17 files changed, 1073 insertions, 175 deletions
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
new file mode 100644
index 0000000000..16a09af6fc
--- /dev/null
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -0,0 +1,128 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+namespace phpbb\console\command\db;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class migrate extends \phpbb\console\command\command
+{
+	/** @var \phpbb\db\migrator */
+	protected $migrator;
+
+	/** @var \phpbb\extension\manager */
+	protected $extension_manager;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\cache\service */
+	protected $cache;
+
+	/** @var \phpbb\log\log */
+	protected $log;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	function __construct(\phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, \phpbb\user $user)
+	{
+		$this->migrator = $migrator;
+		$this->extension_manager = $extension_manager;
+		$this->config = $config;
+		$this->cache = $cache;
+		$this->log = $log;
+		$this->user = $user;
+		$this->user->add_lang(array('common', 'acp/common', 'install', 'migrator'));
+		parent::__construct();
+	}
+
+	protected function configure()
+	{
+		$this
+			->setName('db:migrate')
+			->setDescription('Updates the database by applying migrations.')
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$this->load_migrations();
+		$orig_version = $this->config['version'];
+		while (!$this->migrator->finished())
+		{
+			$migration_start_time = microtime(true);
+
+			try
+			{
+				$this->migrator->update();
+			}
+			catch (\phpbb\db\migration\exception $e)
+			{
+				$output->writeln('<error>' . $e->getLocalisedMessage($this->user) . '</error>');
+				$this->finalise_update();
+				return 1;
+			}
+
+			$migration_stop_time = microtime(true) - $migration_start_time;
+
+			$state = array_merge(
+				array(
+					'migration_schema_done' => false,
+					'migration_data_done'	=> false,
+				),
+				$this->migrator->last_run_migration['state']
+			);
+
+			if (!empty($this->migrator->last_run_migration['effectively_installed']))
+			{
+				$msg = $this->user->lang('MIGRATION_EFFECTIVELY_INSTALLED', $this->migrator->last_run_migration['name']);
+				$output->writeln("<comment>$msg</comment>");
+			}
+			else if ($this->migrator->last_run_migration['task'] == 'process_data_step' && $state['migration_data_done'])
+			{
+				$msg = $this->user->lang('MIGRATION_DATA_DONE', $this->migrator->last_run_migration['name'], $migration_stop_time);
+				$output->writeln("<info>$msg</info>");
+			}
+			else if ($this->migrator->last_run_migration['task'] == 'process_data_step')
+			{
+				$output->writeln($this->user->lang('MIGRATION_DATA_IN_PROGRESS', $this->migrator->last_run_migration['name'], $migration_stop_time));
+			}
+			else if ($state['migration_schema_done'])
+			{
+				$msg = $this->user->lang('MIGRATION_SCHEMA_DONE', $this->migrator->last_run_migration['name'], $migration_stop_time);
+				$output->writeln("<info>$msg</info>");
+			}
+		}
+
+		if ($orig_version != $this->config['version'])
+		{
+			$this->log->add('admin', 'LOG_UPDATE_DATABASE', $orig_version, $this->config['version']);
+		}
+
+		$this->finalise_update();
+		$output->writeln($this->user->lang['DATABASE_UPDATE_COMPLETE']);
+	}
+
+	protected function load_migrations()
+	{
+		$migrations = $this->extension_manager
+			->get_finder()
+			->core_path('phpbb/db/migration/data/')
+			->extension_directory('/migrations')
+			->get_classes();
+		$this->migrator->set_migrations($migrations);
+	}
+
+	protected function finalise_update()
+	{
+		$this->cache->purge();
+		$this->config->increment('assets_version', 1);
+	}
+}
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 9df8130210..2c7493f64c 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -46,7 +46,7 @@ class provider
 			// We hardcode the path to the core config directory
 			// because the finder cannot find it
 			$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
