[geeklog-cvs] geeklog: The install script was switching back to English in som...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6b875907acf6
changeset: 7298:6b875907acf6
user:      Dirk Haun <dirk at haun-online.de>
date:      Wed Sep 09 20:56:06 2009 +0200
description:
The install script was switching back to English in some upgrade scenarios (bug #0000969, patch provided by taca)

diffstat:

 public_html/admin/install/lib-install.php |  4 +++-
 public_html/docs/history                  |  2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 5e47d04d6236 -r 6b875907acf6 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php	Sun Sep 06 21:33:37 2009 +0200
+++ b/public_html/admin/install/lib-install.php	Wed Sep 09 20:56:06 2009 +0200
@@ -623,7 +623,8 @@
  */
 function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path)
 {
-    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass;
+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
+           $language;
 
     require $dbconfig_path;
     require $siteconfig_path;
@@ -672,6 +673,7 @@
             // current version is at least 1.5.0, so upgrade directly
             $req_string = 'index.php?mode=upgrade&step=3'
                         . '&dbconfig_path=' . $dbconfig_path
+                        . '&language=' . $language
                         . '&version=' . $version;
 
             header('Location: ' . $req_string);
diff -r 5e47d04d6236 -r 6b875907acf6 public_html/docs/history
--- a/public_html/docs/history	Sun Sep 06 21:33:37 2009 +0200
+++ b/public_html/docs/history	Wed Sep 09 20:56:06 2009 +0200
@@ -3,6 +3,8 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- The install script was switching back to English in some upgrade scenarios
+  (bug #0000969, patch provided by taca)
 - Added a workaround to not lose the XMLSitemap priorities for Locales where
   the comma is used as the decimal separator [Dirk]
 - Keep track of actual upper/lowercase spelling of plugin names in the