allow what is stated within the changelog...

git-svn-id: file:///svn/phpbb/trunk@7874 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/style/install_update.html

@@ -11,11 +11,21 @@
 </script>
 
 <!-- IF S_ERROR -->
-	<h1>{L_NOTICE}</h1>
+	<div class="errorbox" style="margin-top: 0;">
-	<p style="color: red;">{ERROR_MSG}</p>
+		<h3>{L_NOTICE}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
 <!-- ENDIF -->
 
 <!-- IF S_INTRO -->
+
+	<!-- IF S_WARNING -->
+	<div class="successbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{WARNING_MSG}</p>
+	</div>
+	<!-- ENDIF -->
+
 	<form id="install_update" method="post" action="{U_ACTION}">
 
 	<h1>{L_UPDATE_INSTALLATION}</h1>
@@ -68,6 +78,12 @@
 		<dt><label>{L_LATEST_VERSION}</label></dt>
 		<dd><strong>{LATEST_VERSION}</strong></dd>
 	</dl>
+	<!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
+	<dl>
+		<dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
+		<dd><strong>{PACKAGE_VERSION}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
 	</fieldset>
 
 	<!-- IF not S_UP_TO_DATE -->

phpBB/docs/CHANGELOG.html

@@ -215,6 +215,7 @@ p a {
 		<li>[Fix] Correctly escape language keys in language editor (Bug #13279)</li>
 		<li>[Fix] Correctly hide post/reply buttons if permissions are not given (related to Bug #12809)</li>
 		<li>[Fix] Remove orphan/wrong permission entries for non-existent forums - self-repairing permissions if conversions went &quot;crazy&quot;</li>
+		<li>[Feature] Allow &quot;older&quot; 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.</li>
 
 	</ul>
 

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(
+			$this->unequal_version = true;
-				'S_ERROR'		=> true,
-				'ERROR_MSG'		=> sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version))
-			);
 
-			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"),

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',

phpBB/styles/prosilver/template/message_body.html

@@ -4,7 +4,7 @@
 	<div class="inner"><span class="corners-top"><span></span></span>
 	<h2>{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
-	<!-- IF SCRIPT_NAME == "search" --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
+	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -206,6 +206,7 @@
 					<!-- IF postrow.U_YIM --><li class="yahoo-icon"><a href="{postrow.U_YIM}" title="{L_YIM}"><span>{L_YIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_AIM --><li class="aim-icon"><a href="{postrow.U_AIM}" title="{L_AIM}"><span>{L_AIM}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_JABBER --><li class="jabber-icon"><a href="{postrow.U_JABBER}" onclick="popup('{postrow.U_JABBER}', 550, 320); return false;" title="{L_JABBER}"><span>{L_JABBER}</span></a></li><!-- ENDIF -->
+				</ul>
 			</dd>
 		<!-- ENDIF -->
 		<!-- ENDIF -->