33 files changed, 729 insertions, 273 deletions
diff --git a/phpBB/config/tables.yml b/phpBB/config/tables.yml
index 1191fd0ae1..ec5fec23ad 100644
--- a/phpBB/config/tables.yml
+++ b/phpBB/config/tables.yml
@@ -3,9 +3,9 @@ parameters:
     tables.config_text: %core.table_prefix%config_text
     tables.ext: %core.table_prefix%ext
     tables.log: %core.table_prefix%log
+    tables.migrations: %core.table_prefix%migrations
+    tables.modules: %core.table_prefix%modules
     tables.notification_types: %core.table_prefix%notification_types
     tables.notifications: %core.table_prefix%notifications
     tables.user_notifications: %core.table_prefix%user_notifications
     tables.users: %core.table_prefix%users
-    tables.migrations: %core.table_prefix%migrations
-    tables.modules: %core.table_prefix%modules
diff --git a/phpBB/docs/sphinx.sample.conf b/phpBB/docs/sphinx.sample.conf
index fcaba6dcf3..d1b98d6cbc 100644
--- a/phpBB/docs/sphinx.sample.conf
+++ b/phpBB/docs/sphinx.sample.conf
@@ -1,46 +1,31 @@
 source source_phpbb_{SPHINX_ID}_main
 {
-	type = mysql #mysql or pgsql
-	sql_host = localhost #SQL server host sphinx connects to
+	type = mysql # mysql or pgsql
+	sql_host = localhost # SQL server host sphinx connects to
 	sql_user = username
 	sql_pass = password
 	sql_db = db_name
-	sql_port =  3306 #optional, default is 3306 for mysql and 5432 for pgsql
+	sql_port =  3306 # optional, default is 3306 for mysql and 5432 for pgsql
 	sql_query_pre = SET NAMES 'utf8'
-	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = MAX(post_id) WHERE counter_id = 1
+	sql_query_pre = UPDATE phpbb_sphinx SET max_doc_id = (SELECT MAX(post_id) FROM phpbb_posts) WHERE counter_id = 1
 	sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM phpbb_posts
 	sql_range_step = 5000
-	sql_query = SELECT
-\
-							p.post_id AS id,
-\
-							p.forum_id,
-\
-							p.topic_id,
-\
-							p.poster_id,
-\
-							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-\
-							p.post_time,
-\
-							p.post_subject,
-\
-							p.post_subject as title,
-\
-							p.post_text as data,
-\
-							t.topic_last_post_time,
-\
-							0 as deleted
-\
-						FROM phpbb_posts p, phpbb_topics t
-\
-						WHERE
-\
-							p.topic_id = t.topic_id
-\
-							AND p.post_id >= $start AND p.post_id <= $end 
+	sql_query = SELECT \
+							p.post_id AS id, \
+							p.forum_id, \
+							p.topic_id, \
+							p.poster_id, \
+							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
+							p.post_time, \
+							p.post_subject, \
+							p.post_subject as title, \
+							p.post_text as data, \
+							t.topic_last_post_time, \
+							0 as deleted\
+						FROM phpbb_posts p, phpbb_topics t \
+						WHERE \
+							p.topic_id = t.topic_id \
+							AND p.post_id >= $start AND p.post_id <= $end
 	sql_query_post =
 	sql_query_post_index = UPDATE phpbb_sphinx SET max_doc_id = $maxid WHERE counter_id = 1
 	sql_query_info = SELECT * FROM phpbb_posts WHERE post_id = $id
@@ -55,39 +40,25 @@ source source_phpbb_{SPHINX_ID}_main
 }
 source source_phpbb_{SPHINX_ID}_delta : source_phpbb_{SPHINX_ID}_main
 {
+	sql_query_pre =
 	sql_query_range =
 	sql_range_step =
-	sql_query = SELECT
-\
-							p.post_id AS id,
-\
-							p.forum_id,
-\
-							p.topic_id,
-\
-							p.poster_id,
-\
-							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-\
-							p.post_time,
-\
-							p.post_subject,
-\
-							p.post_subject as title,
-\
-							p.post_text as data,
-\
-							t.topic_last_post_time,
-\
-							0 as deleted
-\
-						FROM phpbb_posts p, phpbb_topics t
-\
-						WHERE
-\
-							p.topic_id = t.topic_id
-\
-							AND p.post_id >=  ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 ) 
+	sql_query = SELECT \
+							p.post_id AS id, \
+							p.forum_id, \
+							p.topic_id, \
+							p.poster_id, \
+							CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post, \
+							p.post_time, \
+							p.post_subject, \
+							p.post_subject as title, \
+							p.post_text as data, \
+							t.topic_last_post_time, \
+							0 as deleted \
+						FROM phpbb_posts p, phpbb_topics t \
+						WHERE \
+							p.topic_id = t.topic_id \
+							AND p.post_id >= ( SELECT max_doc_id FROM phpbb_sphinx WHERE counter_id=1 )
 	sql_query_pre =
 }
 index index_phpbb_{SPHINX_ID}_main
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 266495972b..094d84de40 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -68,13 +68,20 @@ class acp_styles
 
 		$action = $this->request->variable('action', '');
 		$post_actions = array('install', 'activate', 'deactivate', 'uninstall');
