From 24854cb22b746425ebad00aacd4af7e677666c03 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 05 May 2009 11:05:35 -0400
Subject: [PATCH] Merged the following revisions from Trunk:

---
 install/update.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/install/update.php b/install/update.php
index 0c3a207..ca74da8 100644
--- a/install/update.php
+++ b/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"];

--
Gitblit v1.9.1