diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 3d55be4211..34d00241cb 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -11,11 +11,21 @@ -

{L_NOTICE}

-

{ERROR_MSG}

+
+

{L_NOTICE}

+

{ERROR_MSG}

+
+ + +
+

{L_NOTICE}

+

{WARNING_MSG}

+
+ +

{L_UPDATE_INSTALLATION}

@@ -68,6 +78,12 @@
{LATEST_VERSION}
+ +
+
+
{PACKAGE_VERSION}
+
+ diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6255ff1e05..38189bc446 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -215,6 +215,7 @@ p a {
  • [Fix] Correctly escape language keys in language editor (Bug #13279)
  • [Fix] Correctly hide post/reply buttons if permissions are not given (related to Bug #12809)
  • [Fix] Remove orphan/wrong permission entries for non-existent forums - self-repairing permissions if conversions went "crazy"
    • +
  • [Feature] Allow "older" updates applied with the automatic updater. This allows people using it for updating, say, from 3.0.0 to 3.0.1 (with the correct package of course) and then from 3.0.1 to 3.0.2 if the latest version at this time is 3.0.2. These changes take effect beginning with RC4 or people replacing install/install_update.php manually prior doing the updates.
    • diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5918b441d0..958b245e1a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4133,7 +4133,7 @@ function page_header($page_title = '', $display_online_list = true) 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false, - 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, + 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, 'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false, 'S_REGISTERED_USER' => $user->data['is_registered'], 'S_IS_BOT' => $user->data['is_bot'], diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 7c8e965b83..4c4912a2ab 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -58,6 +58,7 @@ class install_update extends module var $new_location; var $latest_version; var $current_version; + var $unequal_version; // Set to false var $test_update = false; @@ -73,6 +74,7 @@ class install_update extends module $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; + $this->unequal_version = false; $this->old_location = $phpbb_root_path . 'install/update/old/'; $this->new_location = $phpbb_root_path . 'install/update/new/'; @@ -173,12 +175,12 @@ class install_update extends module // Check if the update files stored are for the latest version... if ($this->latest_version != $this->update_info['version']['to']) { - $template->assign_vars(array( - 'S_ERROR' => true, - 'ERROR_MSG' => sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version)) - ); + $this->unequal_version = true; - return; + $template->assign_vars(array( + 'S_WARNING' => true, + 'WARNING_MSG' => sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version)) + ); } if ($this->test_update === false) @@ -242,6 +244,12 @@ class install_update extends module 'CURRENT_VERSION' => $this->current_version) ); + // Print out version the update package updates to + if ($this->unequal_version) + { + $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); + } + break; case 'update_db': @@ -254,7 +262,7 @@ class install_update extends module { include_once($phpbb_root_path . 'install/database_update.' . $phpEx); - if ($updates_to_version === $this->latest_version) + if ($updates_to_version === $this->update_info['version']['to']) { $valid = true; } @@ -272,7 +280,7 @@ class install_update extends module // Redirect the user to the database update script with some explanations... $template->assign_vars(array( 'S_DB_UPDATE' => true, - 'S_DB_UPDATE_FINISHED' => ($config['version'] == $this->latest_version) ? true : false, + 'S_DB_UPDATE_FINISHED' => ($config['version'] == $this->update_info['version']['to']) ? true : false, 'U_DB_UPDATE' => append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=1&language=' . $user->data['user_lang']), 'U_DB_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_db"), 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"), diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 021bc7f2c9..48dc4d5a7e 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -445,6 +445,7 @@ $lang = array_merge($lang, array( 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', + 'PACKAGE_UPDATES_TO' => 'Current package updates to version', 'PERFORM_DATABASE_UPDATE' => 'Perform database update', 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.', 'PREVIOUS_VERSION' => 'Previous version', diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index a1b6ddd530..01488e27ec 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -4,7 +4,7 @@

    {MESSAGE_TITLE}

    {MESSAGE_TEXT}

    -

    {L_RETURN_TO_SEARCH_ADV}

    +

    {L_RETURN_TO_SEARCH_ADV}

    diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index ac3703a514..95e37663ae 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -206,6 +206,7 @@
  • {L_YIM}
  • {L_AIM}
  • {L_JABBER}
    • +