From 8b0a6fd2cdf5a2dee53c5485fc7153c5ccde4a6f Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Thu, 30 May 2013 21:30:09 +0200 Subject: [PATCH 1/2] [ticket/11570] Add link back to update process PHPBB3-11570 --- phpBB/install/database_update.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index be3cc60eaa..9f3fd41ef2 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -275,6 +275,17 @@ if ($orig_version != $config['version']) add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']); } -echo $user->lang['DATABASE_UPDATE_COMPLETE']; +echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '
'; + +if ($request->variable('type', 0)) +{ + echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '
'; + echo '' . $user->lang['CONTINUE_UPDATE_NOW'] . ''; +} +else +{ + echo $user->lang['UPDATE_FILES_NOTICE'] . '
'; + echo $user->lang['COMPLETE_LOGIN_TO_BOARD']; +} phpbb_end_update($cache, $config); From ec2cdbed6179f551910759f0e22714d17a683026 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Fri, 31 May 2013 12:18:03 +0200 Subject: [PATCH 2/2] [ticket/11570] Fix link and make the notice more conspiciuous PHPBB3-11570 --- phpBB/install/database_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 9f3fd41ef2..b20ca1e4ea 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -279,12 +279,12 @@ echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '
'; if ($request->variable('type', 0)) { - echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '
'; - echo '' . $user->lang['CONTINUE_UPDATE_NOW'] . ''; + echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '

'; + echo '' . $user->lang['CONTINUE_UPDATE_NOW'] . ''; } else { - echo $user->lang['UPDATE_FILES_NOTICE'] . '
'; + echo '
' . $user->lang['UPDATE_FILES_NOTICE'] . '
'; echo $user->lang['COMPLETE_LOGIN_TO_BOARD']; }