From b5544b2f471ce4c93b08d19919ab062725545ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gae=CC=88tan=20Muller?= <m.gaetan89@gmail.com>
Date: Sat, 3 Jan 2015 11:39:29 +0100
Subject: [ticket/13450] Type-hint return value of $phpbb_container->get()

PHPBB3-13450
---
 phpBB/includes/acp/acp_update.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes/acp/acp_update.php')

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index 0167a06dbb..83604b8261 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -33,6 +33,7 @@ class acp_update
 		$this->tpl_name = 'acp_update';
 		$this->page_title = 'ACP_VERSION_CHECK';
 
+		/* @var $version_helper \phpbb\version_helper */
 		$version_helper = $phpbb_container->get('version_helper');
 		try
 		{
-- 
cgit v1.2.1


From 597297b169e2ae14684ad1f40c8e083be22b241d Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 18 Oct 2015 22:47:04 +0200
Subject: [ticket/14044] Deduplicate the installers

PHPBB3-14044
---
 phpBB/includes/acp/acp_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_update.php')

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index 83604b8261..52897e1043 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -52,7 +52,7 @@ class acp_update
 			$template->assign_block_vars('updates_available', $version_data);
 		}
 
-		$update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update');
+		$update_link = $phpbb_root_path . 'install/app.' . $phpEx;
 
 		$template->assign_vars(array(
 			'S_UP_TO_DATE'			=> empty($updates_available),
-- 
cgit v1.2.1


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

PHPBB3-14764
---
 phpBB/includes/acp/acp_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_update.php')

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,
-- 
cgit v1.2.1


From ed7ec01feaf439f316c0203ec169850419ba0477 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 9 Sep 2017 13:39:35 +0200
Subject: [ticket/15355] Remove version field when no update is available

PHPBB3-15355
---
 phpBB/includes/acp/acp_update.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_update.php')

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index b52f315d7f..9124a59ef2 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -52,7 +52,10 @@ class acp_update
 			$updates_available = array();
 		}
 
-		$template->assign_block_vars('updates_available', $updates_available);
+		if (!empty($updates_available))
+		{
+			$template->assign_block_vars('updates_available', $updates_available);
+		}
 
 		$update_link = $phpbb_root_path . 'install/app.' . $phpEx;
 
-- 
cgit v1.2.1