Fixed: FS#702 - language setting in config.inc.php does not persist during ...

tbrehm

2009-05-04 56f1f4fa56071255750a8133020dc89254061eb3

Fixed: FS#702 - language setting in config.inc.php does not persist during updates.

 install/dist/lib/fedora.lib.php

@@ -554,6 +554,8 @@
        $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
        
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/interface/lib/$configfile", $content);
        
        //* Create the config file for ISPConfig server

 install/dist/lib/opensuse.lib.php

@@ -577,6 +577,8 @@
        $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
        
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/interface/lib/$configfile", $content);
        
        //* Create the config file for ISPConfig server

 install/lib/installer_base.lib.php

@@ -857,6 +857,8 @@
        $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
        
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/interface/lib/$configfile", $content);
        
        //* Create the config file for ISPConfig server

 install/tpl/config.inc.php.master

@@ -133,7 +133,7 @@




//** Default Language

$conf["language"] = 'en';

$conf["language"] = '{language}';




//** Misc.


 install/update.php

@@ -88,6 +88,7 @@
$conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];

if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];