From 7383841af55803c2f9dde9549c100bae179f800e Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sun, 26 May 2013 22:39:23 +0200 Subject: [PATCH 1/3] [ticket/11569] Fixing link to continue update PHPBB3-11569 --- phpBB/install/database_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6637736bf2..eefc50bd04 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -265,7 +265,7 @@ while (!$migrator->finished()) { //echo ''; echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '
'; - echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; + echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; phpbb_end_update($cache, $config); } From c65617479df664f1d4cc03400ba46ca1ad5e95de Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sun, 26 May 2013 23:16:13 +0200 Subject: [PATCH 2/3] [ticket/11569] Add parameter to URL and remove comment PHPBB3-11569 --- phpBB/install/database_update.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index eefc50bd04..0da6ab1eb1 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 ''; echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '
'; - echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; + echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; phpbb_end_update($cache, $config); } From a79e229c25be067b64511ba4df8c3a7ea99b0994 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Wed, 29 May 2013 13:27:15 +0200 Subject: [PATCH 3/3] [ticket/11569] Add type parameter and fix language variable PHPBB3-11569 --- phpBB/install/database_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 0da6ab1eb1..be3cc60eaa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -264,7 +264,7 @@ while (!$migrator->finished()) if ((time() - $update_start_time) >= $safe_time_limit) { echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '
'; - echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; + echo '' . $user->lang['DATABASE_UPDATE_CONTINUE'] . ''; phpbb_end_update($cache, $config); }