+
+		if ($action && in_array($action, $post_actions) && !check_link_hash($request->variable('hash', ''), $action))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		foreach ($post_actions as $key)
 		{
-			if (isset($_POST[$key]))
+			if ($this->request->is_set_post($key))
 			{
 				$action = $key;
 			}
 		}
+
 		if ($action != '')
 		{
 			$this->s_hidden_fields['action'] = $action;
@@ -921,21 +928,23 @@ class acp_styles
 				'L_ACTION'	=> $this->user->lang['DETAILS']
 			);
 
-			// Activate
+			// Activate/Deactive
+			$action_name = ($style['style_active'] ? 'de' : '') . 'activate';
+
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=' . ($style['style_active'] ? 'de' : '') . 'activate&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=' . $action_name . '&amp;hash=' . generate_link_hash($action_name) . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['STYLE_' . ($style['style_active'] ? 'DE' : '') . 'ACTIVATE']
 			);
 
 /*			// Export
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=export&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=export&amp;hash=' . generate_link_hash('export') . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['EXPORT']
 			); */
 
 			// Uninstall
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;hash=' . generate_link_hash('uninstall') . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['STYLE_UNINSTALL']
 			);
 
@@ -957,7 +966,7 @@ class acp_styles
 			else
 			{
 				$actions[] = array(
-					'U_ACTION'	=> $this->u_action . '&amp;action=install&amp;dir=' . urlencode($style['style_path']),
+					'U_ACTION'	=> $this->u_action . '&amp;action=install&amp;hash=' . generate_link_hash('install') . '&amp;dir=' . urlencode($style['style_path']),
 					'L_ACTION'	=> $this->user->lang['INSTALL_STYLE']
 				);
 			}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 9c60436de8..58d994c3c0 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -46,6 +46,17 @@ class phpbb_avatar_manager
 	protected $container;
 
 	/**
+	* Default avatar data row
+	* @var array
+	*/
+	static protected $default_row = array(
+		'avatar'		=> '',
+		'avatar_type'	=> '',
+		'avatar_width'	=> '',
+		'avatar_height'	=> '',
+	);
+
+	/**
 	* Construct an avatar manager object
 	*
 	* @param phpbb_config $config phpBB configuration
@@ -174,6 +185,12 @@ class phpbb_avatar_manager
 	*/
 	static public function clean_row($row)
 	{
+		// Upon creation of a user/group $row might be empty
+		if (empty($row))
+		{
+			return self::$default_row;
+		}
+
 		$keys = array_keys($row);
 		$values = array_values($row);
 
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 8dda94bc2c..b915ee081b 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -568,12 +568,12 @@ class phpbb_db_driver
 	* Run more than one insert statement.
 	*
 	* @param string $table table name to run the statements on
-	* @param array &$sql_ary multi-dimensional array holding the statement data.
+	* @param array $sql_ary multi-dimensional array holding the statement data.
 	*
 	* @return bool false if no statements were executed.
 	* @access public
 	*/
-	function sql_multi_insert($table, &$sql_ary)
+	function sql_multi_insert($table, $sql_ary)
 	{
 		if (!sizeof($sql_ary))
 		{
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 9d7cede95b..ca3ffc8043 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -362,6 +362,12 @@ class phpbb_db_migrator
 	{
 		$state = ($state) ? unserialize($state) : false;
 
+		// reverse order of steps if reverting
+		if ($revert === true)
+		{
+			$steps = array_reverse($steps);
+		}
+
 		foreach ($steps as $step_identifier => $step)
 		{
 			$last_result = false;
diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
new file mode 100644
index 0000000000..c18f908429
--- /dev/null
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -0,0 +1,150 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Collects rows for insert into a database until the buffer size is reached.
+* Then flushes the buffer to the database and starts over again.
+*
+* Benefits over collecting a (possibly huge) insert array and then using
+* $db->sql_multi_insert() include:
+*
+*  - Going over max packet size of the database connection is usually prevented
+*    because the data is submitted in batches.
+*
+*  - Reaching database connection timeout is usually prevented because
+*    submission of batches talks to the database every now and then.
+*
+*  - Usage of less PHP memory because data no longer needed is discarded on
+*    buffer flush.
+*
+* Attention:
+* Please note that users of this class have to call flush() to flush the
+* remaining rows to the database after their batch insert operation is
+* finished.
+*
+* Usage:
+* <code>
+*	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
+*
+*	while (do_stuff())
+*	{
+*		$buffer->insert(array(
+*			'column1' => 'value1',
+*			'column2' => 'value2',
+*		));
+*	}
+*
+*	$buffer->flush();
+* </code>
+*
+* @package dbal
+*/
+class phpbb_db_sql_insert_buffer
+{
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var string */
+	protected $table_name;
+
+	/** @var int */
+	protected $max_buffered_rows;
+
+	/** @var array */
+	protected $buffer = array();
+
+	/**
+	* @param phpbb_db_driver $db
+	* @param string          $table_name
+	* @param int             $max_buffered_rows
+	*/
+	public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500)
+	{
+		$this->db = $db;
+		$this->table_name = $table_name;
+		$this->max_buffered_rows = $max_buffered_rows;
+	}
+
+	/**
+	* Inserts a single row into the buffer if multi insert is supported by the
+	* database (otherwise an insert query is sent immediately). Then flushes
+	* the buffer if the number of rows in the buffer is now greater than or
+	* equal to $max_buffered_rows.
+	*
+	* @param array $row
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function insert(array $row)
+	{
+		$this->buffer[] = $row;
+
+		// Flush buffer if it is full or when DB does not support multi inserts.
+		// In the later case, the buffer will always only contain one row.
+		if (!$this->db->multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
+		{
+			return $this->flush();
+		}
+
+		return false;
+	}
+
+	/**
+	* Inserts a row set, i.e. an array of rows, by calling insert().
+	*
+	* Please note that it is in most cases better to use insert() instead of
+	* first building a huge rowset. Or at least sizeof($rows) should be kept
+	* small.
+	*
+	* @param array $rows 
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function insert_all(array $rows)
+	{
+		// Using bitwise |= because PHP does not have logical ||=
+		$result = 0;
+
+		foreach ($rows as $row)
+		{
+			$result |= (int) $this->insert($row);
+		}
+
+		return (bool) $result;
+	}
+
+	/**
+	* Flushes the buffer content to the DB and clears the buffer.
+	*
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
+	*/
+	public function flush()
+	{
+		if (!empty($this->buffer))
+		{
+			$this->db->sql_multi_insert($this->table_name, $this->buffer);
+			$this->buffer = array();
+
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ff83d4bb37..4e26234390 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -256,6 +256,7 @@ class phpbb_notification_manager
 			SET notification_read = 1
 			WHERE notification_time <= " . (int) $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
 	}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index ddfa720e5e..d8ffdea81d 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -216,7 +216,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
 		}
 
 		return array(
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 2549b29409..22436d3fb1 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -178,7 +178,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
 		}
 
 		return array(
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 48445d0794..28761792ec 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
 		$config_object = new phpbb_search_sphinx_config($this->config_file_data);
 		$config_data = array(
 			'source source_phpbb_' . $this->id . '_main' => array(
-				array('type',						$this->dbtype),
+				array('type',						$this->dbtype . ' # mysql or pgsql'),
 				// This config value sql_host needs to be changed incase sphinx and sql are on different servers
-				array('sql_host',					$dbhost),
+				array('sql_host',					$dbhost . ' # SQL server host sphinx connects to'),
 				array('sql_user',					$dbuser),
 				array('sql_pass',					$dbpasswd),
 				array('sql_db',						$dbname),
-				array('sql_port',					$dbport),
+				array('sql_port',					$dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
 				array('sql_query_pre',				'SET NAMES \'utf8\''),
 				array('sql_query_pre',				'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
 				array('sql_query_range',			'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/includes/search/sphinx/config_variable.php
index 35abe281cb..2c1d35a49c 100644
--- a/phpBB/includes/search/sphinx/config_variable.php
+++ b/phpBB/includes/search/sphinx/config_variable.php
@@ -75,6 +75,6 @@ class phpbb_search_sphinx_config_variable
 	*/
 	function to_string()
 	{
-		return "\t" . $this->name . ' = ' . str_replace("\n", "\\\n", $this->value) . ' ' . $this->comment . "\n";
+		return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
 	}
 }
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f73ad28ba1..9e8ad2fef0 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -843,7 +843,18 @@ class phpbb_template_filter extends php_user_filter
 			return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
 		}
 
-		$parsed_statement = implode(' ', $this->compile_expression($match[3]));
+		/*
+		* Define tags that contain template variables (enclosed in curly brackets)
+		* need to be treated differently.
+		*/
+		if (substr($match[3], 1, 1) == '{' && substr($match[3], -2, 1) == '}')
+		{
+			$parsed_statement = implode(' ', $this->compile_expression(substr($match[3], 2, -2)));
+		}
+		else
+		{
+			$parsed_statement = implode(' ', $this->compile_expression($match[3]));
+		}
 
 		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
 	}
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index c57aec00a0..1de38fddb7 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -457,6 +457,7 @@ class ucp_register
 			'S_LANG_OPTIONS'	=> language_select($data['lang']),
 			'S_TZ_OPTIONS'			=> $timezone_selects['tz_select'],
 			'S_TZ_DATE_OPTIONS'		=> $timezone_selects['tz_dates'],
+			'S_TZ_PRESELECT'	=> !$submit,
 			'S_CONFIRM_REFRESH'	=> ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
 			'S_REGISTRATION'	=> true,
 			'S_COPPA'			=> $coppa,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f118d330ba..c25925a9c8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -777,9 +777,9 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
 # User Notification Options (for first user)
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_post', 0, 2, 'phpbb_notification_method_email');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, '');
-INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('phpbb_notification_type_topic', 0, 2, 'phpbb_notification_method_email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('post', 0, 2, 'email');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, '');
+INSERT INTO phpbb_user_notifications (item_type, item_id, user_id, method) VALUES('topic', 0, 2, 'email');
 
 # POSTGRES COMMIT #
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index c6e964113d..bf5ce30f37 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -31,7 +31,7 @@
 
 	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
 		<div id="darken">&nbsp;</div>
-		<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
+		<div class="phpbb_alert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 	</div>
 
 	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
diff --git a/phpBB/styles/prosilver/template/timezone.js b/phpBB/styles/prosilver/template/timezone.js
index af8206d12d..5e81a0bfdf 100644
--- a/phpBB/styles/prosilver/template/timezone.js
+++ b/phpBB/styles/prosilver/template/timezone.js
@@ -13,7 +13,7 @@ $(document).ready(
 );
 
 $(document).ready(
-	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true')
 );
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index 320b9b7121..a77e82f9a1 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -6,7 +6,7 @@
 			<option value="">{L_SELECT_CURRENT_TIME}</option>
 			{S_TZ_DATE_OPTIONS}
 		</select>
-		<input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+		<input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 	</dd>
 	<!-- ENDIF -->
 	<dd>
diff --git a/phpBB/styles/subsilver2/template/timezone.js b/phpBB/styles/subsilver2/template/timezone.js
index af8206d12d..5e81a0bfdf 100644
--- a/phpBB/styles/subsilver2/template/timezone.js
+++ b/phpBB/styles/subsilver2/template/timezone.js
@@ -13,7 +13,7 @@ $(document).ready(
 );
 
 $(document).ready(
-	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') == 'true')
+	phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') == 'true')
 );
 
 })(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/timezone_option.html b/phpBB/styles/subsilver2/template/timezone_option.html
index 7fa310b1bc..26ba2388c9 100644
--- a/phpBB/styles/subsilver2/template/timezone_option.html
+++ b/phpBB/styles/subsilver2/template/timezone_option.html
@@ -7,7 +7,7 @@
 				<option value="">{L_SELECT_CURRENT_TIME}</option>
 				{S_TZ_DATE_OPTIONS}
 			</select><br />
-			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" data-is-registration="<!-- IF S_REGISTRATION -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+			<input type="button" id="tz_select_date_suggest" class="btnlite" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 		</div>
 		<!-- ENDIF -->
 		<select name="tz" id="timezone" class="autowidth tz_select">
diff --git a/phpunit.xml.all b/phpunit.xml.all
index fde3bbb1a7..3639843771 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -24,15 +24,6 @@
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
             <exclude>
-                <file>./phpBB/includes/db/firebird.php</file>
-                <file>./phpBB/includes/db/mysql.php</file>
-                <file>./phpBB/includes/db/mysqli.php</file>
-                <file>./phpBB/includes/db/mssql.php</file>
-                <file>./phpBB/includes/db/mssql_odbc.php</file>
-                <file>./phpBB/includes/db/mssqlnative.php</file>
-                <file>./phpBB/includes/db/oracle.php</file>
-                <file>./phpBB/includes/db/postgres.php</file>
-                <file>./phpBB/includes/db/sqlite.php</file>
                 <file>./phpBB/includes/search/fulltext_native.php</file>
                 <file>./phpBB/includes/search/fulltext_mysql.php</file>
                 <directory suffix=".php">./phpBB/includes/captcha/</directory>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 27dee48aac..f1cb4b9d09 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -31,15 +31,6 @@
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
             <exclude>
-                <file>./phpBB/includes/db/firebird.php</file>
-                <file>./phpBB/includes/db/mysql.php</file>
-                <file>./phpBB/includes/db/mysqli.php</file>
-                <file>./phpBB/includes/db/mssql.php</file>
-                <file>./phpBB/includes/db/mssql_odbc.php</file>
-                <file>./phpBB/includes/db/mssqlnative.php</file>
-                <file>./phpBB/includes/db/oracle.php</file>
-                <file>./phpBB/includes/db/postgres.php</file>
-                <file>./phpBB/includes/db/sqlite.php</file>
                 <file>./phpBB/includes/search/fulltext_native.php</file>
                 <file>./phpBB/includes/search/fulltext_mysql.php</file>
                 <directory suffix=".php">./phpBB/includes/captcha/</directory>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 9facbcff8b..99f11477aa 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -30,15 +30,6 @@
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
             <exclude>
-                <file>./phpBB/includes/db/firebird.php</file>
-                <file>./phpBB/includes/db/mysql.php</file>
-                <file>./phpBB/includes/db/mysqli.php</file>
-                <file>./phpBB/includes/db/mssql.php</file>
-                <file>./phpBB/includes/db/mssql_odbc.php</file>
-                <file>./phpBB/includes/db/mssqlnative.php</file>
-                <file>./phpBB/includes/db/oracle.php</file>
-                <file>./phpBB/includes/db/postgres.php</file>
-                <file>./phpBB/includes/db/sqlite.php</file>
                 <file>./phpBB/includes/search/fulltext_native.php</file>
                 <file>./phpBB/includes/search/fulltext_mysql.php</file>
                 <directory suffix=".php">./phpBB/includes/captcha/</directory>
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index f01ea47c25..cb895b521a 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -1,90 +1,160 @@
-<?php
-/**
-*
-* @package testing
-* @version $Id$
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/driver/foobar.php';
-
-class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
-{
-	public function setUp()
-	{
-		global $phpbb_root_path, $phpEx;
-
-		// Mock phpbb_container
-		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$this->phpbb_container->expects($this->any())
-			->method('get')
-			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
-
-		// Prepare dependencies for avatar manager and driver
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$cache = $this->getMock('phpbb_cache_driver_interface');
-
-		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
-		$this->avatar_foobar->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.foobar'));
-		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
-		$this->avatar_barfoo->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.barfoo'));
-
-		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
-
-		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
-		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
-
-		// Set up avatar manager
-		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
-	}
-
-	public function test_get_driver()
-	{
-		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
-		$this->assertNull($driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foobar');
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
-		$this->assertNull($driver);
-	}
-
-	public function test_get_all_drivers()
-	{
-		$drivers = $this->manager->get_all_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
-	}
-
-	public function test_get_enabled_drivers()
-	{
-		$drivers = $this->manager->get_enabled_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-	}
-
-	public function test_get_avatar_settings()
-	{
-		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
-
-		$expected_settings = array(
-			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
-		);
-
-		$this->assertEquals($expected_settings, $avatar_settings);
-	}
-}
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/driver/foobar.php';
+
+class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		// Mock phpbb_container
+		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$this->phpbb_container->expects($this->any())
+			->method('get')
+			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
+
+		// Prepare dependencies for avatar manager and driver
+		$config = new phpbb_config(array());
+		$request = $this->getMock('phpbb_request');
+		$cache = $this->getMock('phpbb_cache_driver_interface');
+
+		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.foobar'));
+		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.barfoo'));
+
+		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
+
+		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
+		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
+
+		// Set up avatar manager
+		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
+	}
+
+	public function test_get_driver()
+	{
+		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
+		$this->assertNull($driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foobar');
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
+		$this->assertNull($driver);
+	}
+
+	public function test_get_all_drivers()
+	{
+		$drivers = $this->manager->get_all_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
+	}
+
+	public function test_get_enabled_drivers()
+	{
+		$drivers = $this->manager->get_enabled_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+	}
+
+	public function test_get_avatar_settings()
+	{
+		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
+
+		$expected_settings = array(
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+		);
+
+		$this->assertEquals($expected_settings, $avatar_settings);
+	}
+
+	public function database_row_data()
+	{
+		return array(
+			array(
+				array(
+					'user_avatar'			=> '',
+					'user_avatar_type'		=> '',
+					'user_avatar_width'		=> '',
+					'user_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'group_avatar'			=> '',
+					'group_avatar_type'		=> '',
+					'group_avatar_width'	=> '',
+					'group_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider database_row_data
+	*/
+	public function test_clean_row(array $input, array $output)
+	{
+		$cleaned_row = array();
+
+		$cleaned_row = phpbb_avatar_manager::clean_row($input);
+		foreach ($output as $key => $null)
+		{
+			$this->assertArrayHasKey($key, $cleaned_row);
+		}
+	}
+}
diff --git a/tests/dbal/migrator_tool_module.php b/tests/dbal/migrator_tool_module_test.php
index 6937b6f8c5..3303086b26 100644
--- a/tests/dbal/migrator_tool_module.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -21,7 +21,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	public function setup()
 	{
 		// Need global $db, $user for delete_module function in acp_modules
-		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user;
+		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log;
 
 		parent::setup();
 
@@ -32,6 +32,11 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		$this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx);
 		$user = $this->user = new phpbb_user();
 
+		$cache = new phpbb_mock_cache;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$auth = $this->getMock('phpbb_auth');
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+
 		$this->tool = new phpbb_db_migration_tool_module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules');
 	}
 
diff --git a/tests/dbal/migrator_tool_permission.php b/tests/dbal/migrator_tool_permission_test.php
index 438ab2b28e..438ab2b28e 100644
--- a/tests/dbal/migrator_tool_permission.php
+++ b/tests/dbal/migrator_tool_permission_test.php
diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php
new file mode 100644
index 0000000000..45339a6b50
--- /dev/null
+++ b/tests/dbal/sql_insert_buffer_test.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $buffer;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_config', 2);
+		$this->assert_config_count(2);
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	public function test_multi_insert_disabled_insert_and_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(3);
+		$this->assertFalse($this->buffer->flush());
+		$this->assert_config_count(3);
+	}
+
+	public function test_multi_insert_enabled_insert_and_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertFalse($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(2);
+		$this->assertTrue($this->buffer->flush());
+		$this->assert_config_count(3);
+	}
+
+	public function test_multi_insert_disabled_insert_with_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(3);
+		$this->assertTrue($this->buffer->insert($this->get_row(2)));
+		$this->assert_config_count(4);
+	}
+
+	public function test_multi_insert_enabled_insert_with_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertFalse($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(2);
+		$this->assertTrue($this->buffer->insert($this->get_row(2)));
+		$this->assert_config_count(4);
+	}
+
+	public function test_multi_insert_disabled_insert_all_and_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert_all($this->get_rows(3)));
+		$this->assert_config_count(5);
+	}
+
+	public function test_multi_insert_enabled_insert_all_and_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertTrue($this->buffer->insert_all($this->get_rows(3)));
+		$this->assert_config_count(4);
+		$this->assertTrue($this->buffer->flush());
+		$this->assert_config_count(5);
+	}
+
+	protected function assert_config_count($num_configs)
+	{
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $this->db->sql_query($sql);
+		$this->assertEquals($num_configs, $this->db->sql_fetchfield('num_configs'));
+		$this->db->sql_freeresult($result);
+	}
+
+	protected function check_multi_insert_support()
+	{
+		if (!$this->db->multi_insert)
+		{
+			$this->markTestSkipped('Database does not support multi_insert');
+		}
+	}
+
+	protected function get_row($rownum)
+	{
+		return array(
+			'config_name'	=> "name$rownum",
+			'config_value'	=> "value$rownum",
+			'is_dynamic'	=> '0',
+		);
+	}
+
+	protected function get_rows($n)
+	{
+		$result = array();
+		for ($i = 0; $i < $n; ++$i)
+		{
+			$result[] = $this->get_row($i);
+		}
+		return $result;
+	}
+}
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
new file mode 100644
index 0000000000..ec495da602
--- /dev/null
+++ b/tests/functional/notification_test.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_notification_test extends phpbb_functional_test_case
+{
+	static public function user_subscription_data()
+	{
+		return array(
+			// Rows inserted by phpBB/install/schemas/schema_data.sql
+			// Also see PHPBB3-11460
+			array('post_notification', true),
+			array('topic_notification', true),
+			array('post_email', true),
+			array('topic_email', true),
+
+			// Default behaviour for in-board notifications:
+			// If user did not opt-out, in-board notifications are on.
+			array('bookmark_notification', true),
+			array('quote_notification', true),
+
+			// Default behaviour for email notifications:
+			// If user did not opt-in, email notifications are off.
+			array('bookmark_email', false),
+			array('quote_email', false),
+		);
+	}
+
+	/**
+	* @dataProvider user_subscription_data
+	*/
+	public function test_user_subscriptions($checkbox_name, $expected_status)
+	{
+		$this->login();
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+		$this->assert_response_success();
+
+		$cplist = $crawler->filter('.cplist');
+		if ($expected_status)
+		{
+			$this->assert_checkbox_is_checked($cplist, $checkbox_name);
+		}
+		else
+		{
+			$this->assert_checkbox_is_unchecked($cplist, $checkbox_name);
+		}
+	}
+}
diff --git a/tests/notification/notification.php b/tests/notification/notification_test.php
index 13c868a0c7..beccf55371 100644
--- a/tests/notification/notification.php
+++ b/tests/notification/notification_test.php
@@ -22,11 +22,6 @@ class phpbb_notification_test extends phpbb_database_test_case
 
 		global $phpbb_root_path, $phpEx;
 