-					->directory('config')
+					->directory('/config')
 					->suffix('routing.yml')
 					->find()
 			));
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
new file mode 100644
index 0000000000..971b3e55d3
--- /dev/null
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -0,0 +1,375 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\driver;
+
+/**
+* SQLite3 Database Abstraction Layer
+* Minimum Requirement: 3.6.15+
+* @package dbal
+*/
+class sqlite3 extends \phpbb\db\driver\driver
+{
+	/**
+	* @var	string		Stores errors during connection setup in case the driver is not available
+	*/
+	protected $connect_error = '';
+
+	/**
+	* @var	\SQLite3	The SQLite3 database object to operate against
+	*/
+	protected $dbo = null;
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = false;
+		$this->user = $sqluser;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
+		$this->dbname = $database;
+
+		if (!class_exists('SQLite3', false))
+		{
+			$this->connect_error = 'SQLite3 not found, is the extension installed?';
+			return $this->sql_error('');
+		}
+
+		try
+		{
+			$this->dbo = new \SQLite3($this->server, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
+			$this->db_connect_id = true;
+		}
+		catch (Exception $e)
+		{
+			return array('message' => $e->getMessage());
+		}
+
+		return true;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('sqlite_version')) === false)
+		{
+			$version = \SQLite3::version();
+
+			$this->sql_server_version = $version['versionString'];
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('sqlite_version', $this->sql_server_version);
+			}
+		}
+
+		return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
+	}
+
+	/**
+	* SQL Transaction
+	*
+	* @param	string	$status		Should be one of the following strings:
+	*								begin, commit, rollback
+	* @return	bool	Success/failure of the transaction query
+	*/
+	protected function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return $this->dbo->exec('BEGIN IMMEDIATE');
+			break;
+
+			case 'commit':
+				return $this->dbo->exec('COMMIT');
+			break;
+
+			case 'rollback':
+				return $this->dbo->exec('ROLLBACK');
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @$this->dbo->query($query)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache && $cache_ttl)
+				{
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
+				}
+			}
+			else if (defined('DEBUG'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*
+	* @param	string	$query		The SQL query to execute
+	* @param	int		$total		The number of rows to select
+	* @param	int		$offset
+	* @param	int		$cache_ttl	Either 0 to avoid caching or
+	*				the time in seconds which the result shall be kept in cache
+	* @return	mixed	Buffered, seekable result handle, false on error
+	*/
+	protected function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			$total = -1;
+		}
+
+		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? $this->dbo->changes() : false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		return is_object($query_id) ? $query_id->fetchArray(SQLITE3_ASSOC) : false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_nextid()
+	{
+		return ($this->db_connect_id) ? $this->dbo->lastInsertRowID() : false;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if ($query_id)
+		{
+			return @$query_id->finalize();
+		}
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_escape($msg)
+	{
+		return \SQLite3::escapeString($msg);
+	}
+
+	/**
+	* {@inheritDoc}
+	*
+	* For SQLite an underscore is a not-known character...
+	*/
+	public function sql_like_expression($expression)
+	{
+		// Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it!
+		// We only catch * and ? here, not the character map possible on file globbing.
+		$expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression);
+
+		$expression = str_replace(array('?', '*'), array("\?", "\*"), $expression);
+		$expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression);
+
+		return 'GLOB \'' . $this->sql_escape($expression) . '\'';
+	}
+
+	/**
+	* return sql error array
+	*
+	* @return array
+	*/
+	protected function _sql_error()
+	{
+		if (class_exists('SQLite3', false))
+		{
+			$error = array(
+				'message'	=> $this->dbo->lastErrorMsg(),
+				'code'		=> $this->dbo->lastErrorCode(),
+			);
+		}
+		else
+		{
+			$error = array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
+		}
+
+		return $error;
+	}
+
+	/**
+	* Build db-specific query data
+	*
+	* @param	string	$stage		Available stages: FROM, WHERE
+	* @param	mixed	$data		A string containing the CROSS JOIN query or an array of WHERE clauses
+	*
+	* @return	string	The db-specific query fragment
+	*/
+	protected function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* Close sql connection
+	*
+	* @return	bool		False if failure
+	*/
+	protected function _sql_close()
+	{
+		return $this->dbo->close();
+	}
+
+	/**
+	* Build db-specific report
+	*
+	* @param	string	$mode		Available modes: display, start, stop,
+	*								add_select_row, fromcache, record_fromcache
+	* @param	string	$query		The Query that should be explained
+	* @return	mixed		Either a full HTML page, boolean or null
+	*/
+	protected function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+
+				$explain_query = $query;
+				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+
+				if (preg_match('/^SELECT/', $explain_query))
+				{
+					$html_table = false;
+
+					if ($result = $this->dbo->query("EXPLAIN QUERY PLAN $explain_query"))
+					{
+						while ($row = $result->fetchArray(SQLITE3_ASSOC))
+						{
+							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+						}
+					}
+
+					if ($html_table)
+					{
+						$this->html_hold .= '</table>';
+					}
+				}
+
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = $this->dbo->query($query);
+				while ($void = $result->fetchArray(SQLITE3_ASSOC))
+				{
+					// Take the time spent on parsing rows into account
+				}
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/live_searches_config.php b/phpBB/phpbb/db/migration/data/v310/live_searches_config.php
new file mode 100644
index 0000000000..8b147c954c
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/live_searches_config.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class live_searches_config extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['allow_live_searches']);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_live_searches', '1')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php
index c1da2f4998..2efedd4514 100644
--- a/phpBB/phpbb/db/migration/data/v310/timezone.php
+++ b/phpBB/phpbb/db/migration/data/v310/timezone.php
@@ -39,23 +39,48 @@ class timezone extends \phpbb\db\migration\migration
 		);
 	}
 
