From 04f320cb011f386d11672547c17965a7bd16ef35 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Tue, 5 Apr 2016 06:57:32 -0400 Subject: [ticket/13716] Check phpBB version against config version Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716 --- phpBB/includes/acp/acp_main.php | 6 ++++++ phpBB/includes/acp/acp_update.php | 13 +++++++++++++ 2 files changed, 19 insertions(+) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index afa0f1ea61..848cafeb67 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -453,6 +453,12 @@ class acp_main $template->assign_var('S_VERSION_UP_TO_DATE', true); } + // Incomplete update? + if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) + { + $template->assign_var('S_UPDATE_INCOMPLETE', true); + } + /** * Notice admin * diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 0167a06dbb..a398db60c6 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -62,5 +62,18 @@ class acp_update 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link), )); + + + // Incomplete update? + if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) + { + $database_update_link = append_sid($phpbb_root_path . 'install/database_update.' . $phpEx); + + $template->assign_vars(array( + 'S_UPDATE_INCOMPLETE' => true, + 'FILES_VERSION' => PHPBB_VERSION, + 'INCOMPLETE_INSTRUCTIONS' => $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $update_link, $database_update_link), + )); + } } } -- cgit v1.2.1 From 920219dc56e91769a6d1d1cc7232786b4959e72a Mon Sep 17 00:00:00 2001 From: RMcGirr83 Date: Tue, 5 Apr 2016 14:55:42 -0400 Subject: [ticket/13716] Remove extraneous blank line PHPBB3-13716 --- phpBB/includes/acp/acp_update.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index a398db60c6..ab6fdb3ba5 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -63,7 +63,6 @@ class acp_update 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link), )); - // Incomplete update? if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) { -- cgit v1.2.1 From c93807717251464dd56dfc5b0bc0789bc78a6155 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Mon, 11 Apr 2016 06:04:56 -0400 Subject: [ticket/13716] Fix verboseness PHPBB3-13716 --- phpBB/includes/acp/acp_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index ab6fdb3ba5..529f0f2185 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -71,7 +71,7 @@ class acp_update $template->assign_vars(array( 'S_UPDATE_INCOMPLETE' => true, 'FILES_VERSION' => PHPBB_VERSION, - 'INCOMPLETE_INSTRUCTIONS' => $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $update_link, $database_update_link), + 'INCOMPLETE_INSTRUCTIONS' => $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $database_update_link), )); } } -- cgit v1.2.1