diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-29 13:46:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-29 13:46:25 +0200 |
| commit | b3b92b7b188f07daae889b568a55c2b1b30ca6c1 (patch) | |
| tree | 5d79e884cce7b34f4e924674f9ccafd23d3b6309 | |
| parent | fc1c7211ab3c8766b538625236a7f9628dc8ffb2 (diff) | |
| parent | a79e229c25be067b64511ba4df8c3a7ea99b0994 (diff) | |
| download | forums-b3b92b7b188f07daae889b568a55c2b1b30ca6c1.tar forums-b3b92b7b188f07daae889b568a55c2b1b30ca6c1.tar.gz forums-b3b92b7b188f07daae889b568a55c2b1b30ca6c1.tar.bz2 forums-b3b92b7b188f07daae889b568a55c2b1b30ca6c1.tar.xz forums-b3b92b7b188f07daae889b568a55c2b1b30ca6c1.zip | |
Merge remote-tracking branch 'Elsensee/ticket/11569' into develop
* Elsensee/ticket/11569:
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
[ticket/11569] Fixing link to continue update
| -rw-r--r-- | phpBB/install/database_update.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6637736bf2..be3cc60eaa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -263,9 +263,8 @@ while (!$migrator->finished()) // Are we approaching the time limit? If so we want to pause the update and continue after refreshing if ((time() - $update_start_time) >= $safe_time_limit) { - //echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />'; echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />'; - echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>'; + echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=' . $request->variable('type', 0) . '&language=' . $user->lang['USER_LANG']) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>'; phpbb_end_update($cache, $config); } |