-	public function update_timezones()
+	public function update_timezones($start)
 	{
-		// Update user timezones
-		$sql = 'SELECT user_dst, user_timezone
-			FROM ' . $this->table_prefix . 'users
-			GROUP BY user_timezone, user_dst';
-		$result = $this->db->sql_query($sql);
+		$start = (int) $start;
+		$limit = 500;
+		$converted = 0;
+
+		$update_blocks = array();
 
+		$sql = 'SELECT user_id, user_timezone, user_dst
+			FROM ' . $this->table_prefix . 'users
+			ORDER BY user_id ASC';
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
+			$converted++;
+
+			// In case this is somehow run twice on a row.
+			// Otherwise it would just end up as UTC on the second run
+			if (is_numeric($row['user_timezone']))
+			{
+				$update_blocks[$row['user_timezone'] . ':' . $row['user_dst']][] = (int) $row['user_id'];
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		// Update blocks of users who share the same timezone/dst
+		foreach ($update_blocks as $timezone => $user_ids)
+		{
+			$timezone = explode(':', $timezone);
+			$converted_timezone = $this->convert_phpbb30_timezone($timezone[0], $timezone[1]);
+
 			$sql = 'UPDATE ' . $this->table_prefix . "users
-				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
-				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
-					AND user_dst = " . (int) $row['user_dst'];
+				SET user_timezone = '" . $this->db->sql_escape($converted_timezone) . "'
+				WHERE " . $this->db->sql_in_set('user_id', $user_ids);
 			$this->sql_query($sql);
 		}
-		$this->db->sql_freeresult($result);
+
+		if ($converted == $limit)
+		{
+			// There are still more to convert
+			return $start + $limit;
+		}
 
 		// Update board default timezone
 		$sql = 'UPDATE ' . $this->table_prefix . "config
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 2b0132075b..a983ed91b5 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -257,6 +257,36 @@ class tools
 				'VARBINARY'	=> 'blob',
 			),
 
+			'sqlite3'	=> array(
+				'INT:'		=> 'INT(%d)',
+				'BINT'		=> 'BIGINT(20)',
+				'UINT'		=> 'INTEGER UNSIGNED',
+				'UINT:'		=> 'INTEGER UNSIGNED',
+				'TINT:'		=> 'TINYINT(%d)',
+				'USINT'		=> 'INTEGER UNSIGNED',
+				'BOOL'		=> 'INTEGER UNSIGNED',
+				'VCHAR'		=> 'VARCHAR(255)',
+				'VCHAR:'	=> 'VARCHAR(%d)',
+				'CHAR:'		=> 'CHAR(%d)',
+				'XSTEXT'	=> 'TEXT(65535)',
+				'STEXT'		=> 'TEXT(65535)',
+				'TEXT'		=> 'TEXT(65535)',
+				'MTEXT'		=> 'MEDIUMTEXT(16777215)',
+				'XSTEXT_UNI'=> 'TEXT(65535)',
+				'STEXT_UNI'	=> 'TEXT(65535)',
+				'TEXT_UNI'	=> 'TEXT(65535)',
+				'MTEXT_UNI'	=> 'MEDIUMTEXT(16777215)',
+				'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
+				'DECIMAL'	=> 'DECIMAL(5,2)',
+				'DECIMAL:'	=> 'DECIMAL(%d,2)',
+				'PDECIMAL'	=> 'DECIMAL(6,3)',
+				'PDECIMAL:'	=> 'DECIMAL(%d,3)',
+				'VCHAR_UNI'	=> 'VARCHAR(255)',
+				'VCHAR_UNI:'=> 'VARCHAR(%d)',
+				'VCHAR_CI'	=> 'VARCHAR(255)',
+				'VARBINARY'	=> 'BLOB',
+			),
+
 			'postgres'	=> array(
 				'INT:'		=> 'INT4',
 				'BINT'		=> 'INT8',
@@ -299,7 +329,7 @@ class tools
 	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
 	* @var array
 	*/
-	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
+	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite', 'sqlite3');
 
 	/**
 	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
@@ -389,6 +419,13 @@ class tools
 					WHERE type = "table"';
 			break;
 
+			case 'sqlite3':
+				$sql = 'SELECT name
+					FROM sqlite_master
+					WHERE type = "table"
+						AND name <> "sqlite_sequence"';
+			break;
+
 			case 'mssql':
 			case 'mssql_odbc':
 			case 'mssqlnative':
@@ -567,6 +604,7 @@ class tools
 					case 'mysql_41':
 					case 'postgres':
 					case 'sqlite':
+					case 'sqlite3':
 						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
 					break;
 
@@ -604,6 +642,7 @@ class tools
 
 			case 'mysql_40':
 			case 'sqlite':
+			case 'sqlite3':
 				$table_sql .= "\n);";
 				$statements[] = $table_sql;
 			break;
@@ -722,7 +761,7 @@ class tools
 		$sqlite = false;
 
 		// For SQLite we need to perform the schema changes in a much more different way
-		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
+		if (($this->db->sql_layer == 'sqlite' || $this->db->sql_layer == 'sqlite3') && $this->return_statements)
 		{
 			$sqlite_data = array();
 			$sqlite = true;
@@ -1140,6 +1179,7 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 				$sql = "SELECT sql
 					FROM sqlite_master
 					WHERE type = 'table'
@@ -1273,6 +1313,7 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 				$sql = "PRAGMA index_list('" . $table_name . "');";
 				$col = 'name';
 			break;
@@ -1293,6 +1334,7 @@ class tools
 				case 'oracle':
 				case 'postgres':
 				case 'sqlite':
+				case 'sqlite3':
 					$row[$col] = substr($row[$col], strlen($table_name) + 1);
 				break;
 			}
@@ -1377,6 +1419,7 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 				$sql = "PRAGMA index_list('" . $table_name . "');";
 				$col = 'name';
 			break;
@@ -1390,7 +1433,7 @@ class tools
 				continue;
 			}
 
-			if ($this->sql_layer == 'sqlite' && !$row['unique'])
+			if (($this->sql_layer == 'sqlite' || $this->sql_layer == 'sqlite3') && !$row['unique'])
 			{
 				continue;
 			}
@@ -1418,6 +1461,7 @@ class tools
 				case 'firebird':
 				case 'postgres':
 				case 'sqlite':
+				case 'sqlite3':
 					$row[$col] = substr($row[$col], strlen($table_name) + 1);
 				break;
 			}
@@ -1629,11 +1673,17 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 				$return_array['primary_key_set'] = false;
 				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
 				{
 					$sql .= ' INTEGER PRIMARY KEY';
 					$return_array['primary_key_set'] = true;
+
+					if ($this->sql_layer === 'sqlite3')
+					{
+						$sql .= ' AUTOINCREMENT';
+					}
 				}
 				else
 				{
@@ -1770,67 +1820,63 @@ class tools
 			break;
 
 			case 'sqlite':
-
 				if ($inline && $this->return_statements)
 				{
 					return $column_name . ' ' . $column_data['column_type_sql'];
 				}
 
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				$recreate_queries = $this->sqlite_get_recreate_table_queries($table_name);
+				if (empty($recreate_queries))
 				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
+					break;
+				}
 
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
+				$statements[] = 'begin';
 
-					$statements[] = 'begin';
+				$sql_create_table = array_shift($recreate_queries);
 
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
+				// Create a backup table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $sql_create_table);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
 
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+				preg_match('#\((.*)\)#s', $sql_create_table, $matches);
 
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
 
-					foreach ($old_table_cols as $declaration)
+				foreach ($old_table_cols as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
 					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
+						continue;
 					}
+					$column_list[] = $entities[0];
+				}
 
-					$columns = implode(',', $column_list);
+				$columns = implode(',', $column_list);
 
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
+				$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
 
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+				$statements = array_merge($statements, $recreate_queries);
 
-					$statements[] = 'commit';
-				}
-				else
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+			break;
+
+			case 'sqlite3':
+				if ($inline && $this->return_statements)
 				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
+					return $column_name . ' ' . $column_data['column_type_sql'];
 				}
+
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
 			break;
 		}
 
@@ -1908,67 +1954,61 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 
 				if ($inline && $this->return_statements)
 				{
 					return $column_name;
 				}
 
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				$recreate_queries = $this->sqlite_get_recreate_table_queries($table_name, $column_name);
+				if (empty($recreate_queries))
 				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
+					break;
+				}
 
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
+				$statements[] = 'begin';
 
-					$statements[] = 'begin';
+				$sql_create_table = array_shift($recreate_queries);
 
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
+				// Create a backup table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $sql_create_table);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
 
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+				preg_match('#\((.*)\)#s', $sql_create_table, $matches);
 
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
 
-					foreach ($old_table_cols as $declaration)
+				foreach ($old_table_cols as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
 					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
+						continue;
 					}
+					$column_list[] = $entities[0];
+				}
 
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+				$columns = implode(',', $column_list);
 
-					$statements[] = 'commit';
-				}
-				else
+				$new_table_cols = trim(preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols));
+				if (substr($new_table_cols, -1) === ',')
 				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
+					// Remove the comma from the last entry again
+					$new_table_cols = substr($new_table_cols, 0, -1);
 				}
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+				$statements = array_merge($statements, $recreate_queries);
+
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
 			break;
 		}
 
@@ -1998,6 +2038,7 @@ class tools
 			case 'oracle':
 			case 'postgres':
 			case 'sqlite':
+			case 'sqlite3':
 				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
 			break;
 		}
@@ -2104,35 +2145,29 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 
 				if ($inline && $this->return_statements)
 				{
 					return $column;
 				}
 
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
+				$recreate_queries = $this->sqlite_get_recreate_table_queries($table_name);
+				if (empty($recreate_queries))
 				{
 					break;
 				}
 
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
 				$statements[] = 'begin';
 
+				$sql_create_table = array_shift($recreate_queries);
+
 				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $sql_create_table);
 				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
 				$statements[] = 'DROP TABLE ' . $table_name;
 
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+				preg_match('#\((.*)\)#s', $sql_create_table, $matches);
 
 				$new_table_cols = trim($matches[1]);
 				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
@@ -2152,6 +2187,8 @@ class tools
 
 				// create a new table and fill it up. destroy the temp one
 				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
+				$statements = array_merge($statements, $recreate_queries);
+
 				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
 				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
 
@@ -2182,6 +2219,7 @@ class tools
 			case 'postgres':
 			case 'oracle':
 			case 'sqlite':
+			case 'sqlite3':
 				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			break;
 
@@ -2225,6 +2263,7 @@ class tools
 			case 'postgres':
 			case 'oracle':
 			case 'sqlite':
+			case 'sqlite3':
 				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
 			break;
 
@@ -2316,6 +2355,7 @@ class tools
 				break;
 
 				case 'sqlite':
+				case 'sqlite3':
 					$sql = "PRAGMA index_info('" . $table_name . "');";
 					$col = 'name';
 				break;
@@ -2335,6 +2375,7 @@ class tools
 					case 'oracle':
 					case 'postgres':
 					case 'sqlite':
+					case 'sqlite3':
 						$row[$col] = substr($row[$col], strlen($table_name) + 1);
 					break;
 				}
@@ -2488,35 +2529,29 @@ class tools
 			break;
 
 			case 'sqlite':
+			case 'sqlite3':
 
 				if ($inline && $this->return_statements)
 				{
 					return $column_name . ' ' . $column_data['column_type_sql'];
 				}
 
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
+				$recreate_queries = $this->sqlite_get_recreate_table_queries($table_name);
+				if (empty($recreate_queries))
 				{
 					break;
 				}
 
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
 				$statements[] = 'begin';
 
+				$sql_create_table = array_shift($recreate_queries);
+
 				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $sql_create_table);
 				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
 				$statements[] = 'DROP TABLE ' . $table_name;
 
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+				preg_match('#\((.*)\)#s', $sql_create_table, $matches);
 
 				$new_table_cols = trim($matches[1]);
 				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
@@ -2534,8 +2569,10 @@ class tools
 
 				$columns = implode(',', $column_list);
 
-				// create a new table and fill it up. destroy the temp one
+				// Create a new table and fill it up. destroy the temp one
 				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
+				$statements = array_merge($statements, $recreate_queries);
+
 				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
 				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
 
@@ -2701,4 +2738,75 @@ class tools
 
 		return $this->is_sql_server_2000;
 	}
+
+	/**
+	* Returns the Queries which are required to recreate a table including indexes
+	*
+	* @param string $table_name
+	* @param string $remove_column	When we drop a column, we remove the column
+	*								from all indexes. If the index has no other
+	*								column, we drop it completly.
+	* @return array
+	*/
+	protected function sqlite_get_recreate_table_queries($table_name, $remove_column = '')
+	{
+		$queries = array();
+
+		$sql = "SELECT sql
+			FROM sqlite_master
+			WHERE type = 'table'
+				AND name = '{$table_name}'";
+		$result = $this->db->sql_query($sql);
+		$sql_create_table = $this->db->sql_fetchfield('sql');
+		$this->db->sql_freeresult($result);
+
+		if (!$sql_create_table)
+		{
+			return array();
+		}
+		$queries[] = $sql_create_table;
+
+		$sql = "SELECT sql
+			FROM sqlite_master
+			WHERE type = 'index'
+				AND tbl_name = '{$table_name}'";
+		$result = $this->db->sql_query($sql);
+		while ($sql_create_index = $this->db->sql_fetchfield('sql'))
+		{
+			if ($remove_column)
+			{
+				$match = array();
+				preg_match('#(?:[\w ]+)\((.*)\)#', $sql_create_index, $match);
+				if (!isset($match[1]))
+				{
+					continue;
+				}
+
+				// Find and remove $remove_column from the index
+				$columns = explode(', ', $match[1]);
+				$found_column = array_search($remove_column, $columns);
+				if ($found_column !== false)
+				{
+					unset($columns[$found_column]);
+
+					// If the column list is not empty add the index to the list
+					if (!empty($columns))
+					{
+						$queries[] = str_replace($match[1], implode(', ', $columns), $sql_create_index);
+					}
+				}
+				else
+				{
+					$queries[] = $sql_create_index;
+				}
+			}
+			else
+			{
+				$queries[] = $sql_create_index;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return $queries;
+	}
 }
diff --git a/phpBB/phpbb/feed/attachments_base.php b/phpBB/phpbb/feed/attachments_base.php
new file mode 100644
index 0000000000..a9a8175928
--- /dev/null
+++ b/phpBB/phpbb/feed/attachments_base.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\feed;
+
+/**
+* Abstract class for feeds displaying attachments
+*
+* @package phpBB3
+*/
+abstract class attachments_base extends \phpbb\feed\base
+{
+	/**
+	* Attachments that may be displayed
+	*/
+	protected $attachments = array();
+
+	/**
+	* Retrieve the list of attachments that may be displayed
+	*/
+	protected function fetch_attachments()
+	{
+		$sql_array = array(
+			'SELECT'   => 'a.*',
+			'FROM'     => array(
+				ATTACHMENTS_TABLE => 'a'
+			),
+			'WHERE'    => 'a.in_message = 0 ',
+			'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC',
+		);
+
+		if (isset($this->topic_id))
+		{
+			$sql_array['WHERE'] .= 'AND a.topic_id = ' . (int) $this->topic_id;
+		}
+		else if (isset($this->forum_id))
+		{
+			$sql_array['LEFT_JOIN'] = array(
+				array(
+					'FROM' => array(TOPICS_TABLE => 't'),
+					'ON'   => 'a.topic_id = t.topic_id',
+				)
+			);
+			$sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id;
+		}
+
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query($sql);
+
+		// Set attachments in feed items
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->attachments[$row['post_msg_id']][] = $row;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function open()
+	{
+		parent::open();
+		$this->fetch_attachments();
+	}
+
+	/**
+	* Get attachments related to a given post
+	*
+	* @param $post_id  int  Post id
+	* @return mixed Attachments related to $post_id
+	*/
+	public function get_attachments($post_id)
+	{
+		return $this->attachments[$post_id];
+	}
+}
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php
index 85ecb60f7e..8e6490923d 100644
--- a/phpBB/phpbb/feed/forum.php
+++ b/phpBB/phpbb/feed/forum.php
@@ -80,6 +80,8 @@ class forum extends \phpbb\feed\post_base
 
 			unset($forum_ids_passworded);
 		}
+
+		parent::open();
 	}
 
 	function get_sql()
diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php
index c797d6a8ca..de98f446f3 100644
--- a/phpBB/phpbb/feed/post_base.php
+++ b/phpBB/phpbb/feed/post_base.php
@@ -14,7 +14,7 @@ namespace phpbb\feed;
 *
 * @package phpBB3
 */
-abstract class post_base extends \phpbb\feed\base
+abstract class post_base extends \phpbb\feed\attachments_base
 {
 	var $num_items = 'feed_limit_post';
 	var $attachments = array();
@@ -49,41 +49,4 @@ abstract class post_base extends \phpbb\feed\base
 				. (($this->is_moderator_approve_forum($row['forum_id']) && $row['post_visibility'] !== ITEM_APPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '');
 		}
 	}
-
-	function fetch_attachments()
-	{
-		$sql_array = array(
-			'SELECT'	=> 'a.*',
-			'FROM'		=> array(
-				ATTACHMENTS_TABLE	=>	'a'
-			),
-			'WHERE'		=> 'a.in_message = 0 ',
-			'ORDER_BY'	=> 'a.filetime DESC, a.post_msg_id ASC',
-		);
-
-		if (isset($this->topic_id))
-		{
-			$sql_array['WHERE'] .= 'AND a.topic_id = ' . (int) $this->topic_id;
-		}
-		else if (isset($this->forum_id))
-		{
-			$sql_array['LEFT_JOIN'] = array(
-				array(
-					'FROM'  => array(TOPICS_TABLE => 't'),
-					'ON'    => 'a.topic_id = t.topic_id',
-				)
-			);
-			$sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id;
-		}
-
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query($sql);
-
-		// Set attachments in feed items
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$this->attachments[$row['post_msg_id']][] = $row;
-		}
-		$this->db->sql_freeresult($result);
-	}
 }
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index a7acfb502f..fb49aa65cc 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -83,6 +83,8 @@ class topic extends \phpbb\feed\post_base
 
 			unset($forum_ids_passworded);
 		}