-		if (!function_exists('set_var'))
-		{
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
 		include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx);
 
 		$this->db = $this->new_dbal();
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index f43157775a..56cc7a9de5 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -197,8 +197,6 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array('loop'),
 				'',
 			),
-			/* Currently fail on develop:
-			http://tracker.phpbb.com/browse/PHPBB3-11323
 			array(
 				'include_define_variable.html',
 				array('VARIABLE' => 'variable.html'),
@@ -213,7 +211,6 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				'value',
 			),
-			*/
 			/* no top level nested loops
 			array(
 				'loop_vars.html',
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 887dfea3b5..a411d9c98a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -196,12 +196,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$parseURL = parse_url(self::$config['phpbb_functional_url']);
 
 		$data = array_merge($data, array(
-			'email_enable'		=> false,
-			'smtp_delivery'		=> false,
-			'smtp_host'		=> '',
-			'smtp_auth'		=> '',
-			'smtp_user'		=> '',
-			'smtp_pass'		=> '',
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> '',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
 			'cookie_secure'		=> false,
 			'force_server_vars'	=> false,
 			'server_protocol'	=> $parseURL['scheme'] . '://',
@@ -463,4 +463,68 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertGreaterThan(0, count($nodes), $msg);
 		return $nodes;
 	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is checked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_checked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'checked',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is checked."
+		);
+	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is unchecked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_unchecked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is unchecked."
+		);
+	}
+
+	/**
+	* Searches for an input element of type checkbox with the name $name using
+	* $crawler. Contains an assertion that only one such checkbox exists within
+	* the scope of $crawler.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return Symfony\Component\DomCrawler\Crawler
+	*/
+	public function assert_find_one_checkbox($crawler, $name, $message = '')
+	{
+		$query = sprintf('//input[@type="checkbox" and @name="%s"]', $name);
+		$result = $crawler->filterXPath($query);
+
+		$this->assertEquals(
+			1,
+			sizeof($result),
+			$message ?: 'Failed asserting that exactly one checkbox with name' .
+				" $name exists in crawler scope."
+		);
+
+		return $result;
+	}
 }
