8 files changed, 437 insertions, 481 deletions
diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php
index 685cdc4e57..4c20ad916d 100644
--- a/phpBB/phpbb/cache/driver/base.php
+++ b/phpBB/phpbb/cache/driver/base.php
@@ -15,4 +15,217 @@ namespace phpbb\cache\driver;
 
 abstract class base implements \phpbb\cache\driver\driver_interface
 {
+	var $vars = array();
+	var $is_modified = false;
+
+	var $sql_rowset = array();
+	var $sql_row_pointer = array();
+	var $cache_dir = '';
+
+	/**
+	* {@inheritDoc}
+	*/
+	function purge()
+	{
+		// Purge all phpbb cache files
+		try
+		{
+			$iterator = new \DirectoryIterator($this->cache_dir);
+		}
+		catch (\Exception $e)
+		{
+			return;
+		}
+
+		foreach ($iterator as $fileInfo)
+		{
+			if ($fileInfo->isDot())
+			{
+				continue;
+			}
+			$filename = $fileInfo->getFilename();
+			if ($fileInfo->isDir())
+			{
+				$this->remove_dir($fileInfo->getPathname());
+			}
+			else if (strpos($filename, 'container_') === 0 ||
+				strpos($filename, 'url_matcher') === 0 ||
+				strpos($filename, 'sql_') === 0 ||
+				strpos($filename, 'data_') === 0)
+			{
+				$this->remove_file($fileInfo->getPathname());
+			}
+		}
+
+		unset($this->vars);
+		unset($this->sql_rowset);
+		unset($this->sql_row_pointer);
+
+		$this->vars = array();
+		$this->sql_rowset = array();
+		$this->sql_row_pointer = array();
+
+		$this->is_modified = false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function unload()
+	{
+		$this->save();
+		unset($this->vars);
+		unset($this->sql_rowset);
+		unset($this->sql_row_pointer);
+
+		$this->vars = array();
+		$this->sql_rowset = array();
+		$this->sql_row_pointer = array();
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_load($query)
+	{
+		// Remove extra spaces and tabs
+		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
+
+		if (($rowset = $this->_read('sql_' . md5($query))) === false)
+		{
+			return false;
+		}
+
+		$query_id = sizeof($this->sql_rowset);
+		$this->sql_rowset[$query_id] = $rowset;
+		$this->sql_row_pointer[$query_id] = 0;
+
+		return $query_id;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_exists($query_id)
+	{
+		return isset($this->sql_rowset[$query_id]);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_fetchrow($query_id)
+	{
+		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
+		{
+			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
+		}
+
+		return false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_fetchfield($query_id, $field)
+	{
+		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
+		{
+			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
+		}
+
+		return false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_rowseek($rownum, $query_id)
+	{
+		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
+		{
+			return false;
+		}
+
+		$this->sql_row_pointer[$query_id] = $rownum;
+		return true;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_freeresult($query_id)
+	{
+		if (!isset($this->sql_rowset[$query_id]))
+		{
+			return false;
+		}
+
+		unset($this->sql_rowset[$query_id]);
+		unset($this->sql_row_pointer[$query_id]);
+
+		return true;
+	}
+
+	/**
+	* Removes/unlinks file
+	*
+	* @param string $filename Filename to remove
+	* @param bool $check Check file permissions
+	* @return bool True if the file was successfully removed, otherwise false
+	*/
+	function remove_file($filename, $check = false)
+	{
+		if (!function_exists('phpbb_is_writable'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include($phpbb_root_path . 'includes/functions.' . $phpEx);
+		}
+
+		if ($check && !phpbb_is_writable($this->cache_dir))
+		{
+			// E_USER_ERROR - not using language entry - intended.
+			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
+		}
+
+		return @unlink($filename);
+	}
+
+	/**
+	* Remove directory
+	*
+	* @param string $dir Directory to remove
+	*
+	* @return null
+	*/
+	protected function remove_dir($dir)
+	{
+		try
+		{
+			$iterator = new \DirectoryIterator($dir);
+		}
+		catch (\Exception $e)
+		{
+			return;
+		}
+
+		foreach ($iterator as $fileInfo)
+		{
+			if ($fileInfo->isDot())
+			{
+				continue;
+			}
+
+			if ($fileInfo->isDir())
+			{
+				$this->remove_dir($fileInfo->getPathname());
+			}
+			else
+			{
+				$this->remove_file($fileInfo->getPathname());
+			}
+		}
+
+		@rmdir($dir);
+	}
 }
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 2d538b739c..fd5bce4515 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -18,13 +18,7 @@ namespace phpbb\cache\driver;
 */
 class file extends \phpbb\cache\driver\base
 {
-	var $vars = array();
 	var $var_expires = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
 
 	/**
 	* Set cache path
@@ -50,16 +44,9 @@ class file extends \phpbb\cache\driver\base
 	*/
 	function unload()
 	{
-		$this->save();
-		unset($this->vars);
+		parent::unload();
 		unset($this->var_expires);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
 		$this->var_expires = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
 	}
 
 	/**
@@ -166,8 +153,6 @@ class file extends \phpbb\cache\driver\base
 	{
 		if ($var_name[0] == '_')
 		{
-			global $phpEx;
-
 			if (!$this->_exists($var_name))
 			{
 				return false;
@@ -203,85 +188,8 @@ class file extends \phpbb\cache\driver\base
 	*/
 	function purge()
 	{
-		// Purge all phpbb cache files
-		try
-		{
-			$iterator = new \DirectoryIterator($this->cache_dir);
-		}
-		catch (\Exception $e)
-		{
-			return;
-		}
-
-		foreach ($iterator as $fileInfo)
-		{
-			if ($fileInfo->isDot())
-			{
-				continue;
-			}
-			$filename = $fileInfo->getFilename();
-			if ($fileInfo->isDir())
-			{
-				$this->remove_dir($fileInfo->getPathname());
-			}
-			else if (strpos($filename, 'container_') === 0 ||
-				strpos($filename, 'url_matcher') === 0 ||
-				strpos($filename, 'sql_') === 0 ||
-				strpos($filename, 'data_') === 0)
-			{
-				$this->remove_file($fileInfo->getPathname());
-			}
-		}
-
-		unset($this->vars);
-		unset($this->var_expires);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
+		parent::purge();
 		$this->var_expires = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Remove directory
-	*
-	* @param string $dir Directory to remove
-	*
-	* @return null
-	*/
-	protected function remove_dir($dir)
-	{
-		try
-		{
-			$iterator = new \DirectoryIterator($dir);
-		}
-		catch (\Exception $e)
-		{
-			return;
-		}
-
-		foreach ($iterator as $fileInfo)
-		{
-			if ($fileInfo->isDot())
-			{
-				continue;
-			}
-
-			if ($fileInfo->isDir())
-			{
-				$this->remove_dir($fileInfo->getPathname());
-			}
-			else
-			{
-				$this->remove_file($fileInfo->getPathname());
-			}
-		}
-
-		@rmdir($dir);
 	}
 
 	/**
@@ -392,26 +300,6 @@ class file extends \phpbb\cache\driver\base
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		if (($rowset = $this->_read('sql_' . md5($query))) === false)
-		{
-			return false;
-		}
-
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = $rowset;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
 	function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
 	{
 		// Remove extra spaces and tabs
@@ -436,70 +324,6 @@ class file extends \phpbb\cache\driver\base
 	}
 
 	/**
-	* {@inheritDoc}
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
 	* Read cached data from a specified file
 	*
 	* @access private
@@ -760,28 +584,4 @@ class file extends \phpbb\cache\driver\base
 
 		return $return_value;
 	}
-
-	/**
-	* Removes/unlinks file
-	*
-	* @param string $filename Filename to remove
-	* @param bool $check Check file permissions
-	* @return bool True if the file was successfully removed, otherwise false
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if (!function_exists('phpbb_is_writable'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
-		if ($check && !phpbb_is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
 }
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php
index 5dee375192..56308be8da 100644
--- a/phpBB/phpbb/cache/driver/memory.php
+++ b/phpBB/phpbb/cache/driver/memory.php
@@ -20,13 +20,6 @@ abstract class memory extends \phpbb\cache\driver\base
 {
 	var $key_prefix;
 
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
 	/**
 	* Set cache path
 	*/
@@ -71,21 +64,6 @@ abstract class memory extends \phpbb\cache\driver\base
 	/**
 	* {@inheritDoc}
 	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
 	function save()
 	{
 		if (!$this->is_modified)
@@ -147,47 +125,6 @@ abstract class memory extends \phpbb\cache\driver\base
 	/**
 	* {@inheritDoc}
 	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, 'container_') !== 0 &&
-				strpos($entry, 'url_matcher') !== 0 &&
-				strpos($entry, 'sql_') !== 0 &&
-				strpos($entry, 'data_') !== 0 &&
-				strpos($entry, 'ctpl_') !== 0 &&
-				strpos($entry, 'tpl_') !== 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-
-	/**
-	* {@inheritDoc}
-	*/
 	function destroy($var_name, $table = '')
 	{
 		if ($var_name == 'sql' && !empty($table))
@@ -262,26 +199,6 @@ abstract class memory extends \phpbb\cache\driver\base
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		if (($result = $this->_read('sql_' . md5($query))) === false)
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = $result;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
 	function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
 	{
 		// Remove extra spaces and tabs
@@ -338,94 +255,6 @@ abstract class memory extends \phpbb\cache\driver\base
 	}
 
 	/**
-	* {@inheritDoc}
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
-	* Removes/unlinks file
-	*
-	* @param string $filename Filename to remove
-	* @param bool $check Check file permissions
-	* @return bool True if the file was successfully removed, otherwise false
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if (!function_exists('phpbb_is_writable'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
-		if ($check && !phpbb_is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-
-	/**
 	* Check if a cache var exists
 	*
 	* @access protected
diff --git a/phpBB/phpbb/config_php_file.php b/phpBB/phpbb/config_php_file.php
index 1a562e470d..7445e7df22 100644
--- a/phpBB/phpbb/config_php_file.php
+++ b/phpBB/phpbb/config_php_file.php
@@ -71,59 +71,44 @@ class config_php_file
 	/**
 	* Returns an associative array containing the variables defined by the config file.
 	*
-	* @return bool|array Return the content of the config file or false if the file does not exists.
+	* @return array Return the content of the config file or an empty array if the file does not exists.
 	*/
 	public function get_all()
 	{
-		if (!$this->load_config_file())
-		{
-			return false;
-		}
+		$this->load_config_file();
 
 		return $this->config_data;
 	}
 
 	/**
-	* Return the value of a variable defined into the config.php file and false if the variable does not exist.
+	* Return the value of a variable defined into the config.php file or null if the variable does not exist.
 	*
 	* @param string $variable The name of the variable
-	* @return mixed
+	* @return mixed Value of the variable or null if the variable is not defined.
 	*/
 	public function get($variable)
 	{
-		if (!$this->load_config_file())
-		{
-			return false;
-		}
+		$this->load_config_file();
 
-		return isset($this->config_data[$variable]) ? $this->config_data[$variable] : false;
+		return isset($this->config_data[$variable]) ? $this->config_data[$variable] : null;
 	}
 
 	/**
 	* Load the config file and store the information.
 	*
-	* @return bool True if the file was correctly loaded, false otherwise.
+	* @return null
 	*/
 	protected function load_config_file()
 	{
-		if (!$this->config_loaded)
+		if (!$this->config_loaded && file_exists($this->config_file))
 		{
-			if (file_exists($this->config_file))
-			{
-				$this->defined_vars = get_defined_vars();
+			$this->defined_vars = get_defined_vars();
 
-				require($this->config_file);
-				$this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars);
+			require($this->config_file);
+			$this->config_data = array_diff_key(get_defined_vars(), $this->defined_vars);
 
-				$this->config_loaded = true;
-			}
-			else
-			{
-				return false;
-			}
+			$this->config_loaded = true;
 		}
-
-		return true;
 	}
 
 	/**
diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index efab34b701..948a6a218c 100644
--- a/phpBB/phpbb/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
@@ -41,6 +41,12 @@ class resolver implements ControllerResolverInterface
 	protected $template;
 
 	/**
+	* Request type cast helper object
+	* @var \phpbb\request\type_cast_helper
+	*/
+	protected $type_cast_helper;
+
+	/**
 	* phpBB root path
 	* @var string
 	*/
@@ -59,6 +65,7 @@ class resolver implements ControllerResolverInterface
 		$this->user = $user;
 		$this->container = $container;
 		$this->template = $template;
+		$this->type_cast_helper = new \phpbb\request\type_cast_helper();
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
@@ -138,7 +145,16 @@ class resolver implements ControllerResolverInterface
 		{
 			if (array_key_exists($param->name, $attributes))
 			{
-				$arguments[] = $attributes[$param->name];
+				if (is_string($attributes[$param->name]))
+				{
+					$value = $attributes[$param->name];
+					$this->type_cast_helper->set_var($value, $attributes[$param->name], 'string', true, false);
+					$arguments[] = $value;
+				}
+				else
+				{
+					$arguments[] = $attributes[$param->name];
+				}
 			}
 			else if ($param->getClass() && $param->getClass()->isInstance($request))
 			{
diff --git a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
index f5970e74b2..6335c75398 100644
--- a/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
+++ b/phpBB/phpbb/db/migration/data/v310/soft_delete_mod_convert.php
@@ -119,6 +119,7 @@ class soft_delete_mod_convert extends \phpbb\db\migration\migration
 	{
 		return new \phpbb\content_visibility(
 			new \phpbb\auth\auth(),
+			$this->config,
 			$this->db,
 			new \phpbb\user(),
 			$this->phpbb_root_path,
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 5d93eb8246..3567570137 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1816,7 +1816,8 @@ class tools
 				$old_return_statements = $this->return_statements;
 				$this->return_statements = true;
 
-				$indexes = $this->mssql_get_existing_indexes($table_name, $column_name);
+				$indexes = $this->get_existing_indexes($table_name, $column_name);
+				$indexes = array_merge($indexes, $this->get_existing_indexes($table_name, $column_name, true));
 
 				// Drop any indexes
 				$recreate_indexes = array();
@@ -2038,7 +2039,7 @@ class tools
 			break;
 
 			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
+				$statements[] = 'ALTER TABLE ' . $table_name . ' add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
 			break;
 
 			case 'sqlite':
@@ -2274,10 +2275,23 @@ class tools
 	}
 
 	/**
+	 * Removes table_name from the index_name if it is at the beginning
+	 *
+	 * @param $table_name
+	 * @param $index_name
+	 * @return string
+	 */
+	protected function strip_table_name_from_index_name($table_name, $index_name)
+	{
+		return (strpos(strtoupper($index_name), strtoupper($table_name)) === 0) ? substr($index_name, strlen($table_name) + 1) : $index_name;
+	}
+
+	/**
 	* Change column type (not name!)
 	*/
 	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
 	{
+		$original_column_data = $column_data;
 		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
 		$statements = array();
 
@@ -2289,12 +2303,14 @@ class tools
 				$old_return_statements = $this->return_statements;
 				$this->return_statements = true;
 
-				$indexes = $this->mssql_get_existing_indexes($table_name, $column_name);
+				$indexes = $this->get_existing_indexes($table_name, $column_name);
+				$unique_indexes = $this->get_existing_indexes($table_name, $column_name, true);
 
 				// Drop any indexes
-				if (!empty($indexes))
+				if (!empty($indexes) || !empty($unique_indexes))
 				{
-					foreach ($indexes as $index_name => $index_data)
+					$drop_indexes = array_merge(array_keys($indexes), array_keys($unique_indexes));
+					foreach ($drop_indexes as $index_name)
 					{
 						$result = $this->sql_index_drop($table_name, $index_name);
 						$statements = array_merge($statements, $result);
@@ -2324,6 +2340,16 @@ class tools
 					}
 				}
 
+				if (!empty($unique_indexes))
+				{
+					// Recreate unique indexes after we changed the column
+					foreach ($unique_indexes as $index_name => $index_data)
+					{
+						$result = $this->sql_create_unique_index($table_name, $index_name, $index_data);
+						$statements = array_merge($statements, $result);
+					}
+				}
+
 				$this->return_statements = $old_return_statements;
 			break;
 
@@ -2333,7 +2359,69 @@ class tools
 			break;
 
 			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
+				// We need the data here
+				$old_return_statements = $this->return_statements;
+				$this->return_statements = true;
+
+				// Get list of existing indexes
+				$indexes = $this->get_existing_indexes($table_name, $column_name);
+				$unique_indexes = $this->get_existing_indexes($table_name, $column_name, true);
+
+				// Drop any indexes
+				if (!empty($indexes) || !empty($unique_indexes))
+				{
+					$drop_indexes = array_merge(array_keys($indexes), array_keys($unique_indexes));
+					foreach ($drop_indexes as $index_name)
+					{
+						$result = $this->sql_index_drop($table_name, $this->strip_table_name_from_index_name($table_name, $index_name));
+						$statements = array_merge($statements, $result);
+					}
+				}
+
+				$temp_column_name = 'temp_' . substr(md5($column_name), 0, 25);
+				// Add a temporary table with the new type
+				$result = $this->sql_column_add($table_name, $temp_column_name, $original_column_data);
+				$statements = array_merge($statements, $result);
+
+				// Copy the data to the new column
+				$statements[] = 'UPDATE ' . $table_name . ' SET ' . $temp_column_name . ' = ' . $column_name;
+
+				// Drop the original column
+				$result = $this->sql_column_remove($table_name, $column_name);
+				$statements = array_merge($statements, $result);
+
+				// Recreate the original column with the new type
+				$result = $this->sql_column_add($table_name, $column_name, $original_column_data);
+				$statements = array_merge($statements, $result);
+
+				if (!empty($indexes))
+				{
+					// Recreate indexes after we changed the column
+					foreach ($indexes as $index_name => $index_data)
+					{
+						$result = $this->sql_create_index($table_name, $this->strip_table_name_from_index_name($table_name, $index_name), $index_data);
+						$statements = array_merge($statements, $result);
+					}
+				}
+
+				if (!empty($unique_indexes))
+				{
+					// Recreate unique indexes after we changed the column
+					foreach ($unique_indexes as $index_name => $index_data)
+					{
+						$result = $this->sql_create_unique_index($table_name, $this->strip_table_name_from_index_name($table_name, $index_name), $index_data);
+						$statements = array_merge($statements, $result);
+					}
+				}
+
+				// Copy the data to the original column
+				$statements[] = 'UPDATE ' . $table_name . ' SET ' . $column_name . ' = ' . $temp_column_name;
+
+				// Drop the temporary column again
+				$result = $this->sql_column_remove($table_name, $temp_column_name);
+				$statements = array_merge($statements, $result);
+
+				$this->return_statements = $old_return_statements;
 			break;
 
 			case 'postgres':
@@ -2517,45 +2605,78 @@ class tools
 	*
 	* @param string $table_name
 	* @param string $column_name
+	* @param bool $unique Should we get unique indexes or normal ones
 	* @return array		Array with Index name => columns
 	*/
-	protected function mssql_get_existing_indexes($table_name, $column_name)
+	public function get_existing_indexes($table_name, $column_name, $unique = false)
 	{
-		$existing_indexes = array();
-		if ($this->mssql_is_sql_server_2000())
+		switch ($this->sql_layer)
 		{
-			// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
-			// Deprecated in SQL Server 2005
-			$sql = "SELECT DISTINCT ix.name AS phpbb_index_name
-				FROM sysindexes ix
-				INNER JOIN sysindexkeys ixc
-					ON ixc.id = ix.id
-						AND ixc.indid = ix.indid
-				INNER JOIN syscolumns cols
-					ON cols.colid = ixc.colid
-						AND cols.id = ix.id
-				WHERE ix.id = object_id('{$table_name}')
-					AND cols.name = '{$column_name}'";
+			case 'mysql_40':
+			case 'mysql_41':
+			case 'postgres':
+			case 'sqlite':
+			case 'sqlite3':
+				// Not supported
+				throw new \Exception('DBMS is not supported');
+			break;
 		}
-		else
+
+		$sql = '';
+		$existing_indexes = array();
+
+		switch ($this->sql_layer)
 		{
-			$sql = "SELECT DISTINCT ix.name AS phpbb_index_name
-				FROM sys.indexes ix
-				INNER JOIN sys.index_columns ixc
-					ON ixc.object_id = ix.object_id
-						AND ixc.index_id = ix.index_id
-				INNER JOIN sys.columns cols
-					ON cols.column_id = ixc.column_id
-						AND cols.object_id = ix.object_id
-				WHERE ix.object_id = object_id('{$table_name}')
-					AND cols.name = '{$column_name}'";
+			case 'mssql':
+			case 'mssqlnative':
+				if ($this->mssql_is_sql_server_2000())
+				{
+					// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
+					// Deprecated in SQL Server 2005
+					$sql = "SELECT DISTINCT ix.name AS phpbb_index_name
+					FROM sysindexes ix
+					INNER JOIN sysindexkeys ixc
+						ON ixc.id = ix.id
+							AND ixc.indid = ix.indid
+					INNER JOIN syscolumns cols
+						ON cols.colid = ixc.colid
+							AND cols.id = ix.id
+					WHERE ix.id = object_id('{$table_name}')
+						AND cols.name = '{$column_name}'
+						AND INDEXPROPERTY(ix.id, ix.name, 'IsUnique') = " . ($unique) ? '1' : '0';
+				}
+				else
+				{
+					$sql = "SELECT DISTINCT ix.name AS phpbb_index_name
+					FROM sys.indexes ix
+					INNER JOIN sys.index_columns ixc
+						ON ixc.object_id = ix.object_id
+							AND ixc.index_id = ix.index_id
+					INNER JOIN sys.columns cols
+						ON cols.column_id = ixc.column_id
+							AND cols.object_id = ix.object_id
+					WHERE ix.object_id = object_id('{$table_name}')
+						AND cols.name = '{$column_name}'
+						AND ix.is_unique = " . ($unique) ? '1' : '0';
+				}
+			break;
+
+			case 'oracle':
+				$sql = "SELECT ix.index_name  AS phpbb_index_name, ix.uniqueness AS is_unique
+					FROM all_ind_columns ixc, all_indexes ix
+					WHERE ix.index_name = ixc.index_name
+						AND ixc.table_name = '" . strtoupper($table_name) . "'
+						AND ixc.column_name = '" . strtoupper($column_name) . "'";
+			break;
 		}
 
 		$result = $this->db->sql_query($sql);
-		$existing_indexes = array();
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$existing_indexes[$row['phpbb_index_name']] = array();
+			if (!isset($row['is_unique']) || ($unique && $row['is_unique'] == 'UNIQUE') || (!$unique && $row['is_unique'] == 'NONUNIQUE'))
+			{
+				$existing_indexes[$row['phpbb_index_name']] = array();
+			}
 		}
 		$this->db->sql_freeresult($result);
 
@@ -2564,35 +2685,47 @@ class tools
 			return array();
 		}
 
-		if ($this->mssql_is_sql_server_2000())
-		{
-			$sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name
-				FROM sysindexes ix
-				INNER JOIN sysindexkeys ixc
-					ON ixc.id = ix.id
-						AND ixc.indid = ix.indid
-				INNER JOIN syscolumns cols
-					ON cols.colid = ixc.colid
-						AND cols.id = ix.id
-				WHERE ix.id = object_id('{$table_name}')
-					AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes));
-		}
-		else
+		switch ($this->sql_layer)
 		{
-			$sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name
-				FROM sys.indexes ix
-				INNER JOIN sys.index_columns ixc
-					ON ixc.object_id = ix.object_id
-						AND ixc.index_id = ix.index_id
-				INNER JOIN sys.columns cols
-					ON cols.column_id = ixc.column_id
-						AND cols.object_id = ix.object_id
-				WHERE ix.object_id = object_id('{$table_name}')
-					AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes));
+			case 'mssql':
+			case 'mssqlnative':
+				if ($this->mssql_is_sql_server_2000())
+				{
+					$sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name
+						FROM sysindexes ix
+						INNER JOIN sysindexkeys ixc
+							ON ixc.id = ix.id
+								AND ixc.indid = ix.indid
+						INNER JOIN syscolumns cols
+							ON cols.colid = ixc.colid
+								AND cols.id = ix.id
+						WHERE ix.id = object_id('{$table_name}')
+							AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes));
+				}
+				else
+				{
+					$sql = "SELECT DISTINCT ix.name AS phpbb_index_name, cols.name AS phpbb_column_name
+						FROM sys.indexes ix
+						INNER JOIN sys.index_columns ixc
+							ON ixc.object_id = ix.object_id
+								AND ixc.index_id = ix.index_id
+						INNER JOIN sys.columns cols
+							ON cols.column_id = ixc.column_id
+								AND cols.object_id = ix.object_id
+						WHERE ix.object_id = object_id('{$table_name}')
+							AND " . $this->db->sql_in_set('ix.name', array_keys($existing_indexes));
+				}
+			break;
+
+			case 'oracle':
+				$sql = "SELECT index_name AS phpbb_index_name, column_name AS phpbb_column_name
+					FROM all_ind_columns
+					WHERE table_name = '" . strtoupper($table_name) . "'
+						AND " . $this->db->sql_in_set('index_name', array_keys($existing_indexes));
+			break;
 		}
 
 		$result = $this->db->sql_query($sql);
-
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$existing_indexes[$row['phpbb_index_name']][] = $row['phpbb_column_name'];
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 1051021ea7..edca8ee1af 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -330,27 +330,6 @@ class metadata_manager
 	}
 
 	/**
-	* Version validation helper
-	*
-	* @param string $string The string for comparing to a version
-	* @param string $current_version The version to compare to
-	* @return bool True/False if meets version requirements
-	*/
-	private function _validate_version($string, $current_version)
-	{
-		// Allow them to specify their own comparison operator (ex: <3.1.2, >=3.1.0)
-		$comparison_matches = false;
-		preg_match('#[=<>]+#', $string, $comparison_matches);
-
-		if (!empty($comparison_matches))
-		{
-			return version_compare($current_version, str_replace(array($comparison_matches[0], ' '), '', $string), $comparison_matches[0]);
-		}
-
-		return version_compare($current_version, $string, '>=');
-	}
-
-	/**
 	* Outputs the metadata into the template
 	*
 	* @return null