mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2024-10-01 01:26:10 -04:00
Merge pull request #1396 from alexistoulotte/fix/use-opt-model-options-configuration
fix(configuration): Use "model_options[opt]" section from "conf.php"
This commit is contained in:
commit
a85a7552c1
@ -12,7 +12,6 @@
|
|||||||
namespace PrivateBin;
|
namespace PrivateBin;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use PDO;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration
|
* Configuration
|
||||||
@ -166,7 +165,7 @@ class Configuration
|
|||||||
'tbl' => null,
|
'tbl' => null,
|
||||||
'usr' => null,
|
'usr' => null,
|
||||||
'pwd' => null,
|
'pwd' => null,
|
||||||
'opt' => array(PDO::ATTR_PERSISTENT => true),
|
'opt' => array(),
|
||||||
);
|
);
|
||||||
} elseif (
|
} elseif (
|
||||||
$section == 'model_options' && in_array(
|
$section == 'model_options' && in_array(
|
||||||
@ -235,6 +234,8 @@ class Configuration
|
|||||||
$result = (int) $config[$section][$key];
|
$result = (int) $config[$section][$key];
|
||||||
} elseif (is_string($val) && !empty($config[$section][$key])) {
|
} elseif (is_string($val) && !empty($config[$section][$key])) {
|
||||||
$result = (string) $config[$section][$key];
|
$result = (string) $config[$section][$key];
|
||||||
|
} elseif (is_array($val) && is_array($config[$section][$key])) {
|
||||||
|
$result = $config[$section][$key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->_configuration[$section][$key] = $result;
|
$this->_configuration[$section][$key] = $result;
|
||||||
|
Loading…
Reference in New Issue
Block a user