aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/Configuration.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-22 16:08:24 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-22 16:08:24 +0100
commit415d7a5a716726759c30151af11bd588d52acbb2 (patch)
tree2c0eb625c93516f257ab039a055b2585549a8809 /lib/Minz/Configuration.php
parent3a4260b8744a0deb331e78cff43567a386c8d9a8 (diff)
config.php plutôt que application.ini
Implémente https://github.com/marienfressinaud/FreshRSS/issues/272
Diffstat (limited to 'lib/Minz/Configuration.php')
-rw-r--r--lib/Minz/Configuration.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 9fc913964..1b108dcdf 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -8,7 +8,7 @@
* La classe Configuration permet de gérer la configuration de l'application
*/
class Minz_Configuration {
- const CONF_PATH_NAME = '/application.ini';
+ const CONF_PATH_NAME = '/config.php';
/**
* VERSION est la version actuelle de MINZ
@@ -126,10 +126,7 @@ class Minz_Configuration {
);
}
- $ini_array = parse_ini_file (
- DATA_PATH . self::CONF_PATH_NAME,
- true
- );
+ $ini_array = include(DATA_PATH . self::CONF_PATH_NAME);
if (!$ini_array) {
throw new Minz_PermissionDeniedException (
@@ -147,7 +144,6 @@ class Minz_Configuration {
}
$general = $ini_array['general'];
-
// sel_application est obligatoire
if (!isset ($general['sel_application'])) {
throw new Minz_BadConfigurationException (