+
+		parent::open();
 	}
 
 	function get_sql()
diff --git a/phpBB/phpbb/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php
index 7e28e67b82..e8639a6fa6 100644
--- a/phpBB/phpbb/feed/topic_base.php
+++ b/phpBB/phpbb/feed/topic_base.php
@@ -14,7 +14,7 @@ namespace phpbb\feed;
 *
 * @package phpBB3
 */
-abstract class topic_base extends \phpbb\feed\base
+abstract class topic_base extends \phpbb\feed\attachments_base
 {
 	var $num_items = 'feed_limit_topic';
 
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index fefef39c51..f92c2b72b2 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -216,4 +216,120 @@ class path_helper
 
 		return $scheme . $this->filesystem->clean_path($path);
 	}
+
+	/**
+	* Glue URL parameters together
+	*
+	* @param array $params URL parameters in the form of array(name => value)
+	* @return string Returns the glued string, e.g. name1=value1&amp;name2=value2
+	*/
+	public function glue_url_params($params)
+	{
+		$_params = array();
+
+		foreach ($params as $key => $value)
+		{
+			$_params[] = $key . '=' . $value;
+		}
+		return implode('&amp;', $_params);
+	}
+
+	/**
+	* Get the base and parameters of a URL
+	*
+	* @param string $url URL to break apart
+	* @param bool $is_amp Is the parameter separator &amp;. Defaults to true.
+	* @return array Returns the base and parameters in the form of array('base' => string, 'params' => array(name => value))
+	*/
+	public function get_url_parts($url, $is_amp = true)
+	{
+		$separator = ($is_amp) ? '&amp;' : '&';
+		$params = array();
+
+		if (strpos($url, '?') !== false)
+		{
+			$base = substr($url, 0, strpos($url, '?'));
+			$args = substr($url, strlen($base) + 1);
+			$args = ($args) ? explode($separator, $args) : array();
+
+			foreach ($args as $argument)
+			{
+				if (empty($argument))
+				{
+					continue;
+				}
+				list($key, $value) = explode('=', $argument, 2);
+
+				if ($key === '')
+				{
+					continue;
+				}
+
+				$params[$key] = $value;
+			}
+		}
+		else
+		{
+			$base = $url;
+		}
+
+		return array(
+			'base'		=> $base,
+			'params'	=> $params,
+		);
+	}
+
+	/**
+	* Strip parameters from an already built URL.
+	*
+	* @param string $url URL to strip parameters from
+	* @param array|string $strip Parameters to strip.
+	* @param bool $is_amp Is the parameter separator &amp;. Defaults to true.
+	* @return string Returns the new URL.
+	*/
+	public function strip_url_params($url, $strip, $is_amp = true)
+	{
+		$url_parts = $this->get_url_parts($url, $is_amp);
+		$params = $url_parts['params'];
+
+		if (!is_array($strip))
+		{
+			$strip = array($strip);
+		}
+
+		if (!empty($params))
+		{
+			// Strip the parameters off
+			foreach ($strip as $param)
+			{
+				unset($params[$param]);
+			}
+		}
+
+		return $url_parts['base'] . (($params) ? '?' . $this->glue_url_params($params) : '');
+	}
+
+	/**
+	* Append parameters to an already built URL.
+	*
+	* @param string $url URL to append parameters to
+	* @param array $new_params Parameters to add in the form of array(name => value)
+	* @param string $is_amp Is the parameter separator &amp;. Defaults to true.
+	* @return string Returns the new URL.
+	*/
+	public function append_url_params($url, $new_params, $is_amp = true)
+	{
+		$url_parts = $this->get_url_parts($url, $is_amp);
+		$params = array_merge($url_parts['params'], $new_params);
+
+		// Move the sid to the end if it's set
+		if (isset($params['sid']))
+		{
+			$sid = $params['sid'];
+			unset($params['sid']);
+			$params['sid'] = $sid;
+		}
+
+		return $url_parts['base'] . (($params) ? '?' . $this->glue_url_params($params) : '');
+	}
 }
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 37449c67c4..7d545a5f72 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -28,6 +28,12 @@ class manager
 	protected $db;
 
 	/**
+	* Event dispatcher object
+	* @var \phpbb\event\dispatcher
+	*/
+	protected $dispatcher;
+
+	/**
 	* Request object
 	* @var \phpbb\request\request
 	*/
