[geeklog-cvs] geeklog: When an error occurs in bigdump.php (during migration) ...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/e770d98c2967
changeset: 7218:e770d98c2967
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Aug 02 19:41:51 2009 +0200
description:
When an error occurs in bigdump.php (during migration) keep the language when sending the user back to migrate.php (bug #0000943)

diffstat:

 public_html/admin/install/bigdump.php |  7 ++++++-
 public_html/docs/history              |  2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r e4e3e849bff8 -r e770d98c2967 public_html/admin/install/bigdump.php
--- a/public_html/admin/install/bigdump.php	Sun Aug 02 19:31:01 2009 +0200
+++ b/public_html/admin/install/bigdump.php	Sun Aug 02 19:41:51 2009 +0200
@@ -386,7 +386,12 @@
 }
 
 if ($error) {
-  echo '<p><a href="migrate.php">' . $LANG_BIGDUMP[30] . '</a> ' . $LANG_BIGDUMP[31] . '</p>' . LB;
+    $backurl = 'migrate.php';
+    if (! empty($language)) {
+        $backurl .= '?language=' . $language;
+    }
+    echo '<p><a href="' . $backurl . '">' . $LANG_BIGDUMP[30] . '</a> '
+         . $LANG_BIGDUMP[31] . '</p>' . LB;
 }
 
 if ($dbconnection) mysql_close();
diff -r e4e3e849bff8 -r e770d98c2967 public_html/docs/history
--- a/public_html/docs/history	Sun Aug 02 19:31:01 2009 +0200
+++ b/public_html/docs/history	Sun Aug 02 19:41:51 2009 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2009 (1.6.1)
 ------------
 
+- When an error occurs in bigdump.php (during migration) keep the language when
+  sending the user back to migrate.php (bug #0000943) [Dirk]
 - Use COM_getUserDateTimeFormat, i.e. the user's preferred format, for
   displaying the date and time in search results [Dirk]
 - When disabling a feed, delete the feed file [Dirk]