diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:25:16 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:25:16 +0200 |
| commit | a460aec68cf0927b0b145fd19a62d675369dcda9 (patch) | |
| tree | bca2acad593abb700f4e84f1abffb7490a85b4e6 /phpBB/includes/acp | |
| parent | 450e5b36b89dc5570a89a3bc28dcd4cf21b1b783 (diff) | |
| parent | c60dbede3ef3e42528b95b9b9b5337473bafda5c (diff) | |
| download | forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.gz forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.bz2 forums-a460aec68cf0927b0b145fd19a62d675369dcda9.tar.xz forums-a460aec68cf0927b0b145fd19a62d675369dcda9.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/language/en/install.php
Diffstat (limited to 'phpBB/includes/acp')
| -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 529c3a1835..f44bbbc88d 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -459,6 +459,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 52897e1043..e42367d8a1 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -63,5 +63,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), + )); + } } } |