3 files changed, 84 insertions, 33 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php b/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php
new file mode 100644
index 0000000000..5941c3aa54
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/extensions_version_check_force_unstable.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class extensions_version_check_force_unstable extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\dev');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('extension_force_unstable', false)),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index 871fd97aca..818e27a362 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -109,7 +109,25 @@ class schema_generator
 							{
 								foreach ($add_columns as $column => $column_data)
 								{
-									$this->tables[$table]['COLUMNS'][$column] = $column_data;
+									if (isset($column_data['after']))
+									{
+										$columns = $this->tables[$table]['COLUMNS'];
+										$offset = array_search($column_data['after'], array_keys($columns));
+										unset($column_data['after']);
+
+										if ($offset === false)
+										{
+											$this->tables[$table]['COLUMNS'][$column] = array_values($column_data);
+										}
+										else
+										{
+											$this->tables[$table]['COLUMNS'] = array_merge(array_slice($columns, 0, $offset + 1, true), array($column => array_values($column_data)), array_slice($columns, $offset));
+										}
+									}
+									else
+									{
+										$this->tables[$table]['COLUMNS'][$column] = $column_data;
+									}
 								}
 							}
 						}
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php
index 5991744e76..968a57428f 100644
--- a/phpBB/phpbb/version_helper.php
+++ b/phpBB/phpbb/version_helper.php
@@ -158,15 +158,16 @@ class version_helper
 	}
 
 	/**
-	 * Gets the latest version for the current branch the user is on
-	 *
-	 * @param bool $force_update Ignores cached data. Defaults to false.
-	 * @return string
-	 * @throws \RuntimeException
-	 */
-	public function get_latest_on_current_branch($force_update = false)
+	* Gets the latest version for the current branch the user is on
+	*
+	* @param bool $force_update Ignores cached data. Defaults to false.
+	* @param bool $force_cache Force the use of the cache. Override $force_update.
+	* @return string
+	* @throws \RuntimeException
+	*/
+	public function get_latest_on_current_branch($force_update = false, $force_cache = false)
 	{
-		$versions = $this->get_versions_matching_stability($force_update);
+		$versions = $this->get_versions_matching_stability($force_update, $force_cache);
 
 		$self = $this;
 		$current_version = $this->current_version;
@@ -188,15 +189,16 @@ class version_helper
 	}
 
 	/**
-	 * Obtains the latest version information
-	 *
-	 * @param bool $force_update Ignores cached data. Defaults to false.
-	 * @return string
-	 * @throws \RuntimeException
-	 */
-	public function get_suggested_updates($force_update = false)
+	* Obtains the latest version information
+	*
+	* @param bool $force_update Ignores cached data. Defaults to false.
+	* @param bool $force_cache Force the use of the cache. Override $force_update.
+	* @return string
+	* @throws \RuntimeException
+	*/
+	public function get_suggested_updates($force_update = false, $force_cache = false)
 	{
-		$versions = $this->get_versions_matching_stability($force_update);
+		$versions = $this->get_versions_matching_stability($force_update, $force_cache);
 
 		$self = $this;
 		$current_version = $this->current_version;
@@ -208,15 +210,16 @@ class version_helper
 	}
 
 	/**
-	 * Obtains the latest version information matching the stability of the current install
-	 *
-	 * @param bool $force_update Ignores cached data. Defaults to false.
-	 * @return string Version info
-	 * @throws \RuntimeException
-	 */
-	public function get_versions_matching_stability($force_update = false)
+	* Obtains the latest version information matching the stability of the current install
+	*
+	* @param bool $force_update Ignores cached data. Defaults to false.
+	* @param bool $force_cache Force the use of the cache. Override $force_update.
+	* @return string Version info
+	* @throws \RuntimeException
+	*/
+	public function get_versions_matching_stability($force_update = false, $force_cache = false)
 	{
-		$info = $this->get_versions($force_update);
+		$info = $this->get_versions($force_update, $force_cache);
 
 		if ($this->force_stability !== null)
 		{
@@ -227,19 +230,24 @@ class version_helper
 	}
 
 	/**
-	 * Obtains the latest version information
-	 *
-	 * @param bool $force_update Ignores cached data. Defaults to false.
-	 * @return string Version info, includes stable and unstable data
-	 * @throws \RuntimeException
-	 */
-	public function get_versions($force_update = false)
+	* Obtains the latest version information
+	*
+	* @param bool $force_update Ignores cached data. Defaults to false.
+	* @param bool $force_cache Force the use of the cache. Override $force_update.
+	* @return string Version info, includes stable and unstable data
+	* @throws \RuntimeException
+	*/
+	public function get_versions($force_update = false, $force_cache = false)
 	{
 		$cache_file = 'versioncheck_' . $this->host . $this->path . $this->file;
 
 		$info = $this->cache->get($cache_file);
 
-		if ($info === false || $force_update)
+		if ($info === false && $force_cache)
+		{
+			throw new \RuntimeException($this->user->lang('VERSIONCHECK_FAIL'));
+		}
+		else if ($info === false || $force_update)
 		{
 			$errstr = $errno = '';
 			$info = get_remote_file($this->host, $this->path, $this->file, $errstr, $errno);