diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4af3f1a62c..efcb25cb68 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,7 +14,11 @@

{L_ADMIN_INTRO}

- + +
+

{L_UPDATE_INCOMPLETE} {L_MORE_INFORMATION}

+
+

{L_VERSIONCHECK_FAIL}

{VERSIONCHECK_FAIL_REASON}

diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 0cc995959b..351a3ba26c 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -6,11 +6,16 @@

{L_VERSION_CHECK_EXPLAIN}

+ +
+

{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}

+
+

{L_VERSION_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE}

- +

{L_VERSION_NOT_UP_TO_DATE_ACP} - {L_VERSIONCHECK_FORCE_UPDATE}

@@ -18,10 +23,21 @@
+
{CURRENT_VERSION}
+ +
+
+
{FILES_VERSION}
+
+
+
+
{CURRENT_VERSION}
+
+
@@ -38,6 +54,11 @@ + + {INCOMPLETE_INSTRUCTIONS} +
+ + {UPDATE_INSTRUCTIONS}

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), + )); + } } } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index b202df85be..407b0616bd 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -178,6 +178,7 @@ $lang = array_merge($lang, array( 'DB_PASSWORD' => 'Database password', 'DB_NAME' => 'Database name', 'DB_USERNAME' => 'Database username', + 'DATABASE_VERSION' => 'Database version', 'TABLE_PREFIX' => 'Prefix for tables in database', 'TABLE_PREFIX_EXPLAIN' => 'The prefix must start with a letter and must only contain letters, numbers and underscores.', @@ -213,6 +214,14 @@ $lang = array_merge($lang, array( // 'EMAIL_CONFIG' => 'E-mail configuration', + // Package info + 'PACKAGE_VERSION' => 'Package version installed', + 'UPDATE_INCOMPLETE' => 'Your phpBB installation has not been correctly updated.', + 'UPDATE_INCOMPLETE_MORE' => 'Please read the information below in order to fix this error.', + 'UPDATE_INCOMPLETE_EXPLAIN' => '

Incomplete update

+ +

We noticed that the last update of your phpBB installation hasn’t been completed. Visit the database_update script and run it. If it is missing, please download your package version, upload the "install" folder to your phpBB root directory (where your config.php file is) and run the database update script.

', + // // Server data // @@ -432,6 +441,7 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', + 'FILES_VERSION' => 'Files Version', 'TOGGLE_DISPLAY' => 'View/Hide file list', // File updater