From bb67b079207703568e69bd9d38e8dbe3f33287fc Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 26 May 2013 12:48:49 +0200
Subject: [ticket/11567] Renamed extension_manager variable to avoid fatal
 error

PHPBB3-11567
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5ea950bfad..6637736bf2 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -213,8 +213,8 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 }
 
 $migrator = $phpbb_container->get('migrator');
-$extension_manager = $phpbb_container->get('ext.manager');
-$finder = $extension_manager->get_finder();
+$phpbb_extension_manager = $phpbb_container->get('ext.manager');
+$finder = $phpbb_extension_manager->get_finder();
 
 $migrations = $finder
 	->core_path('includes/db/migration/data/')
-- 
cgit v1.2.1


From 7383841af55803c2f9dde9549c100bae179f800e Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 26 May 2013 22:39:23 +0200
Subject: [ticket/11569] Fixing link to continue update

PHPBB3-11569
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

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 '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', 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) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
 		phpbb_end_update($cache, $config);
 	}
-- 
cgit v1.2.1


From c65617479df664f1d4cc03400ba46ca1ad5e95de Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 26 May 2013 23:16:13 +0200
Subject: [ticket/11569] Add parameter to URL and remove comment

PHPBB3-11569
---
 phpBB/install/database_update.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/install/database_update.php')

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 '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&amp;', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />';
 		echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
+		echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'language=' . $user->data['user_lang']) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
 		phpbb_end_update($cache, $config);
 	}
-- 
cgit v1.2.1


From a79e229c25be067b64511ba4df8c3a7ea99b0994 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 29 May 2013 13:27:15 +0200
Subject: [ticket/11569] Add type parameter and fix language variable

PHPBB3-11569
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

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'] . '<br />';
-		echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'language=' . $user->data['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=' . $user->lang['USER_LANG']) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
 
 		phpbb_end_update($cache, $config);
 	}
-- 
cgit v1.2.1


From 8b0a6fd2cdf5a2dee53c5485fc7153c5ccde4a6f Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 30 May 2013 21:30:09 +0200
Subject: [ticket/11570] Add link back to update process

PHPBB3-11570
---
 phpBB/install/database_update.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'phpBB/install/database_update.php')

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'] . '<br />';
+
+if ($request->variable('type', 0))
+{
+	echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br />';
+	echo '<a href="' . append_sid($phpbb_root_path . 'intall/index.' . $phpEx, 'mode=update&amp;sub=file_check&amp;language=' . $user->lang['USER_LANG']) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
+}
+else
+{
+	echo $user->lang['UPDATE_FILES_NOTICE'] . '<br />';
+	echo $user->lang['COMPLETE_LOGIN_TO_BOARD'];
+}
 
 phpbb_end_update($cache, $config);
-- 
cgit v1.2.1


From ec2cdbed6179f551910759f0e22714d17a683026 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 31 May 2013 12:18:03 +0200
Subject: [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(-)

(limited to 'phpBB/install/database_update.php')

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'] . '<br />';
 
 if ($request->variable('type', 0))
 {
-	echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br />';
-	echo '<a href="' . append_sid($phpbb_root_path . 'intall/index.' . $phpEx, 'mode=update&amp;sub=file_check&amp;language=' . $user->lang['USER_LANG']) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>';
+	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>';
 }
 else
 {
-	echo $user->lang['UPDATE_FILES_NOTICE'] . '<br />';
+	echo '<div class="errorbox">' . $user->lang['UPDATE_FILES_NOTICE'] . '</div>';
 	echo $user->lang['COMPLETE_LOGIN_TO_BOARD'];
 }
 
-- 
cgit v1.2.1