diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:17:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:17:33 +0200 |
| commit | c60dbede3ef3e42528b95b9b9b5337473bafda5c (patch) | |
| tree | b190d35264ffc324c359e37b9207a12374c138c5 /phpBB/includes | |
| parent | aaa99b471913e40ef5a31c12cba70d9fbb653de6 (diff) | |
| parent | 0d7625c534b87b5d27977c2baa5e5ada132f7280 (diff) | |
| download | forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.gz forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.bz2 forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.xz forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.zip | |
Merge pull request #4281 from rmcgirr83/ticket_13716
[ticket/13716] Check phpBB version against config version
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 12 |
2 files changed, 18 insertions, 0 deletions
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..529f0f2185 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -62,5 +62,17 @@ 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', $database_update_link), + )); + } } } |