Fixed a problem with the language setting on updates.

tbrehm

2009-05-25 5898e68138656182bf2fc20e95af97b82242c0da

Fixed a problem with the language setting on updates.

 install/dist/lib/fedora.lib.php

@@ -578,6 +578,8 @@
        
        $content = str_replace('{server_id}', $conf['server_id'], $content);
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/server/lib/$configfile", $content);
        
        

 install/dist/lib/opensuse.lib.php

@@ -599,6 +599,8 @@
        
        $content = str_replace('{server_id}', $conf['server_id'], $content);
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/server/lib/$configfile", $content);
        
        

 install/lib/installer_base.lib.php

@@ -879,6 +879,8 @@
        
        $content = str_replace('{server_id}', $conf['server_id'], $content);
        $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
        $content = str_replace('{language}', $conf['language'], $content);
		
        wf("$install_dir/server/lib/$configfile", $content);
        
        

 install/update.php

@@ -89,6 +89,7 @@
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';

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"];