aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-07-29 21:30:01 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-07-29 21:30:01 +0200
commit5bb08a1ab973ee13237876d11b001c4ed6658892 (patch)
tree9126dcd370ce233ffde7e3a9ae14eab6384ef924 /phpBB/install/database_update.php
parentd8dea6377866be7add5714f842e02011942a9cb4 (diff)
downloadforums-5bb08a1ab973ee13237876d11b001c4ed6658892.tar
forums-5bb08a1ab973ee13237876d11b001c4ed6658892.tar.gz
forums-5bb08a1ab973ee13237876d11b001c4ed6658892.tar.bz2
forums-5bb08a1ab973ee13237876d11b001c4ed6658892.tar.xz
forums-5bb08a1ab973ee13237876d11b001c4ed6658892.zip
[ticket/11574] Change order of files and database update
PHPBB3-11574
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 44cbc74d29..f69f0f6986 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -110,6 +110,7 @@ phpbb_require_updated('includes/functions_container.' . $phpEx);
require($phpbb_root_path . 'config.' . $phpEx);
phpbb_require_updated('includes/constants.' . $phpEx);
+phpbb_include_updated('includes/utf/utf_normalizer.' . $phpEx);
phpbb_require_updated('includes/utf/utf_tools.' . $phpEx);
// Set PHP error handler to ours
@@ -305,7 +306,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=' . $request->variable('language', 'en')) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
+ echo '<a href="' . append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update&amp;sub=update_db&amp;language=' . $request->variable('language', 'en')) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
}
else
{