diff --git a/tests/user/user_loader.php b/tests/user/user_loader.php
deleted file mode 100644
index 0beb804729..0000000000
--- a/tests/user/user_loader.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
-
-class phpbb_user_lang_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml');
-	}
-
-	public function test_user_loader()
-	{
-		$db = $this->new_dbal();
-
-		$user_loader = new phpbb_user_loader($db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
-
-		$user_loader->load_users(array(2));
-
-		$user = $user_loader->get_user(1);
-		$this->assertEquals(1, $user['user_id']);
-		$this->assertEquals('Guest', $user['username']);
-
-		$user = $user_loader->get_user(2);
-		$this->assertEquals(2, $user['user_id']);
-		$this->assertEquals('Admin', $user['username']);
-
-		// Not loaded
-		$user = $user_loader->get_user(3);
-		$this->assertEquals(1, $user['user_id']);
-		$this->assertEquals('Guest', $user['username']);
-
-		$user = $user_loader->get_user(3, true);
-		$this->assertEquals(3, $user['user_id']);
-		$this->assertEquals('Test', $user['username']);
-
-		$user_id = $user_loader->load_user_by_username('Test');
-		$user = $user_loader->get_user($user_id);
-		$this->assertEquals(3, $user['user_id']);
-		$this->assertEquals('Test', $user['username']);
-	}
-}
diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php
new file mode 100644
index 0000000000..5cdb654b18
--- /dev/null
+++ b/tests/user/user_loader_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
+
+class phpbb_user_loader_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $user_loader;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml');
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->user_loader = new phpbb_user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
+	}
+
+	public function test_load_get()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(1);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(2);
+		$this->assertEquals(2, $user['user_id']);
+		$this->assertEquals('Admin', $user['username']);
+	}
+
+	public function test_load_get_unloaded()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(3);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_user_by_username()
+	{
+		$user_id = $this->user_loader->load_user_by_username('Test');
+		$user = $this->user_loader->get_user($user_id);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+}