aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-06-10 13:58:36 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-13 09:57:56 +0200
commitfcf343733887d7d42a3060c48b1a009ae0520467 (patch)
treed25749c5832fec843c1ec13e5fd494f57a97c6b9
parent3eaeede32176d8831f12529aa2053123293b67ca (diff)
downloadforums-fcf343733887d7d42a3060c48b1a009ae0520467.tar
forums-fcf343733887d7d42a3060c48b1a009ae0520467.tar.gz
forums-fcf343733887d7d42a3060c48b1a009ae0520467.tar.bz2
forums-fcf343733887d7d42a3060c48b1a009ae0520467.tar.xz
forums-fcf343733887d7d42a3060c48b1a009ae0520467.zip
[ticket/11574] Add correct language parameter to return links
PHPBB3-11574
-rw-r--r--phpBB/install/database_update.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3341c20058..de7f4f202e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -286,7 +286,7 @@ while (!$migrator->finished())
if ((time() - $update_start_time) >= $safe_time_limit)
{
echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
- echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=' . $request->variable('type', 0) . '&amp;language=' . $user->lang['USER_LANG']) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
+ echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=' . $request->variable('type', 0) . '&amp;language=' . $request->variable('language', 'en')) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
phpbb_end_update($cache, $config);
}
@@ -302,7 +302,7 @@ echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '<br />';
if ($request->variable('type', 0))
{
echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br /><br />';
- echo '<a href="' . append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update&amp;sub=file_check&amp;language=' . $user->lang['USER_LANG']) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
+ echo '<a href="' . append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update&amp;sub=file_check&amp;language=' . $request->variable('language', 'en')) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
}
else
{