@@ -64,6 +70,7 @@ class manager
 	*
 	* @param	\phpbb\auth\auth			$auth		Auth object
 	* @param	\phpbb\db\driver\driver_interface	$db			Database object
+	* @param	\phpbb\event\dispatcher		$dispatcher	Event dispatcher object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
 	* @param	\phpbb\di\service_collection $type_collection
@@ -72,10 +79,11 @@ class manager
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
+		$this->dispatcher = $dispatcher;
 		$this->request = $request;
 		$this->template = $template;
 		$this->type_collection = $type_collection;
@@ -313,6 +321,17 @@ class manager
 		}
 		$this->db->sql_freeresult($result);
 
+		/**
+		* Event to modify profile fields data retrieved from the database
+		*
+		* @event core.grab_profile_fields_data
+		* @var	array	user_ids		Single user id or an array of ids 
+		* @var	array	field_data		Array with profile fields data
+		* @since 3.1.0-b3
+		*/
+		$vars = array('user_ids', 'field_data');
+		extract($this->dispatcher->trigger_event('core.grab_profile_fields_data', compact($vars)));
+
 		$user_fields = array();
 
 		// Go through the fields in correct order
@@ -351,6 +370,18 @@ class manager
 		$tpl_fields = array();
 		$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
 
+		/**
+		* Event to modify data of the generated profile fields, before the template assignment loop
+		*
+		* @event core.generate_profile_fields_template_data_before
+		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	tpl_fields		Array with template data fields
+		* @var	bool	use_contact_fields	Should we display contact fields as such?
+		* @since 3.1.0-b3
+		*/
+		$vars = array('profile_row', 'tpl_fields', 'use_contact_fields');
+		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data_before', compact($vars)));
+
 		foreach ($profile_row as $ident => $ident_ary)
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
@@ -404,6 +435,18 @@ class manager
 			);
 		}
 
