From 86752fc6df0a3cc9a09c997d95747364d2e99dcc Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Fri, 2 Sep 2016 22:03:41 +0200
Subject: [PATCH 1/2] [ticket/14764] Wrong link to database update script has
 been fixed

PHPBB3-14764
---
 phpBB/includes/acp/acp_update.php | 2 +-
 phpBB/language/en/install.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index e42367d8a1..b88e6d3984 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -67,7 +67,7 @@ class acp_update
 		// Incomplete update?
 		if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<'))
 		{
-			$database_update_link = append_sid($phpbb_root_path . 'install/database_update.' . $phpEx);
+			$database_update_link = $phpbb_root_path . 'install/app.php/update';
 
 			$template->assign_vars(array(
 				'S_UPDATE_INCOMPLETE'		=> true,
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index b67b87959d..6d04958899 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -222,7 +222,7 @@ $lang = array_merge($lang, array(
 	'UPDATE_INCOMPLETE_MORE'		=> 'Please read the information below in order to fix this error.',
 	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
 
-		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>',
+		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">update process</a> and read the notice <em>Update database only</em> and press <strong>Submit</strong>. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update</a>. Don\'t forget to delete the "install"-directory after you have updated the database sucessfully.</p>',
 
 	//
 	// Server data

From f6b376def8b61700ada08e6162d9f773f8a2b530 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 5 Sep 2016 20:57:28 +0200
Subject: [PATCH 2/2] [ticket/14764] Implements feedback to wording in install
 db updater

PHPBB3-14764
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 6d04958899..a6aef9797a 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -222,7 +222,7 @@ $lang = array_merge($lang, array(
 	'UPDATE_INCOMPLETE_MORE'		=> 'Please read the information below in order to fix this error.',
 	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
 
-		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">update process</a> and read the notice <em>Update database only</em> and press <strong>Submit</strong>. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update</a>. Don\'t forget to delete the "install"-directory after you have updated the database sucessfully.</p>',
+		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database updater</a>, ensure <em>Update database only</em> is selected and click on <strong>Submit</strong>. Don\'t forget to delete the "install"-directory after you have updated the database sucessfully.</p>',
 
 	//
 	// Server data