Commit 5898e681 authored by tbrehm's avatar tbrehm
Browse files

Fixed a problem with the language setting on updates.

parent 6ba3dc44
...@@ -578,6 +578,8 @@ class installer_dist extends installer_base { ...@@ -578,6 +578,8 @@ class installer_dist extends installer_base {
$content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{server_id}', $conf['server_id'], $content);
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $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); wf("$install_dir/server/lib/$configfile", $content);
......
...@@ -599,6 +599,8 @@ class installer_dist extends installer_base { ...@@ -599,6 +599,8 @@ class installer_dist extends installer_base {
$content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{server_id}', $conf['server_id'], $content);
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $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); wf("$install_dir/server/lib/$configfile", $content);
......
...@@ -879,6 +879,8 @@ class installer_base { ...@@ -879,6 +879,8 @@ class installer_base {
$content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{server_id}', $conf['server_id'], $content);
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $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); wf("$install_dir/server/lib/$configfile", $content);
......
...@@ -89,6 +89,7 @@ $conf['mysql']['charset'] = 'utf8'; ...@@ -89,6 +89,7 @@ $conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"]; $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"]; $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language']; $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_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"]; if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment