commit 79c87d4e6ff79854d484895fbfbd82ed71752195
parent 9fa99a6eedaec48d4fe3477acbe88f01e34647e0
Author: Jan Dankert <devnull@localhost>
Date: Thu, 9 Aug 2012 21:18:46 +0200
Dateinamen der Konfigurationsdatei mit in die Konfiguration aufnehmen.
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/Preferences.class.php b/util/Preferences.class.php
@@ -69,7 +69,8 @@ class Preferences
require('./config/config-default.php');
//echo "default: "; print_r($conf);
- $ini_values = parse_ini_file( Preferences::configurationFile(),false );
+ $filename = Preferences::configurationFile();
+ $ini_values = parse_ini_file( $filename,false );
//echo "loading ".$config_filename;
foreach ( $ini_values as $key=>$value )
@@ -89,6 +90,7 @@ class Preferences
$conf[$parts[0]][$parts[1]][$parts[2]][$parts[3]][$parts[4]][$parts[5]] = $value;
}
+ $conf['config']['filename' ] = $filename;
$conf['config']['last_modification'] = Preferences::lastModificationTime();
return $conf;
}