+		/**
+		* Event to modify template data of the generated profile fields
+		*
+		* @event core.generate_profile_fields_template_data
+		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	tpl_fields		Array with template data fields
+		* @var	bool	use_contact_fields	Should we display contact fields as such?
+		* @since 3.1.0-b3
+		*/
+		$vars = array('profile_row', 'tpl_fields', 'use_contact_fields');
+		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data', compact($vars)));
+
 		return $tpl_fields;
 	}
 
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 7d51d164c7..f3b229cc7c 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -768,6 +768,7 @@ class fulltext_native extends \phpbb\search\base
 				break;
 
 				case 'sqlite':
+				case 'sqlite3':
 					$sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id';
 					$sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results
 							FROM (' . $this->db->sql_build_query('SELECT', $sql_array_count) . ')';
@@ -997,7 +998,7 @@ class fulltext_native extends \phpbb\search\base
 					}
 					else
 					{
-						if ($this->db->sql_layer == 'sqlite')
+						if ($this->db->sql_layer == 'sqlite' || $this->db->sql_layer == 'sqlite3')
 						{
 							$sql = 'SELECT COUNT(topic_id) as total_results
 								FROM (SELECT DISTINCT t.topic_id';
@@ -1014,7 +1015,7 @@ class fulltext_native extends \phpbb\search\base
 								$post_visibility
 								$sql_fora
 								AND t.topic_id = p.topic_id
-								$sql_time" . (($this->db->sql_layer == 'sqlite') ? ')' : '');
+								$sql_time" . (($this->db->sql_layer == 'sqlite' || $this->db->sql_layer == 'sqlite3') ? ')' : '');
 					}
 					$result = $this->db->sql_query($sql);
 
@@ -1481,6 +1482,7 @@ class fulltext_native extends \phpbb\search\base
 		switch ($this->db->sql_layer)
 		{
 			case 'sqlite':
+			case 'sqlite3':
 			case 'firebird':
 				$this->db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE);
 				$this->db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE);
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index f530d30f1f..ea421ffcf3 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1045,8 +1045,9 @@ class session
 	* @param string $name		Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then.
 	* @param string $cookiedata	The data to hold within the cookie
 	* @param int $cookietime	The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set.
+	* @param bool $httponly		Use HttpOnly. Defaults to true. Use false to make cookie accessible by client-side scripts.
 	*/
-	function set_cookie($name, $cookiedata, $cookietime)
+	function set_cookie($name, $cookiedata, $cookietime, $httponly = true)
 	{
 		global $config;
 
@@ -1054,7 +1055,7 @@ class session
 		$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
 		$domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain'];
 
-		header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . '; HttpOnly', false);
+		header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . ';' . (($httponly) ? ' HttpOnly' : ''), false);
 	}
 
 	/**
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index f4efc58540..49577f6e95 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -191,9 +191,16 @@ class lexer extends \Twig_Lexer
 		$parent_class = $this;
 		$callback = function ($matches) use ($parent_class, $parent_nodes)
 		{
-			$name = $matches[1];
-			$subset = trim(substr($matches[2], 1, -1)); // Remove parenthesis
-			$body = $matches[3];
+			$hard_parents = explode('.', $matches[1]);
+			array_pop($hard_parents); // ends with .
+			if ($hard_parents)
+			{
+				$parent_nodes = array_merge($hard_parents, $parent_nodes);
+			}
+
+			$name = $matches[2];
+			$subset = trim(substr($matches[3], 1, -1)); // Remove parenthesis
+			$body = $matches[4];
 
 			// Replace <!-- BEGINELSE -->
 			$body = str_replace('<!-- BEGINELSE -->', '{% else %}', $body);
@@ -242,7 +249,7 @@ class lexer extends \Twig_Lexer
 			return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
 		};
 
-		return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1 -->#s', $callback, $code);
+		return preg_replace_callback('#<!-- BEGIN ((?:[a-zA-Z0-9_]+\.)*)([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1\2 -->#s', $callback, $code);
 	}
 
 	/**
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index 18b7a3d096..f8e473dcad 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -69,7 +69,7 @@ class user extends \phpbb\session
 	*/
 	function setup($lang_set = false, $style_id = false)
 	{
-		global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
+		global $db, $request, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
 		global $phpbb_dispatcher;
 
 		if ($this->data['user_id'] != ANONYMOUS)
@@ -80,7 +80,25 @@ class user extends \phpbb\session
 		}
 		else
 		{
-			$user_lang_name = basename($config['default_lang']);
+			$lang_override = $request->variable('language', '');
+			if ($lang_override)
+			{
+				$this->set_cookie('lang', $lang_override, 0, false);
+			}
+			else
+			{
+				$lang_override = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE);
+			}
+			if ($lang_override)
+			{
+				$use_lang = basename($lang_override);
+				$user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']);
+				$this->data['user_lang'] = $user_lang_name;
+			}
+			else
+			{
+				$user_lang_name = basename($config['default_lang']);
+			}
 			$user_date_format = $config['default_dateformat'];
 			$user_timezone = $config['board_timezone'];
 
@@ -190,7 +208,7 @@ class user extends \phpbb\session
 		}
 		unset($lang_set_ext);
 
-		$style_request = request_var('style', 0);
+		$style_request = $request->variable('style', 0);
 		if ($style_request && (!$config['override_user_style'] || $auth->acl_get('a_styles')) && !defined('ADMIN_START'))
 		{
 			global $SID, $_EXTRA_URL;