From 949e7e06be2d02e23c037a446e51aa632890d33f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 27 May 2009 09:20:35 -0400
Subject: [PATCH] Merged revisions 1206-1212
---
install/update.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/install/update.php b/install/update.php
index ca74da8..b309509 100644
--- a/install/update.php
+++ b/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"];
--
Gitblit v1.9.1