From bcaf65d7cd951b9a453cac413c420cb418b42f8d Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 3 Sep 2011 17:26:36 -0500
Subject: [PATCH 001/279] [ticket/10349] Unit tests: Remove comments while
 loading schema files

Perform the same operations that the installer does when preparing the schema
files. These functions come straight from /includes/functions_install.php and
/includes/functions_admin.php.

PHPBB3-10349
---
 ...phpbb_database_test_connection_manager.php | 59 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index a7559e2183..78be831ecb 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -234,7 +234,12 @@ class phpbb_database_test_connection_manager
 		}
 
 		$filename = $directory . $schema . '_schema.sql';
-		$sql = $this->split_sql(file_get_contents($filename));
+		$remove_remarks = $this->dbms['COMMENTS'];
+
+		$queries = file_get_contents($filename);
+		$this->$remove_remarks($queries);
+		
+		$sql = $this->split_sql($queries);
 
 		foreach ($sql as $query)
 		{
@@ -279,6 +284,49 @@ class phpbb_database_test_connection_manager
 		return $data;
 	}
 
+	/**
+	* remove_remarks will strip the sql comment lines out of an uploaded sql file
+	*/
+	protected function remove_remarks(&$sql)
+	{
+		$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
+	}
+
+	/**
+	* remove_comments will strip the sql comment lines out of an uploaded sql file
+	* specifically for mssql and postgres type files in the install....
+	*/
+	protected function remove_comments(&$output)
+	{
+		$lines = explode("\n", $output);
+		$output = '';
+
+		// try to keep mem. use down
+		$linecount = sizeof($lines);
+
+		$in_comment = false;
+		for ($i = 0; $i < $linecount; $i++)
+		{
+			if (trim($lines[$i]) == '/*')
+			{
+				$in_comment = true;
+			}
+
+			if (!$in_comment)
+			{
+				$output .= $lines[$i] . "\n";
+			}
+
+			if (trim($lines[$i]) == '*/')
+			{
+				$in_comment = false;
+			}
+		}
+
+		unset($lines);
+		return $output;
+	}
+
 	/**
 	* Map a phpBB dbms driver name to dbms data array
 	*/
@@ -289,46 +337,55 @@ class phpbb_database_test_connection_manager
 				'SCHEMA'		=> 'firebird',
 				'DELIM'			=> ';;',
 				'PDO'			=> 'firebird',
+				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mysqli'	=> array(
 				'SCHEMA'		=> 'mysql_41',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
+				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mysql'		=> array(
 				'SCHEMA'		=> 'mysql',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
+				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mssql'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
+				'COMMENTS'		=> 'remove_comments',
 			),
 			'mssql_odbc'=>	array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
+				'COMMENTS'		=> 'remove_comments',
 			),
 			'mssqlnative'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'sqlsrv',
+				'COMMENTS'		=> 'remove_comments',
 			),
 			'oracle'	=>	array(
 				'SCHEMA'		=> 'oracle',
 				'DELIM'			=> '/',
 				'PDO'			=> 'oci',
+				'COMMENTS'		=> 'remove_comments',
 			),
 			'postgres' => array(
 				'SCHEMA'		=> 'postgres',
 				'DELIM'			=> ';',
 				'PDO'			=> 'pgsql',
+				'COMMENTS'		=> 'remove_comments',
 			),
 			'sqlite'		=> array(
 				'SCHEMA'		=> 'sqlite',
 				'DELIM'			=> ';',
 				'PDO'			=> 'sqlite2',
+				'COMMENTS'		=> 'remove_remarks',
 			),
 		);
 

From 4bc11db0ffc3b387e4ad38b0d9ceccfa58f2738d Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 20 Sep 2011 23:23:03 -0500
Subject: [PATCH 002/279] [ticket/10349] Unit tests: Consolidate schema comment
 removal functions

PHPBB3-10349
---
 ...phpbb_database_test_connection_manager.php | 69 +++----------------
 1 file changed, 11 insertions(+), 58 deletions(-)

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 78be831ecb..547361b41d 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -234,12 +234,11 @@ class phpbb_database_test_connection_manager
 		}
 
 		$filename = $directory . $schema . '_schema.sql';
-		$remove_remarks = $this->dbms['COMMENTS'];
 
 		$queries = file_get_contents($filename);
-		$this->$remove_remarks($queries);
+		$sql = $this->remove_comments($queries);
 		
-		$sql = $this->split_sql($queries);
+		$sql = $this->split_sql($sql);
 
 		foreach ($sql as $query)
 		{
@@ -271,60 +270,23 @@ class phpbb_database_test_connection_manager
 			unset($data[key($data)]);
 		}
 
-		if ($this->config['dbms'] == 'sqlite')
-		{
-			// remove comment lines starting with # - they are not proper sqlite
-			// syntax and break sqlite2
-			foreach ($data as $i => $query)
-			{
-				$data[$i] = preg_replace('/^#.*$/m', "\n", $query);
-			}
-		}
-
 		return $data;
 	}
 
 	/**
-	* remove_remarks will strip the sql comment lines out of an uploaded sql file
+	* Removes comments from schema files
+	* 
+	* Note: This performs the functions of remove_remarks() and remove_comments() used during installation
 	*/
-	protected function remove_remarks(&$sql)
+	protected function remove_comments($sql)
 	{
+		// Remove /* */ comments (http://ostermiller.org/findcomment.html)
+		$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
+
+		// Remove # style comments
 		$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
-	}
 
-	/**
-	* remove_comments will strip the sql comment lines out of an uploaded sql file
-	* specifically for mssql and postgres type files in the install....
-	*/
-	protected function remove_comments(&$output)
-	{
-		$lines = explode("\n", $output);
-		$output = '';
-
-		// try to keep mem. use down
-		$linecount = sizeof($lines);
-
-		$in_comment = false;
-		for ($i = 0; $i < $linecount; $i++)
-		{
-			if (trim($lines[$i]) == '/*')
-			{
-				$in_comment = true;
-			}
-
-			if (!$in_comment)
-			{
-				$output .= $lines[$i] . "\n";
-			}
-
-			if (trim($lines[$i]) == '*/')
-			{
-				$in_comment = false;
-			}
-		}
-
-		unset($lines);
-		return $output;
+		return $sql;
 	}
 
 	/**
@@ -337,55 +299,46 @@ class phpbb_database_test_connection_manager
 				'SCHEMA'		=> 'firebird',
 				'DELIM'			=> ';;',
 				'PDO'			=> 'firebird',
-				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mysqli'	=> array(
 				'SCHEMA'		=> 'mysql_41',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
-				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mysql'		=> array(
 				'SCHEMA'		=> 'mysql',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
-				'COMMENTS'		=> 'remove_remarks',
 			),
 			'mssql'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
-				'COMMENTS'		=> 'remove_comments',
 			),
 			'mssql_odbc'=>	array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
-				'COMMENTS'		=> 'remove_comments',
 			),
 			'mssqlnative'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'sqlsrv',
-				'COMMENTS'		=> 'remove_comments',
 			),
 			'oracle'	=>	array(
 				'SCHEMA'		=> 'oracle',
 				'DELIM'			=> '/',
 				'PDO'			=> 'oci',
-				'COMMENTS'		=> 'remove_comments',
 			),
 			'postgres' => array(
 				'SCHEMA'		=> 'postgres',
 				'DELIM'			=> ';',
 				'PDO'			=> 'pgsql',
-				'COMMENTS'		=> 'remove_comments',
 			),
 			'sqlite'		=> array(
 				'SCHEMA'		=> 'sqlite',
 				'DELIM'			=> ';',
 				'PDO'			=> 'sqlite2',
-				'COMMENTS'		=> 'remove_remarks',
 			),
 		);
 

From 26e84b12e817dd5e86a82c379a03a67f9f1bacd1 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Wed, 28 Sep 2011 01:52:08 -0500
Subject: [PATCH 003/279] [ticket/10349] Use new schema comment function in
 installer

This is what now runs in the unit tests. The COMMENTS field in the dbms data
is no longer needed, so it has been removed.

PHPBB3-10349
---
 phpBB/includes/functions_admin.php   | 35 ----------------------------
 phpBB/includes/functions_install.php | 20 +++++++---------
 phpBB/install/install_install.php    |  6 ++---
 3 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index f7e19f3e7d..0c83674054 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2293,41 +2293,6 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
 	return;
 }
 
-/**
-* remove_comments will strip the sql comment lines out of an uploaded sql file
-* specifically for mssql and postgres type files in the install....
-*/
-function remove_comments(&$output)
-{
-	$lines = explode("\n", $output);
-	$output = '';
-
-	// try to keep mem. use down
-	$linecount = sizeof($lines);
-
-	$in_comment = false;
-	for ($i = 0; $i < $linecount; $i++)
-	{
-		if (trim($lines[$i]) == '/*')
-		{
-			$in_comment = true;
-		}
-
-		if (!$in_comment)
-		{
-			$output .= $lines[$i] . "\n";
-		}
-
-		if (trim($lines[$i]) == '*/')
-		{
-			$in_comment = false;
-		}
-	}
-
-	unset($lines);
-	return $output;
-}
-
 /**
 * Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username
 * and group names must be carried through for the moderators table
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 992e8d6bb0..270fa0f0b3 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -50,7 +50,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'firebird',
 			'MODULE'		=> 'interbase',
 			'DELIM'			=> ';;',
-			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'firebird',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -60,7 +59,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql_41',
 			'MODULE'		=> 'mysqli',
 			'DELIM'			=> ';',
-			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'mysqli',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -70,7 +68,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql',
 			'MODULE'		=> 'mysql',
 			'DELIM'			=> ';',
-			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'mysql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -80,7 +77,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'mssql',
 			'DELIM'			=> 'GO',
-			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -90,7 +86,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'odbc',
 			'DELIM'			=> 'GO',
-			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssql_odbc',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -100,7 +95,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'sqlsrv',
 			'DELIM'			=> 'GO',
-			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssqlnative',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -110,7 +104,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'oracle',
 			'MODULE'		=> 'oci8',
 			'DELIM'			=> '/',
-			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'oracle',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -120,7 +113,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql',
 			'DELIM'			=> ';',
-			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'postgres',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -130,7 +122,6 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'sqlite',
 			'MODULE'		=> 'sqlite',
 			'DELIM'			=> ';',
-			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'sqlite',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -514,11 +505,18 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 }
 
 /**
-* remove_remarks will strip the sql comment lines out of an uploaded sql file
+* Removes comments from schema files
+*
 */
-function remove_remarks(&$sql)
+function remove_comments($sql)
 {
+	// Remove /* */ comments (http://ostermiller.org/findcomment.html)
+	$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
+
+	// Remove # style comments
 	$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
+
+	return $sql;
 }
 
 /**
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9fe0c8aed5..9b37ee2be3 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1173,14 +1173,13 @@ class install_install extends module
 		$dbms_schema = 'schemas/' . $available_dbms[$data['dbms']]['SCHEMA'] . '_schema.sql';
 
 		// How should we treat this schema?
-		$remove_remarks = $available_dbms[$data['dbms']]['COMMENTS'];
 		$delimiter = $available_dbms[$data['dbms']]['DELIM'];
 
 		$sql_query = @file_get_contents($dbms_schema);
 
 		$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
 
-		$remove_remarks($sql_query);
+		$sql_query = remove_comments($sql_query);
 
 		$sql_query = split_sql_file($sql_query, $delimiter);
 
@@ -1218,8 +1217,7 @@ class install_install extends module
 		// Change language strings...
 		$sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query);
 
-		// Since there is only one schema file we know the comment style and are able to remove it directly with remove_remarks
-		remove_remarks($sql_query);
+		$sql_query = remove_comments($sql_query);
 		$sql_query = split_sql_file($sql_query, ';');
 
 		foreach ($sql_query as $sql)

From b4dcd4193e7ea52753eb3957bb247b768dc48d12 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Wed, 28 Sep 2011 11:27:39 -0500
Subject: [PATCH 004/279] [ticket/10349] Update function comment

PHPBB3-10349
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 547361b41d..5feab16496 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -275,8 +275,6 @@ class phpbb_database_test_connection_manager
 
 	/**
 	* Removes comments from schema files
-	* 
-	* Note: This performs the functions of remove_remarks() and remove_comments() used during installation
 	*/
 	protected function remove_comments($sql)
 	{

From baac9e5d150dab88ed6f1eca8ca61bc4468ab01c Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 29 Oct 2011 17:10:10 -0500
Subject: [PATCH 005/279] [ticket/10349] Removed duplicated functions from
 schema loading in tests

PHPBB3-10349
---
 phpBB/includes/functions_install.php          |  1 -
 ...phpbb_database_test_connection_manager.php | 47 ++-----------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 270fa0f0b3..6438f35ccc 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -506,7 +506,6 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 
 /**
 * Removes comments from schema files
-*
 */
 function remove_comments($sql)
 {
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 5feab16496..770cc84d7e 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -7,6 +7,8 @@
 *
 */
 
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_install.php';
+
 class phpbb_database_test_connection_manager
 {
 	private $config;
@@ -236,9 +238,9 @@ class phpbb_database_test_connection_manager
 		$filename = $directory . $schema . '_schema.sql';
 
 		$queries = file_get_contents($filename);
-		$sql = $this->remove_comments($queries);
+		$sql = remove_comments($queries);
 		
-		$sql = $this->split_sql($sql);
+		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 
 		foreach ($sql as $query)
 		{
@@ -246,47 +248,6 @@ class phpbb_database_test_connection_manager
 		}
 	}
 
-	/**
-	* Split contents of an SQL file into an array of SQL statements
-	*
-	* Note: This method is not the same as split_sql_file from functions_install.
-	*
-	* @param	string	$sql	Raw contents of an SQL file
-	*
-	* @return Array of runnable SQL statements
-	*/
-	protected function split_sql($sql)
-	{
-		$sql = str_replace("\r" , '', $sql);
-		$data = preg_split('/' . preg_quote($this->dbms['DELIM'], '/') . '$/m', $sql);
-
-		$data = array_map('trim', $data);
-
-		// The empty case
-		$end_data = end($data);
-
-		if (empty($end_data))
-		{
-			unset($data[key($data)]);
-		}
-
-		return $data;
-	}
-
-	/**
-	* Removes comments from schema files
-	*/
-	protected function remove_comments($sql)
-	{
-		// Remove /* */ comments (http://ostermiller.org/findcomment.html)
-		$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
-
-		// Remove # style comments
-		$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
-
-		return $sql;
-	}
-
 	/**
 	* Map a phpBB dbms driver name to dbms data array
 	*/

From bb40789552d1620d0281df8a41a020f826ca8739 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 30 Oct 2011 12:46:10 +0100
Subject: [PATCH 006/279] [ticket/10434] Add script for creating search index
 from CLI.

PHPBB3-10434
---
 phpBB/develop/create_search_index.php | 137 ++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 phpBB/develop/create_search_index.php

diff --git a/phpBB/develop/create_search_index.php b/phpBB/develop/create_search_index.php
new file mode 100644
index 0000000000..374a4cf0a1
--- /dev/null
+++ b/phpBB/develop/create_search_index.php
@@ -0,0 +1,137 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (php_sapi_name() != 'cli')
+{
+	die("This program must be run from the command line.\n");
+}
+
+if ($argc < 2)
+{
+	echo 'Usage: php ' . basename(__FILE__) . " index_type [batch_size]\n";
+	exit(1);
+}
+
+$class_name = basename($argv[1]);
+
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : '../';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+require($phpbb_root_path . 'common.' . $phpEx);
+require($phpbb_root_path . 'includes/acp/acp_search.' . $phpEx);
+require($phpbb_root_path . 'includes/search/' . $class_name . '.' . $phpEx);
+
+$user->session_begin();
+$auth->acl($user->data);
+$user->setup('acp/search');
+
+$search_name = ucfirst(strtolower(str_replace('_', ' ', $class_name)));
+$search_errors = array();
+$search = new $class_name($search_errors);
+
+$batch_size = isset($argv[2]) ? $argv[2] : 2000;
+$time = time();
+
+if (method_exists($search, 'create_index'))
+{
+	if ($error = $search->create_index(null, ''))
+	{
+		var_dump($error);
+		exit(1);
+	}
+}
+else
+{
+	$sql = 'SELECT forum_id, enable_indexing
+		FROM ' . FORUMS_TABLE;
+	$result = $db->sql_query($sql);
+
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$forums[$row['forum_id']] = (bool) $row['enable_indexing'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = 'SELECT post_id
+		FROM ' . POSTS_TABLE . '
+		ORDER BY post_id DESC';
+	$result = $db->sql_query_limit($sql, 1);
+	$max_post_id = (int) $db->sql_fetchfield('post_id');
+
+	$post_counter = 0;
+	while ($post_counter <= $max_post_id)
+	{
+		$row_count = 0;
+
+		printf("Processing posts with %d <= post_id <= %d\n",
+			$post_counter + 1,
+			$post_counter + $batch_size
+		);
+
+		$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
+			FROM ' . POSTS_TABLE . '
+			WHERE post_id >= ' . (int) ($post_counter + 1) . '
+				AND post_id <= ' . (int) ($post_counter + $batch_size);
+		$result = $db->sql_query($sql);
+
+		$buffer = $db->sql_buffer_nested_transactions();
+
+		if ($buffer)
+		{
+			$rows = $db->sql_fetchrowset($result);
+			$rows[] = false; // indicate end of array for while loop below
+
+			$db->sql_freeresult($result);
+		}
+
+		$i = 0;
+		while ($row = ($buffer ? $rows[$i++] : $db->sql_fetchrow($result)))
+		{
+			// Indexing enabled for this forum or global announcement?
+			// Global announcements get indexed by default.
+			if (!$row['forum_id'] || !empty($forums[$row['forum_id']]))
+			{
+				++$row_count;
+
+				$search->index('post',
+					$row['post_id'],
+					$row['post_text'],
+					$row['post_subject'],
+					$row['poster_id'],
+					$row['forum_id']
+				);
+
+				if ($row_count % 10 == 0)
+				{
+					echo '.';
+				}
+			}
+		}
+
+		$delta = (time() - $time);
+		$delta = $delta <= 0 ? 1 : $delta;
+		printf(" %d posts/sec\n", $row_count / $delta);
+
+		if (!$buffer)
+		{
+			$db->sql_freeresult($result);
+		}
+
+		$post_counter += $batch_size;
+	}
+}
+
+$search->tidy();
+
+add_log('admin', 'LOG_SEARCH_INDEX_CREATED', $search_name);
+
+echo $user->lang['SEARCH_INDEX_CREATED'] . "\n";
+echo 'Peak Memory Usage: ' . get_formatted_filesize(memory_get_peak_usage()) . "\n";
+
+exit(0);

From 65921ae67a98fa1aa9010ffd433e6420dd224e81 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Sun, 13 Nov 2011 20:10:51 +0100
Subject: [PATCH 007/279] [ticket/10453] PM viewmessage page is misplacing the
 online icon

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
---
 .../template/ucp_pm_message_header.html       | 29 +++++++++----------
 .../prosilver/template/ucp_pm_viewfolder.html |  1 -
 .../template/ucp_pm_viewmessage.html          | 11 ++++---
 phpBB/styles/prosilver/theme/colours.css      |  6 ----
 phpBB/styles/prosilver/theme/cp.css           | 27 ++---------------
 5 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index fcebab0868..a1017d4b44 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -1,25 +1,28 @@
 <h2>{L_TITLE}<!-- IF CUR_FOLDER_NAME -->: {CUR_FOLDER_NAME}<!-- ENDIF --></h2>
 
-<div class="panel clearfix pm-panel-header<!-- IF S_VIEW_MESSAGE --> pm<!-- ENDIF -->">
+<form id="viewfolder" method="post" action="{S_PM_ACTION}">
+
+<div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-
+	<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+		<div class="reply-all">
+			<ul class="linklist">
+				<li><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></li>	
+			</ul>
+		</div>
+	<!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon clearfix"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
+			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
 		</div>
-
-		<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
-			<div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">&raquo; {L_REPLY_TO_ALL}</a></div>
-		<!-- ENDIF -->
-
 	<!-- ENDIF -->
 
-		<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
-	<ul class="linklist pm-return-to">
+	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
+	<ul class="linklist">
 		<li class="rightside pagination">
 			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
 			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
@@ -28,8 +31,4 @@
 			<!-- ENDIF -->
 		</li>
 	</ul>
-		<!-- ENDIF -->
-	</div>
-</div>
-
-<form id="viewfolder" method="post" action="{S_PM_ACTION}">
+	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index d7e02e405e..c9f28cec64 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -2,7 +2,6 @@
 
 <!-- IF not PROMPT -->
 	<!-- INCLUDE ucp_pm_message_header.html -->
-	<div class="panel pm-panel-message"><div>
 <!-- ENDIF -->
 
 <!-- IF PROMPT -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index df0cf25e82..79c2c0355f 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -1,18 +1,21 @@
-	<!-- INCLUDE ucp_header.html -->
+<!-- INCLUDE ucp_header.html -->
 
 <!-- INCLUDE ucp_pm_message_header.html -->
 
+		<span class="corners-bottom"><span></span></span></div>
+</div>
+
 
 <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
-	<fieldset class="display-options clearfix bg1 pm-message-nav">
+	<fieldset class="display-options clearfix">
 		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
 		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
 
-<div id="post-{MESSAGE_ID}" class="panel clearfix post pm-panel-message pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
-<div>
+<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
+<div class="inner"><span class="corners-top"><span></span></span>
 
 	<div class="postbody">
 
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index e98ce237bc..b9e4491feb 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -884,12 +884,6 @@ dl.mini dt {
 	color: #000000 !important;
 }
 
-/* PM panel adjustments */
-.pm-panel-header,
-#cp-main .pm-message-nav {
-	border-bottom-color: #A4B3BF;
-}
-
 /* PM marking colours */
 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
 	border-left-color: #BC2A4D;
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index b574b0ae1f..9d04371115 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -349,31 +349,10 @@ dl.mini dd {
 }
 
 /* PM panel adjustments */
-.pm-panel-header {
-	margin: 0; 
-	padding-bottom: 10px; 
-	border-bottom: 1px dashed #A4B3BF;
-}
-
 .reply-all {
-	display: block; 
-	padding-top: 4px; 
-	clear: both;
-	float: left;
-}
-
-.pm-panel-message {
-	padding-top: 10px;
-}
-
-.pm-return-to {
-	padding-top: 23px;
-}
-
-#cp-main .pm-message-nav {
-	margin: 0; 
-	padding: 2px 10px 5px 10px; 
-	border-bottom: 1px dashed #A4B3BF;
+	margin-bottom: -60px;
+	position: absolute;
+	margin-left: 200px;
 }
 
 /* PM Message history */

From c0ffc8386ccad6a6a3070faed1ae748f61ac9858 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Mon, 14 Nov 2011 21:38:10 +0100
Subject: [PATCH 008/279] [ticket/10453] PM viewmessage page is misplacing the
 online icon

Removed the position: absolute value, and made it so that if the
buttons are bigger the text move with it, also added support for
bidi.css (text right to left).

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
---
 .../prosilver/template/ucp_pm_message_header.html   |  8 +-------
 phpBB/styles/prosilver/theme/bidi.css               | 13 +++++++++++++
 phpBB/styles/prosilver/theme/cp.css                 | 13 ++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index a1017d4b44..c3b7e54f45 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -6,18 +6,12 @@
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
-	<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
-		<div class="reply-all">
-			<ul class="linklist">
-				<li><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></li>	
-			</ul>
-		</div>
-	<!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
 			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
+	        <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f441784d85..c4a46b432c 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -591,6 +591,19 @@
 /* PM Styles
 ----------------------------------------*/
 
+/* PM panel adjustments */
+.rtl .reply-all a.right {
+	background-position: 5% 60%;
+}
+
+.rtl .reply-all a.right:hover {
+	background-position: 3% 60%;
+}
+
+.rtl .reply-all {
+	padding-left: 5px;
+}
+
 /* Defined rules list for PM options */
 .rtl ol.def-rules {
 	padding-right: 0;
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 9d04371115..6f45d13cef 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -349,10 +349,17 @@ dl.mini dd {
 }
 
 /* PM panel adjustments */
+.reply-all a.left {
+	background-position: 3px 60%;
+}
+
+.reply-all a.left:hover {
+	background-position: 0px 60%;
+}
+
 .reply-all {
-	margin-bottom: -60px;
-	position: absolute;
-	margin-left: 200px;
+    font-size: 11px;
+	padding-top: 5px;
 }
 
 /* PM Message history */

From a9d7b1f9a144a6354638e6ef30e42cec2463f1b8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 21 Nov 2011 00:57:53 +0100
Subject: [PATCH 009/279] [develop-olympus] Increment version number to
 3.0.11-dev in develop-olympus.

---
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index ec7b8c7123..a0444ea594 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.10-RC1');
+define('PHPBB_VERSION', '3.0.11-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ca011c8aa..1d96f40fdf 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4f5bf23c58..fcc372ae93 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-dev');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 

From 3ce5b1d3867b4276985dde78d5a3d021f26ca2a7 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Sat, 16 Jul 2011 08:22:29 -0400
Subject: [PATCH 010/279] [ticket/10280] Change the display of user activation
 settings in the ACP.

Use a select box to be consistent with other settings.

PHPBB3-10280
---
 phpBB/includes/acp/acp_board.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 3ed5f40368..8c761e51fe 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -234,7 +234,7 @@ class acp_board
 						'max_name_chars'		=> array('lang' => 'USERNAME_LENGTH', 'validate' => 'int:8:180', 'type' => false, 'method' => false, 'explain' => false,),
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 
-						'require_activation'	=> array('lang' => 'ACC_ACTIVATION',	'validate' => 'int',	'type' => 'custom', 'method' => 'select_acc_activation', 'explain' => true),
+						'require_activation'	=> array('lang' => 'ACC_ACTIVATION',	'validate' => 'int',	'type' => 'select', 'method' => 'select_acc_activation', 'explain' => true),
 						'new_member_post_limit'	=> array('lang' => 'NEW_MEMBER_POST_LIMIT', 'validate' => 'int:0:255', 'type' => 'text:4:4', 'explain' => true, 'append' => ' ' . $user->lang['POSTS']),
 						'new_member_group_default'=> array('lang' => 'NEW_MEMBER_GROUP_DEFAULT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 						'min_name_chars'		=> array('lang' => 'USERNAME_LENGTH',	'validate' => 'int:1',	'type' => 'custom:5:180', 'method' => 'username_length', 'explain' => true),
@@ -768,24 +768,28 @@ class acp_board
 	/**
 	* Select account activation method
 	*/
-	function select_acc_activation($value, $key = '')
+	function select_acc_activation($selected_value, $value)
 	{
 		global $user, $config;
 
-		$radio_ary = array(
-			USER_ACTIVATION_DISABLE => 'ACC_DISABLE',
-			USER_ACTIVATION_NONE => 'ACC_NONE',
+		$act_ary = array(
+		  'ACC_DISABLE' => USER_ACTIVATION_DISABLE,
+		  'ACC_NONE' => USER_ACTIVATION_NONE,
 		);
-
 		if ($config['email_enable'])
 		{
-			$radio_ary[USER_ACTIVATION_SELF] = 'ACC_USER';
-			$radio_ary[USER_ACTIVATION_ADMIN] = 'ACC_ADMIN';
+			$act_ary['ACC_USER'] = USER_ACTIVATION_SELF;
+			$act_ary['ACC_ADMIN'] = USER_ACTIVATION_ADMIN;
+		}		
+		$act_options = '';
+
+		foreach ($act_ary as $key => $value)
+		{
+			$selected = ($selected_value == $value) ? ' selected="selected"' : '';
+			$act_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$key] . '</option>';
 		}
 
-		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, 'require_activation', $key, '<br />');
-
-		return $radio_text;
+		return $act_options;
 	}
 
 	/**

From 0cb83f99abd67c33fecc511b2e7ac6a49acf058d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 26 Nov 2011 17:32:40 -0500
Subject: [PATCH 011/279] [ticket/10093] Document phpbb.hooks.commit-msg.fatal
 setting.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 4f6ae71d4b..03a602c16c 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -11,6 +11,11 @@
 #
 # ln -s ../../git-tools/hooks/commit-msg \\
 #   .git/hooks/commit-msg
+#
+# You can configure whether invalid commit messages abort commits:
+#
+# git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
+# git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
 
 config_ns="phpbb.hooks.commit-msg";
 

From 26d01d4408a25d70e2bbe32992a1c348ddefff04 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 26 Nov 2011 17:35:10 -0500
Subject: [PATCH 012/279] [ticket/10093] Respect phpbb.hooks.commit-msg.fatal
 on syntax errors.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 03a602c16c..39d5bb3350 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -254,7 +254,7 @@ do
 		echo ">> $line" >&2;
 		echo -n "Expecting: " >&2;
 		echo "$expecting" | sed 's/ /, /g' >&2;
-		exit $err;
+		quit $err;
 	fi
 
 	i=$(( $i + 1 ));

From 6a3ee0996e1b4faf765d72e7249f505fafd5812d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 26 Nov 2011 17:41:25 -0500
Subject: [PATCH 013/279] [ticket/10093] Refactor complaining in commit-msg
 hook for color support.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 39 +++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 39d5bb3350..5c51127dcc 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -60,6 +60,11 @@ quit()
 	fi
 }
 
+complain()
+{
+	echo "$@"
+}
+
 # Check for empty commit message
 if ! grep -qv '^#' "$1"
 then
@@ -75,9 +80,9 @@ msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
 
 if [ $? -eq 0 ]
 then
-	echo "The following lines are greater than 80 characters long:" >&2;
-	echo >&2
-	echo "$msg" >&2;
+	complain "The following lines are greater than 80 characters long:" >&2;
+	complain >&2
+	complain "$msg" >&2;
 
 	quit $ERR_LENGTH;
 fi
@@ -131,9 +136,9 @@ do
 					# Don't be too strict.
 					# Commits may be temporary, intended to be squashed later.
 					# Just issue a warning here.
-					echo "Warning: heading should be a sentence beginning with a capital letter." 1>&2
-					echo "You entered:" 1>&2
-					echo "$line" 1>&2
+					complain "Warning: heading should be a sentence beginning with a capital letter." 1>&2
+					complain "You entered:" 1>&2
+					complain "$line" 1>&2
 				fi
 				# restore exit code
 				(exit $result)
@@ -165,7 +170,7 @@ do
 				echo "$line" | grep -Eq "^#";
 			;;
 			*)
-				echo "Unrecognised token $expect" >&2;
+				complain "Unrecognised token $expect" >&2;
 				quit $err;
 			;;
 		esac
@@ -236,7 +241,7 @@ do
 				expecting="eof";
 			;;
 			*)
-				echo "Unrecognised token $expect" >&2;
+				complain "Unrecognised token $expect" >&2;
 				quit 254;
 			;;
 		esac
@@ -250,10 +255,10 @@ do
 	else
 		# None of the expected line formats matched
 		# Guess we'll call it a day here then
-		echo "Syntax error on line $i:" >&2;
-		echo ">> $line" >&2;
-		echo -n "Expecting: " >&2;
-		echo "$expecting" | sed 's/ /, /g' >&2;
+		complain "Syntax error on line $i:" >&2;
+		complain ">> $line" >&2;
+		complain -n "Expecting: " >&2;
+		complain "$expecting" | sed 's/ /, /g' >&2;
 		quit $err;
 	fi
 
@@ -263,7 +268,7 @@ done
 # If EOF is expected exit cleanly
 echo "$expecting" | grep -q "eof" || (
 	# Unexpected EOF, error
-	echo "Unexpected EOF encountered" >&2;
+	complain "Unexpected EOF encountered" >&2;
 	quit $ERR_EOF;
 ) && (
 	# Do post scan checks
@@ -274,8 +279,8 @@ echo "$expecting" | grep -q "eof" || (
 
 		if [ ! -z "$dupes" ]
 		then
-			echo "The following tickets are repeated:" >&2;
-			echo "$dupes" | sed 's/ /\n/g;s/^/* /g' >&2;
+			complain "The following tickets are repeated:" >&2;
+			complain "$dupes" | sed 's/ /\n/g;s/^/* /g' >&2;
 			quit $ERR_FOOTER;
 		fi
 	fi
@@ -283,8 +288,8 @@ echo "$expecting" | grep -q "eof" || (
 	if [ $ticket -gt 0 ]
 	then
 		echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || (
-			echo "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
-			echo "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
+			complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2;
+			complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2;
 			quit $ERR_FOOTER;
 		) || exit $?;
 	fi

From 92cdf08d48cba4eac30708ab089aae917db13970 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 26 Nov 2011 18:04:03 -0500
Subject: [PATCH 014/279] [ticket/10093] Use color in commit-msg hook
 warning/error messages.

By default color is used if the message is printed to a tty,
phpbb.hooks.commit-msg.color configuration setting can override this.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 51 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 5c51127dcc..959c4e3979 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -16,6 +16,13 @@
 #
 # git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
 # git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
+#
+# Warning/error messages use color by default if the output is a terminal
+# ("output" here is normally standard error when you run git commit).
+# To force or disable the use of color:
+#
+# git config phpbb.hooks.commit-msg.color true	(force color output)
+# git config phpbb.hooks.commit-msg.color false (disable color output)
 
 config_ns="phpbb.hooks.commit-msg";
 
@@ -60,9 +67,51 @@ quit()
 	fi
 }
 
+use_color()
+{
+	if [ -z "$use_color_cached" ]
+	then
+		case $(git config --bool $config_ns.color)
+		in
+		false)
+			use_color_cached=1
+			;;
+		true)
+			use_color_cached=0
+			;;
+		*)
+			# tty detection in shell:
+			# http://hwi.ath.cx/jsh/list/shext/isatty.sh.html
+			tty 0>/dev/stdout >/dev/null 2>&1
+			use_color_cached=$?
+			;;
+		esac
+	fi
+	# return value is the flag inverted -
+	# if return value is 0, this means use color
+	return $use_color_cached
+}
+
 complain()
 {
-	echo "$@"
+	if use_color
+	then
+		# Careful: our argument may include arguments to echo like -n
+		# ANSI color codes:
+		# http://pueblo.sourceforge.net/doc/manual/ansi_color_codes.html
+		printf "\033[31m\033[1m"
+		if [ "$1" = "-n" ]
+		then
+			echo "$@"
+			printf "\033[10m"
+		else
+			# This will print one trailing space.
+			# Not sure how to avoid this at the moment.
+			echo "$@" $(printf "\033[10m")
+		fi
+	else
+		echo "$@"
+	fi
 }
 
 # Check for empty commit message

From 74ae7d03391c4a836364a3e63881f6079837a8e4 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 1 Dec 2011 01:46:33 +0200
Subject: [PATCH 015/279] [ticket/10399] Correctly encoding template component
 urls (3.0)

Correctly encoding template component urls

PHPBB3-10399
---
 phpBB/includes/functions.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c2b099d48a..98a2b3028b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4612,11 +4612,11 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 		'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 
-		'T_THEME_PATH'			=> "{$web_path}styles/" . $user->theme['theme_path'] . '/theme',
-		'T_TEMPLATE_PATH'		=> "{$web_path}styles/" . $user->theme['template_path'] . '/template',
-		'T_SUPER_TEMPLATE_PATH'	=> (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template',
-		'T_IMAGESET_PATH'		=> "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset',
-		'T_IMAGESET_LANG_PATH'	=> "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->lang_name,
+		'T_THEME_PATH'			=> "{$web_path}styles/" . rawurlencode($user->theme['theme_path']) . '/theme',
+		'T_TEMPLATE_PATH'		=> "{$web_path}styles/" . rawurlencode($user->theme['template_path']) . '/template',
+		'T_SUPER_TEMPLATE_PATH'	=> (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . rawurlencode($user->theme['template_inherit_path']) . '/template' : "{$web_path}styles/" . rawurlencode($user->theme['template_path']) . '/template',
+		'T_IMAGESET_PATH'		=> "{$web_path}styles/" . rawurlencode($user->theme['imageset_path']) . '/imageset',
+		'T_IMAGESET_LANG_PATH'	=> "{$web_path}styles/" . rawurlencode($user->theme['imageset_path']) . '/imageset/' . $user->lang_name,
 		'T_IMAGES_PATH'			=> "{$web_path}images/",
 		'T_SMILIES_PATH'		=> "{$web_path}{$config['smilies_path']}/",
 		'T_AVATAR_PATH'			=> "{$web_path}{$config['avatar_path']}/",
@@ -4624,13 +4624,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'T_ICONS_PATH'			=> "{$web_path}{$config['icons_path']}/",
 		'T_RANKS_PATH'			=> "{$web_path}{$config['ranks_path']}/",
 		'T_UPLOAD_PATH'			=> "{$web_path}{$config['upload_path']}/",
-		'T_STYLESHEET_LINK'		=> (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&amp;lang=' . $user->lang_name),
+		'T_STYLESHEET_LINK'		=> (!$user->theme['theme_storedb']) ? "{$web_path}styles/" . rawurlencode($user->theme['theme_path']) . '/theme/stylesheet.css' : append_sid("{$phpbb_root_path}style.$phpEx", 'id=' . $user->theme['style_id'] . '&amp;lang=' . $user->lang_name),
 		'T_STYLESHEET_NAME'		=> $user->theme['theme_name'],
 
-		'T_THEME_NAME'			=> $user->theme['theme_path'],
-		'T_TEMPLATE_NAME'		=> $user->theme['template_path'],
-		'T_SUPER_TEMPLATE_NAME'	=> (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? $user->theme['template_inherit_path'] : $user->theme['template_path'],
-		'T_IMAGESET_NAME'		=> $user->theme['imageset_path'],
+		'T_THEME_NAME'			=> rawurlencode($user->theme['theme_path']),
+		'T_TEMPLATE_NAME'		=> rawurlencode($user->theme['template_path']),
+		'T_SUPER_TEMPLATE_NAME'	=> rawurlencode((isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? $user->theme['template_inherit_path'] : $user->theme['template_path']),
+		'T_IMAGESET_NAME'		=> rawurlencode($user->theme['imageset_path']),
 		'T_IMAGESET_LANG_NAME'	=> $user->data['user_lang'],
 		'T_IMAGES'				=> 'images',
 		'T_SMILIES'				=> $config['smilies_path'],

From 88cad5523e7cdac6826dd8581e27e22a65afda26 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 3 Dec 2011 16:40:05 -0500
Subject: [PATCH 016/279] [ticket/10093] Make commit-msg always not fatal by
 nuking all fatal logic.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 959c4e3979..e5a4c5e60b 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -12,11 +12,6 @@
 # ln -s ../../git-tools/hooks/commit-msg \\
 #   .git/hooks/commit-msg
 #
-# You can configure whether invalid commit messages abort commits:
-#
-# git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
-# git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
-#
 # Warning/error messages use color by default if the output is a terminal
 # ("output" here is normally standard error when you run git commit).
 # To force or disable the use of color:
@@ -26,13 +21,6 @@
 
 config_ns="phpbb.hooks.commit-msg";
 
-if [ "$(git config --bool $config_ns.fatal)" = "false" ]
-then
-	fatal=0;
-else
-	fatal=1;
-fi
-
 debug_level=$(git config --int $config_ns.debug || echo 0);
 
 # Error codes
@@ -59,12 +47,9 @@ debug()
 
 quit()
 {
-	if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ]
-	then
-		exit 0;
-	else
-		exit $1;
-	fi
+	# Now we always exit with success, since git will trash
+	# entered commit message if commit-msg hook exits with a failure.
+	exit 0
 }
 
 use_color()

From 8e59699424f4870e4ad77542b0e37eca696a18a3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 3 Dec 2011 16:42:04 -0500
Subject: [PATCH 017/279] [ticket/10093] Use correct ANSI code for clearing
 color.

PHPBB3-10093
---
 git-tools/hooks/commit-msg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index e5a4c5e60b..52969670ca 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -88,11 +88,11 @@ complain()
 		if [ "$1" = "-n" ]
 		then
 			echo "$@"
-			printf "\033[10m"
+			printf "\033[0m"
 		else
 			# This will print one trailing space.
 			# Not sure how to avoid this at the moment.
-			echo "$@" $(printf "\033[10m")
+			echo "$@" $(printf "\033[0m")
 		fi
 	else
 		echo "$@"

From 0ad81a4cdcfc3611ec77417e1bc9b12aecd69def Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 3 Dec 2011 17:42:10 -0500
Subject: [PATCH 018/279] [ticket/10511] Fix a grammar defect in permissions
 language.

PHPBB3-10511
---
 phpBB/language/en/acp/permissions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index cf248cffdb..00ba01d7d3 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -273,7 +273,7 @@ $lang = array_merge($lang, array(
 	'TRACE_WHO'								=> 'Who',
 	'TRACE_TOTAL'							=> 'Total',
 
-	'USERS_NOT_ASSIGNED'			=> 'No user assigned to this role',
+	'USERS_NOT_ASSIGNED'			=> 'No users are assigned to this role',
 	'USER_IS_MEMBER_OF_DEFAULT'		=> 'is a member of the following pre-defined groups',
 	'USER_IS_MEMBER_OF_CUSTOM'		=> 'is a member of the following user defined groups',
 

From 5b9c83512765373fec3000dd39ba1154412281e3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 3 Dec 2011 17:44:58 -0500
Subject: [PATCH 019/279] [ticket/9876] Distinctly name user and forum roles
 for newly registered users.

PHPBB3-9876
---
 phpBB/language/en/acp/permissions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index cf248cffdb..8ad1db5d93 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -171,7 +171,7 @@ $lang = array_merge($lang, array(
 	'ROLE_FORUM_POLLS'			=> 'Standard Access + Polls',
 	'ROLE_FORUM_READONLY'		=> 'Read Only Access',
 	'ROLE_FORUM_STANDARD'		=> 'Standard Access',
-	'ROLE_FORUM_NEW_MEMBER'		=> 'Newly registered User',
+	'ROLE_FORUM_NEW_MEMBER'		=> 'Newly Registered User Access',
 	'ROLE_MOD_FULL'				=> 'Full Moderator',
 	'ROLE_MOD_QUEUE'			=> 'Queue Moderator',
 	'ROLE_MOD_SIMPLE'			=> 'Simple Moderator',
@@ -181,7 +181,7 @@ $lang = array_merge($lang, array(
 	'ROLE_USER_NOAVATAR'		=> 'No Avatar',
 	'ROLE_USER_NOPM'			=> 'No Private Messages',
 	'ROLE_USER_STANDARD'		=> 'Standard Features',
-	'ROLE_USER_NEW_MEMBER'		=> 'Newly registered User',
+	'ROLE_USER_NEW_MEMBER'		=> 'Newly Registered User Features',
 
 
 	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',

From 1842323ca9a59b8cc34c1af43db6d703cf996d33 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 4 Dec 2011 11:43:55 +0200
Subject: [PATCH 020/279] [ticket/10399] Correctly encoding template component
 urls (3.0)

Changes in style.php

PHPBB3-10399
---
 phpBB/style.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/style.php b/phpBB/style.php
index 916aa8ce5c..f1b41c6a85 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -216,10 +216,10 @@ if ($id)
 
 	// Parse Theme Data
 	$replace = array(
-		'{T_THEME_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme',
-		'{T_TEMPLATE_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['template_path'] . '/template',
-		'{T_IMAGESET_PATH}'			=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset',
-		'{T_IMAGESET_LANG_PATH}'	=> "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang,
+		'{T_THEME_PATH}'			=> "{$phpbb_root_path}styles/" . rawurlencode($theme['theme_path']) . '/theme',
+		'{T_TEMPLATE_PATH}'			=> "{$phpbb_root_path}styles/" . rawurlencode($theme['template_path']) . '/template',
+		'{T_IMAGESET_PATH}'			=> "{$phpbb_root_path}styles/" . rawurlencode($theme['imageset_path']) . '/imageset',
+		'{T_IMAGESET_LANG_PATH}'	=> "{$phpbb_root_path}styles/" . rawurlencode($theme['imageset_path']) . '/imageset/' . $user_image_lang,
 		'{T_STYLESHEET_NAME}'		=> $theme['theme_name'],
 		'{S_USER_LANG}'				=> $user['user_lang']
 	);
@@ -248,7 +248,7 @@ if ($id)
 				$img_data = &$img_array[$img];
 				$imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename'];
 				$imgs[$img] = array(
-					'src'		=> $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc,
+					'src'		=> $phpbb_root_path . 'styles/' . rawurlencode($theme['imageset_path']) . '/imageset/' . $imgsrc,
 					'width'		=> $img_data['image_width'],
 					'height'	=> $img_data['image_height'],
 				);

From cd4958f72c249b9254f7038432cbe7a390dd93bf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Dec 2011 14:44:09 +0200
Subject: [PATCH 021/279] [ticket/10507] Sort styles in acp

Sort styles by name in admin control panel

PHPBB3-10507
---
 phpBB/includes/acp/acp_styles.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 3bc8c86500..38f4c57bd8 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -540,6 +540,7 @@ parse_css_file = {PARSE_CSS_FILE}
 		global $user, $template, $db, $config, $phpbb_root_path, $phpEx;
 
 		$sql_from = '';
+		$sql_sort = 'LOWER(' . $mode . '_name)';
 		$style_count = array();
 
 		switch ($mode)
@@ -571,6 +572,9 @@ parse_css_file = {PARSE_CSS_FILE}
 			case 'imageset':
 				$sql_from = STYLES_IMAGESET_TABLE;
 			break;
+			
+			default:
+				trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		$l_prefix = strtoupper($mode);
@@ -594,7 +598,8 @@ parse_css_file = {PARSE_CSS_FILE}
 		);
 
 		$sql = "SELECT *
-			FROM $sql_from";
+			FROM $sql_from
+			ORDER BY $sql_sort ASC";
 		$result = $db->sql_query($sql);
 
 		$installed = array();

From 80149d0c872292cf7cf7be8aa1eca5641f7cd708 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Dec 2011 16:18:52 +0200
Subject: [PATCH 022/279] [ticket/10507] DBAL unit test

Unit test for ORDER BY LOWER(style_name)

PHPBB3-10507
---
 tests/dbal/fixtures/styles.xml  | 39 +++++++++++++++++++++
 tests/dbal/order_lower_test.php | 62 +++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 tests/dbal/fixtures/styles.xml
 create mode 100644 tests/dbal/order_lower_test.php

diff --git a/tests/dbal/fixtures/styles.xml b/tests/dbal/fixtures/styles.xml
new file mode 100644
index 0000000000..47b384c47f
--- /dev/null
+++ b/tests/dbal/fixtures/styles.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_styles">
+		<column>style_id</column>
+		<column>style_name</column>
+		<column>style_copyright</column>
+		<column>style_active</column>
+		<column>template_id</column>
+		<column>theme_id</column>
+		<column>imageset_id</column>
+		<row>
+			<value>1</value>
+			<value>prosilver</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>prosilver2</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>0</value>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>Prosilver1</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>0</value>
+			<value>3</value>
+			<value>3</value>
+			<value>3</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
new file mode 100644
index 0000000000..fd1c950252
--- /dev/null
+++ b/tests/dbal/order_lower_test.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_dbal_order_lower_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/styles.xml');
+	}
+
+	public function test_cross_join()
+	{
+		$db = $this->new_dbal();
+
+		// http://tracker.phpbb.com/browse/PHPBB3-10507
+		// Test ORDER BY LOWER(style_name)
+		$db->sql_return_on_error(true);
+
+		$sql = 'SELECT * FROM phpbb_styles ORDER BY LOWER(style_name)';
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(
+				array(
+					'style_id' 			=> 1,
+					'style_name'		=> 'prosilver',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 1,
+					'template_id'		=> 1,
+					'theme_id'			=> 1,
+					'imageset_id'		=> 1
+				),
+				array(
+					'style_id' 			=> 3,
+					'style_name'		=> 'Prosilver1',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 0,
+					'template_id'		=> 3,
+					'theme_id'			=> 3,
+					'imageset_id'		=> 3
+				),
+				array(
+					'style_id' 			=> 2,
+					'style_name'		=> 'prosilver2',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 0,
+					'template_id'		=> 2,
+					'theme_id'			=> 2,
+					'imageset_id'		=> 2
+				)
+			), 
+			$db->sql_fetchrowset($result)
+		);
+	}
+}

From 82fff947c641665b80941814813e07e898a7676c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Dec 2011 14:24:39 +0100
Subject: [PATCH 023/279] [ticket/10538] Call htmlspecialchars_decode() on
 Jabber and SMTP passwords.

PHPBB3-10538
---
 phpBB/includes/functions_messenger.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 91b361183c..6549693333 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -568,7 +568,7 @@ class messenger
 		if (!$use_queue)
 		{
 			include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
-			$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']);
+			$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], htmlspecialchars_decode($config['jab_password']), $config['jab_use_ssl']);
 
 			if (!$this->jabber->connect())
 			{
@@ -769,7 +769,7 @@ class queue
 					}
 
 					include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
-					$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']);
+					$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], htmlspecialchars_decode($config['jab_password']), $config['jab_use_ssl']);
 
 					if (!$this->jabber->connect())
 					{
@@ -1022,7 +1022,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false)
 	}
 
 	// Let me in. This function handles the complete authentication process
-	if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], $config['smtp_password'], $config['smtp_auth_method']))
+	if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], htmlspecialchars_decode($config['smtp_password']), $config['smtp_auth_method']))
 	{
 		$smtp->close_session($err_msg);
 		return false;

From fa2edf518748e3ec812857cf913235793216a027 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 00:26:26 -0500
Subject: [PATCH 024/279] [ticket/10546] Add missing argument to adm_back_link
 in acp_captcha.

PHPBB3-10546
---
 phpBB/includes/acp/acp_captcha.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 1893eed14f..469a367bba 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -96,7 +96,7 @@ class acp_captcha
 			}
 			else if ($submit)
 			{
-				trigger_error($user->lang['FORM_INVALID'] . adm_back_link(), E_USER_WARNING);
+				trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 			else
 			{

From 7779dae2cc256eafb6fa9dc1bc882b52c4b1d8ca Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 25 Jun 2010 15:19:10 +0200
Subject: [PATCH 025/279] [ticket/9681] Add password length to security
 settings

PHPBB3-9681
---
 phpBB/includes/acp/acp_board.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 8c761e51fe..f437dca8f9 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -383,6 +383,8 @@ class acp_board
 						'referer_validation'	=> array('lang' => 'REFERER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
 						'check_dnsbl'			=> array('lang' => 'CHECK_DNSBL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'email_check_mx'		=> array('lang' => 'EMAIL_CHECK_MX',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
+						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',			'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
 						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),

From b8ddd329225894ecd181146be799f0f8a085fcc4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 01:45:41 -0500
Subject: [PATCH 026/279] [ticket/7432] Explain what users are inactive in more
 detail.

PHPBB3-7432
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index ef8d6f1cb3..79caa07d98 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -405,7 +405,7 @@ $lang = array_merge($lang, array(
 	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
 	'INACTIVE_USERS'				=> 'Inactive users',
 	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
-	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
+	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
 
 	'NO_INACTIVE_USERS'	=> 'No inactive users',
 

From d9fef488af150107b753b3c30e15ab5bf6d9da38 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 26 Jul 2011 17:48:17 +0200
Subject: [PATCH 027/279] [ticket/9079] Display backtrace on all E_USER_ERROR
 errors, not only SQL errors

PHPBB3-9079
---
 phpBB/includes/db/dbal.php   | 5 -----
 phpBB/includes/functions.php | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index b4c1a72e1c..230c9c8ed7 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -662,12 +662,7 @@ class dbal
 			// The DEBUG_EXTRA constant is for development only!
 			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
 			{
-				// Print out a nice backtrace...
-				$backtrace = get_backtrace();
-
 				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-				$message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
-				$message .= '<br />';
 			}
 			else
 			{
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 852fc683f2..f625f70c0f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3853,6 +3853,13 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				}
 			}
 
+			if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_'))
+			{
+				$backtrace = get_backtrace();
+				$msg_text .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
+				$msg_text .= '<br />';
+			}
+
 			if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))
 			{
 				// let's avoid loops

From b6999237f456443b0b325f2ebee1f990ee7f5116 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 24 Dec 2011 01:24:09 -0500
Subject: [PATCH 028/279] [ticket/9079] Always log backtrace to error log when
 logging errors.

PHPBB3-9079
---
 phpBB/includes/functions.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index f625f70c0f..1eefaee651 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3853,18 +3853,23 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				}
 			}
 
+			$log_text = $msg_text;
+			$backtrace = get_backtrace();
+			if ($backtrace)
+			{
+				$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
+			}
+
 			if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_'))
 			{
-				$backtrace = get_backtrace();
-				$msg_text .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : '';
-				$msg_text .= '<br />';
+				$msg_text = $log_text;
 			}
 
 			if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))
 			{
 				// let's avoid loops
 				$db->sql_return_on_error(true);
-				add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $msg_text);
+				add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $log_text);
 				$db->sql_return_on_error(false);
 			}
 

From fa003bb5fd2fa87f5fec2b19d14fcd4a4eb9b052 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Thu, 22 Dec 2011 00:45:16 -0500
Subject: [PATCH 029/279] [ticket/10542] Remove class="postlink" in subsilver2
 faq_body.html

class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html

PHPBB3-10542
---
 phpBB/styles/subsilver2/template/faq_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html
index bbd9b82b19..6a4df3659c 100644
--- a/phpBB/styles/subsilver2/template/faq_body.html
+++ b/phpBB/styles/subsilver2/template/faq_body.html
@@ -13,7 +13,7 @@
 		<!-- BEGIN faq_block -->
 			<span class="gen"><b>{faq_block.BLOCK_TITLE}</b></span><br />
 			<!-- BEGIN faq_row -->
-				<span class="gen"><a class="postlink" href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
+				<span class="gen"><a href="#f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}">{faq_block.faq_row.FAQ_QUESTION}</a></span><br />
 			<!-- END faq_row -->
 			<br />
 		<!-- END faq_block -->

From 38c2d4da35b6c00e2ef2f6b271eda2c020974eee Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 02:24:11 -0500
Subject: [PATCH 030/279] [ticket/10428] Compare $data to false strictly.

Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
---
 phpBB/includes/acp/acp_users.php | 8 ++++----
 phpBB/includes/session.php       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 4f58434a43..724d450c99 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -2345,7 +2345,7 @@ class acp_users
 	{
 		global $user;
 
-		$var = ($data) ? $data : $user_row['user_options'];
+		$var = ($data !== false) ? $data : $user_row['user_options'];
 
 		if ($value && !($var & 1 << $user->keyoptions[$key]))
 		{
@@ -2357,10 +2357,10 @@ class acp_users
 		}
 		else
 		{
-			return ($data) ? $var : false;
+			return ($data !== false) ? $var : false;
 		}
 
-		if (!$data)
+		if ($data === false)
 		{
 			$user_row['user_options'] = $var;
 			return true;
@@ -2378,7 +2378,7 @@ class acp_users
 	{
 		global $user;
 
-		$var = ($data) ? $data : $user_row['user_options'];
+		$var = ($data !== false) ? $data : $user_row['user_options'];
 		return ($var & 1 << $user->keyoptions[$key]) ? true : false;
 	}
 }
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index caadcbafaa..50b6ac7406 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2343,7 +2343,7 @@ class user extends session
 	{
 		if (!isset($this->keyvalues[$key]))
 		{
-			$var = ($data) ? $data : $this->data['user_options'];
+			$var = ($data !== false) ? $data : $this->data['user_options'];
 			$this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false;
 		}
 
@@ -2355,7 +2355,7 @@ class user extends session
 	*/
 	function optionset($key, $value, $data = false)
 	{
-		$var = ($data) ? $data : $this->data['user_options'];
+		$var = ($data !== false) ? $data : $this->data['user_options'];
 
 		if ($value && !($var & 1 << $this->keyoptions[$key]))
 		{
@@ -2367,10 +2367,10 @@ class user extends session
 		}
 		else
 		{
-			return ($data) ? $var : false;
+			return ($data !== false) ? $var : false;
 		}
 
-		if (!$data)
+		if ($data === false)
 		{
 			$this->data['user_options'] = $var;
 			return true;

From 16ae99eec8e34ec6d542c1e4d82bd288bc0d0026 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 02:29:48 -0500
Subject: [PATCH 031/279] [ticket/10428] Dispose of $this->keyvalues cache for
 optionget.

It does not work properly when custom $data is provided, and
making it work will make the code so complicated that any benefits
from having this cache in the first place will be nullified.

Just get rid of it.

PHPBB3-10428
---
 phpBB/includes/session.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 50b6ac7406..d988426a87 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1507,7 +1507,6 @@ class user extends session
 
 	// Able to add new options (up to id 31)
 	var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17);
-	var $keyvalues = array();
 
 	/**
 	* Constructor to set the lang path
@@ -2341,13 +2340,8 @@ class user extends session
 	*/
 	function optionget($key, $data = false)
 	{
-		if (!isset($this->keyvalues[$key]))
-		{
-			$var = ($data !== false) ? $data : $this->data['user_options'];
-			$this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false;
-		}
-
-		return $this->keyvalues[$key];
+		$var = ($data !== false) ? $data : $this->data['user_options'];
+		return ($var & 1 << $this->keyoptions[$key]) ? true : false;
 	}
 
 	/**

From 99c102344ebe3b4a6c18e36c8bea8f3bdd997f2e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 12:52:51 -0500
Subject: [PATCH 032/279] [ticket/10428] Use phpbb_optionget/set in
 optionget/set for DRYness.

PHPBB3-10428
---
 phpBB/includes/acp/acp_users.php | 28 ++++++++++++----------------
 phpBB/includes/session.php       | 28 ++++++++++++----------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 724d450c99..e433c46db3 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -2347,27 +2347,23 @@ class acp_users
 
 		$var = ($data !== false) ? $data : $user_row['user_options'];
 
-		if ($value && !($var & 1 << $user->keyoptions[$key]))
-		{
-			$var += 1 << $user->keyoptions[$key];
-		}
-		else if (!$value && ($var & 1 << $user->keyoptions[$key]))
-		{
-			$var -= 1 << $user->keyoptions[$key];
-		}
-		else
-		{
-			return ($data !== false) ? $var : false;
-		}
+		$new_var = phpbb_optionset($user->keyoptions[$key], $value, $var);
 
 		if ($data === false)
 		{
-			$user_row['user_options'] = $var;
-			return true;
+			if ($new_var != $var)
+			{
+				$user_row['user_options'] = $new_var;
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
 		else
 		{
-			return $var;
+			return $new_var;
 		}
 	}
 
@@ -2379,7 +2375,7 @@ class acp_users
 		global $user;
 
 		$var = ($data !== false) ? $data : $user_row['user_options'];
-		return ($var & 1 << $user->keyoptions[$key]) ? true : false;
+		return phpbb_optionget($user->keyoptions[$key], $var);
 	}
 }
 
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d988426a87..457071e01e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2341,7 +2341,7 @@ class user extends session
 	function optionget($key, $data = false)
 	{
 		$var = ($data !== false) ? $data : $this->data['user_options'];
-		return ($var & 1 << $this->keyoptions[$key]) ? true : false;
+		return phpbb_optionget($this->keyoptions[$key], $var);
 	}
 
 	/**
@@ -2351,27 +2351,23 @@ class user extends session
 	{
 		$var = ($data !== false) ? $data : $this->data['user_options'];
 
-		if ($value && !($var & 1 << $this->keyoptions[$key]))
-		{
-			$var += 1 << $this->keyoptions[$key];
-		}
-		else if (!$value && ($var & 1 << $this->keyoptions[$key]))
-		{
-			$var -= 1 << $this->keyoptions[$key];
-		}
-		else
-		{
-			return ($data !== false) ? $var : false;
-		}
+		$new_var = phpbb_optionset($this->keyoptions[$key], $value, $var);
 
 		if ($data === false)
 		{
-			$this->data['user_options'] = $var;
-			return true;
+			if ($new_var != $var)
+			{
+				$this->data['user_options'] = $new_var;
+				return true;
+			}
+			else
+			{
+				return false;
+			}
 		}
 		else
 		{
-			return $var;
+			return $new_var;
 		}
 	}
 

From 10453b67525a0e26a3c859df4dab46907189af72 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 22:59:55 -0500
Subject: [PATCH 033/279] [ticket/10428] Documentation for optionget/optionset
 functions.

PHPBB3-10428
---
 phpBB/includes/acp/acp_users.php | 23 +++++++++++++++++++++--
 phpBB/includes/session.php       | 17 +++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index e433c46db3..363c900edc 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -2339,7 +2339,19 @@ class acp_users
 	}
 
 	/**
-	* Optionset replacement for this module based on $user->optionset
+	* Set option bit field for user options in a user row array.
+	*
+	* Optionset replacement for this module based on $user->optionset.
+	*
+	* @param array $user_row Row from the users table.
+	* @param int $key Option key, as defined in $user->keyoptions property.
+	* @param bool $value True to set the option, false to clear the option.
+	* @param int $data Current bit field value, or false to use $user_row['user_options']
+	* @return int|bool If $data is false, the bit field is modified and
+	*                  written back to $user_row['user_options'], and
+	*                  return value is true if the bit field changed and
+	*                  false otherwise. If $data is not false, the new
+	*                  bitfield value is returned.
 	*/
 	function optionset(&$user_row, $key, $value, $data = false)
 	{
@@ -2368,7 +2380,14 @@ class acp_users
 	}
 
 	/**
-	* Optionget replacement for this module based on $user->optionget
+	* Get option bit field from user options in a user row array.
+	*
+	* Optionget replacement for this module based on $user->optionget.
+	*
+	* @param array $user_row Row from the users table.
+	* @param int $key option key, as defined in $user->keyoptions property.
+	* @param int $data bit field value to use, or false to use $user_row['user_options']
+	* @return bool true if the option is set in the bit field, false otherwise
 	*/
 	function optionget(&$user_row, $key, $data = false)
 	{
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 457071e01e..a894242a39 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2336,7 +2336,11 @@ class user extends session
 	}
 
 	/**
-	* Get option bit field from user options
+	* Get option bit field from user options.
+	*
+	* @param int $key option key, as defined in $keyoptions property.
+	* @param int $data bit field value to use, or false to use $this->data['user_options']
+	* @return bool true if the option is set in the bit field, false otherwise
 	*/
 	function optionget($key, $data = false)
 	{
@@ -2345,7 +2349,16 @@ class user extends session
 	}
 
 	/**
-	* Set option bit field for user options
+	* Set option bit field for user options.
+	*
+	* @param int $key Option key, as defined in $keyoptions property.
+	* @param bool $value True to set the option, false to clear the option.
+	* @param int $data Current bit field value, or false to use $this->data['user_options']
+	* @return int|bool If $data is false, the bit field is modified and
+	*                  written back to $this->data['user_options'], and
+	*                  return value is true if the bit field changed and
+	*                  false otherwise. If $data is not false, the new
+	*                  bitfield value is returned.
 	*/
 	function optionset($key, $value, $data = false)
 	{

From d5dc70cbe3be0f18666a0dc7e972b9d6766291af Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Thu, 29 Dec 2011 16:27:48 -0500
Subject: [PATCH 034/279] [ticket/10407] Fix check for empty image paths in
 convertor

This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will temporarily remove the trailing slash, then check if the path is
empty.

PHPBB3-10407
---
 phpBB/includes/functions_convert.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 4a359dcade..4663fe46cc 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -424,7 +424,10 @@ function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false
 
 	$relative_path = empty($convert->convertor['source_path_absolute']);
 
-	if (empty($convert->convertor['avatar_gallery_path']))
+	// strip trailing slash
+	$trimmed_avatar_gallery_path = rtrim($convert->convertor['avatar_gallery_path'], '/');
+
+	if (empty($trimmed_avatar_gallery_path))
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'import_avatar_gallery()'), __LINE__, __FILE__);
 	}
@@ -588,7 +591,10 @@ function import_attachment($source, $use_target = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	if (empty($convert->convertor['upload_path']))
+	// strip trailing slash
+	$trimmed_upload_path = rtrim($convert->convertor['upload_path'], '/');
+
+	if (empty($trimmed_upload_path))
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment()'), __LINE__, __FILE__);
 	}
@@ -647,7 +653,10 @@ function import_smiley($source, $use_target = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	if (!isset($convert->convertor['smilies_path']))
+	// strip trailing slash
+	$trimmed_smilies_path = rtrim($convert->convertor['smilies_path'], '/');
+
+	if (empty($trimmed_smilies_path))
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'import_smiley()'), __LINE__, __FILE__);
 	}
@@ -667,7 +676,10 @@ function import_avatar($source, $use_target = false, $user_id = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	if (!isset($convert->convertor['avatar_path']))
+	// strip trailing slash
+	$trimmed_avatar_path = rtrim($convert->convertor['avatar_path'], '/');
+
+	if (empty($trimmed_avatar_path))
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'import_avatar()'), __LINE__, __FILE__);
 	}

From 17991823ea72ef973852fd9d0a9c516703f2137e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 16:05:02 +0000
Subject: [PATCH 035/279] [ticket/9916] Updating License in the header

PHPBB3-9916
---
 tests/bbcode/url_bbcode_test.php                                | 2 +-
 tests/bootstrap.php                                             | 2 +-
 tests/dbal/cross_join_test.php                                  | 2 +-
 tests/dbal/db_tools_test.php                                    | 2 +-
 tests/dbal/order_lower_test.php                                 | 2 +-
 tests/dbal/select_test.php                                      | 2 +-
 tests/dbal/write_test.php                                       | 2 +-
 tests/error_collector_test.php                                  | 2 +-
 tests/mock/cache.php                                            | 2 +-
 tests/mock/session_testable.php                                 | 2 +-
 tests/mock_user.php                                             | 2 +-
 tests/network/checkdnsrr_test.php                               | 2 +-
 tests/network/ftp_fsock_pasv_epsv_test.php                      | 2 +-
 tests/profile/custom_test.php                                   | 2 +-
 tests/random/gen_rand_string_test.php                           | 2 +-
 tests/regex/censor_test.php                                     | 2 +-
 tests/regex/email_test.php                                      | 2 +-
 tests/regex/ipv4_test.php                                       | 2 +-
 tests/regex/ipv6_test.php                                       | 2 +-
 tests/regex/password_complexity_test.php                        | 2 +-
 tests/regex/table_prefix_test.php                               | 2 +-
 tests/regex/url_test.php                                        | 2 +-
 tests/request/request_var_test.php                              | 2 +-
 tests/security/base.php                                         | 2 +-
 tests/security/extract_current_page_test.php                    | 2 +-
 tests/security/hash_test.php                                    | 2 +-
 tests/security/redirect_test.php                                | 2 +-
 tests/session/append_sid_test.php                               | 2 +-
 tests/session/continue_test.php                                 | 2 +-
 tests/session/init_test.php                                     | 2 +-
 tests/session/testable_factory.php                              | 2 +-
 tests/template/template_test.php                                | 2 +-
 tests/test_framework/phpbb_database_test_case.php               | 2 +-
 tests/test_framework/phpbb_database_test_connection_manager.php | 2 +-
 tests/test_framework/phpbb_test_case.php                        | 2 +-
 tests/test_framework/phpbb_test_case_helpers.php                | 2 +-
 tests/text_processing/censor_text_test.php                      | 2 +-
 tests/text_processing/make_clickable_test.php                   | 2 +-
 tests/user/lang_test.php                                        | 2 +-
 tests/utf/normalizer_test.php                                   | 2 +-
 tests/utf/utf8_clean_string_test.php                            | 2 +-
 tests/utf/utf8_wordwrap_test.php                                | 2 +-
 tests/wrapper/gmgetdate_test.php                                | 2 +-
 tests/wrapper/mt_rand_test.php                                  | 2 +-
 tests/wrapper/version_compare_test.php                          | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index cd85dbd0d9..15bdfc434f 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6f3c93a374..16aed68405 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/dbal/cross_join_test.php b/tests/dbal/cross_join_test.php
index 7110c7a2ea..6c6b8a8449 100644
--- a/tests/dbal/cross_join_test.php
+++ b/tests/dbal/cross_join_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index c0c66b5be7..fbde636b58 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
index fd1c950252..b50494d506 100644
--- a/tests/dbal/order_lower_test.php
+++ b/tests/dbal/order_lower_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 8ddd27465d..05b0e68e29 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index 4709d45fa5..596c50a220 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index e1ac32f5ac..d67dea3719 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 020574b0bb..650545c3d6 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 47089cb94b..70a58fb6cc 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/mock_user.php b/tests/mock_user.php
index 5b89ea3e19..ec14ce430e 100644
--- a/tests/mock_user.php
+++ b/tests/mock_user.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
index 5a756dcef8..1942a50f06 100644
--- a/tests/network/checkdnsrr_test.php
+++ b/tests/network/checkdnsrr_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
index 6ad811e3ca..22f17785b8 100644
--- a/tests/network/ftp_fsock_pasv_epsv_test.php
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
index 585182e583..1f33b45ba9 100644
--- a/tests/profile/custom_test.php
+++ b/tests/profile/custom_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
index 115c55e4e2..3317c78ed9 100644
--- a/tests/random/gen_rand_string_test.php
+++ b/tests/random/gen_rand_string_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index fa9104e71d..5929092e07 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 0695b801d5..17f93259c3 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 9829547508..38a3aa4a8e 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 1b2018403c..d24217b346 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php
index 21e8d12a0a..07453555ee 100644
--- a/tests/regex/password_complexity_test.php
+++ b/tests/regex/password_complexity_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php
index 67a18b4fbc..33bdd4ae2d 100644
--- a/tests/regex/table_prefix_test.php
+++ b/tests/regex/table_prefix_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index c3a336063a..b395f5cae2 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index fa17b1909f..8e609c00af 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/security/base.php b/tests/security/base.php
index db9c884cf4..2658798237 100644
--- a/tests/security/base.php
+++ b/tests/security/base.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index 71c7a3a397..4911f7b452 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index 19a3822145..0c2580c19b 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 70ba8527b1..4848a938c6 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
index 1a3ad633e3..88f6f0718e 100644
--- a/tests/session/append_sid_test.php
+++ b/tests/session/append_sid_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 6737562a0a..c4f7f8d75b 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index 1181fab636..2ce6c4a4ac 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index f3ef19a257..00f79738ef 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 5005710220..aaee7bb4a0 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index e1b368dcea..fdb662b284 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 7a45d87583..c734c90a1a 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index f189da3671..8b16f02638 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0acdce32e0..9a7ab2d237 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index 2843f0b20b..8fcdb7ef85 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 29b982d709..8697907311 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/user/lang_test.php b/tests/user/lang_test.php
index 6c60583a7b..d33f430955 100644
--- a/tests/user/lang_test.php
+++ b/tests/user/lang_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 1dc69e283e..92230cfcc9 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index e5a771eafa..70bd549d5b 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index 03fa9dc38c..39fdf73308 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
index 0b4c3378a9..a838cfdba9 100644
--- a/tests/wrapper/gmgetdate_test.php
+++ b/tests/wrapper/gmgetdate_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/wrapper/mt_rand_test.php b/tests/wrapper/mt_rand_test.php
index c8bcb3d14c..eba0bf2faa 100644
--- a/tests/wrapper/mt_rand_test.php
+++ b/tests/wrapper/mt_rand_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php
index f718cfd16b..8b42eb4bee 100644
--- a/tests/wrapper/version_compare_test.php
+++ b/tests/wrapper/version_compare_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 

From 0fc37fb3972845f76848c1e64d5edfe4b8cd0972 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Jan 2012 10:35:50 +0000
Subject: [PATCH 036/279] [ticket/9916] Changing coding guidelines license

PHPBB3-9916
---
 phpBB/docs/coding-guidelines.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 7d51b26dca..cd113a7226 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -129,9 +129,8 @@
 /**
 *
 * @package {PACKAGENAME}
-* @version &#36;Id: &#36;
 * @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 	</pre></div>
@@ -2322,7 +2321,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 

From 5e52734c240e5ecfb812202cd4cae305be9290c5 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Mon, 2 Jan 2012 15:09:38 +0000
Subject: [PATCH 037/279] [ticket/9916] Changing header in non-distributed
 files

PHPBB3-9916
---
 build/build_changelog.php                  | 2 +-
 build/build_diff.php                       | 5 ++---
 build/build_helper.php                     | 3 +--
 build/diff_class.php                       | 3 +--
 build/package.php                          | 3 +--
 git-tools/merge.php                        | 2 +-
 git-tools/setup_github_network.php         | 2 +-
 phpBB/develop/change_smiley_ref.php        | 2 --
 phpBB/develop/check_flash_bbcodes.php      | 3 +--
 phpBB/develop/create_schema_files.php      | 3 +--
 phpBB/develop/create_search_index.php      | 2 +-
 phpBB/develop/create_variable_overview.php | 2 --
 phpBB/develop/fill.php                     | 2 --
 phpBB/develop/generate_utf_casefold.php    | 3 +--
 phpBB/develop/generate_utf_confusables.php | 3 +--
 phpBB/develop/generate_utf_tables.php      | 3 +--
 phpBB/develop/merge_post_tables.php        | 1 -
 phpBB/develop/mysql_upgrader.php           | 3 +--
 phpBB/develop/utf_normalizer_test.php      | 3 +--
 phpBB/docs/AUTHORS                         | 2 +-
 phpBB/docs/CHANGELOG.html                  | 2 +-
 phpBB/docs/FAQ.html                        | 4 ++--
 phpBB/docs/INSTALL.html                    | 4 ++--
 phpBB/docs/README.html                     | 2 +-
 phpBB/docs/auth_api.html                   | 2 +-
 phpBB/docs/hook_system.html                | 2 +-
 26 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/build/build_changelog.php b/build/build_changelog.php
index 4eb5ebd83b..1e80959adf 100755
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -4,7 +4,7 @@
 *
 * @package build
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU General Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/build/build_diff.php b/build/build_diff.php
index 6a6070228f..0824b53caa 100755
--- a/build/build_diff.php
+++ b/build/build_diff.php
@@ -3,9 +3,8 @@
 /**
 *
 * @package build
-* @version $Id$
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -388,7 +387,7 @@ function build_header($mode, $filenames, $header)
 			$html .= "##		{$filename['phpbb_filename']}\n";
 		}
 	}
-	$html .= "## License: http://opensource.org/licenses/gpl-license.php GNU General Public License v2 \n";
+	$html .= "## License: http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 \n";
 	$html .= "############################################################## \n";
 	$html .= "\n";
 
diff --git a/build/build_helper.php b/build/build_helper.php
index 2d9b86b3c3..d6169b913b 100644
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package build
-* @version $Id$
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/build/diff_class.php b/build/diff_class.php
index 4625ffde24..2d8555400d 100644
--- a/build/diff_class.php
+++ b/build/diff_class.php
@@ -2,10 +2,9 @@
 /**
 *
 * @package build
-* @version $Id$
 * @copyright (c) 2000 Geoffrey T. Dairiki <dairiki@dairiki.org>
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/build/package.php b/build/package.php
index 4ce644e8ca..48f42b3572 100755
--- a/build/package.php
+++ b/build/package.php
@@ -3,9 +3,8 @@
 /**
 *
 * @package build
-* @version $Id$
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/git-tools/merge.php b/git-tools/merge.php
index cbd84b896f..034bd2032c 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index e4e212eef6..5f2e1609a7 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -4,7 +4,7 @@
 *
 * @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/change_smiley_ref.php b/phpBB/develop/change_smiley_ref.php
index db65dd52d4..3d6dd45d6f 100644
--- a/phpBB/develop/change_smiley_ref.php
+++ b/phpBB/develop/change_smiley_ref.php
@@ -5,8 +5,6 @@
  *   begin                : Tuesday, February 25, 2003 
  *   copyright            : (C) 2003 The phpBB Group        
  *   email                : support@phpbb.com                           
- *                                                          
- *   $Id$
  * 
  ***************************************************************************/ 
 
diff --git a/phpBB/develop/check_flash_bbcodes.php b/phpBB/develop/check_flash_bbcodes.php
index b0fa399209..2ce288ee3e 100644
--- a/phpBB/develop/check_flash_bbcodes.php
+++ b/phpBB/develop/check_flash_bbcodes.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2009, 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 7f37b94453..d44efb8870 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 * This file creates new schema files for every database.
 * The filenames will be prefixed with an underscore to not overwrite the current schema files.
diff --git a/phpBB/develop/create_search_index.php b/phpBB/develop/create_search_index.php
index 374a4cf0a1..28001035f6 100644
--- a/phpBB/develop/create_search_index.php
+++ b/phpBB/develop/create_search_index.php
@@ -3,7 +3,7 @@
 *
 * @package phpBB3
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/create_variable_overview.php b/phpBB/develop/create_variable_overview.php
index fe7cacf0d1..a786fc6866 100644
--- a/phpBB/develop/create_variable_overview.php
+++ b/phpBB/develop/create_variable_overview.php
@@ -1,8 +1,6 @@
 <?php
 // -------------------------------------------------------------
 //
-// $Id$
-//
 // FILENAME  : create_variable_overview.php
 // STARTED   : Fri Aug 15 2003
 // COPYRIGHT : © 2003 phpBB Group
diff --git a/phpBB/develop/fill.php b/phpBB/develop/fill.php
index 336e510d06..c1e39fa4f3 100644
--- a/phpBB/develop/fill.php
+++ b/phpBB/develop/fill.php
@@ -1,8 +1,6 @@
 <?php
 // -------------------------------------------------------------
 //
-// $Id$
-//
 // FILENAME  : fill.php
 // STARTED   : Mon Sep 15, 2003
 // COPYRIGHT : © 2001, 2003 phpBB Group
diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php
index 89c4aec01a..73951cb4dc 100644
--- a/phpBB/develop/generate_utf_casefold.php
+++ b/phpBB/develop/generate_utf_casefold.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php
index 0ffa9720c9..d2ffbcfc65 100644
--- a/phpBB/develop/generate_utf_confusables.php
+++ b/phpBB/develop/generate_utf_confusables.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php
index 3d5188163d..6fe5d68ffd 100644
--- a/phpBB/develop/generate_utf_tables.php
+++ b/phpBB/develop/generate_utf_tables.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php
index 3567a569c6..5ccfef84c3 100644
--- a/phpBB/develop/merge_post_tables.php
+++ b/phpBB/develop/merge_post_tables.php
@@ -6,7 +6,6 @@
  *   copyright            : (C) 2003 The phpBB Group        
  *   email                : support@phpbb.com                           
  *                                                          
- *   $Id$
  * 
  ***************************************************************************/ 
 
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index dec8f8c210..49daab0962 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 * This file creates SQL statements to upgrade phpBB on MySQL 3.x/4.0.x to 4.1.x/5.x
 *
diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php
index 7705cd6851..71f24a716b 100644
--- a/phpBB/develop/utf_normalizer_test.php
+++ b/phpBB/develop/utf_normalizer_test.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 81bc9f52e6..de599193d2 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -13,7 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>.
+* along with this program. If not, see <http://opensource.org/licenses/gpl-2.0.php>
 *
 */
 
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a0690819d2..2d3b6a6809 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -2182,7 +2182,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index 83d7a342e0..dbcefc44c1 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -110,7 +110,7 @@ I want to sue you because i think you host an illegal board!</h2>
 
 		<div class="content">
 
-<p>We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.</p>
+<p>We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that license. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.</p>
 
 <p>If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do <strong>not</strong> track the use of phpBB software in any way. So please do not ask us for details on a &quot;given&quot; board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...</p>
 
@@ -328,7 +328,7 @@ I want to sue you because i think you host an illegal board!</h2>
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index e5ba479d9e..c54e408be2 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -82,7 +82,7 @@
 		<li><a href="#webserver_configuration">Webserver configuration</a></li>
 	</ol>
 	</li>
-	<li><a href="#disclaimer">Disclaimer</a></li>
+	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
 
 		</div>
@@ -431,7 +431,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 7ceb698ac4..aa60d7dd25 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -339,7 +339,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index 88618fa640..29469c21ac 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -275,7 +275,7 @@ $auth_admin = new auth_admin();
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
index a5fad0d530..1b8131efaf 100644
--- a/phpBB/docs/hook_system.html
+++ b/phpBB/docs/hook_system.html
@@ -867,7 +867,7 @@ function phpbb_hook_register(&amp;$hook)
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 

From 24cf7f1d29bdfba636d9692a02188b9cddba4e1f Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Mon, 2 Jan 2012 13:09:21 -0500
Subject: [PATCH 038/279] [ticket/10407] Fix check for empty image paths in
 convertor

This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will check the path without the trailing slash to see if the path is
actually empty.

PHPBB3-10407
---
 phpBB/includes/functions_convert.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 4663fe46cc..3b26f417e9 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -424,10 +424,8 @@ function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false
 
 	$relative_path = empty($convert->convertor['source_path_absolute']);
 
-	// strip trailing slash
-	$trimmed_avatar_gallery_path = rtrim($convert->convertor['avatar_gallery_path'], '/');
-
-	if (empty($trimmed_avatar_gallery_path))
+	// check for trailing slash
+	if (rtrim($convert->convertor['avatar_gallery_path'], '/') === '')
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'import_avatar_gallery()'), __LINE__, __FILE__);
 	}
@@ -591,10 +589,8 @@ function import_attachment($source, $use_target = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	// strip trailing slash
-	$trimmed_upload_path = rtrim($convert->convertor['upload_path'], '/');
-
-	if (empty($trimmed_upload_path))
+	// check for trailing slash
+	if (rtrim($convert->convertor['upload_path'], '/') === '')
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment()'), __LINE__, __FILE__);
 	}
@@ -653,10 +649,8 @@ function import_smiley($source, $use_target = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	// strip trailing slash
-	$trimmed_smilies_path = rtrim($convert->convertor['smilies_path'], '/');
-
-	if (empty($trimmed_smilies_path))
+	// check for trailing slash
+	if (rtrim($convert->convertor['smilies_path'], '/') === '')
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'import_smiley()'), __LINE__, __FILE__);
 	}
@@ -676,10 +670,8 @@ function import_avatar($source, $use_target = false, $user_id = false)
 
 	global $convert, $phpbb_root_path, $config, $user;
 
-	// strip trailing slash
-	$trimmed_avatar_path = rtrim($convert->convertor['avatar_path'], '/');
-
-	if (empty($trimmed_avatar_path))
+	// check for trailing slash
+	if (rtrim($convert->convertor['avatar_path'], '/') === '')
 	{
 		$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'import_avatar()'), __LINE__, __FILE__);
 	}

From 23363efaaacd2bec39a51c27db51a2777e7a4c21 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Mon, 2 Jan 2012 21:07:40 +0200
Subject: [PATCH 039/279] [ticket/10563] Show deactivated styles below active
 styles in acp

Separates active and deactivated styles in styles list in acp

PHPBB3-10563
---
 phpBB/adm/style/acp_styles.html   | 6 ++++++
 phpBB/includes/acp/acp_styles.php | 3 +++
 phpBB/language/en/acp/styles.php  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 098cc723d9..6aa1c0ccc9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -402,6 +402,12 @@
 		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
 	</tr>
 	<!-- BEGIN installed -->
+	<!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES -->
+		<!-- DEFINE $INACTIVE_STYLES = 1 -->
+		<tr>
+			<td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td>
+		</tr>
+	<!-- ENDIF -->
 	<tr>
 		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
 		<!-- IF S_STYLE -->
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index e25061d6f0..5a7902755e 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -547,6 +547,7 @@ parse_css_file = {PARSE_CSS_FILE}
 		{
 			case 'style':
 				$sql_from = STYLES_TABLE;
+				$sql_sort = 'style_active DESC, ' . $sql_sort;
 
 				$sql = 'SELECT user_style, COUNT(user_style) AS style_count
 					FROM ' . USERS_TABLE . '
@@ -635,6 +636,8 @@ parse_css_file = {PARSE_CSS_FILE}
 
 				'NAME'					=> $row[$mode . '_name'],
 				'STYLE_COUNT'			=> ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0,
+
+				'S_INACTIVE'			=> ($mode == 'style' && !$row['style_active']) ? true : false,
 				)
 			);
 		}
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 3c8c4a328f..3194a2ebd6 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -267,6 +267,7 @@ $lang = array_merge($lang, array(
 	'IMG_USER_ICON9'		=> 'User defined image 9',
 	'IMG_USER_ICON10'		=> 'User defined image 10',
 
+	'INACTIVE_STYLES'			=> 'Inactive styles',
 	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
 	'INCLUDE_IMAGESET'			=> 'Include imageset',
 	'INCLUDE_TEMPLATE'			=> 'Include template',

From c9733ad7195995a9f28ecbbc8aa3e94a05527114 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 18 Dec 2011 16:28:35 +0800
Subject: [PATCH 040/279] [ticket/10532] Fix $start out of range for pre-made
 searches

PHPBB3-10532
---
 phpBB/search.php | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 2aa61401cf..07be438ab4 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -471,26 +471,33 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 	if ($search_id)
 	{
-		if ($sql)
+		if ($sql || $search_id == 'unreadposts')
 		{
-			// only return up to 1000 ids (the last one will be removed later)
-			$result = $db->sql_query_limit($sql, 1001 - $start, $start);
-
-			while ($row = $db->sql_fetchrow($result))
+			if ($sql)
 			{
-				$id_ary[] = (int) $row[$field];
+				// only return up to 1000 ids (the last one will be removed later)
+				$result = $db->sql_query_limit($sql, 1001);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$id_ary[] = (int) $row[$field];
+				}
+				$db->sql_freeresult($result);
+			}
+			else if ($search_id == 'unreadposts')
+			{
+				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, 1001));
 			}
-			$db->sql_freeresult($result);
 
-			$total_match_count = sizeof($id_ary) + $start;
-			$id_ary = array_slice($id_ary, 0, $per_page);
-		}
-		else if ($search_id == 'unreadposts')
-		{
-			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, 1001 - $start, $start));
-
-			$total_match_count = sizeof($id_ary) + $start;
-			$id_ary = array_slice($id_ary, 0, $per_page);
+			if ($total_match_count = sizeof($id_ary))
+			{
+				// Make sure $start is set to the last page if it exceeds the amount
+				if ($start < 0 || $start >= $total_match_count)
+				{
+					$start = ($start < 0) ? 0 : floor(($total_match_count - 1) / $per_page) * $per_page;
+				}
+				$id_ary = array_slice($id_ary, $start, $per_page);
+			}
 		}
 		else
 		{

From cb7bb31129a38cbdbeb682e869e51b1199b43bfb Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 14 Jan 2012 15:50:47 +0800
Subject: [PATCH 041/279] [ticket/10532] Adjust total match count and limit

Set a variable for the limit of total matches count.
Adjust total match count to limit to provide proper $start value calculation.
Adjust $start value if no matches were found.

PHPBB3-10532
---
 phpBB/search.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 07be438ab4..3956478371 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -469,14 +469,18 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 	$per_page = ($show_results == 'posts') ? $config['posts_per_page'] : $config['topics_per_page'];
 	$total_match_count = 0;
 
+	// Set limit for the $total_match_count to reduce server load
+	$total_matches_limit = 1000;
+	$found_more_search_matches = false;
+
 	if ($search_id)
 	{
 		if ($sql || $search_id == 'unreadposts')
 		{
 			if ($sql)
 			{
-				// only return up to 1000 ids (the last one will be removed later)
-				$result = $db->sql_query_limit($sql, 1001);
+				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+				$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
 
 				while ($row = $db->sql_fetchrow($result))
 				{
@@ -486,11 +490,19 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 			}
 			else if ($search_id == 'unreadposts')
 			{
-				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, 1001));
+				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
 			}
 
 			if ($total_match_count = sizeof($id_ary))
 			{
+				// Limit the number to $total_matches_limit for pre-made searches
+				if ($total_match_count > $total_matches_limit)
+				{
+					$found_more_search_matches = true;
+					$total_match_count = $total_matches_limit;
+				}
+
 				// Make sure $start is set to the last page if it exceeds the amount
 				if ($start < 0 || $start >= $total_match_count)
 				{
@@ -498,6 +510,11 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				}
 				$id_ary = array_slice($id_ary, $start, $per_page);
 			}
+			else
+			{
+				// Set $start to 0 if no matches were found
+				$start = 0;
+			}
 		}
 		else
 		{
@@ -550,10 +567,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 	$icons = $cache->obtain_icons();
 
 	// Output header
-	if ($search_id && ($total_match_count > 1000))
+	if ($found_more_search_matches)
 	{
-		// limit the number to 1000 for pre-made searches
-		$total_match_count--;
 		$l_search_matches = sprintf($user->lang['FOUND_MORE_SEARCH_MATCHES'], $total_match_count);
 	}
 	else

From aa21bc2a733c1690ad7a371f962c244542135a43 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 15 Jan 2012 18:18:04 +0800
Subject: [PATCH 042/279] [ticket/10589] Add alias to 'user_birthday' in
 $leap_year_birthdays definition

PHPBB3-10589
---
 phpBB/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/index.php b/phpBB/index.php
index 0105a0a1bd..46694a6ec2 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -89,7 +89,7 @@ if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('
 	$leap_year_birthdays = '';
 	if ($now['mday'] == 28 && $now['mon'] == 2 && !$user->format_date(time(), 'L'))
 	{
-		$leap_year_birthdays = " OR user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
+		$leap_year_birthdays = " OR u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
 	}
 
 	$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday

From 99164cd20b9d8ca77b1e9a54e0958cdb580945d0 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 17 Jan 2011 00:01:04 +0700
Subject: [PATCH 043/279] [ticket/9831] Correctly store checkbox default value
 for boolean CPF.

PHPBB3-9831
---
 phpBB/includes/acp/acp_profile.php          | 27 ++++++++++++++++++---
 phpBB/includes/functions_profile_fields.php |  4 +--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 2e43b0545a..09a7a2f9ed 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -504,11 +504,26 @@ class acp_profile
 							}
 						}
 					}
-					/* else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+					else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
 					{
-						// Get the number of options if this key is 'field_maxlen'
-						$var = request_var('field_default_value', 0);
-					}*/
+						// 'field_length' == 1 defines radio buttons. Possible values are 1 or 2 only.
+						// 'field_length' == 2 defines checkbox. Possible values are 0 or 1 only.
+						// If we switch the type on step 2, we have to adjust field value.
+						// 1 is a common value for the checkbox and radio buttons.
+
+						// If we switch to the checkbox type but former radio buttons value was 2,
+						// which is not the case for the checkbox, set it to 0 (unchecked).
+						if ($cp->vars['field_length'] == 2 && $var == 2)
+						{
+							$var = 0;
+						}
+						// If we switch to the radio buttons but the former checkbox value was 0,
+						// which is not the case for the radio buttons, set it to 0.
+						else if ($cp->vars['field_length'] == 1 && $var == 0)
+						{
+							$var = 2;
+						}
+					}
 					else if ($field_type == FIELD_INT && $key == 'field_default_value')
 					{
 						// Permit an empty string
@@ -676,6 +691,10 @@ class acp_profile
 						{
 							$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true));
 						}
+						else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+						{
+							$_new_key_ary[$key] =  request_var($key, $cp->vars[$key]);
+						}
 						else
 						{
 							if (!isset($_REQUEST[$key]))
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1eae2a9ad6..7874608009 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -625,10 +625,10 @@ class custom_profile
 
 		$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
 		$user_ident = $profile_row['field_ident'];
-		// checkbox - only testing for isset
+		// checkbox - set the value to "true" if it has been set to 1
 		if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)
 		{
-			$value = (isset($_REQUEST[$profile_row['field_ident']])) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
+			$value = (isset($_REQUEST[$profile_row['field_ident']]) && request_var($profile_row['field_ident'], $default_value) == 1) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
 		}
 		else if ($profile_row['field_type'] == FIELD_INT)
 		{

From 2cf586a37206df3528237a2c91e255539c95a513 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Tue, 17 Jan 2012 12:31:27 -0500
Subject: [PATCH 044/279] [ticket/10580] Remove checking of server timezone and
 DST when registering

Remove checking of server timezone and DST. It causes a problem by
selecting the wrong timezone when registering when the board_timezone is 1
hour less than the server timezone.

PHPBB3-10580
---
 phpBB/includes/ucp/ucp_register.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 4e8729db56..6ad3a55589 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -165,24 +165,8 @@ class ucp_register
 			$captcha->init(CONFIRM_REG);
 		}
 
-		// Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1
-		$timezone = date('Z') / 3600;
-		$is_dst = date('I');
-
-		if ($config['board_timezone'] == $timezone || $config['board_timezone'] == ($timezone - 1))
-		{
-			$timezone = ($is_dst) ? $timezone - 1 : $timezone;
-
-			if (!isset($user->lang['tz_zones'][(string) $timezone]))
-			{
-				$timezone = $config['board_timezone'];
-			}
-		}
-		else
-		{
-			$is_dst = $config['board_dst'];
-			$timezone = $config['board_timezone'];
-		}
+		$is_dst = $config['board_dst'];
+		$timezone = $config['board_timezone'];
 
 		$data = array(
 			'username'			=> utf8_normalize_nfc(request_var('username', '', true)),

From 879c92e8a2b27586d6531de705ded49c6f662ffa Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 15:38:52 +0200
Subject: [PATCH 045/279] [ticket/10569] Invalid string comparison in
 subsilver2

Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
---
 phpBB/styles/subsilver2/template/ucp_main_front.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html
index fdef0bd949..dc945c83d6 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_front.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_front.html
@@ -48,11 +48,11 @@
 		<!-- IF S_SHOW_ACTIVITY -->
 			<tr>
 				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_FORUM}: </b></td>
-				<td><!-- IF ACTIVE_FORUM --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
+				<td><!-- IF ACTIVE_FORUM != '' --><b><a class="gen" href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></b><br /><span class="genmed">[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
 			</tr>
 			<tr>
 				<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td>
-				<td><!-- IF ACTIVE_TOPIC --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
+				<td><!-- IF ACTIVE_TOPIC != '' --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
 			</tr>
 		<!-- ENDIF -->
 		<!-- IF WARNINGS -->

From d2a34961498a03b77885af6a20497e87d36ad7ef Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:00:14 +0200
Subject: [PATCH 046/279] [ticket/10616] Add template inheritance to default
 styles

Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
---
 phpBB/styles/prosilver/template/template.cfg  | 5 +++++
 phpBB/styles/subsilver2/template/template.cfg | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index d31dcb7356..0b0533573a 100644
--- a/phpBB/styles/prosilver/template/template.cfg
+++ b/phpBB/styles/prosilver/template/template.cfg
@@ -23,3 +23,8 @@ version = 3.0.10
 
 # Defining a different template bitfield
 template_bitfield = lNg=
+
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty to ignore template inheritance
+inherit_from = prosilver
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index 4e5c36af99..d557edba87 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -21,3 +21,7 @@ name = subsilver2
 copyright = &copy; phpBB Group, 2003
 version = 3.0.10
 
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty to ignore template inheritance
+inherit_from = subsilver2

From 4aef6ea979befe9c40b3253ed10678a4eeb74160 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:09:48 +0200
Subject: [PATCH 047/279] [ticket/10616] Ignore template inheritance that
 points to self

Ignore template inheritance if it points to self

PHPBB3-10616
---
 phpBB/includes/functions.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1eefaee651..4d2a00f2db 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3322,6 +3322,11 @@ function parse_cfg_file($filename, $lines = false)
 
 		$parsed_items[$key] = $value;
 	}
+	
+	if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name'])
+	{
+		unset($parsed_items['inherit_from']);
+	}
 
 	return $parsed_items;
 }

From 326ff46ef7812f9f725e680e5202364c6b25bb4b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 3 Feb 2012 16:19:42 +0200
Subject: [PATCH 048/279] [ticket/10616] Add template inheritance to exported
 template

Add template inheritance when exporting template.cfg

PHPBB3-10616
---
 phpBB/includes/acp/acp_styles.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 5a7902755e..d7b0484af8 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -99,11 +99,11 @@ parse_css_file = {PARSE_CSS_FILE}
 		$this->template_cfg .= '
 # Some configuration options
 
-#
-# You can use this function to inherit templates from another template.
-# The template of the given name has to be installed.
-# Templates cannot inherit from inheriting templates.
-#';
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty or this template name to ignore template inheritance.
+inherit_from = {INHERIT_FROM}
+';
 
 		$this->imageset_keys = array(
 			'logos' => array(
@@ -2047,9 +2047,7 @@ parse_css_file = {PARSE_CSS_FILE}
 			// Export template core code
 			if ($mode == 'template' || $inc_template)
 			{
-				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg);
-
-				$use_template_name = '';
+				$use_template_name = $style_row['template_name'];
 
 				// Add the inherit from variable, depending on it's use...
 				if ($style_row['template_inherits_id'])
@@ -2063,7 +2061,8 @@ parse_css_file = {PARSE_CSS_FILE}
 					$db->sql_freeresult($result);
 				}
 
-				$template_cfg .= ($use_template_name) ? "\ninherit_from = $use_template_name" : "\n#inherit_from = ";
+				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg);
+
 				$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
 
 				$data[] = array(

From 225892f506e0a109e710534fee64a11614921d88 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 3 Feb 2012 16:14:48 +0000
Subject: [PATCH 049/279] [ticket/9914] Add backup warning to updater.

PHPBB3-9914
---
 phpBB/adm/style/install_update.html | 5 +++++
 phpBB/language/en/install.php       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 22d21d8314..818889c89b 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -43,6 +43,11 @@
 		<p>{WARNING_MSG}</p>
 	</div>
 	<!-- ENDIF -->
+	
+	<div class="errorbox" style="margin-top: 0;">
+		<h3>{L_NOTICE}</h3>
+		<p>{L_BACKUP_NOTICE}</p>
+	</div>
 
 	<form id="install_update" method="post" action="{U_ACTION}">
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f69ca40613..bbf407f1dc 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -52,6 +52,7 @@ $lang = array_merge($lang, array(
 	'BLANK_PREFIX_FOUND'			=> 'A scan of your tables has shown a valid installation using no table prefix.',
 	'BOARD_NOT_INSTALLED'			=> 'No installation found',
 	'BOARD_NOT_INSTALLED_EXPLAIN'	=> 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.',
+	'BACKUP_NOTICE'					=> 'Please backup your board before updating in case any problems arise during the update process.',
 
 	'CATEGORY'					=> 'Category',
 	'CACHE_STORE'				=> 'Cache type',

From c0b3239bf39f6a052dd8f481561ca0442f19ede8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 4 Feb 2012 00:31:59 +0100
Subject: [PATCH 050/279] [ticket/10512] Call startup.php from
 tests/bootstrap.php

PHPBB3-10512
---
 tests/bootstrap.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 16aed68405..2fb805043e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,25 +10,9 @@
 define('IN_PHPBB', true);
 $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
+require_once $phpbb_root_path . 'includes/startup.php';
+
 $table_prefix = 'phpbb_';
-
-if (!defined('E_DEPRECATED'))
-{
-    define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_DEPRECATED);
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
-
 require_once $phpbb_root_path . 'includes/constants.php';
 
 require_once 'test_framework/phpbb_test_case_helpers.php';

From f832f5a4ee88459dae6fda7e1b303b15f84768dc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 5 Feb 2012 22:03:02 +0800
Subject: [PATCH 051/279] [ticket/9831] Fix saving unchecked checkbox field
 value

PHPBB3-9831
---
 phpBB/includes/acp/acp_profile.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 09a7a2f9ed..a591474fce 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -511,6 +511,14 @@ class acp_profile
 						// If we switch the type on step 2, we have to adjust field value.
 						// 1 is a common value for the checkbox and radio buttons.
 
+						// Adjust unchecked checkbox value.
+						// If we return or save settings from 2nd/3rd page
+						// and the checkbox is unchecked, set the value to 0.
+						if (isset($_REQUEST['step']) && !isset($_REQUEST[$key]))
+						{
+							$var = 0;
+						}
+
 						// If we switch to the checkbox type but former radio buttons value was 2,
 						// which is not the case for the checkbox, set it to 0 (unchecked).
 						if ($cp->vars['field_length'] == 2 && $var == 2)

From 62288b3c05049cb02732204af062e0baa1191992 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 7 Feb 2012 22:03:24 +0200
Subject: [PATCH 052/279] [ticket/10569] Invalid string comparison in prosilver

Fixing invalid string comparison in ucp_main_front.html in prosilver

PHPBB3-10569
---
 phpBB/styles/prosilver/template/ucp_main_front.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 39c5d4f396..4a6fa3bf86 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -34,8 +34,8 @@
 		<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
 		<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
 		<dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
-		<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
-		<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
+		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
 		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
 	</dl>
 

From f894da0d25f2ecc4c8f3c039dd9f40607137d4ca Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 9 Feb 2012 15:13:29 +0100
Subject: [PATCH 053/279] [ticket/10633] Stop leaking filename of attachments
 when thumbnail is requested

While filenames are chosen at random and there is no correlation between the
original filename and the new filesystem filename, there is a correlation
between filesystem filename and filesytem filename of thumbnails.

Adjust error message to no longer include the physical filename and make it
consistent with the error message that is shown when there is no attachment at
all.

This information was mostly useless for regular users (i.e. non-admins) anyway.

PHPBB3-10633
---
 phpBB/download/file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index c17f0cf018..bf277c69fa 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -424,7 +424,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 	if (!@file_exists($filename))
 	{
 		send_status_line(404, 'Not Found');
-		trigger_error($user->lang['ERROR_NO_ATTACHMENT'] . '<br /><br />' . sprintf($user->lang['FILE_NOT_FOUND_404'], $filename));
+		trigger_error('ERROR_NO_ATTACHMENT');
 	}
 
 	// Correct the mime type - we force application/octetstream for all files, except images

From 35d5d527dbe2de1a608e6af4b004ed807ff22743 Mon Sep 17 00:00:00 2001
From: James King <ginger_ninja56@yahoo.co.uk>
Date: Wed, 8 Feb 2012 01:33:08 +0000
Subject: [PATCH 054/279] [ticket/10606] Fix incorrect hidden fields array name
 in page_header().

Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
---
 phpBB/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4d2a00f2db..0320230a7d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4553,7 +4553,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		foreach ($_EXTRA_URL as $url_param)
 		{
 			$url_param = explode('=', $url_param, 2);
-			$s_hidden_fields[$url_param[0]] = $url_param[1];
+			$s_search_hidden_fields[$url_param[0]] = $url_param[1];
 		}
 	}
 

From a962e788542dac43a365afde295babf3ee681535 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 9 Feb 2012 15:29:21 +0100
Subject: [PATCH 055/279] [ticket/10606] Also correctly use
 $s_search_hidden_fields in view(forum|topic).

Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
---
 phpBB/viewforum.php | 2 +-
 phpBB/viewtopic.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 588f60b589..6fec662b02 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -278,7 +278,7 @@ if (!empty($_EXTRA_URL))
 	foreach ($_EXTRA_URL as $url_param)
 	{
 		$url_param = explode('=', $url_param, 2);
-		$s_hidden_fields[$url_param[0]] = $url_param[1];
+		$s_search_hidden_fields[$url_param[0]] = $url_param[1];
 	}
 }
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 01cd6a28a8..74420a25c7 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -607,7 +607,7 @@ if (!empty($_EXTRA_URL))
 	foreach ($_EXTRA_URL as $url_param)
 	{
 		$url_param = explode('=', $url_param, 2);
-		$s_hidden_fields[$url_param[0]] = $url_param[1];
+		$s_search_hidden_fields[$url_param[0]] = $url_param[1];
 	}
 }
 

From 345e8e084fd5ab7f99442ce6515a786a90806e2e Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 10 Feb 2012 00:31:13 +0800
Subject: [PATCH 056/279] [ticket/9084] Don't hide 'non-entered' dropdown CPF
 value if not required

PHPBB3-9084
---
 phpBB/includes/functions_profile_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1eae2a9ad6..79701429e6 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -571,7 +571,7 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
-				if ($value == $ident_ary['data']['field_novalue'])
+				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
 				{
 					return NULL;
 				}

From 17f5c6bf71f560be2f4e2ecabae83ab2973bec47 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 18 Feb 2012 12:00:12 +0100
Subject: [PATCH 057/279] [ticket/10605] Check for orphan privmsgs when
 deleting a user

Also moved the hole code into a new function.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 116 ++++++++++++++++++++++++++
 phpBB/includes/functions_user.php     |  58 +------------
 2 files changed, 120 insertions(+), 54 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c40ceb088f..30cff8ed72 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1083,6 +1083,122 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 	return true;
 }
 
+/**
+* Delete all PM(s) for a given user and delete the ones without references
+*/
+function delete_user_pms($user_id)
+{
+	global $db, $user, $phpbb_root_path, $phpEx;
+
+	$user_id = (int) $user_id;
+
+	if (!$user_id)
+	{
+		return false;
+	}
+
+	// Get PM Information for later deleting
+	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE user_id = ' . $user_id . '
+			OR (author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
+	$result = $db->sql_query($sql);
+
+	$undelivered_msg = $undelivered_user = $delete_rows = array();
+	$num_unread = $num_new = $num_deleted = 0;
+	while ($row = $db->sql_fetchrow($result))
+	{
+		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
+		{
+			// Undelivered messages
+			$undelivered_msg[] = $row['msg_id'];
+			$undelivered_user[$row['user_id']][] = true;
+		}
+
+		$delete_rows[$row['msg_id']] = 1;
+	}
+	$db->sql_freeresult($result);
+
+	if (!sizeof($delete_rows))
+	{
+		return false;
+	}
+
+	$db->sql_transaction('begin');
+
+	if (sizeof($undelivered_msg))
+	{
+		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+			WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+		$db->sql_query($sql);
+	}
+
+	foreach ($undelivered_user as $_user_id => $ary)
+	{
+		if ($_user_id == $user_id)
+		{
+			continue;
+		}
+
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
+				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
+			WHERE user_id = ' . $_user_id;
+		$db->sql_query($sql);
+	}
+
+	// Delete private message data
+	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
+		WHERE user_id = $user_id
+			AND " . $db->sql_in_set('msg_id', array_keys($delete_rows));
+	$db->sql_query($sql);
+
+	// Now we have to check which messages we can delete completely
+	$sql = 'SELECT msg_id
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows));
+	$result = $db->sql_query($sql);
+
+	while ($row = $db->sql_fetchrow($result))
+	{
+		unset($delete_rows[$row['msg_id']]);
+	}
+	$db->sql_freeresult($result);
+
+	$delete_ids = array_keys($delete_rows);
+
+	if (sizeof($delete_ids))
+	{
+		// Check if there are any attachments we need to remove
+		if (!function_exists('delete_attachments'))
+		{
+			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+		}
+
+		delete_attachments('message', $delete_ids, false);
+
+		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+		$db->sql_query($sql);
+	}
+
+	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
+	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
+		SET author_id = ' . ANONYMOUS . '
+		WHERE author_id = ' . $user_id;
+	$db->sql_query($sql);
+
+	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
+		SET author_id = ' . ANONYMOUS . '
+		WHERE author_id = ' . $user_id;
+	$db->sql_query($sql);
+
+	$db->sql_transaction('commit');
+
+	return true;
+}
+
 /**
 * Rebuild message header
 */
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6b5cca8abb..20923ea495 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -528,62 +528,12 @@ function user_delete($mode, $user_id, $post_username = false)
 		WHERE session_user_id = ' . $user_id;
 	$db->sql_query($sql);
 
-	// Remove any undelivered mails...
-	$sql = 'SELECT msg_id, user_id
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
-			AND folder_id = ' . PRIVMSGS_NO_BOX;
-	$result = $db->sql_query($sql);
-
-	$undelivered_msg = $undelivered_user = array();
-	while ($row = $db->sql_fetchrow($result))
+	// Clean the private messages tables from the user
+	if (!function_exists('delete_user_pms'))
 	{
-		$undelivered_msg[] = $row['msg_id'];
-		$undelivered_user[$row['user_id']][] = true;
-	}
-	$db->sql_freeresult($result);
-
-	if (sizeof($undelivered_msg))
-	{
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
-		$db->sql_query($sql);
-	}
-
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE author_id = ' . $user_id . '
-			AND folder_id = ' . PRIVMSGS_NO_BOX;
-	$db->sql_query($sql);
-
-	// Delete all to-information
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user_id;
-	$db->sql_query($sql);
-
-	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
-	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
-		SET author_id = ' . ANONYMOUS . '
-		WHERE author_id = ' . $user_id;
-	$db->sql_query($sql);
-
-	$sql = 'UPDATE ' . PRIVMSGS_TABLE . '
-		SET author_id = ' . ANONYMOUS . '
-		WHERE author_id = ' . $user_id;
-	$db->sql_query($sql);
-
-	foreach ($undelivered_user as $_user_id => $ary)
-	{
-		if ($_user_id == $user_id)
-		{
-			continue;
-		}
-
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
-				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
-			WHERE user_id = ' . $_user_id;
-		$db->sql_query($sql);
+		include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
 	}
+	delete_user_pms($user_id);
 
 	$db->sql_transaction('commit');
 

From 11c5a6621389af854170d3190432d3f414c77618 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 18 Feb 2012 23:31:31 +0100
Subject: [PATCH 058/279] [ticket/10658] Use get_user_rank() for group ranks on
 group view.

The old code was buggy because it did not prefix the path with the phpBB root
path which causes problems with bridges and other URL rewriting.

PHPBB3-10658
---
 phpBB/memberlist.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b3c0bae16a..cfa1631dbe 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1221,21 +1221,16 @@ switch ($mode)
 			// Misusing the avatar function for displaying group avatars...
 			$avatar_img = get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR');
 
+			// ... same for group rank
 			$rank_title = $rank_img = $rank_img_src = '';
 			if ($group_row['group_rank'])
 			{
-				if (isset($ranks['special'][$group_row['group_rank']]))
+				get_user_rank($group_row['group_rank'], false, $rank_title, $rank_img, $rank_img_src);
+
+				if ($rank_img)
 				{
-					$rank_title = $ranks['special'][$group_row['group_rank']]['rank_title'];
+					$rank_img .= '<br />';
 				}
-				$rank_img = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] . '" alt="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" title="' . $ranks['special'][$group_row['group_rank']]['rank_title'] . '" /><br />' : '';
-				$rank_img_src = (!empty($ranks['special'][$group_row['group_rank']]['rank_image'])) ? $config['ranks_path'] . '/' . $ranks['special'][$group_row['group_rank']]['rank_image'] : '';
-			}
-			else
-			{
-				$rank_title = '';
-				$rank_img = '';
-				$rank_img_src = '';
 			}
 
 			$template->assign_vars(array(

From c3265c913817e5e774d30993c181d70e853b60d4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 01:52:33 +0100
Subject: [PATCH 059/279] [ticket/10639] Do not allow negative post count as
 rank's minimum posts

PHPBB3-10639
---
 phpBB/includes/acp/acp_ranks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php
index dfd7511427..ea057cd84c 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -52,7 +52,7 @@ class acp_ranks
 				}
 				$rank_title = utf8_normalize_nfc(request_var('title', '', true));
 				$special_rank = request_var('special_rank', 0);
-				$min_posts = ($special_rank) ? 0 : request_var('min_posts', 0);
+				$min_posts = ($special_rank) ? 0 : max(0, request_var('min_posts', 0));
 				$rank_image = request_var('rank_image', '');
 
 				// The rank image has to be a jpg, gif or png

From afcf9cbc8617462853d3b42e4dfc9f1f46051e79 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 02:14:23 +0100
Subject: [PATCH 060/279] [ticket/10630] Perform array_unique on authors array
 before creating the query

This is needed to avoid an additional appearance for an author for every
post he made.

PHPBB3-10630
---
 phpBB/includes/search/fulltext_mysql.php  | 2 +-
 phpBB/includes/search/fulltext_native.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 29cdd8ee9a..52372a14d8 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -707,7 +707,7 @@ class fulltext_mysql extends search_backend
 	*/
 	function index_remove($post_ids, $author_ids, $forum_ids)
 	{
-		$this->destroy_cache(array(), $author_ids);
+		$this->destroy_cache(array(), array_unique($author_ids));
 	}
 
 	/**
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 727e3aaffb..b63205fd76 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1334,7 +1334,7 @@ class fulltext_native extends search_backend
 			$db->sql_query($sql);
 		}
 
-		$this->destroy_cache(array_unique($word_texts), $author_ids);
+		$this->destroy_cache(array_unique($word_texts), array_unique($author_ids));
 	}
 
 	/**

From ef154b78a169402e7f968cd2189b69b041a73543 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 20 Feb 2012 02:16:41 +0100
Subject: [PATCH 061/279] [ticket/10630] Use sql_like_expression() method
 instead of hardcoded LIKE '%x%'

PHPBB3-10630
---
 phpBB/includes/search/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
index 2f20d11495..df7c8a0892 100644
--- a/phpBB/includes/search/search.php
+++ b/phpBB/includes/search/search.php
@@ -295,7 +295,7 @@ class search_backend
 			$sql_where = '';
 			foreach ($authors as $author)
 			{
-				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\'';
+				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors ' . $db->sql_like_expression($db->any_char . ' ' . (int) $author . ' ' . $db->any_char);
 			}
 
 			$sql = 'SELECT search_key

From cd5c01ac2da2ec316e997e8850e1b2d326191e56 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 11:10:10 +0100
Subject: [PATCH 062/279] [ticket/9089] Add tabindex to PM recipient box, to
 allow tabbing to the subject

I also added tabindex 1 to the buttons for adding the recipients.
Also note, that duplicated tabindex are fine:
http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex

PHPBB3-9089
---
 phpBB/styles/prosilver/template/posting_editor.html | 6 +++---
 phpBB/styles/subsilver2/template/ucp_header.html    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 5f7fb8408e..e7c1dc21eb 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -37,10 +37,10 @@
 			<!-- ENDIF -->
 			<!-- IF not S_EDIT_POST -->
 			<dl class="pmlist">
-				<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2"></textarea></dt>
+				<dt><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></dt>
 				<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
-				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /></dd>
+				<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" /></dd>
+				<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" /></dd>
 			</dl>
 			<!-- ENDIF -->
 		<!-- ELSE -->
diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html
index ea64dcb299..1566a15929 100644
--- a/phpBB/styles/subsilver2/template/ucp_header.html
+++ b/phpBB/styles/subsilver2/template/ucp_header.html
@@ -26,7 +26,7 @@
 			<td class="row1"><b class="genmed">{L_USERNAMES}:</b></td>
 		</tr>
 		<tr>
-			<td class="row2"><textarea name="username_list" rows="5" cols="22"></textarea><br />
+			<td class="row2"><textarea name="username_list" rows="5" cols="22" tabindex="1"></textarea><br />
 				[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]
 			</td>
 		</tr>
@@ -41,7 +41,7 @@
 	<!-- ENDIF -->
 	<!-- IF S_ALLOW_MASS_PM -->
 		<tr>
-			<td class="row1"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<input class="post" type="submit" name="add_bcc" value="{L_ADD_BCC}" />&nbsp;</div><div style="float: {S_CONTENT_FLOW_END};">&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD_TO}" />&nbsp;</div></td>
+			<td class="row1"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<input class="post" type="submit" name="add_bcc" value="{L_ADD_BCC}" tabindex="1" />&nbsp;</div><div style="float: {S_CONTENT_FLOW_END};">&nbsp;<input class="post" type="submit" name="add_to" value="{L_ADD_TO}" tabindex="1" />&nbsp;</div></td>
 		</tr>
 	<!-- ENDIF -->
 	</table>

From 340a8f19d687efab84de9335e7c40cabeef90acf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 11:25:22 +0100
Subject: [PATCH 063/279] [ticket/10456] Add tabindex to subsilver2 captcha

Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
---
 phpBB/styles/subsilver2/template/captcha_default.html | 2 +-
 phpBB/styles/subsilver2/template/captcha_qa.html      | 2 +-
 phpBB/styles/subsilver2/template/login_body.html      | 2 +-
 phpBB/styles/subsilver2/template/posting_body.html    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html
index 4c65f81643..e2edf0b810 100644
--- a/phpBB/styles/subsilver2/template/captcha_default.html
+++ b/phpBB/styles/subsilver2/template/captcha_default.html
@@ -12,6 +12,6 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_CONFIRM_CODE}:</b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
+		<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> />
 		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="btnlite" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html
index 23d2a92f68..acc9cdcdfb 100644
--- a/phpBB/styles/subsilver2/template/captcha_qa.html
+++ b/phpBB/styles/subsilver2/template/captcha_qa.html
@@ -3,6 +3,6 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}:</b><br /><span class="gensmall">{L_CONFIRM_QUESTION_EXPLAIN}</span></td>
-		<td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td>
+		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"<!-- IF $CAPTCHA_TAB_INDEX --> tabindex="{$CAPTCHA_TAB_INDEX}"<!-- ENDIF --> /></td>
 		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 262341e0c0..ba316517a9 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -68,7 +68,7 @@
 <!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
 </table>
 <table class="tablebg" width="100%" cellspacing="1">
-		
+	<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
 	<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index fec6d7ff6c..d7947caf2f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -333,6 +333,7 @@
 <!-- ENDIF -->
 
 		<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
+		<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
 		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 		<!-- ENDIF -->
 

From 8e1e48a7b69b78e10297869e3aaf224e5c12e493 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 23 Feb 2012 10:55:57 +0100
Subject: [PATCH 064/279] [ticket/8636] Add resync option to topic_view
 moderation page

PHPBB3-8636
---
 phpBB/includes/mcp/mcp_topic.php                | 11 +++++++++++
 phpBB/styles/prosilver/template/mcp_topic.html  |  1 +
 phpBB/styles/subsilver2/template/mcp_topic.html |  1 +
 3 files changed, 13 insertions(+)

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index d7cc1e795a..7d4edaf362 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -50,6 +50,16 @@ function mcp_topic_view($id, $mode, $action)
 	$submitted_id_list	= request_var('post_ids', array(0));
 	$checked_ids = $post_id_list = request_var('post_id_list', array(0));
 
+	// Resync Topic?
+	if ($action == 'resync')
+	{
+		if (!function_exists('mcp_resync_topics'))
+		{
+			include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx);
+		}
+		mcp_resync_topics(array($topic_id));
+	}
+
 	// Split Topic?
 	if ($action == 'split_all' || $action == 'split_beyond')
 	{
@@ -320,6 +330,7 @@ function mcp_topic_view($id, $mode, $action)
 		'S_CAN_APPROVE'		=> ($has_unapproved_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_LOCK'		=> ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_REPORT'		=> ($auth->acl_get('m_report', $topic_info['forum_id'])) ? true : false,
+		'S_CAN_SYNC'		=> $auth->acl_get('m_', $topic_info['forum_id']),
 		'S_REPORT_VIEW'		=> ($action == 'reports') ? true : false,
 		'S_MERGE_VIEW'		=> ($action == 'merge') ? true : false,
 		'S_SPLIT_VIEW'		=> ($action == 'split') ? true : false,
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index a4d2a0f600..2a5f52f038 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -158,6 +158,7 @@ onload_functions.push('subPanels()');
 		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF S_MERGE_VIEW --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
+		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 	</select>&nbsp;
 	<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
 	<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 13865d26ee..f9f9382ff2 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -135,6 +135,7 @@
 		<!-- IF S_CAN_DELETE --><option value="delete_post">{L_DELETE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_MERGE --><option value="merge_posts"<!-- IF ACTION eq 'merge' --> selected="selected"<!-- ENDIF -->>{L_MERGE_POSTS}</option><!-- ENDIF -->
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF ACTION eq 'split' --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
+		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 	</select>&nbsp;<input class="btnmain" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" /></td>
 </tr>
 </table>

From 8f3fba885859e00646531632558d75b609ecf813 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Feb 2012 01:58:17 +0100
Subject: [PATCH 065/279] [ticket/10532] Put $total_match_count assignment onto
 its own line.

PHPBB3-10532
---
 phpBB/search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 3956478371..87e40832a5 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -494,7 +494,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
 			}
 
-			if ($total_match_count = sizeof($id_ary))
+			$total_match_count = sizeof($id_ary);
+			if ($total_match_count)
 			{
 				// Limit the number to $total_matches_limit for pre-made searches
 				if ($total_match_count > $total_matches_limit)

From 459e8dc09522d8e54ce82182a99ebddf2362a737 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Feb 2012 02:15:39 +0100
Subject: [PATCH 066/279] [ticket/10532] Get rid of inline calculation of
 $start, remove duplicated check

PHPBB3-10532
---
 phpBB/search.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 87e40832a5..3006c0e5d9 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -505,10 +505,15 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				}
 
 				// Make sure $start is set to the last page if it exceeds the amount
-				if ($start < 0 || $start >= $total_match_count)
+				if ($start < 0)
 				{
-					$start = ($start < 0) ? 0 : floor(($total_match_count - 1) / $per_page) * $per_page;
+					$start = 0;
 				}
+				else if ($start >= $total_match_count)
+				{
+					$start = floor(($total_match_count - 1) / $per_page) * $per_page;
+				}
+
 				$id_ary = array_slice($id_ary, $start, $per_page);
 			}
 			else

From 6548a3094f2981a19ff001e67596befab4159ecd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Feb 2012 02:19:12 +0100
Subject: [PATCH 067/279] [ticket/10532] Remove one unnecessary level of if
 block nesting.

PHPBB3-10532
---
 phpBB/search.php | 81 +++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 3006c0e5d9..d89bc79225 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -475,57 +475,54 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 	if ($search_id)
 	{
-		if ($sql || $search_id == 'unreadposts')
+		if ($sql)
 		{
-			if ($sql)
-			{
-				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-				$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
+			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+			$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
 
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$id_ary[] = (int) $row[$field];
-				}
-				$db->sql_freeresult($result);
-			}
-			else if ($search_id == 'unreadposts')
+			while ($row = $db->sql_fetchrow($result))
 			{
-				// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-				$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
-			}
-
-			$total_match_count = sizeof($id_ary);
-			if ($total_match_count)
-			{
-				// Limit the number to $total_matches_limit for pre-made searches
-				if ($total_match_count > $total_matches_limit)
-				{
-					$found_more_search_matches = true;
-					$total_match_count = $total_matches_limit;
-				}
-
-				// Make sure $start is set to the last page if it exceeds the amount
-				if ($start < 0)
-				{
-					$start = 0;
-				}
-				else if ($start >= $total_match_count)
-				{
-					$start = floor(($total_match_count - 1) / $per_page) * $per_page;
-				}
-
-				$id_ary = array_slice($id_ary, $start, $per_page);
-			}
-			else
-			{
-				// Set $start to 0 if no matches were found
-				$start = 0;
+				$id_ary[] = (int) $row[$field];
 			}
+			$db->sql_freeresult($result);
+		}
+		else if ($search_id == 'unreadposts')
+		{
+			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
+			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
 		}
 		else
 		{
 			$search_id = '';
 		}
+
+		$total_match_count = sizeof($id_ary);
+		if ($total_match_count)
+		{
+			// Limit the number to $total_matches_limit for pre-made searches
+			if ($total_match_count > $total_matches_limit)
+			{
+				$found_more_search_matches = true;
+				$total_match_count = $total_matches_limit;
+			}
+
+			// Make sure $start is set to the last page if it exceeds the amount
+			if ($start < 0)
+			{
+				$start = 0;
+			}
+			else if ($start >= $total_match_count)
+			{
+				$start = floor(($total_match_count - 1) / $per_page) * $per_page;
+			}
+
+			$id_ary = array_slice($id_ary, $start, $per_page);
+		}
+		else
+		{
+			// Set $start to 0 if no matches were found
+			$start = 0;
+		}
 	}
 
 	// make sure that some arrays are always in the same order

From 7a061cfc6ea52f86d623e496d7355413739b6254 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Feb 2012 02:29:49 +0100
Subject: [PATCH 068/279] [ticket/10532] Remove unnecessary parentheses around
 calculations of addition.

PHPBB3-10532
---
 phpBB/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index d89bc79225..8cb2020630 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -478,7 +478,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		if ($sql)
 		{
 			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-			$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
+			$result = $db->sql_query_limit($sql, $total_matches_limit + 1);
 
 			while ($row = $db->sql_fetchrow($result))
 			{
@@ -489,7 +489,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 		else if ($search_id == 'unreadposts')
 		{
 			// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
-			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
+			$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, $total_matches_limit + 1));
 		}
 		else
 		{

From d3d8793c1fb161c6450e50c09062c5e4fc9b11aa Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 26 Feb 2012 16:54:31 +0200
Subject: [PATCH 069/279] [ticket/10453] Fixing spacing

Fixing spacing

PHPBB3-10453
---
 phpBB/styles/prosilver/template/ucp_pm_message_header.html | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html    | 2 +-
 phpBB/styles/prosilver/theme/cp.css                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index c3b7e54f45..ae66dd0a36 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -11,7 +11,7 @@
 			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_POST_REPLY_PM}</a></div>
 			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_UCP_PM_COMPOSE}</a></div><!-- ENDIF -->
 			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_FORWARD_PM}</a></div><!-- ENDIF -->
-	        <!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a class="left" title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_REPLY_TO_ALL}</a></div><!-- ENDIF -->			
 		</div>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 79c2c0355f..1840732b64 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -2,7 +2,7 @@
 
 <!-- INCLUDE ucp_pm_message_header.html -->
 
-		<span class="corners-bottom"><span></span></span></div>
+	<span class="corners-bottom"><span></span></span></div>
 </div>
 
 
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index e28887d60f..aed88831a8 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -358,7 +358,7 @@ dl.mini dd {
 }
 
 .reply-all {
-    font-size: 11px;
+	font-size: 11px;
 	padding-top: 5px;
 }
 

From 45f39c6d1f2adc318d521bd9eb75d80f0750fdb8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 18 Feb 2012 12:16:21 +0100
Subject: [PATCH 070/279] [ticket/10605] Delete orphan private messages on
 update

PHPBB3-10605
---
 phpBB/install/database_update.php | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1b7dcd47f..b6298ca651 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2024,6 +2024,48 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC3 to 3.0.10
 		case '3.0.10-RC3':
 		break;
+
+		// Changes from 3.0.10 to 3.0.11-RC1
+		case '3.0.10':
+			// Delete orphan private messages
+			$batch_size = 500;
+
+			$sql_array = array(
+				'SELECT'	=> 'p.msg_id',
+				'FROM'		=> array(
+					PRIVMSGS_TABLE	=> 'p',
+				),
+				'LEFT_JOIN'	=> array(
+					array(
+						'FROM'	=> array(PRIVMSGS_TO_TABLE, 't'),
+						'ON'	=> 'p.msg_id = t.msg_id',
+					),
+				),
+				'WHERE'		=> 't.user_id IS NULL';
+			$sql = $db->sql_build_query('SELECT', $sql_array);
+
+			do
+			{
+				$result = $db->sql_query_limit($sql, $batch_size);
+
+				$delete_pms = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$delete_pms[] = (int) $row['msg_id'];
+				}
+				$db->sql_freeresult($result);
+
+				if (!empty($delete_pms))
+				{
+					$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+						WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
+					$db->sql_query($sql);
+				}
+			}
+			while (sizeof($delete_pms) == $batch_size);
+
+			$no_updates = false;
+		break;
 	}
 }
 

From d3091da5eade90aac1b13244d04bd1fb342bcc59 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Feb 2012 01:08:04 +0100
Subject: [PATCH 071/279] [ticket/9220] Remove margin on table.table1 so it's
 centered in the blue box.

The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
---
 .../styles/prosilver/template/memberlist_body.html |  2 +-
 .../prosilver/template/memberlist_leaders.html     |  4 ++--
 phpBB/styles/prosilver/template/search_body.html   |  2 +-
 .../styles/prosilver/template/viewonline_body.html |  2 +-
 phpBB/styles/prosilver/theme/common.css            | 14 +++++++++++++-
 phpBB/styles/prosilver/theme/tweaks.css            |  4 ----
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 9e6f8c3aab..5ea774bf06 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -80,7 +80,7 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 <!-- ENDIF -->
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
index 3917498050..26e299d261 100644
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ b/phpBB/styles/prosilver/template/memberlist_leaders.html
@@ -4,7 +4,7 @@
 
 <form method="post" action="{S_MODE_ACTION}">
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
@@ -37,7 +37,7 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 	 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index 6616b95a73..4b1d30d77d 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -98,7 +98,7 @@
 </form>
 
 <!-- IF .recentsearch -->
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index b111d743f9..3f1f0e64bf 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -7,7 +7,7 @@
 	<li class="rightside pagination"><!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
 </ul>
 
-<div class="forumbg">
+<div class="forumbg forumbg-table">
 	<div class="inner"><span class="corners-top"><span></span></span>
 	
 	<table class="table1" cellspacing="1">
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8b5e09297e..7eb00bd808 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -418,7 +418,19 @@ table.info tbody th {
 }
 
 .forumbg table.table1 {
-	margin: 0 -2px -1px -1px;
+	margin: 0;
+}
+
+.forumbg-table > .inner {
+	margin: 0 -1px;
+}
+
+.forumbg-table > .inner > span.corners-top {
+	margin: 0 -4px -1px -4px;
+}
+
+.forumbg-table > .inner > span.corners-bottom {
+	margin: -1px -4px 0 -4px;
 }
 
 /* Misc layout styles
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index f7322c2cce..5e11b2122b 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -87,10 +87,6 @@ dl.icon {
 	float: none;
 }
 
-* html .forumbg table.table1 {
-	margin: 0 -2px 0px -1px;
-}
-
 /* Headerbar height fix for IE7 and below */
 * html #site-description p {
 	margin-bottom: 1.0em;

From 17dc8c6c5c0e651a305961fae579c59d09abf88d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 27 Feb 2012 17:16:42 +0100
Subject: [PATCH 072/279] [ticket/9089] Add tabindex to pm/topic/post
 icon-options aswell

PHPBB3-9089
---
 phpBB/styles/prosilver/template/posting_editor.html | 4 ++--
 phpBB/styles/subsilver2/template/posting_body.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index e7c1dc21eb..67ba74a690 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -87,8 +87,8 @@
 	<dl>
 		<dt><label for="icon">{L_ICON}:</label></dt>
 		<dd>
-			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
-			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon -->
+			<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label>
+			<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" /></label> <!-- END topic_icon -->
 		</dd>
 	</dl>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index fec6d7ff6c..dbdf6b230c 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -127,7 +127,7 @@
 		<td class="row2">
 			<table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
+				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} tabindex="1" /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
 			</tr>
 			</table>
 		</td>

From 470b79c9e38ea5c37fe5f4685618e5794b6954ad Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 24 Feb 2012 07:41:08 +0000
Subject: [PATCH 073/279] [ticket/8652] Sending 2 emails on 2 replies

This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
---
 phpBB/includes/functions_posting.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 77d92e26e2..38f542264c 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1286,6 +1286,12 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		{
 			$msg_users[] = $row;
 			$update_notification[$row['notify_type']][] = $row['user_id'];
+			if ($row['notify_type'] === 'topic')
+			{
+				// Using SQL characteristics. If it didn't exist it isn't added.
+				// It's very rare to find someone that is registered in topic and noone is registered in the forum
+				$update_notification['forum'][] = $row['user_id'];
+			}
 		}
 	}
 	unset($notify_rows);

From b74530259faa6197d7215d957c180280210a93e0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 2 Mar 2012 00:19:42 +0100
Subject: [PATCH 074/279] [ticket/8652] Comment for also updating forum watch
 table in user_notification.

PHPBB3-8652
---
 phpBB/includes/functions_posting.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 38f542264c..f920be9c4b 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1286,10 +1286,18 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		{
 			$msg_users[] = $row;
 			$update_notification[$row['notify_type']][] = $row['user_id'];
+
+			/*
+			* We also update the forums watch table for this user when we are
+			* sending out a topic notification to prevent sending out another
+			* notification in case this user is also subscribed to the forum
+			* this topic was posted in.
+			* Since an UPDATE query is used, this has no effect on users only
+			* subscribed to the topic (i.e. no row is created) and should not
+			* be a performance issue.
+			*/
 			if ($row['notify_type'] === 'topic')
 			{
-				// Using SQL characteristics. If it didn't exist it isn't added.
-				// It's very rare to find someone that is registered in topic and noone is registered in the forum
 				$update_notification['forum'][] = $row['user_id'];
 			}
 		}

From efe25a0b49c7445bef665ab28fc979e485e49289 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Oct 2011 15:31:29 +0200
Subject: [PATCH 075/279] [ticket/9813] Use SHOW TABLE STATUS to get search
 stats for native on MySQL.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_native.php | 38 +++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index b63205fd76..e5eee50fdb 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1461,17 +1461,35 @@ class fulltext_native extends search_backend
 	{
 		global $db;
 
-		$sql = 'SELECT COUNT(*) as total_words
-			FROM ' . SEARCH_WORDLIST_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
-		$db->sql_freeresult($result);
+		switch ($db->sql_layer)
+		{
+			case 'mysql4':
+			case 'mysqli':
+				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDLIST_TABLE . "'";
+				$result = $db->sql_query($sql);
+				$this->stats['total_words'] = (int) $db->sql_fetchfield('Rows');
+				$db->sql_freeresult($result);
 
-		$sql = 'SELECT COUNT(*) as total_matches
-			FROM ' . SEARCH_WORDMATCH_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
-		$db->sql_freeresult($result);
+				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDMATCH_TABLE . "'";
+				$result = $db->sql_query($sql);
+				$this->stats['total_matches'] = (int) $db->sql_fetchfield('Rows');
+				$db->sql_freeresult($result);
+			break;
+
+			default:
+				$sql = 'SELECT COUNT(*) as total_words
+					FROM ' . SEARCH_WORDLIST_TABLE;
+				$result = $db->sql_query($sql);
+				$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
+				$db->sql_freeresult($result);
+
+				$sql = 'SELECT COUNT(*) as total_matches
+					FROM ' . SEARCH_WORDMATCH_TABLE;
+				$result = $db->sql_query($sql);
+				$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
+				$db->sql_freeresult($result);
+			break;
+		}
 	}
 
 	/**

From 97cf433dea658127ed60c70ea47d1c3830964f25 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 12 Dec 2011 02:41:48 +0100
Subject: [PATCH 076/279] [ticket/9813] Use table status row count only if
 greater than 100000 or exact.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_native.php | 67 ++++++++++++++---------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index e5eee50fdb..69937ff9c9 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1458,38 +1458,53 @@ class fulltext_native extends search_backend
 	}
 
 	function get_stats()
+	{
+		$this->stats['total_words']		= $this->get_table_row_count(SEARCH_WORDLIST_TABLE);
+		$this->stats['total_matches']	= $this->get_table_row_count(SEARCH_WORDMATCH_TABLE);
+	}
+
+	/**
+	* Gets statistics for a specific database table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Row count. Prefixed with ~ if estimated.
+	*
+	* @access protected
+	*/
+	function get_table_row_count($table_name)
 	{
 		global $db;
 
-		switch ($db->sql_layer)
+		if (stripos($db->sql_layer, 'mysql') === 0)
 		{
-			case 'mysql4':
-			case 'mysqli':
-				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDLIST_TABLE . "'";
-				$result = $db->sql_query($sql);
-				$this->stats['total_words'] = (int) $db->sql_fetchfield('Rows');
-				$db->sql_freeresult($result);
+			$sql = "SHOW TABLE STATUS
+				LIKE '" . $table_name . "'";
+			$result = $db->sql_query($sql);
+			$table_status = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-				$sql = "SHOW TABLE STATUS LIKE '" . SEARCH_WORDMATCH_TABLE . "'";
-				$result = $db->sql_query($sql);
-				$this->stats['total_matches'] = (int) $db->sql_fetchfield('Rows');
-				$db->sql_freeresult($result);
-			break;
-
-			default:
-				$sql = 'SELECT COUNT(*) as total_words
-					FROM ' . SEARCH_WORDLIST_TABLE;
-				$result = $db->sql_query($sql);
-				$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
-				$db->sql_freeresult($result);
-
-				$sql = 'SELECT COUNT(*) as total_matches
-					FROM ' . SEARCH_WORDMATCH_TABLE;
-				$result = $db->sql_query($sql);
-				$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
-				$db->sql_freeresult($result);
-			break;
+			if (isset($table_status['Engine']))
+			{
+				if ($table_status['Engine'] === 'MyISAM')
+				{
+					return $table_status['Rows'];
+				}
+				else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+				{
+					return '~' . $table_status['Rows'];
+				}
+			}
 		}
+
+		// Get exact row count by actually counting rows
+		$sql = 'SELECT COUNT(*) AS rows_total
+			FROM ' . $table_name;
+		$result = $db->sql_query($sql);
+		$rows_total = $db->sql_fetchfield('rows_total');
+		$db->sql_freeresult($result);
+
+		return $rows_total;
 	}
 
 	/**

From f9953fc3395e6b206c0789d40f89f9d2463348e7 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 18 Feb 2012 19:29:32 +0100
Subject: [PATCH 077/279] [ticket/10653] Add ability to count table rows to
 database abstraction layer.

PHPBB3-10653
---
 phpBB/includes/db/dbal.php                | 35 ++++++++++++
 phpBB/includes/db/mysql.php               | 70 +++++++++++++++++++++++
 phpBB/includes/db/mysqli.php              | 70 +++++++++++++++++++++++
 phpBB/includes/search/fulltext_native.php | 46 +--------------
 4 files changed, 177 insertions(+), 44 deletions(-)

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 230c9c8ed7..5d456c2ff0 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -900,6 +900,41 @@ class dbal
 
 		return true;
 	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$sql = 'SELECT COUNT(*) AS rows_total
+			FROM ' . $this->sql_escape($table_name);
+		$result = $this->sql_query($sql);
+		$rows_total = $this->sql_fetchfield('rows_total');
+		$this->sql_freeresult($result);
+
+		return $rows_total;
+	}
 }
 
 /**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 1e24c79577..87413e808d 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -318,6 +318,76 @@ class dbal_mysql extends dbal
 		return @mysql_real_escape_string($msg, $this->db_connect_id);
 	}
 
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 456ce906d0..49b2789ce6 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -315,6 +315,76 @@ class dbal_mysqli extends dbal
 		return @mysqli_real_escape_string($this->db_connect_id, $msg);
 	}
 
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 69937ff9c9..dc961f3c8a 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1458,53 +1458,11 @@ class fulltext_native extends search_backend
 	}
 
 	function get_stats()
-	{
-		$this->stats['total_words']		= $this->get_table_row_count(SEARCH_WORDLIST_TABLE);
-		$this->stats['total_matches']	= $this->get_table_row_count(SEARCH_WORDMATCH_TABLE);
-	}
-
-	/**
-	* Gets statistics for a specific database table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Row count. Prefixed with ~ if estimated.
-	*
-	* @access protected
-	*/
-	function get_table_row_count($table_name)
 	{
 		global $db;
 
-		if (stripos($db->sql_layer, 'mysql') === 0)
-		{
-			$sql = "SHOW TABLE STATUS
-				LIKE '" . $table_name . "'";
-			$result = $db->sql_query($sql);
-			$table_status = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if (isset($table_status['Engine']))
-			{
-				if ($table_status['Engine'] === 'MyISAM')
-				{
-					return $table_status['Rows'];
-				}
-				else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-				{
-					return '~' . $table_status['Rows'];
-				}
-			}
-		}
-
-		// Get exact row count by actually counting rows
-		$sql = 'SELECT COUNT(*) AS rows_total
-			FROM ' . $table_name;
-		$result = $db->sql_query($sql);
-		$rows_total = $db->sql_fetchfield('rows_total');
-		$db->sql_freeresult($result);
-
-		return $rows_total;
+		$this->stats['total_words']		= $db->get_estimated_row_count(SEARCH_WORDLIST_TABLE);
+		$this->stats['total_matches']	= $db->get_estimated_row_count(SEARCH_WORDMATCH_TABLE);
 	}
 
 	/**

From 6df721b21528e4d9881fa191159b123bb2b6b33f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 4 Mar 2012 01:59:40 +0100
Subject: [PATCH 078/279] [ticket/10653] Unit tests for get_row_count() and
 get_estimated_row_count().

PHPBB3-10653
---
 tests/dbal/select_test.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 05b0e68e29..9d46b47b17 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -357,4 +357,29 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		$this->assertSame(false, $row);
 	}
+
+	public function test_get_row_count()
+	{
+		$this->assertSame(
+			3,
+			(int) $this->new_dbal()->get_row_count('phpbb_users'),
+			"Failed asserting that user table has exactly 3 rows."
+		);
+	}
+
+	public function test_get_estimated_row_count()
+	{
+		$actual = $this->new_dbal()->get_estimated_row_count('phpbb_users');
+
+		if (is_string($actual) && isset($actual[0]) && $actual[0] === '~')
+		{
+			$actual = substr($actual, -1);
+		}
+
+		$this->assertGreaterThan(
+			1,
+			$actual,
+			"Failed asserting that estimated row count of user table is greater than 1."
+		);
+	}
 }

From f3af5945e3675c4d799000908c88475ee7016ac4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 4 Mar 2012 22:11:45 +0100
Subject: [PATCH 079/279] [ticket/10653] Fix parameter to substr() in unit
 tests. Should be 1, not -1.

PHPBB3-10653
---
 tests/dbal/select_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 9d46b47b17..21b12777dc 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -373,7 +373,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		if (is_string($actual) && isset($actual[0]) && $actual[0] === '~')
 		{
-			$actual = substr($actual, -1);
+			$actual = substr($actual, 1);
 		}
 
 		$this->assertGreaterThan(

From 785c75254e763a24cf56765ca9a7e02140982497 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 5 Mar 2012 00:29:28 +0100
Subject: [PATCH 080/279] [ticket/9813] Also use estimated row count of posts
 table for fulltext mysql.

Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_mysql.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 52372a14d8..54cc894f6a 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -896,11 +896,7 @@ class fulltext_mysql extends search_backend
 		}
 		$db->sql_freeresult($result);
 
-		$sql = 'SELECT COUNT(post_id) as total_posts
-			FROM ' . POSTS_TABLE;
-		$result = $db->sql_query($sql);
-		$this->stats['total_posts'] = (int) $db->sql_fetchfield('total_posts');
-		$db->sql_freeresult($result);
+		$this->stats['total_posts'] = $db->get_estimated_row_count(POSTS_TABLE);
 	}
 
 	/**

From 89a0cbc57e98d182f2696c49e182c57fb63b88c7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 7 Mar 2012 18:00:57 -0500
Subject: [PATCH 081/279] [ticket/7432] Delete redundant reference to
 "appropriate menu item".

PHPBB3-7432
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 79caa07d98..958b9c7598 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -405,7 +405,7 @@ $lang = array_merge($lang, array(
 	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
 	'INACTIVE_USERS'				=> 'Inactive users',
 	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
-	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
+	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
 
 	'NO_INACTIVE_USERS'	=> 'No inactive users',
 

From 01d90e59a8c311778a832ba4920e4c5a85b1256f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 5 Mar 2012 00:42:36 +0100
Subject: [PATCH 082/279] [ticket/9813] Only get posts table row count if we
 detected a fulltext index.

PHPBB3-9813
---
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 54cc894f6a..779ec1d216 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -896,7 +896,7 @@ class fulltext_mysql extends search_backend
 		}
 		$db->sql_freeresult($result);
 
-		$this->stats['total_posts'] = $db->get_estimated_row_count(POSTS_TABLE);
+		$this->stats['total_posts'] = empty($this->stats) ? 0 : $db->get_estimated_row_count(POSTS_TABLE);
 	}
 
 	/**

From c11607bdd1ad4209a7697f0dc8d46ea81795b14c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 7 Mar 2012 12:11:18 +0100
Subject: [PATCH 083/279] [ticket/10653] Call get_row_count of base class in
 mysql get_estimated_row_count

There is no point in fetching the table status again.

PHPBB3-10653
---
 phpBB/includes/db/mysql.php  | 2 +-
 phpBB/includes/db/mysqli.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 87413e808d..1ccb785150 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -344,7 +344,7 @@ class dbal_mysql extends dbal
 			}
 		}
 
-		return $this->get_row_count($table_name);
+		return parent::get_row_count($table_name);
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 49b2789ce6..a311b8cda6 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -341,7 +341,7 @@ class dbal_mysqli extends dbal
 			}
 		}
 
-		return $this->get_row_count($table_name);
+		return parent::get_row_count($table_name);
 	}
 
 	/**

From bb7e86c2b1920c5820d4c9cca7ec76bd25835fa1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 8 Mar 2012 15:19:15 +0100
Subject: [PATCH 084/279] [ticket/10658] Do not fetch ranks into the $ranks
 array, it is no longer used.

PHPBB3-10658
---
 phpBB/memberlist.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index cfa1631dbe..3dd5bd24b6 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -62,11 +62,6 @@ $default_key = 'c';
 $sort_key = request_var('sk', $default_key);
 $sort_dir = request_var('sd', 'a');
 
-
-// Grab rank information for later
-$ranks = $cache->obtain_ranks();
-
-
 // What do you want to do today? ... oops, I think that line is taken ...
 switch ($mode)
 {

From 025de9ee191654825f6ba09a4804e6ef3633b8cb Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 8 Mar 2012 14:57:47 +0800
Subject: [PATCH 085/279] [ticket/10684] Send notifications for users with
 stale bans

PHPBB3-10684
---
 phpBB/includes/functions_posting.php | 36 +++++++++++++++-------------
 phpBB/includes/functions_user.php    | 29 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f920be9c4b..faf904467f 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1180,28 +1180,23 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 	$topic_title = ($topic_notification) ? $topic_title : $subject;
 	$topic_title = censor_text($topic_title);
 
-	// Get banned User ID's
-	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ban_userid <> 0
-			AND ban_exclude <> 1';
-	$result = $db->sql_query($sql);
-
-	$sql_ignore_users = ANONYMOUS . ', ' . $user->data['user_id'];
-	while ($row = $db->sql_fetchrow($result))
+	// Exclude guests, current user and banned users from notifications
+	if (!function_exists('phpbb_get_banned_users_ids'))
 	{
-		$sql_ignore_users .= ', ' . (int) $row['ban_userid'];
+		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$db->sql_freeresult($result);
+	$sql_ignore_users = phpbb_get_banned_users_ids();
+	$sql_ignore_users[ANONYMOUS] = ANONYMOUS;
+	$sql_ignore_users[$user->data['user_id']] = $user->data['user_id'];
 
 	$notify_rows = array();
 
 	// -- get forum_userids	|| topic_userids
 	$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
 		FROM ' . (($topic_notification) ? TOPICS_WATCH_TABLE : FORUMS_WATCH_TABLE) . ' w, ' . USERS_TABLE . ' u
-		WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . "
-			AND w.user_id NOT IN ($sql_ignore_users)
-			AND w.notify_status = " . NOTIFY_YES . '
+		WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . '
+			AND ' . $db->sql_in_set('w.user_id', $sql_ignore_users, true) . '
+			AND w.notify_status = ' . NOTIFY_YES . '
 			AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
 			AND u.user_id = w.user_id';
 	$result = $db->sql_query($sql);
@@ -1225,16 +1220,23 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 	// forum notification is sent to those not already receiving topic notifications
 	if ($topic_notification)
 	{
+		// Add users who has been already notified to ignore list
 		if (sizeof($notify_rows))
 		{
-			$sql_ignore_users .= ', ' . implode(', ', array_keys($notify_rows));
+			foreach ($notify_rows as $user_id => $row)
+			{
+				if (!isset($sql_ignore_users[$user_id]))
+				{
+					$sql_ignore_users[$user_id] = $user_id;
+				}
+			}
 		}
 
 		$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
 			FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
 			WHERE fw.forum_id = $forum_id
-				AND fw.user_id NOT IN ($sql_ignore_users)
-				AND fw.notify_status = " . NOTIFY_YES . '
+				AND " . $db->sql_in_set('fw.user_id', $sql_ignore_users, true) . '
+				AND fw.notify_status = ' . NOTIFY_YES . '
 				AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
 				AND u.user_id = fw.user_id';
 		$result = $db->sql_query($sql);
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6b5cca8abb..aea94a0d34 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3587,4 +3587,33 @@ function remove_newly_registered($user_id, $user_data = false)
 	return $user_data['group_id'];
 }
 
+/**
+* Get a list of banned users' ids, ignoring stale buns which were not wiped yet.
+*
+* @return array	Array of banned users' ids if any, empty array otherwise
+*/
+function phpbb_get_banned_users_ids()
+{
+	global $db;
+
+	// Get banned User ID's
+	// Ignore stale bans which were not wiped yet
+	$banned_ids_list = array();
+	$sql = 'SELECT ban_userid
+		FROM ' . BANLIST_TABLE . '
+		WHERE ban_userid <> 0
+			AND ban_exclude <> 1
+			AND (ban_end > ' . time() . '
+				OR ban_end = 0)';
+	$result = $db->sql_query($sql);
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$user_id = (int) $row['ban_userid'];
+		$banned_ids_list[$user_id] = $user_id;
+	}
+	$db->sql_freeresult($result);
+
+	return $banned_ids_list;
+}
+
 ?>
\ No newline at end of file

From ee6783109ad7af70665c98d6bbc12d170bc0f892 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 9 Mar 2012 16:41:49 +0800
Subject: [PATCH 086/279] [ticket/10684] Fix 2 typos in comment lines.

PHPBB3-10684
---
 phpBB/includes/functions_posting.php | 2 +-
 phpBB/includes/functions_user.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index faf904467f..ce9762284d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1220,7 +1220,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 	// forum notification is sent to those not already receiving topic notifications
 	if ($topic_notification)
 	{
-		// Add users who has been already notified to ignore list
+		// Add users who have been already notified to ignore list
 		if (sizeof($notify_rows))
 		{
 			foreach ($notify_rows as $user_id => $row)
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index aea94a0d34..dec8d09082 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3588,7 +3588,7 @@ function remove_newly_registered($user_id, $user_data = false)
 }
 
 /**
-* Get a list of banned users' ids, ignoring stale buns which were not wiped yet.
+* Get a list of banned users' ids, ignoring stale bans which were not wiped yet.
 *
 * @return array	Array of banned users' ids if any, empty array otherwise
 */

From cd61de4bfdd1818d173e7413e53d8fd3d7ce1913 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 9 Mar 2012 04:31:03 -0500
Subject: [PATCH 087/279] [ticket/9084] Explain the logic.

PHPBB3-9084
---
 phpBB/includes/functions_profile_fields.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 79701429e6..d44be16184 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -571,6 +571,11 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
+				// If a dropdown field is required, users
+				// cannot choose the "no value" option.
+				// They must choose one of the other options.
+				// Therefore, here we treat a value equal to
+				// the "no value" as a lack of value, i.e. NULL.
 				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
 				{
 					return NULL;

From f563647e4b97fc62aa91bc3bf7c81fcc715f17c3 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 9 Mar 2012 22:35:13 +0800
Subject: [PATCH 088/279] [ticket/10684] Remove isset() for $sql_ignore_users
 update

PHPBB3-10684
---
 phpBB/includes/functions_posting.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ce9762284d..c9b4267c35 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1225,10 +1225,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		{
 			foreach ($notify_rows as $user_id => $row)
 			{
-				if (!isset($sql_ignore_users[$user_id]))
-				{
-					$sql_ignore_users[$user_id] = $user_id;
-				}
+				$sql_ignore_users[$user_id] = $user_id;
 			}
 		}
 

From fbe8086697481f5068a9897c9e629f048a553ee4 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 9 Mar 2012 16:10:02 +0000
Subject: [PATCH 089/279] [ticket/10694] Update PHP warning to 5.3.2

PHPBB3-10694
---
 phpBB/includes/acp/acp_main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index c8df21f5a9..5ecf54a9bc 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -398,7 +398,7 @@ class acp_main
 		// Version check
 		$user->add_lang('install');
 
-		if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.2.0', '<'))
+		if ($auth->acl_get('a_server') && version_compare(PHP_VERSION, '5.3.2', '<'))
 		{
 			$template->assign_vars(array(
 				'S_PHP_VERSION_OLD'	=> true,

From 89a6cb2886dfd4659e6db67e27e42c4df763f723 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 10 Mar 2012 00:17:39 +0800
Subject: [PATCH 090/279] [ticket/10684] Refactor $sql_ignore_users array
 update

PHPBB3-10684
---
 phpBB/includes/functions_posting.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c9b4267c35..af26d8ed0f 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1214,21 +1214,15 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 			'method'		=> $row['user_notify_type'],
 			'allowed'		=> false
 		);
+
+		// Add users who have been already notified to ignore list
+		$sql_ignore_users[$row['user_id']] = $row['user_id'];
 	}
 	$db->sql_freeresult($result);
 
 	// forum notification is sent to those not already receiving topic notifications
 	if ($topic_notification)
 	{
-		// Add users who have been already notified to ignore list
-		if (sizeof($notify_rows))
-		{
-			foreach ($notify_rows as $user_id => $row)
-			{
-				$sql_ignore_users[$user_id] = $user_id;
-			}
-		}
-
 		$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
 			FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
 			WHERE fw.forum_id = $forum_id
@@ -1272,7 +1266,6 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		}
 	}
 
-
 	// Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;)
 	$msg_users = $delete_ids = $update_notification = array();
 	foreach ($notify_rows as $user_id => $row)

From 668c61686b09e12e7f245fc6a402a1b1f6272f1c Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 10 Mar 2012 16:47:07 +0000
Subject: [PATCH 091/279] [ticket/10694] Adjusting details link to 5.3
 announcement

PHPBB3-10694
---
 phpBB/includes/acp/acp_main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 5ecf54a9bc..e529ae0e5a 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -402,7 +402,7 @@ class acp_main
 		{
 			$template->assign_vars(array(
 				'S_PHP_VERSION_OLD'	=> true,
-				'L_PHP_VERSION_OLD'	=> sprintf($user->lang['PHP_VERSION_OLD'], '<a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=1958605">', '</a>'),
+				'L_PHP_VERSION_OLD'	=> sprintf($user->lang['PHP_VERSION_OLD'], '<a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=2152375">', '</a>'),
 			));
 		}
 

From a79b3490c2b21d283d7bc1f15c4923180e0f10b2 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 11 Mar 2012 00:56:07 +0800
Subject: [PATCH 092/279] [ticket/10684] Cast user_id to integer

PHPBB3-10684
---
 phpBB/includes/functions_posting.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index af26d8ed0f..073ce1ff4e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1203,8 +1203,9 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$notify_rows[$row['user_id']] = array(
-			'user_id'		=> $row['user_id'],
+		$notify_user_id = (int) $row['user_id'];
+		$notify_rows[$notify_user_id] = array(
+			'user_id'		=> $notify_user_id,
 			'username'		=> $row['username'],
 			'user_email'	=> $row['user_email'],
 			'user_jabber'	=> $row['user_jabber'],
@@ -1216,7 +1217,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 		);
 
 		// Add users who have been already notified to ignore list
-		$sql_ignore_users[$row['user_id']] = $row['user_id'];
+		$sql_ignore_users[$notify_user_id] = $notify_user_id;
 	}
 	$db->sql_freeresult($result);
 
@@ -1234,8 +1235,9 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_rows[$row['user_id']] = array(
-				'user_id'		=> $row['user_id'],
+			$notify_user_id = (int) $row['user_id'];
+			$notify_rows[$notify_user_id] = array(
+				'user_id'		=> $notify_user_id,
 				'username'		=> $row['username'],
 				'user_email'	=> $row['user_email'],
 				'user_jabber'	=> $row['user_jabber'],

From 24f1896b3c1591fd73eedd014dc6ebb214804f4d Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 11 Mar 2012 09:42:56 +0000
Subject: [PATCH 093/279] [ticket/10697] Updating gitignore to match develop
 branch

PHPBB3-10697
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7d789c59a1..d875beb784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 *~
 /phpunit.xml
+/phpBB/cache/*.html
 /phpBB/cache/*.php
 /phpBB/cache/queue.php.lock
 /phpBB/config.php
+/phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*

From 321d0d9b56011e049b245b6d54975b6c67b3b15b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:44:00 +0800
Subject: [PATCH 094/279] [ticket/10684] Adjust pm_notifications() to handle
 stale bans

- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
---
 phpBB/includes/functions_privmsgs.php | 17 ++++++-----------
 phpBB/includes/functions_user.php     | 14 +++++++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c40ceb088f..8303fc3754 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1622,6 +1622,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 
 	$subject = censor_text($subject);
 
+	// Exclude guests, current user and banned users from notifications
 	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
 
 	if (!sizeof($recipients))
@@ -1629,18 +1630,12 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		return;
 	}
 
-	// Get banned User ID's
-	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ' . $db->sql_in_set('ban_userid', array_map('intval', array_keys($recipients))) . '
-			AND ban_exclude = 0';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
+	if (!function_exists('phpbb_get_banned_users_ids'))
 	{
-		unset($recipients[$row['ban_userid']]);
+		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$db->sql_freeresult($result);
+	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
+	$recipients = array_diff(array_map('intval', array_keys($recipients)), $banned_users);
 
 	if (!sizeof($recipients))
 	{
@@ -1649,7 +1644,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 
 	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
 		FROM ' . USERS_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', array_map('intval', array_keys($recipients)));
+		WHERE ' . $db->sql_in_set('user_id', $recipients);
 	$result = $db->sql_query($sql);
 
 	$msg_list_ary = array();
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index dec8d09082..8f40401f0b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3588,22 +3588,26 @@ function remove_newly_registered($user_id, $user_data = false)
 }
 
 /**
-* Get a list of banned users' ids, ignoring stale bans which were not wiped yet.
+* Get a list of banned users' ids, ignoring stale bans which were not cleaned yet.
 *
+* @param array $users_ids_array Array of users' ids to check for banning,
+*								leave empty to get complete list of banned ids
 * @return array	Array of banned users' ids if any, empty array otherwise
 */
-function phpbb_get_banned_users_ids()
+function phpbb_get_banned_users_ids($users_ids_array = array())
 {
 	global $db;
 
+	$sql_users_ids = (!empty($users_ids_array)) ? $db->sql_in_set('ban_userid', $users_ids_array) : 'ban_userid <> 0';
+
 	// Get banned User ID's
 	// Ignore stale bans which were not wiped yet
 	$banned_ids_list = array();
 	$sql = 'SELECT ban_userid
-		FROM ' . BANLIST_TABLE . '
-		WHERE ban_userid <> 0
+		FROM ' . BANLIST_TABLE . "
+		WHERE $sql_users_ids
 			AND ban_exclude <> 1
-			AND (ban_end > ' . time() . '
+			AND (ban_end > " . time() . '
 				OR ban_end = 0)';
 	$result = $db->sql_query($sql);
 	while ($row = $db->sql_fetchrow($result))

From da395edbca3e25d1758a6b8c26d14c2e48f112d9 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:47:28 +0800
Subject: [PATCH 095/279] [ticket/10684] Remove intval mapping for array keys

PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8303fc3754..4ea8f74153 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1635,7 +1635,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
 	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
-	$recipients = array_diff(array_map('intval', array_keys($recipients)), $banned_users);
+	$recipients = array_diff(array_keys($recipients), $banned_users);
 
 	if (!sizeof($recipients))
 	{

From ff8d5237688beee9ea36848e1ac49565e538c2cd Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:57:51 +0800
Subject: [PATCH 096/279] [ticket/10684] Rename function
 phpbb_get_banned_users_ids() parameter

PHPBB3-10684
---
 phpBB/includes/functions_user.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8f40401f0b..8c42a5bb42 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3590,15 +3590,15 @@ function remove_newly_registered($user_id, $user_data = false)
 /**
 * Get a list of banned users' ids, ignoring stale bans which were not cleaned yet.
 *
-* @param array $users_ids_array Array of users' ids to check for banning,
-*								leave empty to get complete list of banned ids
+* @param array $users_ids Array of users' ids to check for banning,
+*						leave empty to get complete list of banned ids
 * @return array	Array of banned users' ids if any, empty array otherwise
 */
-function phpbb_get_banned_users_ids($users_ids_array = array())
+function phpbb_get_banned_users_ids($users_ids = array())
 {
 	global $db;
 
-	$sql_users_ids = (!empty($users_ids_array)) ? $db->sql_in_set('ban_userid', $users_ids_array) : 'ban_userid <> 0';
+	$sql_users_ids = (!empty($users_ids)) ? $db->sql_in_set('ban_userid', $users_ids) : 'ban_userid <> 0';
 
 	// Get banned User ID's
 	// Ignore stale bans which were not wiped yet

From 3b7a6a3eface3389b48358206fff3cb22615dc30 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 Mar 2012 00:39:12 +0100
Subject: [PATCH 097/279] [ticket/10689] Fix "First character"-option in "Find
 a member"-search

PHPBB3-10689
---
 phpBB/memberlist.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b3c0bae16a..2a2ee407a0 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1346,6 +1346,7 @@ switch ($mode)
 		if ($mode)
 		{
 			$params[] = "mode=$mode";
+			$u_first_char_params[] = "mode=$mode";
 		}
 		$sort_params[] = "mode=$mode";
 

From ba6943a6a0ea50af772dc6e94f13b56292cd9f37 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 Mar 2012 10:11:52 +0100
Subject: [PATCH 098/279] [ticket/10605] Prefix function with phpbb_ and use
 true instead of 1

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 4 ++--
 phpBB/includes/functions_user.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 30cff8ed72..34f16ea9da 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1086,7 +1086,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 /**
 * Delete all PM(s) for a given user and delete the ones without references
 */
-function delete_user_pms($user_id)
+function phpbb_delete_user_pms($user_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
 
@@ -1116,7 +1116,7 @@ function delete_user_pms($user_id)
 			$undelivered_user[$row['user_id']][] = true;
 		}
 
-		$delete_rows[$row['msg_id']] = 1;
+		$delete_rows[$row['msg_id']] = true;
 	}
 	$db->sql_freeresult($result);
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 20923ea495..92a7b8e0e9 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -529,11 +529,11 @@ function user_delete($mode, $user_id, $post_username = false)
 	$db->sql_query($sql);
 
 	// Clean the private messages tables from the user
-	if (!function_exists('delete_user_pms'))
+	if (!function_exists('phpbb_delete_user_pms'))
 	{
 		include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
 	}
-	delete_user_pms($user_id);
+	phpbb_delete_user_pms($user_id);
 
 	$db->sql_transaction('commit');
 

From 71afba0dedd2fcc4e478e191acc23277df8209c9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Mar 2012 22:46:06 -0400
Subject: [PATCH 099/279] [task/php54] Refactor error_reporting call slightly.

Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
---
 phpBB/includes/startup.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index bbe2f127f1..178fb30435 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -19,7 +19,8 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+$level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
+error_reporting($level);
 
 /*
 * Remove variables created by register_globals from the global scope

From 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Mar 2012 22:47:42 -0400
Subject: [PATCH 100/279] [task/php54] Disable E_STRICT in Olympus when running
 on PHP 5.4.

We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
---
 phpBB/includes/startup.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 178fb30435..cf216a65db 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -20,6 +20,21 @@ if (!defined('E_DEPRECATED'))
 	define('E_DEPRECATED', 8192);
 }
 $level = E_ALL & ~E_NOTICE & ~E_DEPRECATED;
+if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
+{
+	// PHP 5.4 adds E_STRICT to E_ALL.
+	// Our utf8 normalizer triggers E_STRICT output on PHP 5.4.
+	// Unfortunately it cannot be made E_STRICT-clean while
+	// continuing to work on PHP 4.
+	// Therefore, in phpBB 3.0.x we disable E_STRICT on PHP 5.4+,
+	// while phpBB 3.1 will fix utf8 normalizer.
+	// E_STRICT is defined starting with PHP 5
+	if (!defined('E_STRICT'))
+	{
+		define('E_STRICT', 2048);
+	}
+	$level &= ~E_STRICT;
+}
 error_reporting($level);
 
 /*

From c551b46115c889ac955649fe5513fb1d39d9979e Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 19 Mar 2012 17:11:30 +0530
Subject: [PATCH 101/279] [ticket/10691] Fixed the speed of creating search
 index

$time is now initialized after each batch iteration.
Speed for each batch iteration of creating search index is fixed.

PHPBB3-10691
---
 phpBB/develop/create_search_index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/develop/create_search_index.php b/phpBB/develop/create_search_index.php
index 28001035f6..c1a7125d61 100644
--- a/phpBB/develop/create_search_index.php
+++ b/phpBB/develop/create_search_index.php
@@ -36,7 +36,6 @@ $search_errors = array();
 $search = new $class_name($search_errors);
 
 $batch_size = isset($argv[2]) ? $argv[2] : 2000;
-$time = time();
 
 if (method_exists($search, 'create_index'))
 {
@@ -68,6 +67,7 @@ else
 	while ($post_counter <= $max_post_id)
 	{
 		$row_count = 0;
+		$time = time();
 
 		printf("Processing posts with %d <= post_id <= %d\n",
 			$post_counter + 1,

From 97d4f168f588288df071e4a8b107b9ffb8b0355f Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Mon, 19 Mar 2012 15:08:28 -0400
Subject: [PATCH 102/279] [ticket/10675] Add disk full language string when
 posting attachments

Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
---
 phpBB/includes/functions_posting.php | 9 ++++++++-
 phpBB/language/en/posting.php        | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f920be9c4b..b40fd67927 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -497,7 +497,14 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	{
 		if ($free_space <= $file->get('filesize'))
 		{
-			$filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED'];
+			if ($auth->acl_get('a_'))
+			{
+				$filedata['error'][] = $user->lang['ATTACH_DISK_FULL'];
+			}
+			else
+			{
+				$filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED'];
+			}
 			$filedata['post_attach'] = false;
 
 			$file->remove();
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index f8d265dddd..dd0ba7fc6d 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'ADD_POLL'					=> 'Poll creation',
 	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank.',
 	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
+	'ATTACH_DISK_FULL'			=> 'There is not enough free disk space to post this attachment',
 	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
 	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
 

From 70d88965c795a5e392605fe556df580773a505c3 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Mon, 19 Mar 2012 23:19:21 -0400
Subject: [PATCH 103/279] [ticket/10708] Check converted passwords for
 multi-byte characters

Check for multi-byte characters in converted passwords.

PHPBB3-10708
---
 phpBB/includes/auth/auth_db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index c20196d019..1c6cdf7832 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -163,7 +163,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 		$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
 		$password_new_format = '';
 
-		set_var($password_new_format, stripslashes($password_old_format), 'string');
+		set_var($password_new_format, stripslashes($password_old_format), 'string', true);
 
 		if ($password == $password_new_format)
 		{

From 2005c339ff26bf189fb818f0e25d6c0954b9702a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 Mar 2012 17:45:08 +0100
Subject: [PATCH 104/279] =?UTF-8?q?[ticket/10717]=20Fix=20profile=20field?=
 =?UTF-8?q?=20sample=20in=20prosilver=C2=B4s=20memberlist=5Fview.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-10717
---
 phpBB/styles/prosilver/template/memberlist_view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index cfec07cff0..2758a7e6cc 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -69,7 +69,7 @@
 		<!-- IF U_JABBER and S_JABBER_ENABLED --><dt>{L_JABBER}:</dt> <dd><a href="{U_JABBER}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_JABBER_MESSAGE}</a></dd><!-- ELSEIF USER_JABBER --><dt>{L_JABBER}:</dt> <dd>{USER_JABBER}</dd><!-- ENDIF -->
 		<!-- IF S_PROFILE_FIELD1 -->
 			<!-- NOTE: Use a construct like this to include admin defined profile fields. Replace FIELD1 with the name of your field. -->
-			<dt>{postrow.PROFILE_FIELD1_NAME}:</dt> <dd>{postrow.PROFILE_FIELD1_VALUE}</dd>
+			<dt>{PROFILE_FIELD1_NAME}:</dt> <dd>{PROFILE_FIELD1_VALUE}</dd>
 		<!-- ENDIF -->
 		</dl>
 	</div>

From c2169f689955dfb3d6fe48bd0186e06583d7f7a4 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 21 Mar 2012 09:17:16 +0000
Subject: [PATCH 105/279] [feature/events-dispatcher] Adding phpBB/vendor to
 .gitignore

PHPBB3-9550
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7d789c59a1..59f7f49e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
 /phpBB/store/*
+/phpBB/vendor
 /tests/phpbb_unit_tests.sqlite2
 /tests/test_config.php
 /tests/tmp/*

From 4dafcc2525fa72f2bd91760fae49e51ff9d1a0ef Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 21 Mar 2012 22:57:29 +0000
Subject: [PATCH 106/279] [task/travis] Adding Travis Continuous Intergration
 Support

PHPBB3-10718
---
 .travis.yml                | 33 +++++++++++++++++++++++++++++++++
 travis/mysql.travis.xml    | 28 ++++++++++++++++++++++++++++
 travis/postgres.travis.xml | 30 ++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 travis/mysql.travis.xml
 create mode 100644 travis/postgres.travis.xml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..e091954e0e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: php
+php:
+  - 5.2
+  - 5.3
+  - 5.4
+
+env:
+  - DB=mysql
+  - DB=postgres
+
+before_script:
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' ]; then pyrus install --force phpunit/DbUnit; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.4' ]; then pyrus install --force phpunit/DbUnit; fi"
+  - phpenv rehash
+
+script:
+  - phpunit --configuration travis/$DB.travis.xml
+
+notifications:
+  email:
+    recipients:
+      - m@michaelcullum.com
+    on_success: never
+    on_failure: always
+
+branches:
+  only:
+    develop
+    task/travis
diff --git a/travis/mysql.travis.xml b/travis/mysql.travis.xml
new file mode 100644
index 0000000000..a849f50136
--- /dev/null
+++ b/travis/mysql.travis.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+		 strict="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests/</directory>
+		</testsuite>
+	</testsuites>
+
+	<php>
+		<const name="dbms" value="mysqli"/>
+		<const name="dbhost" value="0.0.0.0" />
+		<const name="dbport" value="3306" />
+		<const name="dbname" value="phpbb_tests" />
+		<const name="dbuser" value="root" />
+		<const name="dbpasswd" value="" />
+		<const name="table_prefix" value="phpbb_"/>
+	</php>
+</phpunit>
diff --git a/travis/postgres.travis.xml b/travis/postgres.travis.xml
new file mode 100644
index 0000000000..e44696a335
--- /dev/null
+++ b/travis/postgres.travis.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+		 strict="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests/</directory>
+		</testsuite>
+	</testsuites>
+
+	<php>
+		<!-- "Real" test database -->
+		<!-- uncomment, otherwise sqlite memory runs -->
+		<const name="dbms" value="postgres"/>
+		<const name="dbhost" value="localhost" />
+		<const name="dbport" value="5432" />
+		<const name="dbname" value="phpbb_tests" />
+		<const name="dbuser" value="postgres" />
+		<const name="dbpasswd" value="" />
+		<const name="table_prefix" value="phpbb_"/>
+	</php>
+</phpunit>

From 9120c7691e28ca298eb83ebbe12a82c2723cfeee Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 21 Mar 2012 23:25:50 +0000
Subject: [PATCH 107/279] [task/travis] Removing development information

PHPBB3-10718
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e091954e0e..8e870ca9c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,12 @@ script:
 notifications:
   email:
     recipients:
-      - m@michaelcullum.com
+      - dev-team@phpbb.com
     on_success: never
-    on_failure: always
+    on_failure: change
 
 branches:
   only:
     develop
+    develop-olympus
     task/travis

From 4325bbf4c601332614f456df969983d85829e931 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 21 Mar 2012 23:30:56 +0000
Subject: [PATCH 108/279] [task/travis] Add automated testing to readme

PHPBB3-10718
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 6b94f898a3..f7dfc4926e 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,12 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev
 3. [Read our Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request
 
+## AUTOMATED TESTING
+
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below.
+Develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3)
+Develop-Olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3)
+
 ## LICENSE
 
 [GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)

From 5a9dd1994fc20aaebe3145540b630826d7333998 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 22 Mar 2012 21:19:01 +0800
Subject: [PATCH 109/279] [ticket/10684] Adjust function and parameter name,
 minor changes.

PHPBB3-10684
---
 phpBB/includes/functions_posting.php  |  4 ++--
 phpBB/includes/functions_privmsgs.php |  4 ++--
 phpBB/includes/functions_user.php     | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 073ce1ff4e..7f45b2da8c 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1181,11 +1181,11 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 	$topic_title = censor_text($topic_title);
 
 	// Exclude guests, current user and banned users from notifications
-	if (!function_exists('phpbb_get_banned_users_ids'))
+	if (!function_exists('phpbb_get_banned_user_ids'))
 	{
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$sql_ignore_users = phpbb_get_banned_users_ids();
+	$sql_ignore_users = phpbb_get_banned_user_ids();
 	$sql_ignore_users[ANONYMOUS] = ANONYMOUS;
 	$sql_ignore_users[$user->data['user_id']] = $user->data['user_id'];
 
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4ea8f74153..447920cfd5 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1630,11 +1630,11 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 		return;
 	}
 
-	if (!function_exists('phpbb_get_banned_users_ids'))
+	if (!function_exists('phpbb_get_banned_user_ids'))
 	{
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 	}
-	$banned_users = phpbb_get_banned_users_ids(array_keys($recipients));
+	$banned_users = phpbb_get_banned_user_ids(array_keys($recipients));
 	$recipients = array_diff(array_keys($recipients), $banned_users);
 
 	if (!sizeof($recipients))
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8c42a5bb42..10fb57ea97 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3588,24 +3588,24 @@ function remove_newly_registered($user_id, $user_data = false)
 }
 
 /**
-* Get a list of banned users' ids, ignoring stale bans which were not cleaned yet.
+* Gets user ids of currently banned registered users.
 *
-* @param array $users_ids Array of users' ids to check for banning,
+* @param array $user_ids Array of users' ids to check for banning,
 *						leave empty to get complete list of banned ids
 * @return array	Array of banned users' ids if any, empty array otherwise
 */
-function phpbb_get_banned_users_ids($users_ids = array())
+function phpbb_get_banned_user_ids($user_ids = array())
 {
 	global $db;
 
-	$sql_users_ids = (!empty($users_ids)) ? $db->sql_in_set('ban_userid', $users_ids) : 'ban_userid <> 0';
+	$sql_user_ids = (!empty($user_ids)) ? $db->sql_in_set('ban_userid', $user_ids) : 'ban_userid <> 0';
 
 	// Get banned User ID's
 	// Ignore stale bans which were not wiped yet
 	$banned_ids_list = array();
 	$sql = 'SELECT ban_userid
 		FROM ' . BANLIST_TABLE . "
-		WHERE $sql_users_ids
+		WHERE $sql_user_ids
 			AND ban_exclude <> 1
 			AND (ban_end > " . time() . '
 				OR ban_end = 0)';

From d1980f6ad616e800ff82299ceafc5c8c763c6570 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 13:32:58 +0000
Subject: [PATCH 110/279] [task/travis] Fixing some travis issues

PHPBB3-10718
---
 .travis.yml | 2 +-
 README.md   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e870ca9c2..bf97a20850 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ notifications:
   email:
     recipients:
       - dev-team@phpbb.com
-    on_success: never
+    on_success: change
     on_failure: change
 
 branches:
diff --git a/README.md b/README.md
index f7dfc4926e..51e65176c6 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@ Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the dev
 ## AUTOMATED TESTING
 
 We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below.
-Develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3)
-Develop-Olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3)
+develop - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop)](http://travis-ci.org/phpbb/phpbb3)
+develop-olympus - [![Build Status](https://secure.travis-ci.org/phpbb/phpbb3.png?branch=develop-olympus)](http://travis-ci.org/phpbb/phpbb3)
 
 ## LICENSE
 

From c7f65fba627680e7de81ae6c7ea9c1e0fc4359ea Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 14:13:25 +0000
Subject: [PATCH 111/279] [task/travis] Rename travis phpunit config files

PHPBB3-10718
---
 .travis.yml                                                 | 2 +-
 travis/{mysql.travis.xml => phpunit-mysql-travis.xml}       | 0
 travis/{postgres.travis.xml => phpunit-postgres-travis.xml} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename travis/{mysql.travis.xml => phpunit-mysql-travis.xml} (100%)
 rename travis/{postgres.travis.xml => phpunit-postgres-travis.xml} (100%)

diff --git a/.travis.yml b/.travis.yml
index bf97a20850..d638e1cccd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_script:
   - phpenv rehash
 
 script:
-  - phpunit --configuration travis/$DB.travis.xml
+  - phpunit --configuration travis/phpunit-$DB-travis.xml
 
 notifications:
   email:
diff --git a/travis/mysql.travis.xml b/travis/phpunit-mysql-travis.xml
similarity index 100%
rename from travis/mysql.travis.xml
rename to travis/phpunit-mysql-travis.xml
diff --git a/travis/postgres.travis.xml b/travis/phpunit-postgres-travis.xml
similarity index 100%
rename from travis/postgres.travis.xml
rename to travis/phpunit-postgres-travis.xml

From 115ee7f3b815567cf598178225022b2d7d7f5310 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 14:44:36 +0000
Subject: [PATCH 112/279] [task/travis] Some more small travis fixes

PHPBB3-10718
---
 .travis.yml                     | 6 ------
 travis/phpunit-mysql-travis.xml | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d638e1cccd..78221d588c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,3 @@ notifications:
       - dev-team@phpbb.com
     on_success: change
     on_failure: change
-
-branches:
-  only:
-    develop
-    develop-olympus
-    task/travis
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index a849f50136..807dfbcdaa 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -8,7 +8,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="true"
-		 strict="true"
+         strict="true"
          bootstrap="../tests/bootstrap.php">
 	<testsuites>
 		<testsuite name="phpBB Test Suite">

From 0ed66ad0e8d11c802520046b446aa5622a637df9 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 16:00:10 +0000
Subject: [PATCH 113/279] [task/travis] Exclude functional and slow tests

PHPBB3-10718
---
 travis/phpunit-mysql-travis.xml    | 6 ++++++
 travis/phpunit-postgres-travis.xml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 807dfbcdaa..79215c8de1 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -16,6 +16,12 @@
 		</testsuite>
 	</testsuites>
 
+	<groups>
+		<exclude>
+			<group>slow</group>
+		</exclude>
+	</groups>
+
 	<php>
 		<const name="dbms" value="mysqli"/>
 		<const name="dbhost" value="0.0.0.0" />
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index e44696a335..02db76ae78 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -16,6 +16,12 @@
 		</testsuite>
 	</testsuites>
 
+	<groups>
+		<exclude>
+			<group>slow</group>
+		</exclude>
+	</groups>
+
 	<php>
 		<!-- "Real" test database -->
 		<!-- uncomment, otherwise sqlite memory runs -->

From 841d11c6cd90d331c2923ba7851dd5f813203ddf Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 16:09:58 +0000
Subject: [PATCH 114/279] [task/travis] Refactor php version check for dbunit
 install

PHPBB3-10718
---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78221d588c..d73bbd2a48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,7 @@ before_script:
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' ]; then pyrus install --force phpunit/DbUnit; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.4' ]; then pyrus install --force phpunit/DbUnit; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi"
   - phpenv rehash
 
 script:

From 5bcdfe94dd487441565c00450b3a8efcaeecd840 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 23 Mar 2012 06:40:15 +0000
Subject: [PATCH 115/279] [ticket/10723] Stop Travis running all tests on
 sqlite

Correct information so all tests don't run on sqlite

PHPBB3-10723
---
 travis/phpunit-mysql-travis.xml    | 14 +++++++-------
 travis/phpunit-postgres-travis.xml | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 79215c8de1..36845a7f71 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -23,12 +23,12 @@
 	</groups>
 
 	<php>
-		<const name="dbms" value="mysqli"/>
-		<const name="dbhost" value="0.0.0.0" />
-		<const name="dbport" value="3306" />
-		<const name="dbname" value="phpbb_tests" />
-		<const name="dbuser" value="root" />
-		<const name="dbpasswd" value="" />
-		<const name="table_prefix" value="phpbb_"/>
+		<server name="PHPBB_TEST_DBMS" value="mysqli" />
+		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
+		<server name="PHPBB_TEST_DBPORT" value="3306" />
+		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
+		<server name="PHPBB_TEST_DBUSER" value="root" />
+		<server name="PHPBB_TEST_DBPASSWD" value="" />
+		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
 	</php>
 </phpunit>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 02db76ae78..461a53bcb1 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -25,12 +25,12 @@
 	<php>
 		<!-- "Real" test database -->
 		<!-- uncomment, otherwise sqlite memory runs -->
-		<const name="dbms" value="postgres"/>
-		<const name="dbhost" value="localhost" />
-		<const name="dbport" value="5432" />
-		<const name="dbname" value="phpbb_tests" />
-		<const name="dbuser" value="postgres" />
-		<const name="dbpasswd" value="" />
-		<const name="table_prefix" value="phpbb_"/>
+		<server name="PHPBB_TEST_DBMS" value="postgres"/>
+		<server name="PHPBB_TEST_DBHOST" value="localhost" />
+		<server name="PHPBB_TEST_DBPORT" value="5432" />
+		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
+		<server name="PHPBB_TEST_DBUSER" value="postgres" />
+		<server name="PHPBB_TEST_DBPASSWD" value="" />
+		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
 	</php>
 </phpunit>

From 2768db44f557cd5db4b54a287ecb1d2fcbe94140 Mon Sep 17 00:00:00 2001
From: HTF <harderthanfire@gmail.com>
Date: Sat, 24 Mar 2012 15:13:04 +0000
Subject: [PATCH 116/279] [ticket/10129] Remove apostrophes and plurals in ACP
 user management -> permissions language file as per ticket.

PHPBB3-10129
---
 phpBB/language/en/acp/common.php      |  8 ++++----
 phpBB/language/en/acp/permissions.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 958b9c7598..e64ba3c371 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -96,10 +96,10 @@ $lang = array_merge($lang, array(
 	'ACP_GLOBAL_MODERATORS'			=> 'Global moderators',
 	'ACP_GLOBAL_PERMISSIONS'		=> 'Global permissions',
 	'ACP_GROUPS'					=> 'Groups',
-	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Groups’ forum permissions',
+	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Group forum permissions',
 	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
 	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
-	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
+	'ACP_GROUPS_PERMISSIONS'		=> 'Group permissions',
 
 	'ACP_ICONS'					=> 'Topic icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
@@ -172,9 +172,9 @@ $lang = array_merge($lang, array(
 	'ACP_THEMES'				=> 'Themes',
 
 	'ACP_UPDATE'					=> 'Updating',
-	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
+	'ACP_USERS_FORUM_PERMISSIONS'	=> 'User forum permissions',
 	'ACP_USERS_LOGS'				=> 'User logs',
-	'ACP_USERS_PERMISSIONS'			=> 'Users’ permissions',
+	'ACP_USERS_PERMISSIONS'			=> 'User permissions',
 	'ACP_USER_ATTACH'				=> 'Attachments',
 	'ACP_USER_AVATAR'				=> 'Avatar',
 	'ACP_USER_FEEDBACK'				=> 'Feedback',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 016be51282..c0396cc247 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -40,10 +40,10 @@ $lang = array_merge($lang, array(
 		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
 
 		<h2>Global Permissions</h2>
-		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.</p>
+		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into User Permissions, Group Permissions, Administrators and Global Moderators.</p>
 
 		<h2>Forum Based Permissions</h2>
-		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.</p>
+		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, User Forum Permissions and Group Forum Permissions.</p>
 
 		<h2>Permission Roles</h2>
 		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
@@ -83,13 +83,13 @@ $lang = array_merge($lang, array(
 	'ACP_FORUM_PERMISSIONS_COPY_EXPLAIN'		=> 'Here you can copy forum permissions from one forum to one or more other forums.',
 	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
 	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
-	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
+	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual user permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group permissions.',
 	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
 	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
 	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
 	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
 	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
-	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
+	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group permissions.',
 	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
 	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups.',
 	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums.',
@@ -225,8 +225,8 @@ $lang = array_merge($lang, array(
 	'SELECT_TYPE'					=> 'Select type',
 	'SET_PERMISSIONS'				=> 'Set permissions',
 	'SET_ROLE_PERMISSIONS'			=> 'Set role permissions',
-	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
-	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
+	'SET_USERS_PERMISSIONS'			=> 'Set user permissions',
+	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set user forum permissions',
 
 	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
 	'TRACE_FOR'						=> 'Trace for',

From e8830f605f73a0c8fa5c3ea579ee18f295b81600 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:18:02 +0200
Subject: [PATCH 117/279] [ticket/10605] Use unset() instead of checking
 user_id over and over again.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 34f16ea9da..59dea50094 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1134,13 +1134,9 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
+	unset($undelivered_user[$user_id]);
 	foreach ($undelivered_user as $_user_id => $ary)
 	{
-		if ($_user_id == $user_id)
-		{
-			continue;
-		}
-
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
 				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '

From 2203bc204e55c33e2e9b212eeb0c7bf2e3060851 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:29:29 +0200
Subject: [PATCH 118/279] [ticket/10605] Turn $undelivered_user into a real
 array of counters.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 59dea50094..352bd4d15d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1113,7 +1113,15 @@ function phpbb_delete_user_pms($user_id)
 		{
 			// Undelivered messages
 			$undelivered_msg[] = $row['msg_id'];
-			$undelivered_user[$row['user_id']][] = true;
+
+			if (isset($undelivered_user[$row['user_id']]))
+			{
+				++$undelivered_user[$row['user_id']];
+			}
+			else
+			{
+				$undelivered_user[$row['user_id']] = 1;
+			}
 		}
 
 		$delete_rows[$row['msg_id']] = true;
@@ -1135,11 +1143,11 @@ function phpbb_delete_user_pms($user_id)
 	}
 
 	unset($undelivered_user[$user_id]);
-	foreach ($undelivered_user as $_user_id => $ary)
+	foreach ($undelivered_user as $_user_id => $count)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ',
-				user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . '
+			SET user_new_privmsg = user_new_privmsg - ' . $count . ',
+				user_unread_privmsg = user_unread_privmsg - ' . $count . '
 			WHERE user_id = ' . $_user_id;
 		$db->sql_query($sql);
 	}

From dbc7a69ad2bf6b062a4d7a40d62be29a410b5c18 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:30:52 +0200
Subject: [PATCH 119/279] [ticket/10605] Remove unused variable declarations.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 352bd4d15d..4ff0c53420 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1106,7 +1106,6 @@ function phpbb_delete_user_pms($user_id)
 	$result = $db->sql_query($sql);
 
 	$undelivered_msg = $undelivered_user = $delete_rows = array();
-	$num_unread = $num_new = $num_deleted = 0;
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)

From 9040f18d7cf9de137acbac6072dc2ffd3cede1b5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:35:01 +0200
Subject: [PATCH 120/279] [ticket/10605] Remove unnecessary array_keys calls on
 $delete_rows.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4ff0c53420..00029a1986 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1123,7 +1123,7 @@ function phpbb_delete_user_pms($user_id)
 			}
 		}
 
-		$delete_rows[$row['msg_id']] = true;
+		$delete_rows[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
@@ -1154,13 +1154,13 @@ function phpbb_delete_user_pms($user_id)
 	// Delete private message data
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
 		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', array_keys($delete_rows));
+			AND " . $db->sql_in_set('msg_id', $delete_rows);
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows));
+		WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))

From dd53d0576d8256e37074cc23dd5b9769acc12d1a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:39:49 +0200
Subject: [PATCH 121/279] [ticket/10605] Remove unnecessary $delete_ids array.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 00029a1986..23f582641b 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1169,9 +1169,7 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	$delete_ids = array_keys($delete_rows);
-
-	if (sizeof($delete_ids))
+	if (!empty($delete_rows))
 	{
 		// Check if there are any attachments we need to remove
 		if (!function_exists('delete_attachments'))
@@ -1179,10 +1177,10 @@ function phpbb_delete_user_pms($user_id)
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
 
-		delete_attachments('message', $delete_ids, false);
+		delete_attachments('message', $delete_rows, false);
 
 		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+			WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
 		$db->sql_query($sql);
 	}
 

From ad073d22b9e543d5842af7b8ef94fe7e6b443504 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 01:43:09 +0200
Subject: [PATCH 122/279] [ticket/10605] Break long comment into multiple lines
 80 chars short.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 23f582641b..e7beae3fab 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1184,7 +1184,8 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
+	// Set the remaining author id to anonymous
+	// This way users are still able to read messages from users being removed
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
 		SET author_id = ' . ANONYMOUS . '
 		WHERE author_id = ' . $user_id;

From 9c8aab4d32a001ae66fe005b7124737fc5ad7dd6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 27 Mar 2012 02:02:17 +0200
Subject: [PATCH 123/279] [ticket/10605] Rename $delete_rows to $delete_ids.

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index e7beae3fab..576da4d439 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1105,7 +1105,7 @@ function phpbb_delete_user_pms($user_id)
 				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
 	$result = $db->sql_query($sql);
 
-	$undelivered_msg = $undelivered_user = $delete_rows = array();
+	$undelivered_msg = $undelivered_user = $delete_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
@@ -1123,11 +1123,11 @@ function phpbb_delete_user_pms($user_id)
 			}
 		}
 
-		$delete_rows[(int) $row['msg_id']] = (int) $row['msg_id'];
+		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
-	if (!sizeof($delete_rows))
+	if (empty($delete_ids))
 	{
 		return false;
 	}
@@ -1154,22 +1154,22 @@ function phpbb_delete_user_pms($user_id)
 	// Delete private message data
 	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
 		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', $delete_rows);
+			AND " . $db->sql_in_set('msg_id', $delete_ids);
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
+		WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		unset($delete_rows[$row['msg_id']]);
+		unset($delete_ids[$row['msg_id']]);
 	}
 	$db->sql_freeresult($result);
 
-	if (!empty($delete_rows))
+	if (!empty($delete_ids))
 	{
 		// Check if there are any attachments we need to remove
 		if (!function_exists('delete_attachments'))
@@ -1177,10 +1177,10 @@ function phpbb_delete_user_pms($user_id)
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
 
-		delete_attachments('message', $delete_rows, false);
+		delete_attachments('message', $delete_ids, false);
 
 		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $delete_rows);
+			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 		$db->sql_query($sql);
 	}
 

From 0397b462174887bda3fea4bcebf9a26f6b591a3e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 27 Mar 2012 17:29:03 +0200
Subject: [PATCH 124/279] [ticket/10605] Split query to be able to use indexes

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 34 ++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 576da4d439..dd81e8f92d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1098,11 +1098,11 @@ function phpbb_delete_user_pms($user_id)
 	}
 
 	// Get PM Information for later deleting
+	// The two queries where split, so we can use our indexes
+	// Part 1: get PMs the user received
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user_id . '
-			OR (author_id = ' . $user_id . '
-				AND folder_id = ' . PRIVMSGS_NO_BOX . ')';
+		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
 
 	$undelivered_msg = $undelivered_user = $delete_ids = array();
@@ -1127,6 +1127,34 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
+	// Part 2: get PMs the user sent
+	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+		FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX;
+	$result = $db->sql_query($sql);
+
+	while ($row = $db->sql_fetchrow($result))
+	{
+		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
+		{
+			// Undelivered messages
+			$undelivered_msg[] = $row['msg_id'];
+
+			if (isset($undelivered_user[$row['user_id']]))
+			{
+				++$undelivered_user[$row['user_id']];
+			}
+			else
+			{
+				$undelivered_user[$row['user_id']] = 1;
+			}
+		}
+
+		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
+	}
+	$db->sql_freeresult($result);
+
 	if (empty($delete_ids))
 	{
 		return false;

From b9324577aca6f7f7632b609e975e510e25d8ec86 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 27 Mar 2012 17:32:55 +0200
Subject: [PATCH 125/279] =?UTF-8?q?[ticket/10605]=20Reset=20user=C2=B4s=20?=
 =?UTF-8?q?pm=20count=20to=200=20when=20deleting=20his=20PMs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index dd81e8f92d..14a6d83b2a 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1169,7 +1169,17 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	unset($undelivered_user[$user_id]);
+	// Reset the user´s pm count to 0
+	if (isset($undelivered_user[$user_id]))
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_new_privmsg = 0,
+				user_unread_privmsg = 0
+			WHERE user_id = ' . $user_id;
+		$db->sql_query($sql);
+		unset($undelivered_user[$user_id]);
+	}
+
 	foreach ($undelivered_user as $_user_id => $count)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '

From 1789e0948bd3a06392d8f919d80889ed5bbf2583 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 28 Mar 2012 17:05:45 -0400
Subject: [PATCH 126/279] [ticket/10732] Add config_dev.php and config_test.php
 to .gitignore

PHPBB3-10732
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index d875beb784..e6e017f85e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 /phpBB/cache/*.php
 /phpBB/cache/queue.php.lock
 /phpBB/config.php
+/phpBB/config_dev.php
+/phpBB/config_test.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*

From fff9f6611eddffb4c509d6e5126c0b0c9723f345 Mon Sep 17 00:00:00 2001
From: Jan Schejbal <jan-bugreport@gmx.de>
Date: Thu, 29 Mar 2012 04:16:34 +0200
Subject: [PATCH 127/279] [ticket/10730] Added label tag around "select" text
 in post splitting UI

Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.

PHPBB3-10730
---
 phpBB/styles/prosilver/template/mcp_topic.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 2a5f52f038..5dbc8d670c 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -106,7 +106,7 @@ onload_functions.push('subPanels()');
 			<div class="inner"><span class="corners-top"><span></span></span>
 
 			<div class="postbody" id="pr{postrow.POST_ID}">
-				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li>{L_SELECT}: <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></li></ul>
+				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}: <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul>
 
 				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
 				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>

From 9391d423c05818e5f18ddbe051e1713c835f4404 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 30 Mar 2012 19:04:20 +0100
Subject: [PATCH 128/279] [feature/event-dispatcher] Adding composer.phar to
 .gitignore for olympus

To keep the .gitignore's the same.

PHPBB3-9550
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e6e017f85e..de26e1dd1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /phpBB/cache/*.html
 /phpBB/cache/*.php
 /phpBB/cache/queue.php.lock
+/phpBB/composer.phar
 /phpBB/config.php
 /phpBB/config_dev.php
 /phpBB/config_test.php

From b8b342be2d238616b96ace9acbe8af2e18ba1e7a Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Sat, 31 Mar 2012 12:46:44 -0400
Subject: [PATCH 129/279] [Ticket/10675] Correct language string
 ATTACH_DISK_FULL

Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index dd0ba7fc6d..24f3204c57 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -42,7 +42,7 @@ $lang = array_merge($lang, array(
 	'ADD_POLL'					=> 'Poll creation',
 	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank.',
 	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
-	'ATTACH_DISK_FULL'			=> 'There is not enough free disk space to post this attachment',
+	'ATTACH_DISK_FULL'			=> 'There is not enough free disk space to post this attachment.',
 	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
 	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
 

From b1b530f92cca7eb115e096ea8901133d421771d2 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 1 Apr 2012 18:25:50 +0530
Subject: [PATCH 130/279] [ticket/10731] Fixed addquote() to work on opera
 browser.

In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
---
 phpBB/styles/prosilver/template/editor.js  | 4 ++--
 phpBB/styles/subsilver2/template/editor.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index cfdb54f54b..c16b0ef703 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -219,7 +219,7 @@ function addquote(post_id, username, l_wrote)
 
 	// Get text selection - not only the post content :(
 	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie)
+	if (window.getSelection && !is_ie && !window.opera)
 	{
 		theSelection = window.getSelection().toString();
 	}
@@ -456,4 +456,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
\ No newline at end of file
+}
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 7cc5de9034..151cf53ff1 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -221,7 +221,7 @@ function addquote(post_id, username, l_wrote)
 
 	// Get text selection - not only the post content :(
 	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie)
+	if (window.getSelection && !is_ie && !window.opera)
 	{
 		theSelection = window.getSelection().toString();
 	}
@@ -459,4 +459,4 @@ function getCaretPosition(txtarea)
 	}
 
 	return caretPos;
-}
\ No newline at end of file
+}

From 42101fe8d48cbdbe1a4e73bd9cc388a9e4b490c5 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 2 Apr 2012 16:26:23 +0530
Subject: [PATCH 131/279] [ticket/10699] Long h2 title breaks div.minitabs in
 MCP

Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
---
 phpBB/styles/prosilver/template/mcp_topic.html |  4 ++--
 phpBB/styles/prosilver/theme/cp.css            | 17 +++++++++++++++++
 phpBB/styles/prosilver/theme/tweaks.css        | 10 ++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index 5dbc8d670c..e8d5ceada4 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE mcp_header.html -->
-
+<div class="tabs-container">
 <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
 
 <script type="text/javascript">
@@ -35,7 +35,7 @@ onload_functions.push('subPanels()');
 		</li>
 	</ul>
 </div>
-
+</div>
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
 <div class="panel">
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index aed88831a8..d4382b067e 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -104,6 +104,23 @@ ul.cplist {
 	width: 100%;
 }
 
+.tabs-container h2 {
+	float: left;
+	white-space: nowrap;
+	margin-bottom: 0px;
+}
+
+.tabs-container #minitabs {
+	float: right;
+	margin-top: 19px;
+}
+
+.tabs-container:after {
+	display: block;
+	clear: both;
+	content: '';
+}
+
 /* CP tabbed menu
 ----------------------------------------*/
 #tabs {
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 5e11b2122b..0c03020100 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -94,4 +94,14 @@ dl.icon {
 
 *:first-child+html #site-description p {
 	margin-bottom: 1.0em;
+}
+
+/* #minitabs fix for IE */
+.tabs-container {
+	zoom: 1;
+}
+
+#minitabs {
+	white-space: nowrap;
+	*min-width: 50%;
 }
\ No newline at end of file

From 17e050e109e7048b75a24cac87ad9d5bad4893e5 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 2 Apr 2012 16:59:05 +0530
Subject: [PATCH 132/279] [ticket/10699] Long h2 title breaks div.minitabs in
 MCP

Fixed minor issues in formatting.

PHPBB3-10699
---
 phpBB/styles/prosilver/template/mcp_topic.html | 2 ++
 phpBB/styles/prosilver/theme/cp.css            | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index e8d5ceada4..13b661ef0a 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -1,4 +1,5 @@
 <!-- INCLUDE mcp_header.html -->
+
 <div class="tabs-container">
 <h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
 
@@ -36,6 +37,7 @@ onload_functions.push('subPanels()');
 	</ul>
 </div>
 </div>
+
 <form id="mcp" method="post" action="{S_MCP_ACTION}">
 
 <div class="panel">
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index d4382b067e..7c7158bd00 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -106,7 +106,6 @@ ul.cplist {
 
 .tabs-container h2 {
 	float: left;
-	white-space: nowrap;
 	margin-bottom: 0px;
 }
 

From 084e1ae5603f4204945d25afcfabaeb1198df20f Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Tue, 3 Apr 2012 22:15:59 +0530
Subject: [PATCH 133/279] [ticket/10561] All users can choose deactivated
 styles (fixed).

A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
---
 phpBB/includes/functions.php     | 18 ++++++++++++++++++
 phpBB/includes/ucp/ucp_prefs.php |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0320230a7d..530638c56b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1238,6 +1238,24 @@ function style_select($default = '', $all = false)
 	return $style_options;
 }
 
+/**
+* Check if style is activated
+*/
+function style_verify($style_id = 0)
+{
+	global $db;
+
+	$sql = 'SELECT style_id, style_active
+		FROM ' . STYLES_TABLE . "
+		WHERE style_id = $style_id";
+	$result = $db->sql_query($sql);
+
+	$style_verified = $db->sql_fetchrow($result);
+	$db->sql_freeresult($result);
+
+	return $style_verified['style_active'];
+}
+
 /**
 * Pick a timezone
 */
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 13167b2b3d..0df8acd5af 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -61,7 +61,8 @@ class ucp_prefs
 
 				if ($submit)
 				{
-					$data['style'] = ($config['override_user_style']) ? $config['default_style'] : $data['style'];
+					$data['style'] = ($config['override_user_style']) ? $config['default_style'] :
+						(style_verify($data['style']) ? $data['style'] : ((int) $user->data['user_style']));
 
 					$error = validate_data($data, array(
 						'dateformat'	=> array('string', false, 1, 30),

From b81a5afc2541e035b78bfe5f7c8374c9d4ae6b9f Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Tue, 3 Apr 2012 22:56:06 +0530
Subject: [PATCH 134/279] [ticket/10561] Changes made to function
 phpbb_style_is_active().

Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
---
 phpBB/includes/functions.php     | 12 +++++++-----
 phpBB/includes/ucp/ucp_prefs.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 530638c56b..3881299648 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1239,21 +1239,23 @@ function style_select($default = '', $all = false)
 }
 
 /**
-* Check if style is activated
+* @author Hari Sankar R <hsr@theinglorio.us>
+* @param int $style_id The style_id of a style which should be checked if activated or not.
+* @return boolean
 */
-function style_verify($style_id = 0)
+function phpbb_style_is_active($style_id)
 {
 	global $db;
 
-	$sql = 'SELECT style_id, style_active
+	$sql = 'SELECT style_active
 		FROM ' . STYLES_TABLE . "
-		WHERE style_id = $style_id";
+		WHERE style_id = ". (int) $style_id;
 	$result = $db->sql_query($sql);
 
 	$style_verified = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
 
-	return $style_verified['style_active'];
+	return (bool) $style_verified['style_active'];
 }
 
 /**
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 0df8acd5af..e81bd1e1bb 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -62,7 +62,7 @@ class ucp_prefs
 				if ($submit)
 				{
 					$data['style'] = ($config['override_user_style']) ? $config['default_style'] :
-						(style_verify($data['style']) ? $data['style'] : ((int) $user->data['user_style']));
+						(phpbb_style_is_active($data['style']) ? $data['style'] : ((int) $user->data['user_style']));
 
 					$error = validate_data($data, array(
 						'dateformat'	=> array('string', false, 1, 30),

From c5481371b9e4dc6f30f7a9bce1beba21530f9977 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Tue, 3 Apr 2012 23:04:56 +0530
Subject: [PATCH 135/279] [ticket/10561] Changes made to $db->sql_fetchrow().

Changed $db->sql_fetchrow() to $db->sql_fetchfield().

PHPBB3-10561
---
 phpBB/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3881299648..a6ddcdd0a3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1252,10 +1252,10 @@ function phpbb_style_is_active($style_id)
 		WHERE style_id = ". (int) $style_id;
 	$result = $db->sql_query($sql);
 
-	$style_verified = $db->sql_fetchrow($result);
+	$style_verified = (bool) $db->sql_fetchfield('style_active');;
 	$db->sql_freeresult($result);
 
-	return (bool) $style_verified['style_active'];
+	return $style_verified;
 }
 
 /**

From a84b97f58e8177eb28ad41cfb261200d523c9ff5 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Tue, 3 Apr 2012 23:15:16 +0530
Subject: [PATCH 136/279] [ticket/10561] Fixed syntax error and renamed return
 variables.

Renamed $style_verified to $style_is_active and fixed extra ';'.

PHPBB3-10561
---
 phpBB/includes/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a6ddcdd0a3..70a961a744 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1252,10 +1252,10 @@ function phpbb_style_is_active($style_id)
 		WHERE style_id = ". (int) $style_id;
 	$result = $db->sql_query($sql);
 
-	$style_verified = (bool) $db->sql_fetchfield('style_active');;
+	$style_is_active = (bool) $db->sql_fetchfield('style_active');
 	$db->sql_freeresult($result);
 
-	return $style_verified;
+	return $style_is_active;
 }
 
 /**

From 0df3f1c5d0a4b2c71139a7f4c02cb81ee5200809 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Wed, 4 Apr 2012 00:09:05 +0800
Subject: [PATCH 137/279] [ticket/10508] Marked as read message now less
 specific.

Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 005640b7dd..7b59461610 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -191,7 +191,7 @@ $lang = array_merge($lang, array(
 	'FORM_INVALID'			=> 'The submitted form was invalid. Try submitting again.',
 	'FORUM'					=> 'Forum',
 	'FORUMS'				=> 'Forums',
-	'FORUMS_MARKED'			=> 'The selected forums have been marked read.',
+	'FORUMS_MARKED'			=> 'Forums have been marked read.',
 	'FORUM_CAT'				=> 'Forum category',
 	'FORUM_INDEX'			=> 'Board index',
 	'FORUM_LINK'			=> 'Forum link',

From 57209a1e680da729cad0a1cd7e9462254edcd6cb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 3 Apr 2012 23:05:15 -0400
Subject: [PATCH 138/279] [ticket/10760] Use externally specified PHP_BIN if
 any.

We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index 4d03359773..a8bb12e96e 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -12,8 +12,10 @@
 # ln -s ../../git-tools/hooks/pre-commit \\
 #   .git/hooks/pre-commit
 
-# NOTE: this is run through /usr/bin/env
-PHP_BIN=php
+if [ -z "$PHP_BIN" ]
+then
+	PHP_BIN=php
+fi
 
 # necessary check for initial commit
 if git rev-parse --verify HEAD >/dev/null 2>&1
@@ -64,7 +66,7 @@ do
 
 	# check the staged file content for syntax errors
 	# using php -l (lint)
-	result=$(git cat-file -p $sha | /usr/bin/env $PHP_BIN -l 2>/dev/null)
+	result=$(git cat-file -p $sha | $PHP_BIN -l 2>/dev/null)
 	if [ $? -ne 0 ]
 	then
 		error=1

From 786fcbf212caf4c201d9abba36fca3b8f58617a9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 3 Apr 2012 23:06:50 -0400
Subject: [PATCH 139/279] [ticket/10760] Use echo -e only if echo understands
 -e.

/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index a8bb12e96e..0e230d3308 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -17,6 +17,13 @@ then
 	PHP_BIN=php
 fi
 
+if [ $(echo -e test) = test ]
+then
+	echo_e="echo -e"
+else
+	echo_e="echo"
+fi
+
 # necessary check for initial commit
 if git rev-parse --verify HEAD >/dev/null 2>&1
 then
@@ -78,7 +85,7 @@ unset IFS
 
 if [ $error -eq 1 ]
 then
-	echo -e "PHP Syntax check failed:";
-	echo -e "$errors" | grep "^Parse error:"
+	echo "PHP Syntax check failed:"
+	$echo_e "$errors" | grep "^Parse error:"
 	exit 1
 fi

From b803fc4351431bc53ee3221fa6232664134aa0ba Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 3 Apr 2012 23:14:44 -0400
Subject: [PATCH 140/279] [ticket/10760] Quote PHP_BIN when using it.

This should make a difference on windows where paths may include spaces.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index 0e230d3308..5be33fb9a1 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -36,7 +36,7 @@ fi
 error=0
 errors=""
 
-if ! which $PHP_BIN >/dev/null 2>&1
+if ! which "$PHP_BIN" >/dev/null 2>&1
 then
 	echo "PHP Syntax check failed:"
 	echo "PHP binary does not exist or is not in path: $PHP_BIN"
@@ -73,7 +73,7 @@ do
 
 	# check the staged file content for syntax errors
 	# using php -l (lint)
-	result=$(git cat-file -p $sha | $PHP_BIN -l 2>/dev/null)
+	result=$(git cat-file -p $sha | "$PHP_BIN" -l 2>/dev/null)
 	if [ $? -ne 0 ]
 	then
 		error=1

From a0da2408e7cb0054da5d766bffa91f23d7beaec9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 3 Apr 2012 23:18:33 -0400
Subject: [PATCH 141/279] [ticket/10760] Account for display_errors=stderr in
 pre-commit hook.

With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index 5be33fb9a1..a0c2b6b247 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -73,7 +73,13 @@ do
 
 	# check the staged file content for syntax errors
 	# using php -l (lint)
-	result=$(git cat-file -p $sha | "$PHP_BIN" -l 2>/dev/null)
+	# note: if display_errors=stderr in php.ini,
+	# parse errors are printed on stderr; otherwise
+	# they are printed on stdout.
+	# we filter everything other than parse errors
+	# with a grep below, therefore it should be safe
+	# to combine stdout and stderr in all circumstances
+	result=$(git cat-file -p $sha | "$PHP_BIN" -l 2>&1)
 	if [ $? -ne 0 ]
 	then
 		error=1

From 0ceb77fb995e7433242a87c1fe0c22840a2b23e1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 3 Apr 2012 19:29:34 +0800
Subject: [PATCH 142/279] [ticket/10607] Added 'Powered by' translation string.

Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
---
 phpBB/adm/index.php                                  | 1 +
 phpBB/adm/style/overall_footer.html                  | 2 +-
 phpBB/adm/style/simple_footer.html                   | 2 +-
 phpBB/includes/functions.php                         | 1 +
 phpBB/language/en/common.php                         | 1 +
 phpBB/styles/prosilver/template/overall_footer.html  | 2 +-
 phpBB/styles/prosilver/template/simple_footer.html   | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html  | 2 +-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index bf4dc37044..3c984f8290 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -199,6 +199,7 @@ function adm_page_footer($copyright_html = true)
 		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '',
 		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
 		'S_COPYRIGHT_HTML'	=> $copyright_html,
+		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
 		'VERSION'			=> $config['version'])
 	);
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index b48b449597..361d3185fd 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -9,7 +9,7 @@
 
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+			{CREDIT_LINE}
 			<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- ENDIF -->
 
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index ac9c26a690..6395eace6c 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -5,7 +5,7 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+		<br />{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0320230a7d..ce80dc4a66 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4738,6 +4738,7 @@ function page_footer($run_cron = true)
 	$template->assign_vars(array(
 		'DEBUG_OUTPUT'			=> (defined('DEBUG')) ? $debug_output : '',
 		'TRANSLATION_INFO'		=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
+		'CREDIT_LINE'			=> $user->lang('POWERED_BY', '<a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
 
 		'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '')
 	);
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 005640b7dd..ff0a20abca 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -450,6 +450,7 @@ $lang = array_merge($lang, array(
 	'POST_TIME'				=> 'Post time',
 	'POST_TOPIC'			=> 'Post a new topic',
 	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
+	'POWERED_BY'			=> 'Powered by %s',
 	'PREVIEW'				=> 'Preview',
 	'PREVIOUS'				=> 'Previous',		// Used in pagination
 	'PREVIOUS_STEP'			=> 'Previous',
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index b252ff0de9..25b60be6e1 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -19,7 +19,7 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+	<div class="copyright">{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 9795140c47..cc54c42d18 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -1,6 +1,6 @@
 	</div>
 
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+	<div class="copyright">{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 5d6b63986f..6cd7a215b0 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+	<span class="copyright">{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 043be16cdb..db95c7952a 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -2,7 +2,7 @@
 </div>
 
 <div id="wrapfooter">
-	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
+	<span class="copyright">{CREDIT_LINE}
 </div>
 
 </body>

From f2967b666974c6622717a064060e546129e11e37 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 00:01:08 -0400
Subject: [PATCH 143/279] [ticket/10760] Catch both versions of parse error
 output in php.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index a0c2b6b247..bb667bf8ff 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -92,6 +92,20 @@ unset IFS
 if [ $error -eq 1 ]
 then
 	echo "PHP Syntax check failed:"
+	# php "display errors" (display_errors php.ini value)
+	# and "log errors" (log_errors php.ini value).
+	# these are independent settings - see main/main.c in php source.
+	# the "log errors" setting produces output which
+	# starts with "PHP Parse error:"; the "display errors"
+	# setting produces output starting with "Parse error:".
+	# if both are turned on php dumps the parse error twice.
+	# therefore here we try to grep for one version and
+	# if that yields no results grep for the other version.
 	$echo_e "$errors" | grep "^Parse error:"
+	if [ $? -ne 0 ]
+	then
+		# match failed
+		$echo_e "$errors" | grep "^PHP Parse error:"
+	fi
 	exit 1
 fi

From 6536a36208b3a2ecebaf5ab8e93f63b84127ae3f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 00:27:06 -0400
Subject: [PATCH 144/279] [ticket/10760] PHP is great. This commit is the
 proof.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index bb667bf8ff..9e78edd90d 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -101,6 +101,30 @@ then
 	# if both are turned on php dumps the parse error twice.
 	# therefore here we try to grep for one version and
 	# if that yields no results grep for the other version.
+	#
+	# other fun php facts:
+	#
+	# 1. in cli, display_errors and log_errors have different
+	#    destinations by default. display_errors prints to
+	#    standard output and log_errors prints to standard error.
+	#    whether these destinations make sense is left
+	#    as an exercise for the reader.
+	# 2. as mentioned above, with all output turned on
+	#    php will print parse errors twice, one time on stdout
+	#    and one time on stderr.
+	# 2. it is possible to set both display_errors and log_errors
+	#    to off. if this is done php will print the text
+	#    "Errors parsing <file>" but will not say what
+	#    the errors are. useful behavior, this.
+	# 3. on my system display_errors defaults to on and
+	#    log_errors defaults to off, therefore providing
+	#    by default one copy of messages. your mileage may vary.
+	# 4. by setting display_errors=stderr and log_errors=on,
+	#    both sets of messages will be printed on stderr.
+	# 5. php-cgi binary, given display_errors=stderr and
+	#    log_errors=on, still prints both sets of messages
+	#    on stderr, but formats one set as an html fragment.
+	# 6. your entry here? ;)
 	$echo_e "$errors" | grep "^Parse error:"
 	if [ $? -ne 0 ]
 	then

From efdd1e623e2dc060ae9b524b67c624037d8a94f0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 11:41:14 -0400
Subject: [PATCH 145/279] [ticket/10760] Value must be quoted as it might be
 two words.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index 9e78edd90d..ecc3a35ba3 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -17,7 +17,7 @@ then
 	PHP_BIN=php
 fi
 
-if [ $(echo -e test) = test ]
+if [ "$(echo -e test)" = test ]
 then
 	echo_e="echo -e"
 else

From dc63db1860e597b1201994a17fd7679bfdc9b0d8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 11:43:59 -0400
Subject: [PATCH 146/279] [ticket/10760] Fix numbering in php fun facts.

PHPBB3-10760
---
 git-tools/hooks/pre-commit | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit
index ecc3a35ba3..03babe47cd 100755
--- a/git-tools/hooks/pre-commit
+++ b/git-tools/hooks/pre-commit
@@ -112,19 +112,19 @@ then
 	# 2. as mentioned above, with all output turned on
 	#    php will print parse errors twice, one time on stdout
 	#    and one time on stderr.
-	# 2. it is possible to set both display_errors and log_errors
+	# 3. it is possible to set both display_errors and log_errors
 	#    to off. if this is done php will print the text
 	#    "Errors parsing <file>" but will not say what
 	#    the errors are. useful behavior, this.
-	# 3. on my system display_errors defaults to on and
+	# 4. on my system display_errors defaults to on and
 	#    log_errors defaults to off, therefore providing
 	#    by default one copy of messages. your mileage may vary.
-	# 4. by setting display_errors=stderr and log_errors=on,
+	# 5. by setting display_errors=stderr and log_errors=on,
 	#    both sets of messages will be printed on stderr.
-	# 5. php-cgi binary, given display_errors=stderr and
+	# 6. php-cgi binary, given display_errors=stderr and
 	#    log_errors=on, still prints both sets of messages
 	#    on stderr, but formats one set as an html fragment.
-	# 6. your entry here? ;)
+	# 7. your entry here? ;)
 	$echo_e "$errors" | grep "^Parse error:"
 	if [ $? -ne 0 ]
 	then

From 018419b36cf4d81cf2fa3f82d85f9bc8580c9c19 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Thu, 5 Apr 2012 19:31:18 +0530
Subject: [PATCH 147/279] [ticket/10561] Moved and renamed the funtion
 validate_style().

Fixed minor changes as suggested by @bantu.

PHPBB3-10561
---
 phpBB/includes/functions.php      | 20 --------------------
 phpBB/includes/functions_user.php | 19 +++++++++++++++++++
 phpBB/includes/ucp/ucp_prefs.php  | 10 ++++++++--
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 70a961a744..0320230a7d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1238,26 +1238,6 @@ function style_select($default = '', $all = false)
 	return $style_options;
 }
 
-/**
-* @author Hari Sankar R <hsr@theinglorio.us>
-* @param int $style_id The style_id of a style which should be checked if activated or not.
-* @return boolean
-*/
-function phpbb_style_is_active($style_id)
-{
-	global $db;
-
-	$sql = 'SELECT style_active
-		FROM ' . STYLES_TABLE . "
-		WHERE style_id = ". (int) $style_id;
-	$result = $db->sql_query($sql);
-
-	$style_is_active = (bool) $db->sql_fetchfield('style_active');
-	$db->sql_freeresult($result);
-
-	return $style_is_active;
-}
-
 /**
 * Pick a timezone
 */
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 10fb57ea97..7313844955 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1948,6 +1948,25 @@ function validate_jabber($jid)
 	return false;
 }
 
+/**
+* @param int $style_id The style_id of a style which should be checked if activated or not.
+* @return boolean
+*/
+function phpbb_validate_style($style_id)
+{
+	global $db;
+
+	$sql = 'SELECT style_active
+		FROM ' . STYLES_TABLE . '
+		WHERE style_id = '. (int) $style_id;
+	$result = $db->sql_query($sql);
+
+	$style_is_active = (bool) $db->sql_fetchfield('style_active');
+	$db->sql_freeresult($result);
+
+	return $style_is_active;
+}
+
 /**
 * Remove avatar
 */
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index e81bd1e1bb..5b915824d6 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -61,8 +61,14 @@ class ucp_prefs
 
 				if ($submit)
 				{
-					$data['style'] = ($config['override_user_style']) ? $config['default_style'] :
-						(phpbb_style_is_active($data['style']) ? $data['style'] : ((int) $user->data['user_style']));
+					if ($config['override_user_style'])
+					{
+						$data['style'] = $config['default_style'];
+					}
+					else if (!phpbb_validate_style($data['style']))
+					{
+						$data['style'] = (int) $user->data['user_style']);
+					}
 
 					$error = validate_data($data, array(
 						'dateformat'	=> array('string', false, 1, 30),

From be9eb577856d2dec24a3023ef00275b0e6ac88b4 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 5 Apr 2012 22:22:11 +0100
Subject: [PATCH 148/279] [ticket/10455] Removed NOTE from prosilver
 overall_header.html.

PHPBB3-10455
---
 phpBB/styles/prosilver/template/overall_header.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a46c161542..c75cc92940 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -28,10 +28,6 @@
 	Based on style:   prosilver (this is the default phpBB3 style)
 	Original author:  Tom Beddard ( http://www.subBlue.com/ )
 	Modified by:
-
-	NOTE: This page was generated by phpBB, the free open-source bulletin board package.
-	      The phpBB Group is not responsible for the content of this page and forum. For more information
-	      about phpBB please visit http://www.phpbb.com
 -->
 
 <script type="text/javascript">

From 03e382f99c61c12655998ac8bd798fca7a34c099 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:34:37 -0400
Subject: [PATCH 149/279] [ticket/10605] Fix syntax error in database updater.

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b6298ca651..6088a58fc4 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2041,7 +2041,7 @@ function change_database_data(&$no_updates, $version)
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),
-				'WHERE'		=> 't.user_id IS NULL';
+				'WHERE'		=> 't.user_id IS NULL');
 			$sql = $db->sql_build_query('SELECT', $sql_array);
 
 			do

From de1e343c5b408da09448b3150cfec2de75afd04a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:34:54 -0400
Subject: [PATCH 150/279] [ticket/10605] Add a section for updating from 3.0.10
 to schema updates.

Without it data updates do not appear to be run.

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6088a58fc4..116e6ea9a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -993,6 +993,8 @@ function database_update_info()
 		'3.0.10-RC2'	=> array(),
 		// No changes from 3.0.10-RC3 to 3.0.10
 		'3.0.10-RC3'	=> array(),
+		// No changes from 3.0.10 to 3.0.11-RC1
+		'3.0.10'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);

From 2b2286a46c56b8a9e5444fd06eff263f880e0c78 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 5 Apr 2012 17:35:27 -0400
Subject: [PATCH 151/279] [ticket/10605] Fix left join usage.

Previously this produced broken SQL:

SELECT p.msg_id FROM phpbb_privmsgs p
LEFT JOIN 0 phpbb_privmsgs_to ON (p.msg_id = t.msg_id)
WHERE t.user_id IS NULL LIMIT 500 OFFSET 0

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 116e6ea9a6..0737061887 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2039,7 +2039,7 @@ function change_database_data(&$no_updates, $version)
 				),
 				'LEFT_JOIN'	=> array(
 					array(
-						'FROM'	=> array(PRIVMSGS_TO_TABLE, 't'),
+						'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),

From 293f66d4edfdfd0df38234b1927ea556e9ea18a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?=
 <adonais.neoadonis@gmail.com>
Date: Thu, 5 Apr 2012 19:03:08 -0500
Subject: [PATCH 152/279] [ticket/10764] FAQ now mentions GitHub instead of
 SourceForge

The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.

PHPBB3-10764
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index b915a3da19..b7a3220f74 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -333,7 +333,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
+		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses GitHub to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
 	),
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',

From 04bb44ce3300679cbb208eab7757854087372305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?=
 <adonais.neoadonis@gmail.com>
Date: Thu, 5 Apr 2012 20:22:00 -0500
Subject: [PATCH 153/279] [ticket/10764] FAQ now mentions Area51 instead of
 SourceForge

The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.

PHPBB3-10764
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index b7a3220f74..c500917d58 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -333,7 +333,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses GitHub to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
+		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, or you want to report a bug, please visit the phpBB <a href="http://area51.phpbb.com/">Area51</a> website, where you will find resources to do so.'
 	),
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',

From ea5ae09c7d899bd0daa2b8b18371d6c4fbba4c5e Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Fri, 6 Apr 2012 14:09:56 +0530
Subject: [PATCH 154/279] [ticket/10561] Added section in database_update.php

Added section to check for existing users using a
deactivated style, and revert it to default style.

PHPBB3-10561
---
 phpBB/install/database_update.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a1b7dcd47f..91016273e6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1871,6 +1871,24 @@ function change_database_data(&$no_updates, $version)
 			}
 			// end Bing Bot addition
 
+			// Updates users having current style a deactivated one
+			$sql = 'SELECT style_id
+					FROM ' . STYLES_TABLE . '
+					WHERE style_active = 0';
+			$result = $db->sql_query($sql);
+
+			while($temp = $db->sql_fetchfield('style_id', false, $result))
+			{
+				$styles[] = $temp;
+			}
+
+			$db->sql_freeresult($result);
+			$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_style = ' . $config['default_style'] .'
+					WHERE ' . $db->sql_in_set('user_style', $styles);
+			$result = $db->sql_query($sql);
+			$db->sql_freeresult($result);
+
 			// Delete shadow topics pointing to not existing topics
 			$batch_size = 500;
 

From 1808a61fe3e89399aec4ecced36e270faa7d0beb Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sat, 7 Apr 2012 19:42:42 +0530
Subject: [PATCH 155/279] [ticket/10561] Added to
 database_update:database_update_info()

Updates made to database_update.php

PHPBB3-10561
---
 phpBB/install/database_update.php | 45 ++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 91016273e6..096d90219b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -993,6 +993,8 @@ function database_update_info()
 		'3.0.10-RC2'	=> array(),
 		// No changes from 3.0.10-RC3 to 3.0.10
 		'3.0.10-RC3'	=> array(),
+		// No changes from 3.0.10 to 3.0.11-RC1
+		'3.0.10'		=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -1871,24 +1873,6 @@ function change_database_data(&$no_updates, $version)
 			}
 			// end Bing Bot addition
 
-			// Updates users having current style a deactivated one
-			$sql = 'SELECT style_id
-					FROM ' . STYLES_TABLE . '
-					WHERE style_active = 0';
-			$result = $db->sql_query($sql);
-
-			while($temp = $db->sql_fetchfield('style_id', false, $result))
-			{
-				$styles[] = $temp;
-			}
-
-			$db->sql_freeresult($result);
-			$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_style = ' . $config['default_style'] .'
-					WHERE ' . $db->sql_in_set('user_style', $styles);
-			$result = $db->sql_query($sql);
-			$db->sql_freeresult($result);
-
 			// Delete shadow topics pointing to not existing topics
 			$batch_size = 500;
 
@@ -2042,6 +2026,31 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC3 to 3.0.10
 		case '3.0.10-RC3':
 		break;
+		
+		// Changes from 3.0.10 to 3.0.11-RC1
+		case '3.0.10':
+			// Updates users having current style a deactivated one
+			$deactivated_style_ids = array();
+			$sql = 'SELECT style_id
+					FROM ' . STYLES_TABLE . '
+					WHERE style_active = 0';
+			$result = $db->sql_query($sql);
+
+			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
+			{
+				$deactivated_style_ids[] = (int) $temp_style_id;
+			}
+
+			$db->sql_freeresult($result);
+			if (!empty($deactivated_style_ids))
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_style = ' . $config['default_style'] .'
+						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
+				$result = $db->sql_query($sql);
+			}
+			$no_updates = false;
+		break;
 	}
 }
 

From 03a35581c4b0dcb7c20885d4ca807ea7117872cb Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sat, 7 Apr 2012 23:15:12 +0530
Subject: [PATCH 156/279] [ticket/10561] Reverted to phpbb_style_is_active()

Changes made to function name, reverted to old.

PHPBB3-10561
---
 phpBB/includes/functions_user.php | 2 +-
 phpBB/includes/ucp/ucp_prefs.php  | 4 ++--
 phpBB/install/database_update.php | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7313844955..770eab48d5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1952,7 +1952,7 @@ function validate_jabber($jid)
 * @param int $style_id The style_id of a style which should be checked if activated or not.
 * @return boolean
 */
-function phpbb_validate_style($style_id)
+function phpbb_style_is_active($style_id)
 {
 	global $db;
 
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 5b915824d6..f6fe916d8b 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -65,9 +65,9 @@ class ucp_prefs
 					{
 						$data['style'] = $config['default_style'];
 					}
-					else if (!phpbb_validate_style($data['style']))
+					else if (!phpbb_style_is_active($data['style']))
 					{
-						$data['style'] = (int) $user->data['user_style']);
+						$data['style'] = (int) $user->data['user_style'];
 					}
 
 					$error = validate_data($data, array(
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 096d90219b..8f00b18846 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2030,18 +2030,18 @@ function change_database_data(&$no_updates, $version)
 		// Changes from 3.0.10 to 3.0.11-RC1
 		case '3.0.10':
 			// Updates users having current style a deactivated one
-			$deactivated_style_ids = array();
 			$sql = 'SELECT style_id
 					FROM ' . STYLES_TABLE . '
 					WHERE style_active = 0';
 			$result = $db->sql_query($sql);
 
+			$deactivated_style_ids = array();
 			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
 			{
 				$deactivated_style_ids[] = (int) $temp_style_id;
 			}
-
 			$db->sql_freeresult($result);
+
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
@@ -2049,6 +2049,7 @@ function change_database_data(&$no_updates, $version)
 						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
 				$result = $db->sql_query($sql);
 			}
+
 			$no_updates = false;
 		break;
 	}

From 4e630ef1601ef39c7947de7d071fdccf68f52e3b Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 00:33:55 +0530
Subject: [PATCH 157/279] [ticket/10561] Casted $config['default_style'] to int

PHPBB3-10561
---
 phpBB/includes/ucp/ucp_prefs.php  | 2 +-
 phpBB/install/database_update.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index f6fe916d8b..17d7d23f02 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -63,7 +63,7 @@ class ucp_prefs
 				{
 					if ($config['override_user_style'])
 					{
-						$data['style'] = $config['default_style'];
+						$data['style'] = (int) $config['default_style'];
 					}
 					else if (!phpbb_style_is_active($data['style']))
 					{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8f00b18846..576b3c0ba8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2045,7 +2045,7 @@ function change_database_data(&$no_updates, $version)
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_style = ' . $config['default_style'] .'
+						SET user_style = ' . (int) $config['default_style'] .'
 						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
 				$result = $db->sql_query($sql);
 			}

From 9bce716081f55f209afbfb3ecf1a097b47292da4 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 00:57:29 +0530
Subject: [PATCH 158/279] [ticket/10561] Added function desc for
 phpbb_style_is_active()

PHPBB3-10561
---
 phpBB/includes/functions_user.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 770eab48d5..83316be2a3 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1949,6 +1949,8 @@ function validate_jabber($jid)
 }
 
 /**
+* Verifies whether a style ID corresponds to an active style.
+*
 * @param int $style_id The style_id of a style which should be checked if activated or not.
 * @return boolean
 */

From 8442b19e59e3d07129c3ef5286ada84a3ac64b98 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 01:04:17 +0530
Subject: [PATCH 159/279] [ticket/10561] Changed $temp_style_id to $style_id

PHPBB3-10561
---
 phpBB/install/database_update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 576b3c0ba8..ba89a07e92 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2036,9 +2036,9 @@ function change_database_data(&$no_updates, $version)
 			$result = $db->sql_query($sql);
 
 			$deactivated_style_ids = array();
-			while ($temp_style_id = $db->sql_fetchfield('style_id', false, $result))
+			while ($style_id = $db->sql_fetchfield('style_id', false, $result))
 			{
-				$deactivated_style_ids[] = (int) $temp_style_id;
+				$deactivated_style_ids[] = (int) $style_id;
 			}
 			$db->sql_freeresult($result);
 

From 2a48284fc9125edad2dbd9de41dfb1ef61926b6b Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 01:25:17 +0530
Subject: [PATCH 160/279] [ticket/10561] Removed extra tabs, changes made to
 $db->sql_query()

Substituted $db->sql_query() with _sql()

PHPBB3-10561
---
 phpBB/install/database_update.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ba89a07e92..6097341ace 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2031,8 +2031,8 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.10':
 			// Updates users having current style a deactivated one
 			$sql = 'SELECT style_id
-					FROM ' . STYLES_TABLE . '
-					WHERE style_active = 0';
+				FROM ' . STYLES_TABLE . '
+				WHERE style_active = 0';
 			$result = $db->sql_query($sql);
 
 			$deactivated_style_ids = array();
@@ -2045,9 +2045,9 @@ function change_database_data(&$no_updates, $version)
 			if (!empty($deactivated_style_ids))
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_style = ' . (int) $config['default_style'] .'
-						WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
-				$result = $db->sql_query($sql);
+					SET user_style = ' . (int) $config['default_style'] .'
+					WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
+				_sql($sql, $errored, $error_ary);
 			}
 
 			$no_updates = false;

From 41ef41ac63af83f04d0e82cd1891c12060e90227 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 10 Apr 2012 00:46:24 +0200
Subject: [PATCH 161/279] [ticket/10774] Add unit tests for UNIQUE index
 existence and creation.

PHPBB3-10774
---
 tests/dbal/db_tools_test.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index fbde636b58..c7ddb88ce8 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -354,9 +354,20 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
 	}
 
+	public function test_unique_index_exists()
+	{
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq'));
+	}
+
 	public function test_create_index_against_index_exists()
 	{
 		$this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal'));
 		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey'));
 	}
+
+	public function test_create_unique_index_against_unique_index_exists()
+	{
+		$this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id'));
+	}
 }

From ef8160e8a2a1dbb51cd2603eefcd9309d2daece8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 10 Apr 2012 00:53:27 +0200
Subject: [PATCH 162/279] [ticket/10774] Correctly specify index name when
 creating unique index on MySQL.

PHPBB3-10774
---
 phpBB/includes/db/db_tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 2cba11133a..c6dd23e6bd 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2115,7 +2115,7 @@ class phpbb_db_tools
 
 			case 'mysql_40':
 			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX (' . implode(', ', $column) . ')';
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
 			break;
 
 			case 'mssql':

From 534d96695744e2ddeebf33a971edef40d443e585 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 Apr 2012 21:39:27 +0200
Subject: [PATCH 163/279] [ticket/10788] Add imkingdavid to the list of
 developers in docs/AUTHORS.

PHPBB3-10788
---
 phpBB/docs/AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index de599193d2..234f8c273b 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -25,6 +25,7 @@ phpBB Lead Developer:  naderman (Nils Adermann)
 phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        bantu (Andreas Fischer)
                        ckwalsh (Cullen Walsh)
+                       imkingdavid (David King)
                        igorw (Igor Wiedler)
                        kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)

From f394fd250e5cf35a38579ecc403a78e223f37da8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 Apr 2012 22:08:36 +0200
Subject: [PATCH 164/279] [ticket/10788] Move ckwalsh and kellanved to the
 Former Contributors section.

PHPBB3-10788
---
 phpBB/docs/AUTHORS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 234f8c273b..57adec6a67 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -24,10 +24,8 @@ phpBB Lead Developer:  naderman (Nils Adermann)
 
 phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        bantu (Andreas Fischer)
-                       ckwalsh (Cullen Walsh)
                        imkingdavid (David King)
                        igorw (Igor Wiedler)
-                       kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)
                        Oleg (Oleg Pudeyev)
                        rxu (Ruslan Uzdenov)
@@ -49,9 +47,11 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                        APTX (Marek A. Ruszczyński)   [12/2007 - 04/2011]
                        Ashe (Ludovic Arnaud)         [10/2002 - 11/2003, 06/2006 - 10/2006]
                        BartVB (Bart van Bragt)       [11/2000 - 03/2006]
+                       ckwalsh (Cullen Walsh)        [01/2010 - 07/2011]
                        DavidMJ (David M.)            [12/2005 - 08/2009]
                        dhn (Dominik Dröscher)        [05/2007 - 01/2011]
                        GrahamJE (Graham Eames)       [09/2005 - 11/2006]
+                       kellanved (Henry Sudhof)      [04/2007 - 03/2011]
                        TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
                        Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
 

From 4b6b41a1e5cb3d4ba7c896dfa4d72082aa2f069e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 13 Apr 2012 16:26:41 +0200
Subject: [PATCH 165/279] [ticket/10605] Add parameter documentation to
 phpbb_delete_user_pms

PHPBB3-10605
---
 phpBB/includes/functions_privmsgs.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 14a6d83b2a..00bec11569 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1085,6 +1085,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 
 /**
 * Delete all PM(s) for a given user and delete the ones without references
+*
+* @param	int		$user_id	ID of the user whose private messages we want to delete
+*
+* @return	boolean		False if there were no pms found, true otherwise.
 */
 function phpbb_delete_user_pms($user_id)
 {

From 7a4b4c7599f3203664350158e36e666a59ca9de2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 13 Apr 2012 16:31:49 +0200
Subject: [PATCH 166/279] [ticket/10094] Purge acm_file cache before phpBB
 installation.

PHPBB3-10094
---
 phpBB/install/install_install.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 026fc0d404..08d072c522 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -53,11 +53,13 @@ class install_install extends module
 
 	function main($mode, $sub)
 	{
-		global $lang, $template, $language, $phpbb_root_path;
+		global $lang, $template, $language, $phpbb_root_path, $cache;
 
 		switch ($sub)
 		{
 			case 'intro':
+				$cache->purge();
+
 				$this->page_title = $lang['SUB_INTRO'];
 
 				$template->assign_vars(array(

From 249d8ede1261f6736a1d245ad204bc2bca544945 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 16 Apr 2012 01:24:10 +0530
Subject: [PATCH 167/279] [ticket/10797] user rank is displayed in mcp_warn.php

When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
---
 phpBB/includes/mcp/mcp_warn.php | 4 ++--
 phpBB/language/en/mcp.php       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 63e5b19155..1016204ff8 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -308,7 +308,7 @@ class mcp_warn
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
 
-		$rank_title = $rank_img = '';
+		get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
 		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
 
 		$template->assign_vars(array(
@@ -413,7 +413,7 @@ class mcp_warn
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
 
-		$rank_title = $rank_img = '';
+		get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
 		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
 
 		// OK, they didn't submit a warning so lets build the page for them to do so
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index d0bcec0d9c..16b55b3612 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -274,6 +274,7 @@ $lang = array_merge($lang, array(
 	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
 	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
 
+	'RANK'						=> 'User rank',
 	'READ_USERNOTES'			=> 'User notes',
 	'READ_WARNINGS'				=> 'User warnings',
 	'REPORTER'					=> 'Reporter',

From 7a6d3ec61bff708fa1ebc60765c91af0a5648fc9 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 15 Apr 2012 23:33:34 -0500
Subject: [PATCH 168/279] [ticket/10819] Improve side-by-side diff styling

Used transparent background for unchanged lines
Shortened the table headers and make the background grey
Added a border between the columns
Increased the font size on pre blocks
Added Consolas as the first pre font, for Windows users
Added wordwrapping for pre blocks

PHPBB3-10819
---
 phpBB/adm/style/install_update_diff.html | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b65a014312..96bf2532b1 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -119,6 +119,7 @@ table.hrdiff {
 	overflow: hidden;
 	border-bottom: 1px solid #999;
 	table-layout: fixed;
+	background: transparent;
 }
 
 table.hrdiff th {
@@ -128,7 +129,8 @@ table.hrdiff th {
 	font-family: Verdana,Helvetica,sans-serif;
 	font-size: 11px;
 	border-bottom: 1px solid #999;
-	background: transparent;
+	border-right: 1px solid #999;
+	background: #D9D9D9;
 }
 
 table.hrdiff thead th {
@@ -142,29 +144,28 @@ table.hrdiff tr:first-child th {
 }
 
 table.hrdiff tbody th {
-	padding: 2em 1px 1px 1px;
 	font-size: 80%;
 	border-top: 1px solid #999;
 }
 
-table.hrdiff tbody td.old {
-	border-left: 1px solid #999;
-	border-right: 1px solid #999;
-}
-table.hrdiff tbody td.new {
+table.hrdiff tbody td {
 	border-right: 1px solid #999;
 }
 
+/* Variant of http://www.longren.org/wrapping-text-inside-pre-tags/ */
 table.hrdiff td pre {
-	overflow: auto;
-	display: block;
-	width: 100%;
-	overflow: auto;
-	display: block;
+	font-family: "Consolas", monospace;
+	font-size: 1.1em;
+	overflow-x: auto;			/* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+	white-space: pre-wrap;		/* css-3 */
+	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
+	white-space: -pre-wrap;		/* Opera 4-6 */
+	white-space: -o-pre-wrap;	/* Opera 7 */
+	word-wrap: break-word;		/* Internet Explorer 5.5+ */
 }
 
 table.hrdiff .unmodified {
-	background: #fff;
+	background: transparent;
 }
 
 table.hrdiff .added {

From 09621342a54525e9dfcd3419b91d39e13ee7a326 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 15 Apr 2012 23:38:12 -0500
Subject: [PATCH 169/279] [ticket/10819] Forgot this causes vertical scrollbars
 on IE

PHPBB3-10819
---
 phpBB/adm/style/install_update_diff.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index 96bf2532b1..e57d19161d 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -156,7 +156,6 @@ table.hrdiff tbody td {
 table.hrdiff td pre {
 	font-family: "Consolas", monospace;
 	font-size: 1.1em;
-	overflow-x: auto;			/* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
 	white-space: pre-wrap;		/* css-3 */
 	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
 	white-space: -pre-wrap;		/* Opera 4-6 */

From bdf21e45caadd74c7f4c41d6e1bf4737d9300cf4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 16 Apr 2012 03:04:29 -0400
Subject: [PATCH 170/279] [ticket/10767] Revert unconditional unfatality in
 commit-msg hook.

Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic."

This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26.

PHPBB3-10093
PHPBB3-10767
---
 git-tools/hooks/commit-msg | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 52969670ca..3c42411602 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -12,6 +12,11 @@
 # ln -s ../../git-tools/hooks/commit-msg \\
 #   .git/hooks/commit-msg
 #
+# You can configure whether invalid commit messages abort commits:
+#
+# git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
+# git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
+#
 # Warning/error messages use color by default if the output is a terminal
 # ("output" here is normally standard error when you run git commit).
 # To force or disable the use of color:
@@ -21,6 +26,13 @@
 
 config_ns="phpbb.hooks.commit-msg";
 
+if [ "$(git config --bool $config_ns.fatal)" = "false" ]
+then
+	fatal=0;
+else
+	fatal=1;
+fi
+
 debug_level=$(git config --int $config_ns.debug || echo 0);
 
 # Error codes
@@ -47,9 +59,12 @@ debug()
 
 quit()
 {
-	# Now we always exit with success, since git will trash
-	# entered commit message if commit-msg hook exits with a failure.
-	exit 0
+	if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ]
+	then
+		exit 0;
+	else
+		exit $1;
+	fi
 }
 
 use_color()

From 1ce8a1d7ee1f361278358f5b2b3e15b449d2a8aa Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 17 Apr 2012 05:49:59 -0400
Subject: [PATCH 171/279] [ticket/10767] Default to non-fatal behavior.

PHPBB3-10767
---
 git-tools/hooks/commit-msg | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 3c42411602..4c9e56f555 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -14,9 +14,11 @@
 #
 # You can configure whether invalid commit messages abort commits:
 #
-# git config phpbb.hooks.commit-msg.fatal true	(abort, this is the default)
+# git config phpbb.hooks.commit-msg.fatal true	(abort)
 # git config phpbb.hooks.commit-msg.fatal false (warn only, do not abort)
 #
+# The default is to warn only.
+#
 # Warning/error messages use color by default if the output is a terminal
 # ("output" here is normally standard error when you run git commit).
 # To force or disable the use of color:
@@ -26,11 +28,11 @@
 
 config_ns="phpbb.hooks.commit-msg";
 
-if [ "$(git config --bool $config_ns.fatal)" = "false" ]
+if [ "$(git config --bool $config_ns.fatal)" = "true" ]
 then
-	fatal=0;
-else
 	fatal=1;
+else
+	fatal=0;
 fi
 
 debug_level=$(git config --int $config_ns.debug || echo 0);

From 45b910f9b445dc50cf65e456d8fe6f3aae2cbc11 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 17 Apr 2012 05:56:09 -0400
Subject: [PATCH 172/279] [ticket/10767] Use warning/error language as
 appropriate.

When commit-msg hook is fatal, label the message as an error.

When it is not fatal, label the message as a warning.

"Syntax error" is still always an error, not sure if this
should be changed.

PHPBB3-10767
---
 git-tools/hooks/commit-msg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 4c9e56f555..fbeda805b7 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -31,8 +31,10 @@ config_ns="phpbb.hooks.commit-msg";
 if [ "$(git config --bool $config_ns.fatal)" = "true" ]
 then
 	fatal=1;
+	severity=Error;
 else
 	fatal=0;
+	severity=Warning;
 fi
 
 debug_level=$(git config --int $config_ns.debug || echo 0);
@@ -187,7 +189,7 @@ do
 					# Don't be too strict.
 					# Commits may be temporary, intended to be squashed later.
 					# Just issue a warning here.
-					complain "Warning: heading should be a sentence beginning with a capital letter." 1>&2
+					complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2
 					complain "You entered:" 1>&2
 					complain "$line" 1>&2
 				fi

From aceca2566b80753d79c1dc77f5470618b0a2078d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 17 Apr 2012 05:59:35 -0400
Subject: [PATCH 173/279] [ticket/10767] Clarify what happens at the end of the
 hook.

If there are problems and fatal is true, print that the commit
is aborted.

If there are problems and fatal is false, print instructions
for fixing the commit.

PHPBB3-10767
---
 git-tools/hooks/commit-msg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index fbeda805b7..b156d276df 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -63,10 +63,17 @@ debug()
 
 quit()
 {
-	if [ $1 -gt 0 ] && [ $1 -ne $ERR_UNKNOWN ] && [ $fatal -eq 0 ]
+	if [ $1 -eq 0 ] || [ $1 -eq $ERR_UNKNOWN ]
 	then
+		# success
+		exit 0;
+	elif [ $fatal -eq 0 ]
+	then
+		# problems found but fatal is false
+		complain 'Please run `git commit --amend` and fix the problems mentioned.' 1>&2
 		exit 0;
 	else
+		complain "Aborting commit." 1>&2
 		exit $1;
 	fi
 }

From 00c54f8a7cad92eff14fe62530766666c2c796a7 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 17 Apr 2012 22:59:10 -0500
Subject: [PATCH 174/279] [ticket/10819] Remove support for older browsers

PHPBB3-10819
---
 phpBB/adm/style/install_update_diff.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index e57d19161d..4d8bcfd1fc 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -152,14 +152,10 @@ table.hrdiff tbody td {
 	border-right: 1px solid #999;
 }
 
-/* Variant of http://www.longren.org/wrapping-text-inside-pre-tags/ */
 table.hrdiff td pre {
 	font-family: "Consolas", monospace;
 	font-size: 1.1em;
 	white-space: pre-wrap;		/* css-3 */
-	white-space: -moz-pre-wrap !important;	/* Mozilla, since 1999 */
-	white-space: -pre-wrap;		/* Opera 4-6 */
-	white-space: -o-pre-wrap;	/* Opera 7 */
 	word-wrap: break-word;		/* Internet Explorer 5.5+ */
 }
 

From 90fc8fe59f5f6e53071a8ccb85d085d62491c466 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 04:30:42 +0530
Subject: [PATCH 175/279] [ticket/10797] language key rank moved to common

Language key RANK moved from memberlist to common.
Removed from mcp language.

PHPBB3-10797
---
 phpBB/language/en/common.php     | 1 +
 phpBB/language/en/mcp.php        | 1 -
 phpBB/language/en/memberlist.php | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 005640b7dd..dc6bab3ce2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -459,6 +459,7 @@ $lang = array_merge($lang, array(
 	'PRIVATE_MESSAGING'		=> 'Private messaging',
 	'PROFILE'				=> 'User Control Panel',
 
+	'RANK'						=> 'Rank',
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
 	'READING_LINK'				=> 'Following forum link %s',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 16b55b3612..d0bcec0d9c 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -274,7 +274,6 @@ $lang = array_merge($lang, array(
 	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
 	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
 
-	'RANK'						=> 'User rank',
 	'READ_USERNOTES'			=> 'User notes',
 	'READ_WARNINGS'				=> 'User warnings',
 	'REPORTER'					=> 'Reporter',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index e71f9d6565..7dc5e6b74a 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -110,7 +110,6 @@ $lang = array_merge($lang, array(
 
 	'POST_IP'				=> 'Posted from IP/domain',
 
-	'RANK'					=> 'Rank',
 	'REAL_NAME'				=> 'Recipient name',
 	'RECIPIENT'				=> 'Recipient',
 	'REMOVE_FOE'			=> 'Remove foe',

From edf60bcd550334a521f35700d52d800b1851d693 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 14 Apr 2012 18:57:21 +0200
Subject: [PATCH 176/279] [ticket/10812] Disabled register_globals check in PHP
 5.4

Disabled the check for register_globals if PHP version is 5.4+

PHPBB3-10812
---
 phpBB/install/install_install.php | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 026fc0d404..454c8b4df0 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -166,25 +166,28 @@ class install_install extends module
 			'S_LEGEND'		=> false,
 		));
 
-		// Check for register_globals being enabled
-		if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+		// Don't check for register_globals on 5.4+
+		if (version_compare($php_version, '5.4.0-dev') < 0)
 		{
-			$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
+			// Check for register_globals being enabled
+			if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
+			{
+				$result = '<strong style="color:red">' . $lang['NO'] . '</strong>';
+			}
+			else
+			{
+				$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
+			}
+
+			$template->assign_block_vars('checks', array(
+				'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
+				'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
+				'RESULT'		=> $result,
+
+				'S_EXPLAIN'		=> true,
+				'S_LEGEND'		=> false,
+			));
 		}
-		else
-		{
-			$result = '<strong style="color:green">' . $lang['YES'] . '</strong>';
-		}
-
-		$template->assign_block_vars('checks', array(
-			'TITLE'			=> $lang['PHP_REGISTER_GLOBALS'],
-			'TITLE_EXPLAIN'	=> $lang['PHP_REGISTER_GLOBALS_EXPLAIN'],
-			'RESULT'		=> $result,
-
-			'S_EXPLAIN'		=> true,
-			'S_LEGEND'		=> false,
-		));
-
 
 		// Check for url_fopen
 		if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on')

From 4788705a9a885df4bc9af834d6911a8c9919ce0b Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 15 Apr 2012 15:01:32 +0530
Subject: [PATCH 177/279] [ticket/10815] enables feed feature by default for a
 fresh install

PHPBB3-10815
---
 phpBB/install/schemas/schema_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index fcc372ae93..efc81e37c0 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -99,7 +99,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_http_auth', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_post', '15');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit_topic', '10');

From de70b17b1dc19e19faa0d56395a1aba8868c9624 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Fri, 20 Apr 2012 23:50:49 -0500
Subject: [PATCH 178/279] [ticket/10492] Separate config generation from the
 installer

PHPBB3-10492
---
 phpBB/includes/functions_install.php          | 52 +++++++++++++++++++
 phpBB/install/install_install.php             | 28 +---------
 .../phpbb_database_test_case.php              | 40 ++------------
 .../phpbb_test_case_helpers.php               | 45 ++++++++++++++++
 4 files changed, 102 insertions(+), 63 deletions(-)

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 6caa5c943f..633b2755f0 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -512,4 +512,56 @@ function adjust_language_keys_callback($matches)
 	}
 }
 
+/**
+* Creates the output to be stored in a phpBB config.php file
+*
+* @param	array	$data Array containing the database connection information
+* @param	string	$dbms The name of the DBAL class to use
+* @param	array	$load_extensions Array of additional extensions that should be loaded
+* @param	bool	$debug If the debug constants should be enabled by default or not
+*
+* @return	string	The output to write to the file
+*/
+function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug = false)
+{
+	$load_extensions = implode(',', $load_extensions);
+
+	$config_data = "<?php\n";
+	$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
+
+	$config_data_array = array(
+		'dbms'			=> $dbms,
+		'dbhost'		=> $data['dbhost'],
+		'dbport'		=> $data['dbport'],
+		'dbname'		=> $data['dbname'],
+		'dbuser'		=> $data['dbuser'],
+		'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
+		'table_prefix'	=> $data['table_prefix'],
+		'acm_type'		=> 'file',
+		'load_extensions'	=> $load_extensions,
+	);
+
+	foreach ($config_data_array as $key => $value)
+	{
+		$config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n";
+	}
+
+	$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
+
+	if ($debug)
+	{
+		$config_data .= "@define('DEBUG', true);\n";
+		$config_data .= "@define('DEBUG_EXTRA', true);\n";
+	}
+	else
+	{
+		$config_data .= "// @define('DEBUG', true);\n";
+		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
+	}
+
+	$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
+
+	return $config_data;
+}
+
 ?>
\ No newline at end of file
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 454c8b4df0..81dac9ecde 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -884,34 +884,8 @@ class install_install extends module
 
 		@chmod($phpbb_root_path . 'cache/install_lock', 0777);
 
-		$load_extensions = implode(',', $load_extensions);
-
 		// Time to convert the data provided into a config file
-		$config_data = "<?php\n";
-		$config_data .= "// phpBB 3.0.x auto-generated configuration file\n// Do not change anything in this file!\n";
-
-		$config_data_array = array(
-			'dbms'			=> $available_dbms[$data['dbms']]['DRIVER'],
-			'dbhost'		=> $data['dbhost'],
-			'dbport'		=> $data['dbport'],
-			'dbname'		=> $data['dbname'],
-			'dbuser'		=> $data['dbuser'],
-			'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
-			'table_prefix'	=> $data['table_prefix'],
-			'acm_type'		=> 'file',
-			'load_extensions'	=> $load_extensions,
-		);
-
-		foreach ($config_data_array as $key => $value)
-		{
-			$config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n";
-		}
-		unset($config_data_array);
-
-		$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
-		$config_data .= "// @define('DEBUG', true);\n";
-		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
-		$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
+		$config_data = phpbb_create_config_file_data($data, $available_dbms[$data['dbms']]['DRIVER'], $load_extensions);
 
 		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
 		if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path))
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index fdb662b284..e742b543b0 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -40,46 +40,14 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	public function get_database_config()
 	{
-		if (isset($_SERVER['PHPBB_TEST_DBMS']))
-		{
-			return array(
-				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '',
-				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
-				'dbport'	=> isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',
-				'dbname'	=> isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '',
-				'dbuser'	=> isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '',
-				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
-			);
-		}
-		else if (file_exists(dirname(__FILE__) . '/../test_config.php'))
-		{
-			include(dirname(__FILE__) . '/../test_config.php');
+		$config = phpbb_test_case_helpers::get_test_config();
 
-			return array(
-				'dbms'		=> $dbms,
-				'dbhost'	=> $dbhost,
-				'dbport'	=> $dbport,
-				'dbname'	=> $dbname,
-				'dbuser'	=> $dbuser,
-				'dbpasswd'	=> $dbpasswd,
-			);
-		}
-		else if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
-		{
-			// Silently use sqlite
-			return array(
-				'dbms'		=> 'sqlite',
-				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
-				'dbport'	=> '',
-				'dbname'	=> '',
-				'dbuser'	=> '',
-				'dbpasswd'	=> '',
-			);
-		}
-		else
+		if (!isset($config['dbms']))
 		{
 			$this->markTestSkipped('Missing test_config.php: See first error.');
 		}
+
+		return $config;
 	}
 
 	public function getConnection()
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9a7ab2d237..9c60969d76 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -41,4 +41,49 @@ class phpbb_test_case_helpers
 		$this->expectedTriggerError = true;
 		$this->test_case->setExpectedException($exceptionName, (string) $message, $errno);
 	}
+
+	static public function get_test_config()
+	{
+		$config = array();
+
+		if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
+		{
+			$config = array_merge($config, array(
+				'dbms'		=> 'sqlite',
+				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
+				'dbport'	=> '',
+				'dbname'	=> '',
+				'dbuser'	=> '',
+				'dbpasswd'	=> '',
+			));
+		}
+
+		if (file_exists(dirname(__FILE__) . '/../test_config.php'))
+		{
+			include(dirname(__FILE__) . '/../test_config.php');
+
+			$config = array_merge($config, array(
+				'dbms'		=> $dbms,
+				'dbhost'	=> $dbhost,
+				'dbport'	=> $dbport,
+				'dbname'	=> $dbname,
+				'dbuser'	=> $dbuser,
+				'dbpasswd'	=> $dbpasswd,
+			));
+		}
+
+		if (isset($_SERVER['PHPBB_TEST_DBMS']))
+		{
+			$config = array_merge($config, array(
+				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '',
+				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
+				'dbport'	=> isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',
+				'dbname'	=> isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '',
+				'dbuser'	=> isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '',
+				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : ''
+			));
+		}
+
+		return $config;
+	}
 }

From 2aa994b5ad76941689e7993707509e48438c500b Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 21 Apr 2012 04:37:57 -0500
Subject: [PATCH 179/279] [ticket/10492] Backporting functional tests

PHPBB3-10492
---
 phpunit.xml.all                               |   4 +
 phpunit.xml.dist                              |   5 +
 phpunit.xml.functional                        |  35 ++++
 tests/bootstrap.php                           |   5 +
 tests/functional/browse_test.php              |  26 +++
 .../phpbb_functional_test_case.php            | 164 ++++++++++++++++++
 .../phpbb_test_case_helpers.php               |  12 ++
 vendor/goutte.phar                            | Bin 0 -> 267414 bytes
 8 files changed, 251 insertions(+)
 create mode 100644 phpunit.xml.functional
 create mode 100644 tests/functional/browse_test.php
 create mode 100644 tests/test_framework/phpbb_functional_test_case.php
 create mode 100644 vendor/goutte.phar

diff --git a/phpunit.xml.all b/phpunit.xml.all
index 1be2830729..9e220ff559 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -14,6 +14,10 @@
     <testsuites>
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
+            <exclude>./tests/functional</exclude>
+        </testsuite>
+        <testsuite name="phpBB Functional Tests">
+            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
     </testsuites>
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index de8134da8e..f8bf063d9a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,11 +14,16 @@
     <testsuites>
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
+            <exclude>./tests/functional</exclude>
+        </testsuite>
+        <testsuite name="phpBB Functional Tests">
+            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
     </testsuites>
 
     <groups>
         <exclude>
+            <group>functional</group>
             <group>slow</group>
         </exclude>
     </groups>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
new file mode 100644
index 0000000000..376d52e6d8
--- /dev/null
+++ b/phpunit.xml.functional
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="phpBB Test Suite">
+            <directory suffix="_test.php">./tests/</directory>
+            <exclude>./tests/functional</exclude>
+        </testsuite>
+        <testsuite name="phpBB Functional Tests">
+            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
+        </testsuite>
+    </testsuites>
+
+    <groups>
+        <include>
+            <group>functional</group>
+        </include>
+    </groups>
+
+    <filter>
+        <blacklist>
+            <directory>./tests/</directory>
+        </blacklist>
+    </filter>
+</phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 2fb805043e..d6c5d25bc8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,3 +19,8 @@ require_once 'test_framework/phpbb_test_case_helpers.php';
 require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
 require_once 'test_framework/phpbb_database_test_connection_manager.php';
+
+if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
+{
+	require_once 'test_framework/phpbb_functional_test_case.php';
+}
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
new file mode 100644
index 0000000000..d056003578
--- /dev/null
+++ b/tests/functional/browse_test.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_browse_test extends phpbb_functional_test_case
+{
+	public function test_index()
+	{
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+
+	public function test_viewforum()
+	{
+		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
new file mode 100644
index 0000000000..b5e6f7e377
--- /dev/null
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -0,0 +1,164 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
+
+class phpbb_functional_test_case extends phpbb_test_case
+{
+	protected $client;
+	protected $root_url;
+
+	static protected $config = array();
+	static protected $already_installed = false;
+
+	static public function setUpBeforeClass()
+	{
+		if (!extension_loaded('phar'))
+		{
+			self::markTestSkipped('phar extension is not loaded');
+		}
+
+		require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
+	}
+
+	public function setUp()
+	{
+		if (!isset(self::$config['phpbb_functional_url']))
+		{
+			$this->markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
+		}
+
+		$this->client = new Goutte\Client();
+		$this->root_url = self::$config['phpbb_functional_url'];
+	}
+
+	public function request($method, $path)
+	{
+		return $this->client->request($method, $this->root_url . $path);
+	}
+
+	// bootstrap, called after board is set up
+	// once per test case class
+	// test cases can override this
+	protected function bootstrap()
+	{
+	}
+
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+
+		$this->backupStaticAttributesBlacklist += array(
+			'phpbb_functional_test_case' => array('config', 'already_installed'),
+		);
+
+		if (!static::$already_installed)
+		{
+			$this->install_board();
+			$this->bootstrap();
+			static::$already_installed = true;
+		}
+	}
+
+	protected function install_board()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		self::$config = phpbb_test_case_helpers::get_test_config();
+
+		if (!isset(self::$config['phpbb_functional_url']))
+		{
+			return;
+		}
+
+		self::$config['table_prefix'] = 'phpbb_';
+		$this->recreate_database(self::$config);
+
+		if (file_exists($phpbb_root_path . "config.$phpEx"))
+		{
+			if (!file_exists($phpbb_root_path . "config_dev.$phpEx"))
+			{
+				rename($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_dev.$phpEx");
+			}
+			else
+			{
+				unlink($phpbb_root_path . "config.$phpEx");
+			}
+		}
+
+		// begin data
+		$data = array();
+
+		$data = array_merge($data, self::$config);
+
+		$data = array_merge($data, array(
+			'default_lang'	=> 'en',
+			'admin_name'	=> 'admin',
+			'admin_pass1'	=> 'admin',
+			'admin_pass2'	=> 'admin',
+			'board_email'	=> 'nobody@example.com',
+		));
+
+		$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'		=> '',
+			'cookie_secure'		=> false,
+			'force_server_vars'	=> false,
+			'server_protocol'	=> $parseURL['scheme'] . '://',
+			'server_name'		=> 'localhost',
+			'server_port'		=> isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
+			'script_path'		=> $parseURL['path'],
+		));
+		// end data
+
+		$content = $this->do_request('install');
+		$this->assertContains('Welcome to Installation', $content);
+
+		$this->do_request('create_table', $data);
+
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true));
+
+		$this->do_request('config_file', $data);
+
+		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
+
+		$this->do_request('final', $data);
+	}
+
+	private function do_request($sub, $post_data = null)
+	{
+		$context = null;
+
+		if ($post_data)
+		{
+			$context = stream_context_create(array(
+				'http' => array(
+					'method'	=> 'POST',
+					'header'	=> 'Content-Type: application/x-www-form-urlencoded',
+					'content'	=> http_build_query($post_data),
+					'ignore_errors' => true,
+				),
+			));
+		}
+
+		return file_get_contents(self::$config['phpbb_functional_url'] . 'install/index.php?mode=install&sub=' . $sub, false, $context);
+	}
+
+	private function recreate_database($config)
+	{
+		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
+		$db_conn_mgr->recreate_db();
+	}
+}
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9c60969d76..b46c36efaa 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -70,6 +70,11 @@ class phpbb_test_case_helpers
 				'dbuser'	=> $dbuser,
 				'dbpasswd'	=> $dbpasswd,
 			));
+
+			if (isset($phpbb_functional_url))
+			{
+				$config['phpbb_functional_url'] = $phpbb_functional_url;
+			}
 		}
 
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -84,6 +89,13 @@ class phpbb_test_case_helpers
 			));
 		}
 
+		if (isset($_SERVER['PHPBB_FUNCTIONAL_URL']))
+		{
+			$config = array_merge($config, array(
+				'phpbb_functional_url'	=> isset($_SERVER['PHPBB_FUNCTIONAL_URL']) ? $_SERVER['PHPBB_FUNCTIONAL_URL'] : '',
+			));
+		}
+
 		return $config;
 	}
 }
diff --git a/vendor/goutte.phar b/vendor/goutte.phar
new file mode 100644
index 0000000000000000000000000000000000000000..20b7166a6717aa5b904859fc1ffe3b32106d55a8
GIT binary patch
literal 267414
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
L-+lYd^KbrtSl@Ba

literal 0
HcmV?d00001


From 6293bbf09949335bb8101bcef8f043750d756dc9 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 21 Apr 2012 05:24:57 -0500
Subject: [PATCH 180/279] [ticket/10492] Fix line endings

PHPBB3-10492
---
 tests/functional/browse_test.php | 52 ++++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index d056003578..723cf93232 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -1,26 +1,26 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_browse_test extends phpbb_functional_test_case
-{
-	public function test_index()
-	{
-		$crawler = $this->request('GET', 'index.php');
-		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
-	}
-
-	public function test_viewforum()
-	{
-		$crawler = $this->request('GET', 'viewforum.php?f=2');
-		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
-	}
-}
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_browse_test extends phpbb_functional_test_case
+{
+	public function test_index()
+	{
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+
+	public function test_viewforum()
+	{
+		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+}

From a21b367b21d811a3673145572b0bdd123ccc4767 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 14:16:55 +0200
Subject: [PATCH 181/279] [ticket/10836] Enable avatars by default at install

Enables avatars and local avatar upload by default.

PHPBB3-10836
---
 phpBB/install/schemas/schema_data.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index efc81e37c0..ba2d18da00 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -8,10 +8,10 @@
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote_upload', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_birthdays', '1');

From 8cf0b79a4746b416e66264cc3313f46d995b1783 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 23 Apr 2012 17:16:16 -0400
Subject: [PATCH 182/279] [task/functional] Increase code coverage for
 functional tests

PHPBB3-10758
---
 tests/functional/auth_test.php                | 40 ++++++++++
 tests/functional/browse_test.php              |  6 ++
 tests/functional/lang_test.php                | 37 +++++++++
 .../phpbb_functional_test_case.php            | 77 ++++++++++++++++++-
 4 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 tests/functional/auth_test.php
 create mode 100644 tests/functional/lang_test.php

diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
new file mode 100644
index 0000000000..e955dcb4df
--- /dev/null
+++ b/tests/functional/auth_test.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_auth_test extends phpbb_functional_test_case
+{
+	public function test_login()
+	{
+		$this->login();
+
+		// check for logout link
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
+	}
+
+	/**
+	* @depends test_login
+	*/
+	public function test_logout()
+	{
+		$this->login();
+		$this->add_lang('ucp');
+
+		// logout
+		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text());
+
+		// look for a register link, which should be visible only when logged out
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
+	}
+}
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 723cf93232..26c18c4c1f 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -23,4 +23,10 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'viewforum.php?f=2');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
+
+	public function test_viewtopic()
+	{
+		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
+	}
 }
diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php
new file mode 100644
index 0000000000..f77dd511a3
--- /dev/null
+++ b/tests/functional/lang_test.php
@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_lang_test extends phpbb_functional_test_case
+{
+	public function test_lang()
+	{
+		// Test a language string present in the common language file
+		$this->assertEquals('Board index', $this->lang('FORUM_INDEX'));
+	}
+
+	public function test_add_lang()
+	{
+		$this->add_lang('ucp');
+
+		// Test a language string present only in the UCP language file
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
+	public function test_add_langs()
+	{
+		$this->add_lang(array('groups', 'memberlist'));
+
+		// Test a language string from each UCP and memberlist
+		$this->assertEquals('The selected group is already your default group.', $this->lang('ALREADY_DEFAULT_GROUP'));
+		$this->assertEquals('Profile', $this->lang('ABOUT_USER'));
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b5e6f7e377..f14e214a78 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -6,6 +6,7 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
+use Symfony\Component\BrowserKit\CookieJar;
 
 require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
 
@@ -13,6 +14,14 @@ class phpbb_functional_test_case extends phpbb_test_case
 {
 	protected $client;
 	protected $root_url;
+	/**
+	* @var string Session ID for current test's session (each test makes its own)
+	*/
+	protected $sid;
+	/**
+	* @var array Language array used by phpBB
+	*/
+	private $lang = array();
 
 	static protected $config = array();
 	static protected $already_installed = false;
@@ -34,8 +43,13 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$this->markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
 
-		$this->client = new Goutte\Client();
+		$this->cookieJar = new CookieJar;
+		$this->client = new Goutte\Client(array(), array(), null, $this->cookieJar);
 		$this->root_url = self::$config['phpbb_functional_url'];
+		// Clear the language array so that things
+		// that were added in other tests are gone
+		$this->lang = array();
+		$this->add_lang('common');
 	}
 
 	public function request($method, $path)
@@ -161,4 +175,65 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
 		$db_conn_mgr->recreate_db();
 	}
+
+	protected function login()
+	{
+		$this->add_lang('ucp');
+
+		$crawler = $this->request('GET', 'ucp.php');
+		$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
+
+		$cookies = $this->cookieJar->all();
+		$sid = '';
+		// get the SID from the cookie
+		foreach ($cookies as $key => $cookie);
+		{
+			if (substr($key, -4) == '_sid')
+			{
+				$this->sid = $cookie->getValue();
+			}
+		}
+	}
+
+	protected function add_lang($lang_file)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		if (is_array($lang_file))
+		{
+			foreach ($lang_file as $file)
+			{
+				$this->add_lang($file);
+			}
+		}
+
+		$lang_path = "{$phpbb_root_path}language/en/$lang_file.$phpEx";
+
+		$lang = array();
+
+		if (file_exists($lang_path))
+		{
+			include($lang_path);
+		}
+
+		$this->lang = array_merge($this->lang, $lang);
+	}
+
+	protected function lang()
+	{
+		$args = func_get_args();
+		$key = $args[0];
+
+		if (empty($this->lang[$key]))
+		{
+			throw new Exception('Language key "' . $key . '" could not be found.');
+		}
+
+		$args[0] = $this->lang[$key];
+
+		return call_user_func_array('sprintf', $args);
+	}
 }

From b82c77b38f69aa2d8030ee848042a0169592878b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 24 Apr 2012 14:10:50 -0400
Subject: [PATCH 183/279] [task/functional] Make sure missing language values
 are handled properly

PHPBB3-10758
---
 tests/functional/lang_test.php                      | 8 ++++++++
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php
index f77dd511a3..053806a431 100644
--- a/tests/functional/lang_test.php
+++ b/tests/functional/lang_test.php
@@ -18,6 +18,14 @@ class phpbb_functional_lang_test extends phpbb_functional_test_case
 		$this->assertEquals('Board index', $this->lang('FORUM_INDEX'));
 	}
 
+	/**
+	* @expectedException RuntimeException
+	*/
+	public function test_lang_missing()
+	{
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
 	public function test_add_lang()
 	{
 		$this->add_lang('ucp');
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index f14e214a78..177f93cf3b 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -229,7 +229,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		if (empty($this->lang[$key]))
 		{
-			throw new Exception('Language key "' . $key . '" could not be found.');
+			throw new RuntimeException('Language key "' . $key . '" could not be found.');
 		}
 
 		$args[0] = $this->lang[$key];

From 1a8db76a200bd0de0bf17acd89e87e4875513d4c Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 22:52:11 +0200
Subject: [PATCH 184/279] [ticket/10836] Check if avatar directory is writable
 after install

Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
---
 phpBB/install/install_install.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 81dac9ecde..35fc0bb58e 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -105,6 +105,7 @@ class install_install extends module
 				$this->add_language($mode, $sub);
 				$this->add_bots($mode, $sub);
 				$this->email_admin($mode, $sub);
+				$this->disable_avatars_if_unwritable();
 
 				// Remove the lock file
 				@unlink($phpbb_root_path . 'cache/install_lock');
@@ -1941,6 +1942,21 @@ class install_install extends module
 		));
 	}
 
+	/**
+	* Check if the avatar directory is writable and disable avatars
+	* if it isn't writable.
+	*/
+	function disable_avatars_if_unwritable()
+	{
+		global $phpbb_root_path;
+
+		if (!phpbb_is_writable($phpbb_root_path . 'images/avatars/upload/'))
+		{
+			set_config('allow_avatar', 0);
+			set_config('allow_avatar_upload', 0);
+		}
+	}
+
 	/**
 	* Generate a list of available mail server authentication methods
 	*/

From 8d45901657801dcbf33ac2936559dbfe2ac373d8 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Fri, 27 Apr 2012 22:19:41 +0200
Subject: [PATCH 185/279] [ticket/10849] Added missing helptext for listitem

Added the missing helptext for list item in subsilver2.

PHPBB3-10849
---
 phpBB/styles/subsilver2/template/posting_buttons.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index a9105b5eec..cfe69dee56 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -16,6 +16,7 @@
 			q: '{LA_BBCODE_Q_HELP}',
 			c: '{LA_BBCODE_C_HELP}',
 			l: '{LA_BBCODE_L_HELP}',
+			e: '{LA_BBCODE_LISTITEM_HELP}',
 			o: '{LA_BBCODE_O_HELP}',
 			p: '{LA_BBCODE_P_HELP}',
 			w: '{LA_BBCODE_W_HELP}',

From 665f38d42f8692f5eab76348568ddb46b372492d Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 30 Apr 2012 22:01:53 +0200
Subject: [PATCH 186/279] [ticket/10846] fixing SQL query bug in acp_main.php

PHPBB3-10846
---
 phpBB/includes/acp/acp_main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index e529ae0e5a..cffe296651 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -201,7 +201,7 @@ class acp_main
 						// No maximum post id? :o
 						if (!$max_post_id)
 						{
-							$sql = 'SELECT MAX(post_id)
+							$sql = 'SELECT MAX(post_id) as max_post_id
 								FROM ' . POSTS_TABLE;
 							$result = $db->sql_query($sql);
 							$max_post_id = (int) $db->sql_fetchfield('max_post_id');

From 2dd71f65204c8e484c81147e4966e33fcb7d1f42 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 1 May 2012 09:52:48 +0200
Subject: [PATCH 187/279] [ticket/10835] fixing misleading message in UCP

PHPBB3-10835
---
 phpBB/language/en/ucp.php                                     | 3 ++-
 phpBB/styles/prosilver/template/ucp_profile_reg_details.html  | 4 ++--
 phpBB/styles/subsilver2/template/ucp_profile_reg_details.html | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3ebc863447..fb417a5742 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -137,7 +137,8 @@ $lang = array_merge($lang, array(
 	'CREATE_FOLDER'				=> 'Add folder…',
 	'CURRENT_IMAGE'				=> 'Current image',
 	'CURRENT_PASSWORD'			=> 'Current password',
-	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
+	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must enter your current password if you wish to alter your e-mail address or username.',
+	'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'You must enter your current password if you wish to change it, alter your e-mail address or username.',
 	'CUR_PASSWORD_EMPTY'		=> 'You did not enter your current password.',
 	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
 	'CUSTOM_DATEFORMAT'			=> 'Custom…',
diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
index edd58d5e25..5eb55dc71c 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
@@ -45,7 +45,7 @@
 
 	<fieldset>
 	<dl>
-		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span>{L_CURRENT_PASSWORD_EXPLAIN}</span></dt>
+		<dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt>
 		<dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd>
 	</dl>
 	</fieldset>
@@ -54,7 +54,7 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
index 78fb5a9628..09f60ad5a7 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
@@ -42,7 +42,7 @@
 	<th colspan="2">{L_CONFIRM_CHANGES}</th>
 </tr>
 <tr>
-	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td>
+	<td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>
 	<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
 </tr>
 <tr>

From 58842b5ca8020b16a99f5420381a2b095bba89de Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 5 May 2012 16:01:07 -0400
Subject: [PATCH 188/279] [ticket/10834] Backport general development language
 changes to 3.0.

PHPBB3-10688
PHPBB3-10834
---
 phpBB/docs/README.html | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index aa60d7dd25..fb30ef5cba 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -106,6 +106,7 @@
 
 	<ul>
 		<li>Updates from phpBB3 RC1 to the latest version</li>
+		<li>Note: if using the <em>Automatic Update Package</em>, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.</li>
 		<li>Conversions from phpBB 2.0.x to the latest version</li>
 		<li>New installations of phpBB3 - always only the latest released version</li>
 	</ul>
@@ -136,13 +137,13 @@
 
 	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
 
-	<p>Installation of these packages is straightforward, simply download the required language pack and unarchive it into the <samp>languages/</samp> folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the <code>Admin-&gt;System-&gt;Language Packs</code> and install the now appeared new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.</p>
+	<p>Installation of these packages is straightforward, simply download the required language pack and unarchive it into the <samp>languages/</samp> folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the <code>Admin-&gt;System-&gt;Language Packs</code> and install the now appearing new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.</p>
 
 	<p>If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.</p>
 
 	<a name="styles"></a><h3>2.ii. Styles</h3>
 
-	<p>Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
+	<p>Although phpBB Group are rather proud of the included styles we realise that they may not be to everyone's tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
 
 	<p><a href="http://www.phpbb.com/styles/">http://www.phpbb.com/styles/</a></p>
 
@@ -192,7 +193,7 @@
 
 	<p>phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
 
-	<p><a href="http://www.phpbb.com/">http://www.phpbb.com/</a></p>
+	<p><a href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a></p>
 
 	<p>If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.</p>
 
@@ -200,6 +201,8 @@
 
 	<p>Another place you may find help is our IRC channel. This operates on the Freenode IRC network, <em>irc.freenode.net</em> and the channel is <em>#phpbb</em> and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.</p>
 
+	<p>There are other IRC channels available, please see <a href="http://www.phpbb.com/support/irc/">http://www.phpbb.com/support/irc/</a> for the complete list.</p>
+
 		</div>
 
 		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
@@ -216,9 +219,9 @@
 
 		<div class="content">
 
-	<p>This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with only point releases seeing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.</p>
+	<p>This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with only point releases seeing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.1. Please do not post questions asking when 3.1 will be available, no release date has been set.</p>
 
-	<p>For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:</p>
+	<p>Those interested in the development of phpBB should keep an eye on the development forums to see how things are progressing:</p>
 
 	<p><a href="http://area51.phpbb.com/phpBB/">http://area51.phpbb.com/phpBB/</a></p>
 
@@ -240,17 +243,17 @@
 
 		<div class="content">
 
-	<p>The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please <strong>DO NOT</strong> post bug reports to our forums, they will be locked. In addition please <strong>DO NOT</strong> use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).</p>
+	<p>The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please <strong>DO NOT</strong> post bug reports to our forums. In addition please <strong>DO NOT</strong> use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).</p>
 
-	<p><a href="http://tracker.phpbb.com/">http://tracker.phpbb.com/</a></p>
+	<p><a href="http://tracker.phpbb.com/browse/PHPBB3">http://tracker.phpbb.com/browse/PHPBB3</a></p>
 
 	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
 
 	<ul>
-		<li>Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br /><br /></li>
+		<li>Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues.<br /><br /></li>
 		<li>Next please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
-		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3<br /><br /></li>
-		<li>If no existing bug exists then please feel free to add it</li>
+		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3.<br /><br /></li>
+		<li>If no existing bug exists then please feel free to add it.</li>
 	</ul>
 
 	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
@@ -261,10 +264,12 @@
 		<li>DB type/version, e.g. MySQL 4.0.1, PostgreSQL 7.3.2, MSSQL Server 2000 SP1, etc.</li>
 	</ul>
 
-	<p>The relevant database type/version is listed within the administration control panel</p>
+	<p>The relevant database type/version is listed within the administration control panel.</p>
 
 	<p>Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request <a href="https://github.com/phpbb/phpbb3">on GitHub</a>.</p>
 
+	<p>If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.0.x the coding guidelines may be found here: <a href="http://area51.phpbb.com/docs/30x/coding-guidelines.html">http://area51.phpbb.com/docs/30x/coding-guidelines.html</a></p>
+
 	<p>Once a bug has been submitted you will be emailed any follow up comments added to it. <strong>Please</strong> if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.</p>
 
 <a name="securitybugs"></a><h3>5.i. Security related bugs</h3>
@@ -317,7 +322,7 @@
 
 	<p>Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem. </p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p>
 
 <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
 

From c34ee343ba1ff0c401f3a04216e9e7ffb9a1a859 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 5 May 2012 16:08:37 -0400
Subject: [PATCH 189/279] [ticket/10843] Backport changes to install language.

PHPBB3-10688
PHPBB3-10843
---
 phpBB/docs/INSTALL.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index c54e408be2..6ab118e3ee 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -141,13 +141,13 @@
 			<li>PostgreSQL 7.3+</li>
 			<li>SQLite 2.8.2+</li>
 			<li>Firebird 2.1+</li>
-			<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
+			<li>MS SQL Server 2000 or above (directly or via ODBC or the native adapter)</li>
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 4.3.3+ (>=4.3.3, >4.4.x, >5.x.x, >6.0-dev (compatible))</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 4.3.3+ (>=4.3.3, >=4.4.x, >=5.x.x, >=5.4.x)</strong> with support for the database you intend to use.</li>
 		<li>getimagesize() function need to be enabled.</li>
-		<li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required.
+		<li>Presence of the following modules within PHP will provide access to additional features, but they are not required:
 		<ul>
 			<li>zlib Compression support</li>
 			<li>Remote FTP support</li>
@@ -182,7 +182,7 @@
 
 	<p>All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in <strong>ASCII</strong> mode, while all graphics should be uploaded in <strong>BINARY</strong> mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.</p>
 
-	<p>phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
+	<p>phpBB3 comes supplied with British English as its standard language. However a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
 
 	<p>Once all the files have been uploaded to your site you should point your browser at this location with the addition of <code>install/</code>. For example if your domain name is <em>www.mydomain.tld</em> and you placed phpBB3 in a directory /phpBB3 off your web root you would enter <em>http://www.mydomain.tld/phpBB3/install/</em> or (alternatively) <em>http://www.mydomain.tld/phpBB3/install/index.php</em> into your browser. When you have done this you should see the phpBB3 Installation screen appear.</p>
 

From a960bd6790a60bd1023e632230848e9e786c8921 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 6 May 2012 19:37:49 +0300
Subject: [PATCH 190/279] [ticket/10860] Fixing js error in updater

Fixing javascript error in side-by-side diff styling in updater:
resizing inner block instead of outer block and increasing
height by inner/outer block difference.

PHPBB3-10860
---
 phpBB/adm/style/install_update_diff.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index b65a014312..15ea00141d 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -15,12 +15,12 @@
 // <![CDATA[
 function resize_panel()
 {
-	var block = document.getElementById('codepanel');
+	var block = document.getElementById('diff_content');
 	var height;
 
 	if (window.innerHeight)
 	{
-		height = window.innerHeight - 150;
+		height = window.innerHeight - 200;
 		block.style.height = height + 'px';
 	}
 	else

From 8d15f1b02ecff1c9e90b8bed1b1f356eaaff348b Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 7 May 2012 08:18:50 +0200
Subject: [PATCH 191/279] [ticket/10835] changing
 CURRENT_CHANGE_PASSWORD_EXPLAIN language entry

PHPBB3-10835
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index fb417a5742..6f6b319d48 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -138,7 +138,7 @@ $lang = array_merge($lang, array(
 	'CURRENT_IMAGE'				=> 'Current image',
 	'CURRENT_PASSWORD'			=> 'Current password',
 	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must enter your current password if you wish to alter your e-mail address or username.',
-	'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'You must enter your current password if you wish to change it, alter your e-mail address or username.',
+	'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'To change your password, your email address, or your username, you must enter your current password.',
 	'CUR_PASSWORD_EMPTY'		=> 'You did not enter your current password.',
 	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
 	'CUSTOM_DATEFORMAT'			=> 'Custom…',

From e52d23848a1b116d32fbad9dd384e0755553b829 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 8 May 2012 18:44:43 -0500
Subject: [PATCH 192/279] [ticket/10858] Fix MSSQL Native's row seeking
 behavior

The result_mssqlnative class remains in case someone wants to use it

PHPBB3-10858
---
 phpBB/includes/db/mssqlnative.php | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 7fbc374e77..6391664a3e 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -447,14 +447,39 @@ class dbal_mssqlnative extends dbal
 	{
 		global $cache;
 
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
 		if (isset($cache->sql_rowset[$query_id]))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
 
-		$seek = new result_mssqlnative($query_id);
-		$row = $seek->seek($rownum);
-		return ($row = $seek->fetch()) ? $row : false;
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$this->sql_freeresult($query_id);
+		$query_id = $this->sql_query($this->last_query_text);
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+		for ($i = 0; $i < $rownum; $i++)
+		{
+			if (!$this->sql_fetchrow($query_id))
+			{
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	/**

From afbaa6979b62acb16fa09247ec4613d5d7d683fa Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 8 May 2012 18:45:51 -0500
Subject: [PATCH 193/279] [ticket/10858] Tests for row seeking with
 fetchfield()

PHPBB3-10858
---
 tests/dbal/select_test.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 21b12777dc..1b04450fcd 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -125,6 +125,32 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $ary);
 	}
 
+	public static function fetchfield_seek_data()
+	{
+		return array(
+			array(1, 'foobar'),
+			array(0, 'barfoo'),
+			array(2, 'bertie'),
+		);
+	}
+
+	/**
+	* @dataProvider fetchfield_seek_data
+	*/
+	public function test_fetchfield_seek($rownum, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			ORDER BY user_id ASC');
+
+		$field = $db->sql_fetchfield('username_clean', $rownum, $result);
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $field);
+	}
+
 	public static function query_limit_data()
 	{
 		return array(

From 09d49fb7b2be51a29f5a03c0a1a3816d7e55a466 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 8 May 2012 19:41:22 -0500
Subject: [PATCH 194/279] [ticket/10858] Move generic row seeking to DBAL

Removed from: firebird, mssql_odbc, and mssqlnative

PHPBB3-10858
---
 phpBB/includes/db/dbal.php        | 43 +++++++++++++++++++++++++++++++
 phpBB/includes/db/firebird.php    | 43 -------------------------------
 phpBB/includes/db/mssql_odbc.php  | 43 -------------------------------
 phpBB/includes/db/mssqlnative.php | 43 -------------------------------
 4 files changed, 43 insertions(+), 129 deletions(-)

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 5d456c2ff0..358df50402 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -194,6 +194,49 @@ class dbal
 		return false;
 	}
 
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$this->sql_freeresult($query_id);
+		$query_id = $this->sql_query($this->last_query_text);
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+		for ($i = 0; $i < $rownum; $i++)
+		{
+			if (!$this->sql_fetchrow($query_id))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	* Fetch field
 	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 7e3f15ed1d..7072c58ac0 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -359,49 +359,6 @@ class dbal_firebird extends dbal
 		return (sizeof($row)) ? $row : false;
 	}
 
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	* Get last inserted id after insert statement
 	*/
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 75a080b1b7..34f7a87337 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -255,49 +255,6 @@ class dbal_mssql_odbc extends dbal
 		return ($query_id !== false) ? @odbc_fetch_array($query_id) : false;
 	}
 
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	* Get last inserted id after insert statement
 	*/
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 6391664a3e..92ac9b1fb9 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -439,49 +439,6 @@ class dbal_mssqlnative extends dbal
 		return $row;
 	}
 
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	* Get last inserted id after insert statement
 	*/

From 226743d10bd1c31095c8bf970de8698789ca6e61 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 10 May 2012 11:43:25 +0200
Subject: [PATCH 195/279] [ticket/10881] Replace old (and unify) file headers
 in develop files.

This especially also fixes the problem of the copyright symbol being
represented using 0xA9, which is neither ASCII nor the appropriate UTF8
byte sequence for the copyright symbol.

PHPBB3-10881
---
 phpBB/develop/add_permissions.php          | 18 ++++++----------
 phpBB/develop/calc_email_hash.php          | 18 ++++++----------
 phpBB/develop/change_smiley_ref.php        | 24 ++++++---------------
 phpBB/develop/check_flash_bbcodes.php      |  4 +---
 phpBB/develop/create_variable_overview.php | 22 ++++++++-----------
 phpBB/develop/fill.php                     | 17 +++++++--------
 phpBB/develop/merge_attachment_tables.php  | 18 ++++++----------
 phpBB/develop/merge_post_tables.php        | 25 ++++++----------------
 phpBB/develop/mysql_upgrader.php           |  1 -
 9 files changed, 53 insertions(+), 94 deletions(-)

diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index 035c23f49c..6f26bf6ac6 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -1,15 +1,11 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : add_permissions.php
-// STARTED   : Sat Nov 06, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
+/**
+*
+* @package phpBB3
+* @copyright (c) 2004 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
 
 //
 // Security message:
diff --git a/phpBB/develop/calc_email_hash.php b/phpBB/develop/calc_email_hash.php
index a67b0f52a3..fccdfdfca9 100644
--- a/phpBB/develop/calc_email_hash.php
+++ b/phpBB/develop/calc_email_hash.php
@@ -1,15 +1,11 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : calc_email_hash.php
-// STARTED   : Tue Feb 03, 2004
-// COPYRIGHT : © 2004 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
+/**
+*
+* @package phpBB3
+* @copyright (c) 2004 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
 
 //
 // Security message:
diff --git a/phpBB/develop/change_smiley_ref.php b/phpBB/develop/change_smiley_ref.php
index 3d6dd45d6f..59ee77b7b1 100644
--- a/phpBB/develop/change_smiley_ref.php
+++ b/phpBB/develop/change_smiley_ref.php
@@ -1,21 +1,11 @@
 <?php
-/***************************************************************************  
- *                           merge_clean_posts.php  
- *                            -------------------                         
- *   begin                : Tuesday, February 25, 2003 
- *   copyright            : (C) 2003 The phpBB Group        
- *   email                : support@phpbb.com                           
- * 
- ***************************************************************************/ 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- * 
- ***************************************************************************/ 
+/**
+*
+* @package phpBB3
+* @copyright (c) 2003 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
 
 //
 // Security message:
diff --git a/phpBB/develop/check_flash_bbcodes.php b/phpBB/develop/check_flash_bbcodes.php
index 2ce288ee3e..5946f685b8 100644
--- a/phpBB/develop/check_flash_bbcodes.php
+++ b/phpBB/develop/check_flash_bbcodes.php
@@ -5,10 +5,8 @@
 * @copyright (c) 2009, 2010 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-*/
-
-/**
 * This script will check your database for potentially dangerous flash BBCode tags
+*
 */
 
 //
diff --git a/phpBB/develop/create_variable_overview.php b/phpBB/develop/create_variable_overview.php
index a786fc6866..f926d79eb5 100644
--- a/phpBB/develop/create_variable_overview.php
+++ b/phpBB/develop/create_variable_overview.php
@@ -1,17 +1,13 @@
 <?php
-// -------------------------------------------------------------
-//
-// FILENAME  : create_variable_overview.php
-// STARTED   : Fri Aug 15 2003
-// COPYRIGHT : © 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
-
-/*
-	This script generates an index of some template vars and their use within the templates.
-	It writes down all language variables used by various templates.
+/**
+*
+* @package phpBB3
+* @copyright (c) 2003 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* This script generates an index of some template vars and their use within the templates.
+* It writes down all language variables used by various templates.
+*
 */
 
 //
diff --git a/phpBB/develop/fill.php b/phpBB/develop/fill.php
index c1e39fa4f3..e0d054d073 100644
--- a/phpBB/develop/fill.php
+++ b/phpBB/develop/fill.php
@@ -1,13 +1,12 @@
 <?php
-// -------------------------------------------------------------
-//
-// FILENAME  : fill.php
-// STARTED   : Mon Sep 15, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ]
-//
-// -------------------------------------------------------------
+/**
+*
+* @package phpBB3
+* @copyright (c) 2001, 2003 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 //
 // Security message:
 //
diff --git a/phpBB/develop/merge_attachment_tables.php b/phpBB/develop/merge_attachment_tables.php
index ae7fe57be4..0186b3cc8b 100644
--- a/phpBB/develop/merge_attachment_tables.php
+++ b/phpBB/develop/merge_attachment_tables.php
@@ -1,15 +1,11 @@
 <?php
-// -------------------------------------------------------------
-//
-// $Id$
-//
-// FILENAME  : merge_attachment_tables.php
-// STARTED   : Tue Nov 04, 2003
-// COPYRIGHT : © 2001, 2003 phpBB Group
-// WWW       : http://www.phpbb.com/
-// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
-// 
-// -------------------------------------------------------------
+/**
+*
+* @package phpBB3
+* @copyright (c) 2001, 2003 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
 
 //
 // Security message:
diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php
index 5ccfef84c3..2d99d725d0 100644
--- a/phpBB/develop/merge_post_tables.php
+++ b/phpBB/develop/merge_post_tables.php
@@ -1,22 +1,11 @@
 <?php
-/***************************************************************************  
- *                           merge_clean_posts.php  
- *                            -------------------                         
- *   begin                : Tuesday, February 25, 2003 
- *   copyright            : (C) 2003 The phpBB Group        
- *   email                : support@phpbb.com                           
- *                                                          
- * 
- ***************************************************************************/ 
-
-/***************************************************************************  
- *                                                     
- *   This program is free software; you can redistribute it and/or modify    
- *   it under the terms of the GNU General Public License as published by   
- *   the Free Software Foundation; either version 2 of the License, or  
- *   (at your option) any later version.                      
- * 
- ***************************************************************************/ 
+/**
+*
+* @package phpBB3
+* @copyright (c) 2003 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
 
 //
 // Security message:
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 49daab0962..05d279a099 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -9,7 +9,6 @@
 *
 */
 
-
 //
 // Security message:
 //

From 643970dce4710b1eebbeb86ff4ac0074c9bfe298 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 26 Mar 2012 22:59:35 +0530
Subject: [PATCH 196/279] [ticket/10308] disable retain/ delete posts option
 when deleting a user

When deleting a user, it asks whether the posts by user should be retained
or deleted. The selection should be disable if the user has no posts.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 9237e45daf..0eeb7cde8b 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -140,7 +140,7 @@
 		<legend>{L_DELETE_USER}</legend>
 		<dl>
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
 		</dl>
 		<p class="quick">
 			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />

From 239e6016a308cd80135ebe9d7057c2eb102af29d Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 9 Apr 2012 02:21:45 +0530
Subject: [PATCH 197/279] [ticket/10308] Displays message to user if there are
 no posts.

While deletng the user, if the user has no posts in addition to the
options being disabled an added message is displayed.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 3 +++
 phpBB/language/en/acp/users.php         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 0eeb7cde8b..b158995563 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -141,6 +141,9 @@
 		<dl>
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
+			<!-- IF USER_POSTS == 0 -->
+			<dd>{L_NO_POSTS}</dd>
+			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
 			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index eda9659795..928699fd11 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -77,6 +77,7 @@ $lang = array_merge($lang, array(
 
 	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
 
+	'NO_POSTS'				=> 'The user has no posts.',
 	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
 	'NO_WARNINGS'			=> 'No warnings.',
 	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',

From 8f7e85604bb36679db1baa37588fc5e39a8b853f Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 11 Apr 2012 03:00:16 +0530
Subject: [PATCH 198/279] [ticket/10308] fixes language entity.

Language key has been changed and has been made more specific to
avoid conflicts

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/language/en/acp/users.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index b158995563..73be17c4c1 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
 			<!-- IF USER_POSTS == 0 -->
-			<dd>{L_NO_POSTS}</dd>
+			<dd>{L_USER_NO_POSTS}</dd>
 			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 928699fd11..25e172e55c 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -77,7 +77,6 @@ $lang = array_merge($lang, array(
 
 	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
 
-	'NO_POSTS'				=> 'The user has no posts.',
 	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
 	'NO_WARNINGS'			=> 'No warnings.',
 	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
@@ -125,6 +124,7 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
 	'USER_LIFTED_NR'				=> 'Successfully removed the user’s newly registered status.',
 	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
+	'USER_NO_POSTS'					=> 'The user has no posts.',
 	'USER_OUTBOX_EMPTIED'			=> 'Successfully emptied user’s private message outbox.',
 	'USER_OUTBOX_EMPTY'				=> 'The user’s private message outbox was already empty.',
 	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',

From 59177a86c4160a4879aaf77e602f91ccea0fb107 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 17:11:07 +0530
Subject: [PATCH 199/279] [ticket/10308] fix language and user's total posts

language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 8 +++++---
 phpBB/includes/acp/acp_users.php        | 8 ++++++++
 phpBB/language/en/acp/users.php         | 2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 73be17c4c1..e6a1411bbb 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -140,9 +140,11 @@
 		<legend>{L_DELETE_USER}</legend>
 		<dl>
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-			<dd><select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_RETAIN_POSTS}</option><option value="remove"<!-- IF USER_POSTS == 0 --> disabled="disabled" class="disabled-option"<!-- ENDIF -->>{L_DELETE_POSTS}</option></select></dd>
-			<!-- IF USER_POSTS == 0 -->
-			<dd>{L_USER_NO_POSTS}</dd>
+			<dd>
+			<!-- IF USER_TOTAL_POSTS == 0 -->
+			{L_USER_NO_POSTS}
+			<!-- ELSE -->
+			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
 			<!-- ENDIF -->
 		</dl>
 		<p class="quick">
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 363c900edc..1f0f053a85 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1009,6 +1009,13 @@ class acp_users
 				$user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
 				$db->sql_freeresult($result);
 
+				$sql = 'SELECT COUNT(post_id) as user_total_posts
+					FROM ' . POSTS_TABLE . '
+					WHERE poster_id = '. $user_id;
+				$result = $db->sql_query($sql);
+				$user_row['user_total_posts'] = (int) $db->sql_fetchfield('user_total_posts');
+				$db->sql_freeresult($result);
+
 				$template->assign_vars(array(
 					'L_NAME_CHARS_EXPLAIN'		=> sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']),
 					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']),
@@ -1036,6 +1043,7 @@ class acp_users
 					'USER_EMAIL'		=> $user_row['user_email'],
 					'USER_WARNINGS'		=> $user_row['user_warnings'],
 					'USER_POSTS'		=> $user_row['user_posts'],
+					'USER_TOTAL_POSTS'	=> $user_row['user_total_posts'],
 					'USER_INACTIVE_REASON'	=> $inactive_reason,
 				));
 
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 25e172e55c..7f3a3d2a48 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -124,7 +124,7 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
 	'USER_LIFTED_NR'				=> 'Successfully removed the user’s newly registered status.',
 	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
-	'USER_NO_POSTS'					=> 'The user has no posts.',
+	'USER_NO_POSTS'					=> 'The user has no posts to retain or delete.',
 	'USER_OUTBOX_EMPTIED'			=> 'Successfully emptied user’s private message outbox.',
 	'USER_OUTBOX_EMPTY'				=> 'The user’s private message outbox was already empty.',
 	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',

From faf232219ef3b7a5dcc3d22639d4005040b0d8ad Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 23:11:55 +0530
Subject: [PATCH 200/279] [ticket/10308] renames language key to
 USER_NO_POSTS_DELETE

language key renamed to make its usability more clearer.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/language/en/acp/users.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index e6a1411bbb..2a27cc2a63 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_TOTAL_POSTS == 0 -->
-			{L_USER_NO_POSTS}
+			{L_USER_NO_POSTS_DELETE}
 			<!-- ELSE -->
 			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
 			<!-- ENDIF -->
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 7f3a3d2a48..52b7a35eac 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -124,7 +124,7 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
 	'USER_LIFTED_NR'				=> 'Successfully removed the user’s newly registered status.',
 	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
-	'USER_NO_POSTS'					=> 'The user has no posts to retain or delete.',
+	'USER_NO_POSTS_DELETE'			=> 'The user has no posts to retain or delete.',
 	'USER_OUTBOX_EMPTIED'			=> 'Successfully emptied user’s private message outbox.',
 	'USER_OUTBOX_EMPTY'				=> 'The user’s private message outbox was already empty.',
 	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',

From cf303c34788b32e1c09f483e2760b77eff3e05ca Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 14:29:21 +0530
Subject: [PATCH 201/279] [ticket/10308] fixes user deletion if no posts

introduces a hidden input field with retain posts as the mode in case
user has no posts.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 2a27cc2a63..fdc1d55855 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_TOTAL_POSTS == 0 -->
-			{L_USER_NO_POSTS_DELETE}
+			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
 			<!-- ENDIF -->

From 164054f0679caaa68fb8400d3469b1149022db29 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 22 Apr 2012 00:36:38 +0530
Subject: [PATCH 202/279] [ticket/10308] fixes sql query, limit it to 1

instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/includes/acp/acp_users.php        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index fdc1d55855..ea2700e5e4 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -141,7 +141,7 @@
 		<dl>
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
-			<!-- IF USER_TOTAL_POSTS == 0 -->
+			<!-- IF USER_HAS_POSTS == 0 -->
 			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1f0f053a85..7565d43690 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1009,11 +1009,11 @@ class acp_users
 				$user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
 				$db->sql_freeresult($result);
 
-				$sql = 'SELECT COUNT(post_id) as user_total_posts
+				$sql = 'SELECT post_id
 					FROM ' . POSTS_TABLE . '
 					WHERE poster_id = '. $user_id;
-				$result = $db->sql_query($sql);
-				$user_row['user_total_posts'] = (int) $db->sql_fetchfield('user_total_posts');
+				$result = $db->sql_query_limit($sql, 1);
+				$user_row['user_has_posts'] = ($db->sql_fetchfield('post_id') ? 1 : 0);
 				$db->sql_freeresult($result);
 
 				$template->assign_vars(array(
@@ -1043,7 +1043,7 @@ class acp_users
 					'USER_EMAIL'		=> $user_row['user_email'],
 					'USER_WARNINGS'		=> $user_row['user_warnings'],
 					'USER_POSTS'		=> $user_row['user_posts'],
-					'USER_TOTAL_POSTS'	=> $user_row['user_total_posts'],
+					'USER_HAS_POSTS'	=> $user_row['user_has_posts'],
 					'USER_INACTIVE_REASON'	=> $inactive_reason,
 				));
 

From 23ea588880a6793b53f2f4da0eb0609bed3fc90c Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 9 May 2012 21:41:12 +0530
Subject: [PATCH 203/279] [ticket/10308] makes variable boolean

makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
---
 phpBB/includes/acp/acp_users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 7565d43690..70e08f79f2 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1013,7 +1013,7 @@ class acp_users
 					FROM ' . POSTS_TABLE . '
 					WHERE poster_id = '. $user_id;
 				$result = $db->sql_query_limit($sql, 1);
-				$user_row['user_has_posts'] = ($db->sql_fetchfield('post_id') ? 1 : 0);
+				$user_row['user_has_posts'] = (bool) $db->sql_fetchfield('post_id');
 				$db->sql_freeresult($result);
 
 				$template->assign_vars(array(

From cf556f92c91816f6aef9028d911b5584f08842af Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 9 May 2012 21:46:27 +0530
Subject: [PATCH 204/279] [ticket/10308] fixes language variable name

Language variable has be renamed for better understanding

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 2 +-
 phpBB/language/en/acp/users.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index ea2700e5e4..1969428e38 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -142,7 +142,7 @@
 			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 			<dd>
 			<!-- IF USER_HAS_POSTS == 0 -->
-			{L_USER_NO_POSTS_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
+			{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
 			<!-- ELSE -->
 			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
 			<!-- ENDIF -->
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 52b7a35eac..785283faea 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -124,7 +124,7 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
 	'USER_LIFTED_NR'				=> 'Successfully removed the user’s newly registered status.',
 	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
-	'USER_NO_POSTS_DELETE'			=> 'The user has no posts to retain or delete.',
+	'USER_NO_POSTS_TO_DELETE'			=> 'The user has no posts to retain or delete.',
 	'USER_OUTBOX_EMPTIED'			=> 'Successfully emptied user’s private message outbox.',
 	'USER_OUTBOX_EMPTY'				=> 'The user’s private message outbox was already empty.',
 	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',

From 8393b8e755150593dbf85f545ac7ca3d8798e58c Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 10 Apr 2012 11:14:05 +0200
Subject: [PATCH 205/279] [ticket/9896] Links changed

Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/

PHPBB3-9896
---
 phpBB/docs/README.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index aa60d7dd25..0bdf94d181 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -130,9 +130,9 @@
 
 	<a name="i18n"></a><h3>2.i. Internationalisation (i18n)</h3>
 
-	<p>A number of language packs and style localisations are available. You can find them on our official download page:</p>
+	<p>A number of language packs and style localisations are available. You can find them on our official language packs page:</p>
 
-	<p><a href="http://www.phpbb.com/downloads/">http://www.phpbb.com/downloads/</a></p>
+	<p><a href="http://www.phpbb.com/languages/">http://www.phpbb.com/languages/</a></p>
 
 	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
 
@@ -144,7 +144,7 @@
 
 	<p>Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
 
-	<p><a href="http://www.phpbb.com/styles/">http://www.phpbb.com/styles/</a></p>
+	<p><a href="http://www.phpbb.com/customise/db/styles-2/">http://www.phpbb.com/customise/db/styles-2/</a></p>
 
 	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3.</p>
 
@@ -156,7 +156,7 @@
 
 	<p>Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:</p>
 
-	<p><a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods/</a></p>
+	<p><a href="http://www.phpbb.com/customise/db/modifications-1/">http://www.phpbb.com/customise/db/modifications-1/</a></p>
 
 	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.</p>
 
@@ -192,7 +192,7 @@
 
 	<p>phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
 
-	<p><a href="http://www.phpbb.com/">http://www.phpbb.com/</a></p>
+	<p><a href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a></p>
 
 	<p>If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.</p>
 

From 041b7be77ecd4e52048b94b4e47ad8268716a032 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 11 May 2012 01:50:36 +0530
Subject: [PATCH 206/279] [ticket/10308] fixes indentation

indentation is fixed and user_posts variable is compared as a boolean
variable.

PHPBB3-10308
---
 phpBB/adm/style/acp_users_overview.html | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 1969428e38..e2dcdb6307 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -135,24 +135,24 @@
 	</form>
 
 	<!-- IF not S_OWN_ACCOUNT -->
-	<form id="user_delete" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_DELETE_USER}</legend>
-		<dl>
-			<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
-			<dd>
-			<!-- IF USER_HAS_POSTS == 0 -->
-			{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
-			<!-- ELSE -->
-			<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
-			<!-- ENDIF -->
-		</dl>
-		<p class="quick">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-			<input type="hidden" name="delete" value="1" />
-			{S_FORM_TOKEN}
-		</p>
-	</fieldset>
-	</form>
+		<form id="user_delete" method="post" action="{U_ACTION}">
+			<fieldset>
+				<legend>{L_DELETE_USER}</legend>
+				<dl>
+					<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+					<dd>
+					<!-- IF USER_HAS_POSTS -->
+						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd>
+					<!-- ELSE -->
+						{L_USER_NO_POSTS_TO_DELETE}<input type="hidden" id="delete_type" name="delete_type" value="retain" />
+					<!-- ENDIF -->
+				</dl>
+				<p class="quick">
+					<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+					<input type="hidden" name="delete" value="1" />
+					{S_FORM_TOKEN}
+				</p>
+			</fieldset>
+		</form>
 	<!-- ENDIF -->
 <!-- ENDIF -->

From 1019226dfa359cb223d68e7b9132006a8cd2a859 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 23:22:35 -0400
Subject: [PATCH 207/279] [ticket/10887] Split auto increment test from db
 tools test.

Auto increment test does not need any particular columns
and should not depend, in particular, on correct handling
of binary data.

This commit moves auto increment test into its own file and
gives it its own table with a simple schema.

PHPBB3-10887
---
 tests/dbal/auto_increment_test.php | 100 +++++++++++++++++++++++++++++
 tests/dbal/db_tools_test.php       |  45 -------------
 2 files changed, 100 insertions(+), 45 deletions(-)
 create mode 100644 tests/dbal/auto_increment_test.php

diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php
new file mode 100644
index 0000000000..c18e589861
--- /dev/null
+++ b/tests/dbal/auto_increment_test.php
@@ -0,0 +1,100 @@
+<?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__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $tools;
+	protected $table_exists;
+	protected $table_data;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->tools = new phpbb_db_tools($this->db);
+
+		$this->table_data = array(
+			'COLUMNS'		=> array(
+				'c_id'				=> array('UINT', NULL, 'auto_increment'),
+				'c_uint'				=> array('UINT', 4),
+			),
+			'PRIMARY_KEY'	=> 'c_id',
+		);
+		$this->tools->sql_create_table('prefix_table_name', $this->table_data);
+		$this->table_exists = true;
+	}
+
+	protected function tearDown()
+	{
+		if ($this->table_exists)
+		{
+			$this->tools->sql_table_drop('prefix_table_name');
+		}
+
+		parent::tearDown();
+	}
+
+	static protected function get_default_values()
+	{
+		return array(
+			'c_uint' => 0,
+		);
+	}
+
+	public function test_auto_increment()
+	{
+		$sql = 'DELETE FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+
+		$row1 = array_merge(self::get_default_values(), array(
+			'c_uint' => 1,
+		));
+		$row2 = array_merge(self::get_default_values(), array(
+			'c_uint' => 2,
+		));
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1);
+		$result = $this->db->sql_query($sql);
+		$id1 = $this->db->sql_nextid();
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2);
+		$result = $this->db->sql_query($sql);
+		$id2 = $this->db->sql_nextid();
+
+		$this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value');
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id1";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row1['c_id'] = $id1;
+		$this->assertEquals($row1, $row_actual);
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id2";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row2['c_id'] = $id2;
+		$this->assertEquals($row2, $row_actual);
+	}
+}
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index c7ddb88ce8..516fb9e739 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -189,51 +189,6 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertEquals($row_expect[$column_name], $row_actual[$column_name], "Column $column_name of type $type should have equal return and input value.");
 	}
 
-	public function test_auto_increment()
-	{
-		$sql = 'DELETE FROM prefix_table_name';
-		$result = $this->db->sql_query($sql);
-
-		$row1 = array_merge(self::get_default_values(), array(
-			'c_uint' => 1,
-			'c_vchar' => '1', // these values are necessary to avoid unique index issues
-			'c_vchar_size' => '1',
-		));
-		$row2 = array_merge(self::get_default_values(), array(
-			'c_uint' => 2,
-			'c_vchar' => '2',
-			'c_vchar_size' => '2',
-		));
-
-		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1);
-		$result = $this->db->sql_query($sql);
-		$id1 = $this->db->sql_nextid();
-
-		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2);
-		$result = $this->db->sql_query($sql);
-		$id2 = $this->db->sql_nextid();
-
-		$this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value');
-
-		$sql = "SELECT *
-			FROM prefix_table_name WHERE c_id = $id1";
-		$result = $this->db->sql_query($sql);
-		$row_actual = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$row1['c_id'] = $id1;
-		$this->assertEquals($row1, $row_actual);
-
-		$sql = "SELECT *
-			FROM prefix_table_name WHERE c_id = $id2";
-		$result = $this->db->sql_query($sql);
-		$row_actual = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$row2['c_id'] = $id2;
-		$this->assertEquals($row2, $row_actual);
-	}
-
 	public function test_list_columns()
 	{
 		$this->assertEquals(

From 74e9245df3b6652db10e46302510d27a54db827e Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Fri, 11 May 2012 08:09:56 +0200
Subject: [PATCH 208/279] [ticket/10835] changing "e-mail" to "email"

PHPBB3-10835
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6f6b319d48..7df26e040f 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -137,7 +137,7 @@ $lang = array_merge($lang, array(
 	'CREATE_FOLDER'				=> 'Add folder…',
 	'CURRENT_IMAGE'				=> 'Current image',
 	'CURRENT_PASSWORD'			=> 'Current password',
-	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must enter your current password if you wish to alter your e-mail address or username.',
+	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must enter your current password if you wish to alter your email address or username.',
 	'CURRENT_CHANGE_PASSWORD_EXPLAIN' => 'To change your password, your email address, or your username, you must enter your current password.',
 	'CUR_PASSWORD_EMPTY'		=> 'You did not enter your current password.',
 	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',

From b5b65c214dc42a9e7a9cf15ebc00600d00331985 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 05:06:46 -0400
Subject: [PATCH 209/279] [ticket/10887] Add spaces.

PHPBB3-10887
---
 tests/dbal/auto_increment_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php
index c18e589861..e87fc1c6bd 100644
--- a/tests/dbal/auto_increment_test.php
+++ b/tests/dbal/auto_increment_test.php
@@ -19,7 +19,7 @@ class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
 	protected function setUp()

From e5afe39987200779df35b55259900ab947ce46d0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 10 Apr 2012 02:41:33 +0200
Subject: [PATCH 210/279] [ticket/10889] Make default value for c_char_size a
 CHAR(4) as defined.

PHPBB3-10889
---
 tests/dbal/db_tools_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 516fb9e739..9bed0648cd 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -106,7 +106,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			'c_bool' => 0,
 			'c_vchar' => '',
 			'c_vchar_size' => '',
-			'c_char_size' => '',
+			'c_char_size' => 'abcd',
 			'c_xstext' => '',
 			'c_stext' => '',
 			'c_text' => '',

From 1960629240679965ca22a98e69973dcfe2e05476 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 11 May 2012 15:17:13 +0200
Subject: [PATCH 211/279] [ticket/10492] Skip functional tests on PHP 5.2 on
 travis

PHPBB3-10492
---
 travis/phpunit-mysql-travis.xml    | 4 ++++
 travis/phpunit-postgres-travis.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 36845a7f71..e54b2bb77b 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -13,6 +13,10 @@
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
 			<directory suffix="_test.php">../tests/</directory>
+			<exclude>tests/functional</exclude>
+		</testsuite>
+		<testsuite name="phpBB Functional Tests">
+			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 461a53bcb1..55ba996548 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -13,6 +13,10 @@
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
 			<directory suffix="_test.php">../tests/</directory>
+			<exclude>tests/functional</exclude>
+		</testsuite>
+		<testsuite name="phpBB Functional Tests">
+			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 

From 3a604145921b3df90379c4e44370a040165c43ef Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Thu, 12 Apr 2012 20:10:20 -0500
Subject: [PATCH 212/279] [ticket/10892] Reformat RUNNING_TESTS.txt to 80 char
 lines.

PHPBB3-10892
---
 tests/RUNNING_TESTS.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 59197acc0f..3ac8bfcd67 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -36,8 +36,9 @@ found on the wiki (see below).
     $dbuser = 'user';
     $dbpasswd = 'password';
 
-Alternatively you can specify parameters in the environment, so e.g. the following
-will run phpunit with the same parameters as in the shown test_config.php file:
+Alternatively you can specify parameters in the environment, so e.g. the
+following will run phpunit with the same parameters as in the shown
+test_config.php file:
 
     $ PHPBB_TEST_DBMS='mysqli' PHPBB_TEST_DBHOST='localhost' \
       PHPBB_TEST_DBNAME='database' PHPBB_TEST_DBUSER='user' \
@@ -46,7 +47,8 @@ will run phpunit with the same parameters as in the shown test_config.php file:
 Running
 =======
 
-Once the prerequisites are installed, run the tests from the project root directory (above phpBB):
+Once the prerequisites are installed, run the tests from the project root
+directory (above phpBB):
 
     $ phpunit
 
@@ -54,8 +56,8 @@ Slow tests
 --------------
 Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow.
 Thus these tests are in the `slow` group, which is excluded by default. You can
-enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you only
-want the slow tests, run:
+enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
+only want the slow tests, run:
 
     $ phpunit --group slow
 

From 07fb16edb583008ea2bc11556370cbeb41ff7c5e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 22:10:19 -0400
Subject: [PATCH 213/279] [ticket/10892] Reformat RUNNING_TESTS.txt to 79 char
 lines.

PHPBB3-10892
---
 tests/RUNNING_TESTS.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 3ac8bfcd67..dac6753187 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -24,9 +24,9 @@ Database Tests
 By default all tests requiring a database connection will use sqlite. If you
 do not have sqlite installed the tests will be skipped. If you wish to run the
 tests on a different database you have to create a test_config.php file within
-your tests directory following the same format as phpBB's config.php. An example
-for mysqli can be found below. More information on configuration options can be
-found on the wiki (see below).
+your tests directory following the same format as phpBB's config.php. An
+example for mysqli can be found below. More information on configuration
+options can be found on the wiki (see below).
 
     <?php
     $dbms = 'mysqli';

From 44b509b2b2bce281601ed590805ad448d00b5fb1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 22:14:12 -0400
Subject: [PATCH 214/279] [ticket/10892] Add empty lines for consistency.

Some headings had empty lines after them, some did not.

Add missing empty lines.

PHPBB3-10892
---
 tests/RUNNING_TESTS.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index dac6753187..ebc61360de 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -21,6 +21,7 @@ the following PHP extensions must be installed and enabled to run unit tests:
 
 Database Tests
 --------------
+
 By default all tests requiring a database connection will use sqlite. If you
 do not have sqlite installed the tests will be skipped. If you wish to run the
 tests on a different database you have to create a test_config.php file within
@@ -54,6 +55,7 @@ directory (above phpBB):
 
 Slow tests
 --------------
+
 Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow.
 Thus these tests are in the `slow` group, which is excluded by default. You can
 enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you

From 2592fbf8e927b064f41b744b8725341f18e02e68 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 22:14:40 -0400
Subject: [PATCH 215/279] [ticket/10892] Update wiki link to mediawiki.

PHPBB3-10892
---
 tests/RUNNING_TESTS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index ebc61360de..c80c42a83d 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -67,4 +67,4 @@ More Information
 ================
 
 Further information is available on phpbb wiki:
-http://wiki.phpbb.com/display/DEV/Unit+Tests
+http://wiki.phpbb.com/Unit_Tests

From 725db1ba29960aa8ad2a24c7324078c69c6c8ced Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 22:24:01 -0400
Subject: [PATCH 216/279] [ticket/10891] Allow specifying test_config.php path
 via environment.

PHPBB3-10891
---
 tests/RUNNING_TESTS.txt                          |  6 ++++++
 tests/test_framework/phpbb_test_case_helpers.php | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 59197acc0f..b92423c1f4 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -36,6 +36,12 @@ found on the wiki (see below).
     $dbuser = 'user';
     $dbpasswd = 'password';
 
+It is possible to have multiple test_config.php files, for example if you
+are testing on multiple databases. You can specify which test_config.php file
+to use in the environment as follows:
+
+    $ PHPBB_TEST_CONFIG=tests/test_config.php phpunit
+
 Alternatively you can specify parameters in the environment, so e.g. the following
 will run phpunit with the same parameters as in the shown test_config.php file:
 
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index b46c36efaa..2a3c27f9f9 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -58,9 +58,19 @@ class phpbb_test_case_helpers
 			));
 		}
 
-		if (file_exists(dirname(__FILE__) . '/../test_config.php'))
+		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
 		{
-			include(dirname(__FILE__) . '/../test_config.php');
+			// Could be an absolute path
+			$test_config = $_SERVER['PHPBB_TEST_CONFIG'];
+		}
+		else
+		{
+			$test_config = dirname(__FILE__) . '/../test_config.php';
+		}
+
+		if (file_exists($test_config))
+		{
+			include($test_config);
 
 			$config = array_merge($config, array(
 				'dbms'		=> $dbms,

From f71a9d369c84ec938408a2134b09ea259f6cbbab Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 14 May 2012 00:34:42 +0200
Subject: [PATCH 217/279] [ticket/10605] Put end of array on its own line
 because start of array is too.

PHPBB3-10605
---
 phpBB/install/database_update.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0737061887..2a361aae26 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2043,7 +2043,8 @@ function change_database_data(&$no_updates, $version)
 						'ON'	=> 'p.msg_id = t.msg_id',
 					),
 				),
-				'WHERE'		=> 't.user_id IS NULL');
+				'WHERE'		=> 't.user_id IS NULL',
+			);
 			$sql = $db->sql_build_query('SELECT', $sql_array);
 
 			do

From 95e1d4e9db8d2174c8ee5c6bb35be06abc57e3cf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 14 May 2012 00:36:18 +0200
Subject: [PATCH 218/279] [ticket/10605] Use database updater function _sql()
 instead of $db->sql_query()

PHPBB3-10605
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2a361aae26..95a0282878 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2062,7 +2062,7 @@ function change_database_data(&$no_updates, $version)
 				{
 					$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
 						WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
-					$db->sql_query($sql);
+					_sql($sql, $errored, $error_ary);
 				}
 			}
 			while (sizeof($delete_pms) == $batch_size);

From 70be7e109f067d6f6d1add488338294dd59c7785 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 18 May 2012 11:15:53 +0200
Subject: [PATCH 219/279] [ticket/10898] Do not write ?> into config.php to
 avoid whitespace output.

PHPBB3-10898
---
 phpBB/includes/functions_install.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 633b2755f0..9e9c48ff58 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -559,8 +559,6 @@ function phpbb_create_config_file_data($data, $dbms, $load_extensions, $debug =
 		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
 	}
 
-	$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
-
 	return $config_data;
 }
 

From 7ec6254078e28e94410adb51cd95d5ea687ae39d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 01:25:19 +0200
Subject: [PATCH 220/279] [ticket/10890] Fix
 test_sql_fetchrow_returns_false_when_empty() on MS and ORA.

Fix phpbb_dbal_select_test::test_sql_fetchrow_returns_false_when_empty() on
MSSQL and Oracle by specifying an existing table in the query.

PHPBB3-10890
---
 tests/dbal/select_test.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 1b04450fcd..81cd13b006 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -375,7 +375,9 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 	{
 		$db = $this->new_dbal();
 
-		$sql = 'SELECT * FROM (SELECT 1) AS TBL WHERE 1 = 0';
+		$sql = 'SELECT user_id
+			FROM phpbb_users
+			WHERE 1 = 0';
 		$result = $db->sql_query($sql);
 
 		$row = $db->sql_fetchrow($result);

From ee875c0a43ac734d1693cdd7393c8f4277233426 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 02:24:31 +0200
Subject: [PATCH 221/279] [ticket/10790] Remove a (kind of) dead code section
 from submit_pm().

The type of $user->data['user_id'] is (almost) guranteed to be integer
since session::session_create() casts it to integer.
The type of $row['user_id'] is only an integer if the DB driver adjusts the
PHP type according to the DB type. This is only done by some of our
not-so-popular DB drivers and is not the case for MySQL.

As such this comparison is (almost) never true and a PM is also sent to the
author itself when it is sent to a group the author is also a member of.

Since this behaviour seems to have been accepted by the communty, the dead
code is removed and current behaviour is kept.

Also, checking this in the loop seems to be a rather bad idea.

Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68.

PHPBB3-10790
---
 phpBB/includes/functions_privmsgs.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d2fce000aa..261ed45727 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1522,12 +1522,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				// Additionally, do not include the sender if he is in the group he wants to send to. ;)
-				if ($row['user_id'] === $user->data['user_id'])
-				{
-					continue;
-				}
-
 				$field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc';
 				$recipients[$row['user_id']] = $field;
 			}

From efbf14f029b7e6a1724fb1c5aa32294eb33017bc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 03:08:39 +0200
Subject: [PATCH 222/279] [ticket/10565] update_forum_tracking_info(): Remove
 unnecessary GROUP BY clause

PHPBB3-10565
---
 phpBB/includes/functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ce80dc4a66..b415b2742d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1924,8 +1924,7 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 					AND t.topic_last_post_time > ' . $mark_time_forum . '
 					AND t.topic_moved_id = 0 ' .
 					$sql_update_unapproved . '
-					AND (tt.topic_id IS NULL OR tt.mark_time < t.topic_last_post_time)
-				GROUP BY t.forum_id';
+					AND (tt.topic_id IS NULL OR tt.mark_time < t.topic_last_post_time)';
 			$result = $db->sql_query_limit($sql, 1);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);

From 896b43aa5b7fe439106beb50cf56d6f066928537 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 03:11:53 +0200
Subject: [PATCH 223/279] [ticket/10565] Add line breaks to query in order to
 follow coding guidelines.

PHPBB3-10565
---
 phpBB/includes/functions.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b415b2742d..bc811cc75b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1918,13 +1918,17 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 		}
 		else
 		{
-			$sql = 'SELECT t.forum_id FROM ' . TOPICS_TABLE . ' t
-				LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')
+			$sql = 'SELECT t.forum_id
+				FROM ' . TOPICS_TABLE . ' t
+				LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt
+					ON (tt.topic_id = t.topic_id
+						AND tt.user_id = ' . $user->data['user_id'] . ')
 				WHERE t.forum_id = ' . $forum_id . '
 					AND t.topic_last_post_time > ' . $mark_time_forum . '
 					AND t.topic_moved_id = 0 ' .
 					$sql_update_unapproved . '
-					AND (tt.topic_id IS NULL OR tt.mark_time < t.topic_last_post_time)';
+					AND (tt.topic_id IS NULL
+						OR tt.mark_time < t.topic_last_post_time)';
 			$result = $db->sql_query_limit($sql, 1);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);

From ea1e2ed36280b8e3a4078885a07f7d3398ce5703 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 03:32:54 +0200
Subject: [PATCH 224/279] [ticket/10401] Return correct type when ldap_bind()
 fails in ldap_login().

ldap_login() is supposed to return an array.

PHPBB3-10401
---
 phpBB/includes/auth/auth_ldap.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 5dfa74ddab..eebf147d48 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -156,7 +156,11 @@ function login_ldap(&$username, &$password)
 	{
 		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
 		{
-			return $user->lang['LDAP_NO_SERVER_CONNECTION'];
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
 		}
 	}
 

From b96c05069569dd1db48a5bffa15c2fcd69369e6b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 22 May 2012 10:46:36 -0400
Subject: [PATCH 225/279] [task/functional] Change property visibility, remove
 globals, reword comment

PHPBB3-10758
---
 tests/test_framework/phpbb_functional_test_case.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 177f93cf3b..59579c1c33 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -14,14 +14,16 @@ class phpbb_functional_test_case extends phpbb_test_case
 {
 	protected $client;
 	protected $root_url;
+
 	/**
 	* @var string Session ID for current test's session (each test makes its own)
 	*/
 	protected $sid;
+
 	/**
 	* @var array Language array used by phpBB
 	*/
-	private $lang = array();
+	protected $lang = array();
 
 	static protected $config = array();
 	static protected $already_installed = false;
@@ -187,8 +189,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
 
 		$cookies = $this->cookieJar->all();
-		$sid = '';
-		// get the SID from the cookie
+		
+		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
 		foreach ($cookies as $key => $cookie);
 		{
 			if (substr($key, -4) == '_sid')
@@ -200,8 +202,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 	protected function add_lang($lang_file)
 	{
-		global $phpbb_root_path, $phpEx;
-
 		if (is_array($lang_file))
 		{
 			foreach ($lang_file as $file)
@@ -210,7 +210,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			}
 		}
 
-		$lang_path = "{$phpbb_root_path}language/en/$lang_file.$phpEx";
+		$lang_path = "./phpBB/language/en/$lang_file.php";
 
 		$lang = array();
 

From 819accedc87921a6fd1788fa2164d023f6d97f98 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 22 May 2012 10:52:49 -0400
Subject: [PATCH 226/279] [task/functional] Fix $lang_path variable

PHPBB3-10758
---
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 59579c1c33..1bcc3928df 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -210,7 +210,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			}
 		}
 
-		$lang_path = "./phpBB/language/en/$lang_file.php";
+		$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";
 
 		$lang = array();
 

From 09d15db1fabe22fc241d80c528fbd95e0d9fa122 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 22 May 2012 12:06:27 -0300
Subject: [PATCH 227/279] [task/functional] Use proper format for @var doc
 blocks.

PHPBB3-10758
---
 tests/test_framework/phpbb_functional_test_case.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 1bcc3928df..76fed76fae 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -16,12 +16,14 @@ class phpbb_functional_test_case extends phpbb_test_case
 	protected $root_url;
 
 	/**
-	* @var string Session ID for current test's session (each test makes its own)
+	* Session ID for current test's session (each test makes its own)
+	* @var string
 	*/
 	protected $sid;
 
 	/**
-	* @var array Language array used by phpBB
+	* Language array used by phpBB
+	* @var array
 	*/
 	protected $lang = array();
 

From bad91d8e74eea420d9ea7d9a0ac0ecf47d23fdb7 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 18:41:15 +0200
Subject: [PATCH 228/279] [ticket/10907] Mark (var)binary tests as incomplete
 on non-MySQL DBMSes.

PHPBB3-10907
---
 tests/dbal/db_tools_test.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 9bed0648cd..c20e46011f 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -165,6 +165,11 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 	*/
 	public function test_created_column($column_name, $column_value)
 	{
+		if ($column_name === 'c_varbinary' && stripos(get_class($this->db), 'mysql') === false)
+		{
+			$this->markTestIncomplete('Binary handling is not implemented properly on non-MySQL DBMSes.');
+		}
+
 		$row_insert = self::get_default_values();
 		$row_insert[$column_name] = $column_value;
 

From 8cb9004ab3ba01e0833ae25418691f8f69bf0172 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 27 May 2012 12:30:12 +0200
Subject: [PATCH 229/279] [ticket/10909] Also test develop-olympus with low PHP
 5.3 version on travis.

Also test develop-olympus with low PHP 5.3 version (i.e. PHP 5.3.3) on travis.

PHPBB3-10909
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d73bbd2a48..6a1ecedac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 php:
   - 5.2
+  - 5.3.3
   - 5.3
   - 5.4
 

From 13f30e8d9d05b69f8b7fda451fa6062b199dd7f7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 29 May 2012 14:27:25 +0200
Subject: [PATCH 230/279] [ticket/10908] Download files only up to
 max_upload_filesize if limit is 0

PHPBB3-10908
---
 phpBB/includes/functions_upload.php | 33 +++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index d5bbd80242..73ac1df2d2 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -751,6 +751,31 @@ class fileupload
 		$filename = $url['path'];
 		$filesize = 0;
 
+		$remote_max_filesize = $this->max_filesize;
+		if (!$remote_max_filesize)
+		{
+			$max_filesize = @ini_get('upload_max_filesize');
+
+			if (!empty($max_filesize))
+			{
+				$unit = strtolower(substr($max_filesize, -1, 1));
+				$remote_max_filesize = (int) $max_filesize;
+
+				switch ($unit)
+				{
+					case 'g':
+						$remote_max_filesize *= 1024;
+					// no break
+					case 'm':
+						$remote_max_filesize *= 1024;
+					// no break
+					case 'k':
+						$remote_max_filesize *= 1024;
+					// no break
+				}
+			}
+		}
+
 		$errno = 0;
 		$errstr = '';
 
@@ -779,9 +804,9 @@ class fileupload
 				$block = @fread($fsock, 1024);
 				$filesize += strlen($block);
 
-				if ($this->max_filesize && $filesize > $this->max_filesize)
+				if ($remote_max_filesize && $filesize > $remote_max_filesize)
 				{
-					$max_filesize = get_formatted_filesize($this->max_filesize, false);
+					$max_filesize = get_formatted_filesize($remote_max_filesize, false);
 
 					$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
 					return $file;
@@ -807,9 +832,9 @@ class fileupload
 					{
 						$length = (int) str_replace('content-length: ', '', strtolower($line));
 
-						if ($length && $length > $this->max_filesize)
+						if ($remote_max_filesize && $length && $length > $remote_max_filesize)
 						{
-							$max_filesize = get_formatted_filesize($this->max_filesize, false);
+							$max_filesize = get_formatted_filesize($remote_max_filesize, false);
 
 							$file = new fileerror(sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize['value'], $max_filesize['unit']));
 							return $file;

From 42dd60edad6c3533f6b718e731d43661641fd1fc Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 29 May 2012 14:54:04 +0200
Subject: [PATCH 231/279] [ticket/10913] Redirect to index if session id is
 required but was not sent

PHPBB3-10913
---
 phpBB/includes/session.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index a894242a39..496c12a0d1 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -322,8 +322,15 @@ class session
 			}
 		}
 
-		// Is session_id is set or session_id is set and matches the url param if required
-		if (!empty($this->session_id) && (!defined('NEED_SID') || (isset($_GET['sid']) && $this->session_id === $_GET['sid'])))
+		// if no session id is set, redirect to index.php
+		if (defined('NEED_SID') && (!isset($_GET['sid']) || $this->session_id !== $_GET['sid']))
+		{
+			send_status_line(401, 'Not authorized');
+			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
+		}
+
+		// if session id is set
+		if (!empty($this->session_id))
 		{
 			$sql = 'SELECT u.*, s.*
 				FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u

From 701bf571dfffa171271d567759cf92c3830d159c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 29 May 2012 15:29:31 +0200
Subject: [PATCH 232/279] [ticket/10550] Sort not installed styles list in the
 styles section of the ACP.

PHPBB3-10550
---
 phpBB/includes/acp/acp_styles.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index d7b0484af8..47cd02bca7 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -667,7 +667,9 @@ inherit_from = {INHERIT_FROM}
 
 						if ($name && !in_array($name, $installed))
 						{
-							$new_ary[] = array(
+							// The array key is used for sorting later on.
+							// $file is appended because $name doesn't have to be unique.
+							$new_ary[$name . $file] = array(
 								'path'		=> $file,
 								'name'		=> $name,
 								'copyright'	=> $items['copyright'],
@@ -683,6 +685,8 @@ inherit_from = {INHERIT_FROM}
 
 		if (sizeof($new_ary))
 		{
+			ksort($new_ary);
+
 			foreach ($new_ary as $cfg)
 			{
 				$template->assign_block_vars('uninstalled', array(

From c494abc8c765f2398b0b782fc6979a5e033bb0f5 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 29 May 2012 15:49:52 +0200
Subject: [PATCH 233/279] [ticket/10908] Document that 0 filesize configuration
 means limited by PHP

PHPBB3-10908
---
 phpBB/language/en/acp/attachments.php | 2 +-
 phpBB/language/en/acp/board.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 1821b8c867..6aeb3c2188 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -57,7 +57,7 @@ $lang = array_merge($lang, array(
 	'ATTACH_EXT_GROUPS_URL'				=> 'Extension groups',
 	'ATTACH_ID'							=> 'ID',
 	'ATTACH_MAX_FILESIZE'				=> 'Maximum file size',
-	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file, with 0 being unlimited.',
+	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file. If this value is 0, the uploadable filesize is only limited by your PHP configuration.',
 	'ATTACH_MAX_PM_FILESIZE'			=> 'Maximum file size messaging',
 	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
 	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 6e6d4302cd..f24376f8aa 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -108,7 +108,7 @@ $lang = array_merge($lang, array(
 	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
 	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 	'MAX_FILESIZE'					=> 'Maximum avatar file size',
-	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files.',
+	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files. If this value is 0, the uploaded filesize is only limited by your PHP configuration.',
 	'MIN_AVATAR_SIZE'				=> 'Minimum avatar dimensions',
 	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 ));

From 6036b948ff8ff02f890d46000aafea5dd157d025 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 May 2012 13:38:41 +0200
Subject: [PATCH 234/279] [ticket/10611] Generate db_tools instance in
 acp_database module.

PHPBB3-10611
---
 phpBB/includes/acp/acp_database.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 62bcd43a47..6380f221f8 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -21,6 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 class acp_database
 {
+	var $db_tools;
 	var $u_action;
 
 	function main($id, $mode)
@@ -28,6 +29,12 @@ class acp_database
 		global $cache, $db, $user, $auth, $template, $table_prefix;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
+		if (!class_exists('phpbb_db_tools'))
+		{
+			require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
+		}
+		$this->db_tools = new phpbb_db_tools($db);
+
 		$user->add_lang('acp/database');
 
 		$this->tpl_name = 'acp_database';

From 515c27270fe04b5e2f69a0cedc5007ef889fdf77 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 May 2012 13:41:36 +0200
Subject: [PATCH 235/279] [ticket/10611] Use phpbb_db_tools::sql_list_tables()
 instead of get_tables().

get_tables() was deprecated by phpbb_db_tools::sql_list_tables()

This prevents unnecessarily loading functions_install.php

PHPBB3-10611
---
 phpBB/includes/acp/acp_database.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 6380f221f8..885760f859 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -180,8 +180,7 @@ class acp_database
 					break;
 
 					default:
-						include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
-						$tables = get_tables($db);
+						$tables = $this->db_tools->sql_list_tables();
 						asort($tables);
 						foreach ($tables as $table_name)
 						{

From 9240ddbfa7cc4deb2076dcb989e6bfb318652e47 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 May 2012 13:45:00 +0200
Subject: [PATCH 236/279] [ticket/10611] Filter out not existing database
 tables when making a backup.

Using $this->db_tools->sql_list_tables() as the first argument gives us table
names as array keys as a by-product which might be useful at some point.

PHPBB3-10611
---
 phpBB/includes/acp/acp_database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 885760f859..758cd10434 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -57,7 +57,7 @@ class acp_database
 				{
 					case 'download':
 						$type	= request_var('type', '');
-						$table	= request_var('table', array(''));
+						$table	= array_intersect($this->db_tools->sql_list_tables(), request_var('table', array('')));
 						$format	= request_var('method', '');
 						$where	= request_var('where', '');
 

From de4dff8bb077e98e203e0e83bd52630053970ee0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 May 2012 21:01:25 +0200
Subject: [PATCH 237/279] [ticket/10162] Add test cases for top level domain
 names longer than 6 chars.

PHPBB3-10162
---
 tests/regex/email_test.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 17f93259c3..b4ea5b23aa 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -28,6 +28,8 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('alice_foo@bar.phpbb.com'),
 			array('alice+tag@foo.phpbb.com'),
 			array('alice&amp;tag@foo.phpbb.com'),
+			array('alice@phpbb.australia'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlong'),
 
 			//array('"John Doe"@example.com'),
 			//array('Alice@[192.168.2.1]'),		// IPv4
@@ -96,6 +98,7 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
 			array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
 			array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlongZ'),
 		);
 	}
 

From 037b95eccc1f039e687360d9f804f7323a65e9df Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 30 May 2012 21:09:30 +0200
Subject: [PATCH 238/279] [ticket/10162] Increase maximum length of email
 address TLD from 6 to 63.

Increase maximum length of email address top level domains from 6 to 63.

PHPBB3-10162
---
 phpBB/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index bc811cc75b..5914831539 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3456,7 +3456,7 @@ function get_preg_expression($mode)
 		case 'email':
 			// Regex written by James Watts and Francisco Jose Martin Moreno
 			// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
-			return '([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*(?:[\w\!\#$\%\'\*\+\-\/\=\?\^\`{\|\}\~]|&amp;)+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)';
+			return '([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*(?:[\w\!\#$\%\'\*\+\-\/\=\?\^\`{\|\}\~]|&amp;)+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,63})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)';
 		break;
 
 		case 'bbcode_htm':

From 643a86504a30f6b9fbe0f073bb03009b4fbd0f43 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 11:44:41 +0200
Subject: [PATCH 239/279] [ticket/10751] Add sql_lower_text() to database
 abstraction layer.

On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char).
So, in order to use it on a text column, we have to convert it to an
appropriate type. We do so using the SUBSTRING function.

PHPBB3-10751
---
 phpBB/includes/db/dbal.php        | 12 ++++++++++++
 phpBB/includes/db/mssql.php       |  8 ++++++++
 phpBB/includes/db/mssql_odbc.php  |  8 ++++++++
 phpBB/includes/db/mssqlnative.php |  8 ++++++++
 4 files changed, 36 insertions(+)

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 358df50402..9cc337955b 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -500,6 +500,18 @@ class dbal
 		return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
 	}
 
+	/**
+	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
+	*
+	* @param string $column_name	The column name to use
+	*
+	* @return string				A SQL statement like "LOWER($column_name)"
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER($column_name)";
+	}
+
 	/**
 	* Run more than one insert statement.
 	*
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 6899a73902..b7178593dc 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -332,6 +332,14 @@ class dbal_mssql extends dbal
 		return str_replace(array("'", "\0"), array("''", ''), $msg);
 	}
 
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 34f7a87337..2ecc42cadf 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -310,6 +310,14 @@ class dbal_mssql_odbc extends dbal
 		return str_replace(array("'", "\0"), array("''", ''), $msg);
 	}
 
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 92ac9b1fb9..c91cc188b0 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -492,6 +492,14 @@ class dbal_mssqlnative extends dbal
 		return str_replace(array("'", "\0"), array("''", ''), $msg);
 	}
 
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
 	/**
 	* Build LIKE expression
 	* @access private

From 9ab5ad2986a836554bbf137d577c38155540c0a8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 11:48:56 +0200
Subject: [PATCH 240/279] [ticket/10751] Use sql_lower_text() in view_log().
 log_data is a text column.

PHPBB3-10751
---
 phpBB/includes/functions_admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0e1a11b4aa..204fa9a43d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2557,7 +2557,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		{
 			$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
 		}
-		$sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+		$sql_lower = $db->sql_lower_text('l.log_data');
+		$sql_keywords .= "$sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
 	}
 
 	if ($log_count !== false)

From d22e7ce9df7d54591430fb542f2c2e14535c18cc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 19:57:13 +0200
Subject: [PATCH 241/279] [ticket/10788] Add Arty to the list of phpBB
 developers in docs/AUTHORS.

PHPBB3-10788
---
 phpBB/docs/AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 57adec6a67..446b204a08 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -23,6 +23,7 @@ involved in phpBB.
 phpBB Lead Developer:  naderman (Nils Adermann)
 
 phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
+                       Arty (Vjacheslav Trushkin)
                        bantu (Andreas Fischer)
                        imkingdavid (David King)
                        igorw (Igor Wiedler)

From d8ddda512180be56100a890410dece8046aade28 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:19:28 +0200
Subject: [PATCH 242/279] [develop-olympus] Bumping version numbers to final
 for 3.0.11 releases.

---
 phpBB/docs/INSTALL.html                       | 4 ++--
 phpBB/install/convertors/convert_phpbb20.php  | 2 +-
 phpBB/styles/prosilver/imageset/imageset.cfg  | 2 +-
 phpBB/styles/prosilver/style.cfg              | 2 +-
 phpBB/styles/prosilver/template/template.cfg  | 2 +-
 phpBB/styles/prosilver/theme/theme.cfg        | 2 +-
 phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +-
 phpBB/styles/subsilver2/style.cfg             | 2 +-
 phpBB/styles/subsilver2/template/template.cfg | 2 +-
 phpBB/styles/subsilver2/theme/theme.cfg       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 6ab118e3ee..e17f496c56 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -274,7 +274,7 @@
 
 	<p>This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.</p>
 
-	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.9</samp> you should select the phpBB-3.0.9_to_3.0.10.zip/tar.gz file.</p>
+	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.10</samp> you should select the phpBB-3.0.10_to_3.0.11.zip/tar.gz file.</p>
 
 	<p>The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
 
@@ -286,7 +286,7 @@
 
 	<p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
 
-	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <samp>3.0.9</samp> you need the phpBB-3.0.9_to_3.0.10.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
+	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <samp>3.0.10</samp> you need the phpBB-3.0.10_to_3.0.11.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
 
 	<p>If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
 
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 81cc2f68f3..7d6fed6164 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.0.10',
+	'phpbb_version'	=> '3.0.11',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg
index 5a703d9e47..d7ba7690f6 100644
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ b/phpBB/styles/prosilver/imageset/imageset.cfg
@@ -19,7 +19,7 @@
 # General Information about this style
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-version = 3.0.10
+version = 3.0.11
 
 # Images
 img_site_logo = site_logo.gif*52*139
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 95d8d287e4..97e8aced01 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -19,4 +19,4 @@
 # General Information about this style
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-version = 3.0.10
\ No newline at end of file
+version = 3.0.11
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index 0b0533573a..eb3df8bfd3 100644
--- a/phpBB/styles/prosilver/template/template.cfg
+++ b/phpBB/styles/prosilver/template/template.cfg
@@ -19,7 +19,7 @@
 # General Information about this template
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-version = 3.0.10
+version = 3.0.11
 
 # Defining a different template bitfield
 template_bitfield = lNg=
diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg
index e8698f7fe4..ec489d0b3d 100644
--- a/phpBB/styles/prosilver/theme/theme.cfg
+++ b/phpBB/styles/prosilver/theme/theme.cfg
@@ -21,7 +21,7 @@
 # General Information about this theme
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-version = 3.0.10
+version = 3.0.11
 
 # Some configuration options
 
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index 75a4aad038..c943db6735 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -19,7 +19,7 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 13e44435c6..4c40ee4438 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -19,4 +19,4 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-version = 3.0.10
+version = 3.0.11
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index d557edba87..6568aeca08 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,7 +19,7 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Template inheritance
 # See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index d7837a3766..5bd4480eef 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -21,7 +21,7 @@
 # General Information about this theme
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.10
+version = 3.0.11
 
 # Some configuration options
 

From 2011085c29d3141d66d390449b52ba6bd069ab69 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:26:28 +0200
Subject: [PATCH 243/279] [develop-olympus] Bump version numbers for 3.0.11-RC1
 release.

---
 build/build.xml                       | 6 +++---
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 6 +++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 3d8d3de640..c1179015eb 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.10" />
-	<property name="prevversion" value="3.0.9" />
-	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.10-RC1, 3.0.10-RC2, 3.0.10-RC3" />
+	<property name="newversion" value="3.0.11-RC1" />
+	<property name="prevversion" value="3.0.10" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index a0444ea594..5b72d89795 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.11-dev');
+define('PHPBB_VERSION', '3.0.11-RC1');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c700b483a5..c1fe144c62 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-dev');
+define('UPDATES_TO_VERSION', '3.0.11-RC1');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -951,7 +951,7 @@ function database_update_info()
 						// this column was removed from the database updater
 						// after 3.0.9-RC3 was released. It might still exist
 						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.11 after the db_tools class is capable of properly
+						// 3.0.12 after the db_tools class is capable of properly
 						// removing a primary key.
 						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
 						'attempt_ip'			=> array('VCHAR:40', ''),
@@ -996,7 +996,7 @@ function database_update_info()
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
 
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ba2d18da00..99b8f7f96d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 

From 19a47dfbbc4265e33c14d6679b5693d80120db4b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 31 May 2012 20:56:40 +0200
Subject: [PATCH 244/279] [develop-olympus] Add changelog for 3.0.11 release.

---
 phpBB/docs/CHANGELOG.html | 155 +++++++++++++++++++++++++++++++++-----
 1 file changed, 136 insertions(+), 19 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 2d3b6a6809..71e28be9bc 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,6 +53,7 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ol style="list-style-type: lower-roman;">
+		<li><a href="#v3010">Changes since 3.0.10</a></li>
 		<li><a href="#v309">Changes since 3.0.9</a></li>
 		<li><a href="#v308">Changes since 3.0.8</a></li>
 		<li><a href="#v307-PL1">Changes since 3.0.7-PL1</a></li>
@@ -91,7 +92,123 @@
 
 		<div class="content">
 
-	<a name="v309"></a><h3>1.i. Changes since 3.0.9</h3>
+	<a name="v3010"></a><h3>1.i. Changes since 3.0.10</h3>
+
+<h4>Bug</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7432">PHPBB3-7432</a>] - Unclear language for Inactive Users on ACP main page</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8652">PHPBB3-8652</a>] - Duplicate Emails Sent When Subscribed to Forum and Topic</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9079">PHPBB3-9079</a>] - Display backtrace on all E_USER_ERROR errors, not only SQL errors (when DEBUG_EXTRA is enabled)</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9084">PHPBB3-9084</a>] - Unable to display 'option equal to non entered value' if dropdown CPF is not required</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9089">PHPBB3-9089</a>] - PM message title box not accessible via Tab key</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9220">PHPBB3-9220</a>] - Blue border width when table in a div</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9681">PHPBB3-9681</a>] - Password length not in security settings</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9813">PHPBB3-9813</a>] - fulltext_native.php on innodb loading deadly slow for big indexes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9831">PHPBB3-9831</a>] - Cannot change default of Boolean checkbox custom profile field</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10094">PHPBB3-10094</a>] - Clear cache before phpBB installation</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10129">PHPBB3-10129</a>] - Missing apostrophes in ACP user management -&gt; permissions</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10349">PHPBB3-10349</a>] - Unit tests do not remove comments from schemas</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10399">PHPBB3-10399</a>] - Special characters aren't parsed in style component variables</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10401">PHPBB3-10401</a>] - auth_ldap has an incorrect return value in login_ldap()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10407">PHPBB3-10407</a>] - Incorrect check for empty image file paths during conversion</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10428">PHPBB3-10428</a>] - optionget/optionset functions in session.php and acp_users.php incorrectly check whether $data is at its default value</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10456">PHPBB3-10456</a>] - Subsilver2 does not define $CAPTCHA_TAB_INDEX</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10508">PHPBB3-10508</a>] - Marking forums as read displays misleading language</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10511">PHPBB3-10511</a>] - Grammar defect in permissions language</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10512">PHPBB3-10512</a>] - Test failure when no default timezone is set in php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10532">PHPBB3-10532</a>] - Out of range $start causes a page with no search results but with pagination</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10538">PHPBB3-10538</a>] - Special character are not correctly parsed for SMTP protocol</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10542">PHPBB3-10542</a>] - Incorrect class=&quot;postlink&quot; in styles/subsilver2/template/faq_body.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10546">PHPBB3-10546</a>] - Argument missing for adm_back_link() in acp_captcha.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10561">PHPBB3-10561</a>] - All users can choose deactivated styles.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10569">PHPBB3-10569</a>] - template/ucp_main_front.html does not correctly handle active topic with the name &quot;0&quot;</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10580">PHPBB3-10580</a>] - Default tz in registration dropdown not the same as the board default tz</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10589">PHPBB3-10589</a>] - user_birthday does not use table alias in $leap_year_birthdays variable definition</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10605">PHPBB3-10605</a>] - Orpahned privmsgs are left in the prvmsgs table, with no ties in privmsgs_to table</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10606">PHPBB3-10606</a>] - $s_hidden_fields -&gt; incorrect array name (3 files affected)</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10611">PHPBB3-10611</a>] - Add a check for selected tables existence for ACP database backup tool</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10615">PHPBB3-10615</a>] - Static calls in utf normalizer yield E_STRICT spam on php 5.4</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10630">PHPBB3-10630</a>] - Prune Users produced unnecessarily long query; Got a packet bigger than 'max_allowed_packet' bytes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10633">PHPBB3-10633</a>] - Users are able to get the real filename of attachment</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10639">PHPBB3-10639</a>] - negative value of ranks message</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10658">PHPBB3-10658</a>] - Rank-item is not shown on team-list</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10675">PHPBB3-10675</a>] - Use more descriptive message when disk is out of space</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10684">PHPBB3-10684</a>] - Function user_notification() prevents notifications for users with stale bans</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10689">PHPBB3-10689</a>] - Bug in the popup &quot; Find a member&quot; when select by letter.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10691">PHPBB3-10691</a>] - Search index creation CLI script incorrectly calculates indexing speed</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10699">PHPBB3-10699</a>] - Long h2 title breaks div.minitabs in MCP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10708">PHPBB3-10708</a>] - After a conversion, passwords with UTF8 characters do not work when user_pass_convert is set.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10717">PHPBB3-10717</a>] - memberlist_view.html: including admin defined profile fields doesnt work</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10723">PHPBB3-10723</a>] - Do not use SQLite on PHP 5.4 in Tests on Travis</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10731">PHPBB3-10731</a>] - JS function addquote() works incorrectly in Opera</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10751">PHPBB3-10751</a>] - MS SQL Error when searching Admin Log</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10760">PHPBB3-10760</a>] - In pre-commit git hook, syntax error is thrown, but is not specifically described</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10767">PHPBB3-10767</a>] - Git hooks do not work properly with git GUIs</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10774">PHPBB3-10774</a>] - db_tools::create_unique_index does not use specified index names on MySQL</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10790">PHPBB3-10790</a>] - Strict comparison on user_id for sending pms</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10797">PHPBB3-10797</a>] - Template var for user rank not filled</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10835">PHPBB3-10835</a>] - Misleading message in UCP when no permission to change password</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10846">PHPBB3-10846</a>] - Missing alias for MAX(post_id) in SQL query in acp_main.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10849">PHPBB3-10849</a>] - Missing BBCode Help Text in subsilver2</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10858">PHPBB3-10858</a>] - $db-&gt;sql_fetchfield returns false with mssqlnative</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10860">PHPBB3-10860</a>] - Side-by-side diff styling javascript bug</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10881">PHPBB3-10881</a>] - Some files use 0xA9 as the copyright symbol which is neither ASCII nor the UTF8 copyright symbol.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10887">PHPBB3-10887</a>] - Auto increment tests depend on varbinary handling</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10889">PHPBB3-10889</a>] - Default value for c_char_size in database unit tests is an empty string instead of a char(4)</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10890">PHPBB3-10890</a>] - test_sql_fetchrow_returns_false_when_empty() fails on MSSQL and Oracle</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10908">PHPBB3-10908</a>] - No remote avatar size limit results in files limited only by PHP memory limit</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10913">PHPBB3-10913</a>] - Admin is logged out when accessing any url under adm/ without session id</li>
+</ul>
+<h4>Improvement</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8599">PHPBB3-8599</a>] - Add &quot;Select All&quot; to &quot;Add multiple smilies&quot; screen</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8636">PHPBB3-8636</a>] - Add resync option to topic_view moderation page</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9876">PHPBB3-9876</a>] - Names and descriptions for roles &quot;Newly registered User&quot; in &quot;User roles&quot; and &quot;Forum roles&quot; must be different</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9914">PHPBB3-9914</a>] - Add backup warning to Automatic DB Updater</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9916">PHPBB3-9916</a>] - License in header not linking to version 2 of GNU GPL</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10093">PHPBB3-10093</a>] - Make commit-msg hook always not fatal</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10162">PHPBB3-10162</a>] - Allow TLDs over 6 characters in email addresses</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10280">PHPBB3-10280</a>] - Change the ACP user activation display</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10308">PHPBB3-10308</a>] - Disable Retain/Delete Posts selection if the user has no posts.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10453">PHPBB3-10453</a>] - PM viewmessage page is misplacing the online icon</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10492">PHPBB3-10492</a>] - Port functional tests to develop-olympus</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10507">PHPBB3-10507</a>] - Sort installed styles list in admin control panel - styles</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10550">PHPBB3-10550</a>] - Sort not installed styles list in admin control panel - styles</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10563">PHPBB3-10563</a>] - ACP usability improvement: show deactivated styles below active styles in styles list</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10565">PHPBB3-10565</a>] - Performance: Unneeded GROUP BY in update_forum_tracking_info</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10607">PHPBB3-10607</a>] - phpBB Credit Line Hardcoded</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10653">PHPBB3-10653</a>] - Add ability to count table rows to database abstraction layer</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10730">PHPBB3-10730</a>] - Add label tags around &quot;select&quot; text in post splitting UI in MCP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10764">PHPBB3-10764</a>] - FAQ mentions SourceForge</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10812">PHPBB3-10812</a>] - Installer should not display register globals UI for php 5.4+</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10815">PHPBB3-10815</a>] - Enable Feeds by default</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10819">PHPBB3-10819</a>] - Improve side-by-side diff styling</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10834">PHPBB3-10834</a>] - Backport general development language changes in readme files</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10836">PHPBB3-10836</a>] - Enable Avatars by default</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10891">PHPBB3-10891</a>] - Allow specifying test config file name via environment variable</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10892">PHPBB3-10892</a>] - Cosmetic improvements to RUNNING_TESTS.txt</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10898">PHPBB3-10898</a>] - Do not write ?&gt; into config.php to avoid whitespace output</li>
+</ul>
+<h4>New Feature</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10616">PHPBB3-10616</a>] - Add template inheritance by default</li>
+</ul>
+<h4>Sub-task</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10907">PHPBB3-10907</a>] - Mark (var)binary tests as incomplete on non-MySQL DBMSes</li>
+</ul>
+<h4>Task</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9896">PHPBB3-9896</a>] - Update links in docs/readme.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10434">PHPBB3-10434</a>] - Add a script that allows creating a search index from CLI</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10455">PHPBB3-10455</a>] - Remove NOTE from header files</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10694">PHPBB3-10694</a>] - Update notification in ACP (Olympus) for increase of minimum PHP version to 5.3.2</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10718">PHPBB3-10718</a>] - Add Travis CI</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10788">PHPBB3-10788</a>] - Update docs/AUTHORS for 3.0.11-RC1</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10909">PHPBB3-10909</a>] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2</li>
+</ul>
+
+	<a name="v309"></a><h3>1.ii. Changes since 3.0.9</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -227,7 +344,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10480">PHPBB3-10480</a>] - Automate changelog building</li>
 </ul>
 
-	<a name="v308"></a><h3>1.ii. Changes since 3.0.8</h3>
+	<a name="v308"></a><h3>1.iii. Changes since 3.0.8</h3>
 
 <h4>        Bug
 </h4>
@@ -595,7 +712,7 @@
 </ul>
 
 
-	<a name="v307-PL1"></a><h3>1.iii. Changes since 3.0.7-PL1</h3>
+	<a name="v307-PL1"></a><h3>1.iv. Changes since 3.0.7-PL1</h3>
 <h4>        Security
 </h4>
 <ul>
@@ -1053,13 +1170,13 @@
 </ul>
 
 
-	<a name="v307"></a><h3>1.iiv. Changes since 3.0.7</h3>
+	<a name="v307"></a><h3>1.iv. Changes since 3.0.7</h3>
 
 	<ul>
 		<li>[Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)</li>
 	</ul>
 
-	<a name="v306"></a><h3>1.v. Changes since 3.0.6</h3>
+	<a name="v306"></a><h3>1.vi. Changes since 3.0.6</h3>
 
 	<ul>
 		<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
@@ -1163,7 +1280,7 @@
 
 	</ul>
 
-	<a name="v305"></a><h3>1.vi. Changes since 3.0.5</h3>
+	<a name="v305"></a><h3>1.vii. Changes since 3.0.5</h3>
 
 	<ul>
 		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -1385,7 +1502,7 @@
 		<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
 	</ul>
 
-	<a name="v304"></a><h3>1.vii. Changes since 3.0.4</h3>
+	<a name="v304"></a><h3>1.viii. Changes since 3.0.4</h3>
 
 	<ul>
 		<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
@@ -1474,7 +1591,7 @@
 		<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
 	</ul>
 
-	<a name="v303"></a><h3>1.viii. Changes since 3.0.3</h3>
+	<a name="v303"></a><h3>1.ix. Changes since 3.0.3</h3>
 
 	<ul>
 		<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -1506,7 +1623,7 @@
 		<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
 	</ul>
 
-	<a name="v302"></a><h3>1.ix. Changes since 3.0.2</h3>
+	<a name="v302"></a><h3>1.x. Changes since 3.0.2</h3>
 
 	<ul>
 		<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
@@ -1605,7 +1722,7 @@
 		<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
 	</ul>
 
-	<a name="v301"></a><h3>1.x. Changes since 3.0.1</h3>
+	<a name="v301"></a><h3>1.xi. Changes since 3.0.1</h3>
 
 	<ul>
 		<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -1653,7 +1770,7 @@
 		<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
 	</ul>
 
-	<a name="v300"></a><h3>1.xi Changes since 3.0.0</h3>
+	<a name="v300"></a><h3>1.xii Changes since 3.0.0</h3>
 
 	<ul>
 		<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -1724,7 +1841,7 @@
 		<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
 	</ul>
 
-	<a name="v30rc8"></a><h3>1.xii. Changes since 3.0.RC8</h3>
+	<a name="v30rc8"></a><h3>1.xiii. Changes since 3.0.RC8</h3>
 
 	<ul>
 		<li>[Fix] Cleaned usernames contain only single spaces, so &quot;a_name&quot; and &quot;a__name&quot; are treated as the same name (Bug #15634)</li>
@@ -1733,7 +1850,7 @@
 		<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
 	</ul>
 
-	<a name="v30rc7"></a><h3>1.xiii. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>1.xiv. Changes since 3.0.RC7</h3>
 
 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -1768,7 +1885,7 @@
 		<li>[Fix] No duplication of active topics (Bug #15474)</li>
 	</ul>
 
-	<a name="v30rc6"></a><h3>1.xiv. Changes since 3.0.RC6</h3>
+	<a name="v30rc6"></a><h3>1.xv. Changes since 3.0.RC6</h3>
 
 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -1778,7 +1895,7 @@
 		<li>[Fix] Able to request new password (Bug #14743)</li>
 	</ul>
 
-	<a name="v30rc5"></a><h3>1.xv. Changes since 3.0.RC5</h3>
+	<a name="v30rc5"></a><h3>1.xvi. Changes since 3.0.RC5</h3>
 
 	<ul>
 		<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@@ -1841,7 +1958,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
-	<a name="v30rc4"></a><h3>1.xvi. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>1.xvii. Changes since 3.0.RC4</h3>
 
 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -1892,7 +2009,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>
 
-	<a name="v30rc3"></a><h3>1.xvii. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>1.xviii. Changes since 3.0.RC3</h3>
 
 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -2001,7 +2118,7 @@
 
 	</ul>
 
-	<a name="v30rc2"></a><h3>1.xviii. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>1.xviv. Changes since 3.0.RC2</h3>
 
 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -2047,7 +2164,7 @@
 
 	</ul>
 
-	<a name="v30rc1"></a><h3>1.xix. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>1.xx. Changes since 3.0.RC1</h3>
 
 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>

From d26606f986eca33495b112e00abb93a2716ac77e Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 19 Jun 2012 01:20:58 -0500
Subject: [PATCH 245/279] [ticket/10925] Clarify installation requirements for
 SQLite

PHPBB3-10925
---
 phpBB/docs/INSTALL.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index c54e408be2..482d283dfc 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -139,7 +139,7 @@
 		<ul>
 			<li>MySQL 3.23 or above (MySQLi supported)</li>
 			<li>PostgreSQL 7.3+</li>
-			<li>SQLite 2.8.2+</li>
+			<li>SQLite 2.8.2+ (SQLite 3 is not supported)</li>
 			<li>Firebird 2.1+</li>
 			<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
 			<li>Oracle</li>

From 80fafdeb1a6eca735a60ef50dbc973dfd066eb22 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Jun 2012 14:38:13 +0200
Subject: [PATCH 246/279] [ticket/10935] Limit number of PM rules per user to
 5000

PHPBB3-10935
---
 phpBB/includes/ucp/ucp_pm_options.php | 17 +++++++++++++++--
 phpBB/language/en/ucp.php             |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 58c2d087c8..efa390ed87 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -328,10 +328,23 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 				trigger_error('RULE_ALREADY_DEFINED');
 			}
 
+			// Prevent users from flooding the rules table
+			$sql = 'SELECT COUNT(rule_id) AS num_rules
+				FROM ' . PRIVMSGS_RULES_TABLE . '
+				WHERE user_id = ' . (int) $user->data['user_id'];
+			$result = $db->sql_query($sql);
+			$num_rules = (int) $db->sql_fetchfield('num_rules');
+			$db->sql_freeresult($result);
+
+			if ($num_rules >= 5000)
+			{
+				trigger_error('RULE_LIMIT_REACHED');
+			}
+
 			$sql = 'INSERT INTO ' . PRIVMSGS_RULES_TABLE . ' ' . $db->sql_build_array('INSERT', $rule_ary);
 			$db->sql_query($sql);
 
-			// Update users message rules
+			// Set the user_message_rules bit
 			$sql = 'UPDATE ' . USERS_TABLE . '
 				SET user_message_rules = 1
 				WHERE user_id = ' . $user->data['user_id'];
@@ -378,7 +391,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			// Update users message rules
+			// Unset the user_message_rules bit
 			if (!$row)
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7df26e040f..94d9a5171e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -388,6 +388,7 @@ $lang = array_merge($lang, array(
 	'RULE_ADDED'						=> 'Rule successfully added.',
 	'RULE_ALREADY_DEFINED'				=> 'This rule was defined previously.',
 	'RULE_DELETED'						=> 'Rule successfully removed.',
+	'RULE_LIMIT_REACHED'				=> 'You cannot add more PM rules. You have reached the maximum number of rules.',
 	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
 	'RULE_REMOVED_MESSAGE'				=> 'One private message had been removed due to private message filters.',
 	'RULE_REMOVED_MESSAGES'				=> '%d private messages were removed due to private message filters.',

From ac8ebfabc7a4fae591ac780f621e4e21d09d070c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:26:48 +0200
Subject: [PATCH 247/279] [ticket/10950] Use proper ' in order to fix comment.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 261ed45727..e6e8e0ab6c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1173,7 +1173,7 @@ function phpbb_delete_user_pms($user_id)
 		$db->sql_query($sql);
 	}
 
-	// Reset the user´s pm count to 0
+	// Reset the user's pm count to 0
 	if (isset($undelivered_user[$user_id]))
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '

From 35b18676cda35b81277a9532ac9a579abbfda09d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:28:13 +0200
Subject: [PATCH 248/279] [ticket/10950] Fix SQL coding style (indentation) in
 second SQL query.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index e6e8e0ab6c..d76efd2ff6 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1135,7 +1135,7 @@ function phpbb_delete_user_pms($user_id)
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
-				AND folder_id = ' . PRIVMSGS_NO_BOX;
+			AND folder_id = ' . PRIVMSGS_NO_BOX;
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))

From 2a76b7e8690eaf19c25ed4c13540c1e1aab31cdd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:30:09 +0200
Subject: [PATCH 249/279] [ticket/10950] Remove redundant if statement.

We already know author_id and folder_id.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d76efd2ff6..d75b4d92a8 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1140,19 +1140,16 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
-		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-		{
-			// Undelivered messages
-			$undelivered_msg[] = $row['msg_id'];
+		// Undelivered messages
+		$undelivered_msg[] = $row['msg_id'];
 
-			if (isset($undelivered_user[$row['user_id']]))
-			{
-				++$undelivered_user[$row['user_id']];
-			}
-			else
-			{
-				$undelivered_user[$row['user_id']] = 1;
-			}
+		if (isset($undelivered_user[$row['user_id']]))
+		{
+			++$undelivered_user[$row['user_id']];
+		}
+		else
+		{
+			$undelivered_user[$row['user_id']] = 1;
 		}
 
 		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];

From a50d1a3576b9e92dfbcfc5bb951e2985ae1872a1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:32:16 +0200
Subject: [PATCH 250/279] [ticket/10950] Move array initialisation to the
 front.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d75b4d92a8..cdfde4c7ea 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1103,13 +1103,14 @@ function phpbb_delete_user_pms($user_id)
 
 	// Get PM Information for later deleting
 	// The two queries where split, so we can use our indexes
+	$undelivered_msg = $undelivered_user = $delete_ids = array();
+
 	// Part 1: get PMs the user received
 	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
 
-	$undelivered_msg = $undelivered_user = $delete_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)

From 9c2930178f37ed881055da3e65286704a3a8220e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:43:43 +0200
Subject: [PATCH 251/279] [ticket/10950] Use a variable for the private message
 id.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index cdfde4c7ea..d77d46d46d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1113,10 +1113,13 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
+		$msg_id = (int) $row['msg_id'];
+		$delete_ids[$msg_id] = $msg_id;
+
 		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
 		{
 			// Undelivered messages
-			$undelivered_msg[] = $row['msg_id'];
+			$undelivered_msg[] = $msg_id;
 
 			if (isset($undelivered_user[$row['user_id']]))
 			{
@@ -1127,8 +1130,6 @@ function phpbb_delete_user_pms($user_id)
 				$undelivered_user[$row['user_id']] = 1;
 			}
 		}
-
-		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 
@@ -1141,8 +1142,11 @@ function phpbb_delete_user_pms($user_id)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
+		$msg_id = (int) $row['msg_id'];
+		$delete_ids[$msg_id] = $msg_id;
+
 		// Undelivered messages
-		$undelivered_msg[] = $row['msg_id'];
+		$undelivered_msg[] = $msg_id;
 
 		if (isset($undelivered_user[$row['user_id']]))
 		{
@@ -1152,8 +1156,6 @@ function phpbb_delete_user_pms($user_id)
 		{
 			$undelivered_user[$row['user_id']] = 1;
 		}
-
-		$delete_ids[(int) $row['msg_id']] = (int) $row['msg_id'];
 	}
 	$db->sql_freeresult($result);
 

From fce385e5bc1212d9c3233b7a1ae2212eb1626e9b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:45:36 +0200
Subject: [PATCH 252/279] [ticket/10950] Select the correct columns in SQL
 queries.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index d77d46d46d..1800242b71 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1106,7 +1106,7 @@ function phpbb_delete_user_pms($user_id)
 	$undelivered_msg = $undelivered_user = $delete_ids = array();
 
 	// Part 1: get PMs the user received
-	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+	$sql = 'SELECT msg_id, user_id, author_id, folder_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
@@ -1134,7 +1134,7 @@ function phpbb_delete_user_pms($user_id)
 	$db->sql_freeresult($result);
 
 	// Part 2: get PMs the user sent
-	$sql = 'SELECT msg_id, author_id, folder_id, pm_unread, pm_new
+	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;

From 30475856c46b3604693b6d5df22be3360ae16822 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 10:47:26 +0200
Subject: [PATCH 253/279] [ticket/10950] Add empty line to make unset() call
 more visible.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 1800242b71..72dd3c7d20 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1181,6 +1181,7 @@ function phpbb_delete_user_pms($user_id)
 				user_unread_privmsg = 0
 			WHERE user_id = ' . $user_id;
 		$db->sql_query($sql);
+
 		unset($undelivered_user[$user_id]);
 	}
 

From 49afc1f2dc3a3ee17c6abff1e94c25a8ba8b3604 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Jun 2012 11:16:38 +0200
Subject: [PATCH 254/279] [ticket/10950] Correct comment for the second query.

Only undelivered messages are handled.

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 72dd3c7d20..afd254d6ea 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1133,7 +1133,7 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	// Part 2: get PMs the user sent
+	// Part 2: get PMs the user sent, but has yet to be received
 	$sql = 'SELECT msg_id, user_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '

From d30dc11f3e1ade19fd8643bdded6f11625da1bb3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 23 Jun 2012 16:02:16 +0200
Subject: [PATCH 255/279] [ticket/10950] Add some first and simple unit tests
 for phpbb_delete_user_pms()

Todo: Add cases to in which the msg is also deleted.

PHPBB3-10950
---
 tests/privmsgs/delete_user_pms_test.php     |  95 +++++++++++++++
 tests/privmsgs/fixtures/delete_user_pms.xml | 127 ++++++++++++++++++++
 2 files changed, 222 insertions(+)
 create mode 100644 tests/privmsgs/delete_user_pms_test.php
 create mode 100644 tests/privmsgs/fixtures/delete_user_pms.xml

diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
new file mode 100644
index 0000000000..b399d94c6d
--- /dev/null
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -0,0 +1,95 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php';
+
+class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml');
+	}
+
+	public static function delete_user_pms_data()
+	{
+		return array(
+		//	array(
+		//		(user we delete),
+		//		array(remaining privmsgs ids),
+		//		array(remaining privmsgs_to),
+		//	),
+			array(
+				2,
+				array(
+					array('msg_id' => 1),
+					array('msg_id' => 2),
+				),
+				array(
+					//array('msg_id' => 1, 'user_id' => 2),
+					array('msg_id' => 1, 'user_id' => 3),
+					array('msg_id' => 1, 'user_id' => 4),
+					//array('msg_id' => 2, 'user_id' => 2),
+					array('msg_id' => 2, 'user_id' => 4),
+				),
+			),
+			array(
+				3,
+				array(
+					array('msg_id' => 1),
+					array('msg_id' => 2),
+				),
+				array(
+					array('msg_id' => 1, 'user_id' => 2),
+					//array('msg_id' => 1, 'user_id' => 3),
+					array('msg_id' => 1, 'user_id' => 4),
+					array('msg_id' => 2, 'user_id' => 2),
+					array('msg_id' => 2, 'user_id' => 4),
+				),
+			),
+			array(
+				5,
+				array(
+					array('msg_id' => 1),
+					array('msg_id' => 2),
+				),
+				array(
+					array('msg_id' => 1, 'user_id' => 2),
+					array('msg_id' => 1, 'user_id' => 3),
+					array('msg_id' => 1, 'user_id' => 4),
+					array('msg_id' => 2, 'user_id' => 2),
+					array('msg_id' => 2, 'user_id' => 4),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider delete_user_pms_data
+	*/
+	public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaining_privmsgs_to)
+	{
+		global $db;
+
+		$db = $this->new_dbal();
+
+		phpbb_delete_user_pms($delete_user);
+
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TABLE;
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($remaining_privmsgs, $db->sql_fetchrowset($result));
+
+		$sql = 'SELECT msg_id, user_id
+			FROM ' . PRIVMSGS_TO_TABLE;
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($remaining_privmsgs_to, $db->sql_fetchrowset($result));
+	}
+}
diff --git a/tests/privmsgs/fixtures/delete_user_pms.xml b/tests/privmsgs/fixtures/delete_user_pms.xml
new file mode 100644
index 0000000000..848164080c
--- /dev/null
+++ b/tests/privmsgs/fixtures/delete_user_pms.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_new_privmsg</column>
+		<column>user_unread_privmsg</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>2</value>
+			<value>sender</value>
+			<value>sender</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>pm in inbox</value>
+			<value>pm in inbox</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>pm in no box</value>
+			<value>pm in no box</value>
+			<value>2</value>
+			<value>2</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>no pms</value>
+			<value>no pms</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_privmsgs">
+		<column>msg_id</column>
+		<column>root_level</column>
+		<column>author_id</column>
+		<column>message_subject</column>
+		<column>message_text</column>
+		<row>
+			<value>1</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#1</value>
+			<value>#1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#2</value>
+			<value>#2</value>
+		</row>
+	</table>
+	<table name="phpbb_privmsgs_to">
+		<column>msg_id</column>
+		<column>user_id</column>
+		<column>author_id</column>
+		<column>pm_new</column>
+		<column>pm_unread</column>
+		<column>folder_id</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+	</table>
+</dataset>

From c9f9e66328a9d679ff2d02d66df420db48a64323 Mon Sep 17 00:00:00 2001
From: Oyabun1 <bilby7@gmail.com>
Date: Fri, 29 Jun 2012 01:39:14 -0500
Subject: [PATCH 256/279] [ticket/10441] Update to docs/README.html

Updated information about styles, languages, and MODs
Added a section about the Knowledge Base.
Various phrase changes.

PHPBB3-10441
---
 phpBB/docs/README.html | 63 +++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index e6fb77ac08..a4cbe65254 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -54,7 +54,7 @@
 				<li><a href="#install">Installing phpBB3</a></li>
 				<li><a href="#run">Running phpBB3</a>
 				<ol style="list-style-type: lower-roman;">
-					<li><a href="#i18n">Internationalisation (i18n)</a></li>
+					<li><a href="#i18n">Languages (Internationalisation - i18n)</a></li>
 					<li><a href="#styles">Styles</a></li>
 					<li><a href="#mods">Modifications</a></li>
 				</ol>
@@ -62,8 +62,9 @@
 				<li><a href="#help">Getting help with phpBB3</a>
 				<ol style="list-style-type: lower-roman;">
 					<li><a href="#docs">Documentation</a></li>
+					<li><a href="#kb">Knowledge Base</a></li>
 					<li><a href="#website">Community Forums</a></li>
-					<li><a href="#irc">Internet Relay Chat</a></li>
+					<li><a href="#irc">Internet Relay Chat (IRC)</a></li>
 				</ol>
 				</li>
 				<li><a href="#status">Status of this version</a></li>
@@ -127,41 +128,41 @@
 
 		<div class="content">
 
-	<p>Once installed phpBB is easily managed by both admin and moderator control panels. If you need help or advice with phpBB please see <a href="#help">Section 3</a> below.</p>
+	<p>Once installed, phpBB is easily managed via the Administration and Moderator Control Panels. If you need help or advice with phpBB, please see <a href="#help">Section 3</a> below.</p>
 
-	<a name="i18n"></a><h3>2.i. Internationalisation (i18n)</h3>
+	<a name="i18n"></a><h3>2.i. Languages (Internationalisation - i18n)</h3>
 
-	<p>A number of language packs and style localisations are available. You can find them on our official language packs page:</p>
+	<p>A number of language packs with included style localisations are available. You can find them listed in the <a href="http://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="http://www.phpbb.com/customise/db/language_packs-25/">Language Packs</a> section of the <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
 	<p><a href="http://www.phpbb.com/languages/">http://www.phpbb.com/languages/</a></p>
 
 	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
 
-	<p>Installation of these packages is straightforward, simply download the required language pack and unarchive it into the <samp>languages/</samp> folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the <code>Admin-&gt;System-&gt;Language Packs</code> and install the now appearing new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.</p>
+	<p>Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included <code>language</code> and <code>styles</code> folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: <code>System tab -&gt; General Tasks -&gt; Language packs</code>. A more detailed description of the process is in the Knowledge Base article, <a href="http://www.phpbb.com/kb/article/how-to-install-a-language-pack/">How to Install a Language Pack</a>.</p>
 
-	<p>If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.</p>
+	<p>If your language is not available, please visit our <a href="http://www.phpbb.com/community/viewforum.php?f=66">[3.0.x] Translations</a> forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can <a href="http://www.phpbb.com/languages/apply.php">Apply to become a translator</a>.</p>
 
 	<a name="styles"></a><h3>2.ii. Styles</h3>
 
-	<p>Although phpBB Group are rather proud of the included styles we realise that they may not be to everyone's tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at</p>
+	<p>Although the phpBB Group is rather proud of the included styles, we realise that they may not be to everyone's taste. Therefore, phpBB3 allows styles to be switched with relative ease. First, you need to locate and download a style you like. We maintain such a section in the <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
 	<p><a href="http://www.phpbb.com/customise/db/styles-2/">http://www.phpbb.com/customise/db/styles-2/</a></p>
 
-	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3.</p>
+	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3. It is also important to ensure that the style is updated to match the current version of the phpBB software you are using.</p>
 
-	<p>Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your <samp>styles/</samp> directory. You then need to visit <code>Administration -&gt; Styles</code>, you should see the new style available, click install and it will become available for all your users.</p>
+	<p>Once you have downloaded a style, the usual next step is to unarchive (or upload the unarchived contents of) the package into your <code>styles/</code> directory. You then need to visit <code>Administration Control Panel -&gt; Styles tab</code> where you should see the new style available. Click &quot;Install&quot; to install the style.</p>
 
-	<p><strong>Please note</strong> that if you create your own style or modify existing ones, please remember to enable the &quot;Recompile stale style components&quot; setting within the <code>Admin-&gt;General-&gt;Load Settings</code> screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect.</p>
+	<p><strong>Please note</strong> that to improve efficiency, the software caches certain data. For this reason, if you create your own style or modify existing ones, please remember to &quot;Refresh&quot; the appropriate style components <code>Administration Control Panel -&gt; Styles tab -&gt; Style Components</code> screen. You may also need to reload the page you have changed in your web browser to overcome browser caching. If the changed components are not refreshed you will not see your changes taking effect.</p>
 
 	<a name="mods"></a><h3>2.iii. Modifications</h3>
 
-	<p>Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:</p>
+	<p>Although not officially supported by the phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB software, known as <strong>MODs</strong>, extend its capabilities still further. Information on MODs can be found at:</p>
 
-	<p><a href="http://www.phpbb.com/customise/db/modifications-1/">http://www.phpbb.com/customise/db/modifications-1/</a></p>
+	<p><a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods</a></p>
 
-	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.</p>
+	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the MOD and see if the problem is resolved. Any support for a MOD should only be sought in the &quot;Discussion/Support&quot; forum for that MOD.</p>
 
-	<p>Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.</p>
+	<p>Also remember that any modifications, particularly those which modify the database in any way, may render upgrading your forum to future versions more difficult. With all this said, many users have and continue to utilise many of the MODs already available with great success.</p>
 
 		</div>
 
@@ -189,17 +190,23 @@
 
 	<p>This covers everything from installation through setting permissions and managing users.</p>
 
-	<a name="website"></a><h3>3.ii. Community Forums</h3>
+	<a name="kb"></a><h3>3.ii. Knowledge Base</h3>
 
-	<p>phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
+	<p>The Knowledge Base consists of a number of detailed articles on some common issues phpBB users may encounter while using the product. The Knowledge Base can be found at:</p>
+
+	<p><a href="http://www.phpbb.com/kb/">http://www.phpbb.com/kb/</a></p>
+
+	<a name="website"></a><h3>3.iii. Community Forums</h3>
+
+	<p>The phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:</p>
 
 	<p><a href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a></p>
 
 	<p>If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.</p>
 
-	<a name="irc"></a><h3>3.iii Internet Relay Chat</h3>
+	<a name="irc"></a><h3>3.iv Internet Relay Chat</h3>
 
-	<p>Another place you may find help is our IRC channel. This operates on the Freenode IRC network, <em>irc.freenode.net</em> and the channel is <em>#phpbb</em> and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.</p>
+	<p>Another place you may find help is our IRC channel. This operates on the Freenode IRC network, <a href="irc://irc.freenode.net">irc.freenode.net</a> and the channel is <em>#phpbb</em> and can be accessed by any decent IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.</p>
 
 	<p>There are other IRC channels available, please see <a href="http://www.phpbb.com/support/irc/">http://www.phpbb.com/support/irc/</a> for the complete list.</p>
 
@@ -225,7 +232,7 @@
 
 	<p><a href="http://area51.phpbb.com/phpBB/">http://area51.phpbb.com/phpBB/</a></p>
 
-	<p>Please note that this forum should <strong>NOT</strong> be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
+	<p>Please note that the devolopment forums should <strong>NOT</strong> be used to seek support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
 
 		</div>
 
@@ -250,13 +257,13 @@
 	<p>While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:</p>
 
 	<ul>
-		<li>Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues.<br /><br /></li>
-		<li>Next please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
-		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3.<br /><br /></li>
-		<li>If no existing bug exists then please feel free to add it.</li>
+		<li>First, determine if your bug is reproduceable; how to determine this depends on the bug in question. Only if the bug is reproduceable is it likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues<br /><br /></li>
+		<li>Next, please read or search through the existing bug reports to see if <em>your</em> bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).<br /><br /></li>
+		<li>Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please <strong>DO NOT</strong> post your particular bug to the forum unless it's non-reproduceable or you are sure it&rsquo;s related to something you have done rather than phpBB3<br /><br /></li>
+		<li>If no existing bug exists then please feel free to add it</li>
 	</ul>
 
-	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
+	<p>If you do post a new bug (i.e. one that isn't already listed in the bug tracker) first make sure that you have logged in (your username and password are the same as for the community forums) then please include the following details:</p>
 
 	<ul>
 		<li>Your server type/version, e.g. Apache 1.3.28, IIS 4, Sambar, etc.</li>
@@ -294,7 +301,7 @@
 
 		<div class="content">
 
-	<p>This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.</p>
+	<p>This list is not complete but does represent those bugs which may affect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.</p>
 
 	<ul>
 		<li>Conversions may fail to complete on large boards under some hosts</li>
@@ -322,7 +329,7 @@
 
 	<p>Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p>
 
 <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
 
@@ -344,7 +351,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright &copy; <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 		</div>
 

From 6203ef0c61b2896d85922d99edebf9df03896126 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Fri, 29 Jun 2012 12:10:14 -0500
Subject: [PATCH 257/279] [ticket/10441] Typo

PHPBB3-10441
---
 phpBB/docs/README.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index a4cbe65254..6b6b21d8ae 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -232,7 +232,7 @@
 
 	<p><a href="http://area51.phpbb.com/phpBB/">http://area51.phpbb.com/phpBB/</a></p>
 
-	<p>Please note that the devolopment forums should <strong>NOT</strong> be used to seek support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
+	<p>Please note that the development forums should <strong>NOT</strong> be used to seek support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.</p>
 
 		</div>
 

From 625333ea2ed4b89ea479786f599948d5530c7202 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 30 Jun 2012 12:21:37 -0500
Subject: [PATCH 258/279] [ticket/10773] ACP logo with registered trademark
 symbol

PHPBB3-10773
---
 phpBB/adm/images/phpbb_logo.gif | Bin 3883 -> 0 bytes
 phpBB/adm/images/phpbb_logo.png | Bin 0 -> 9313 bytes
 phpBB/adm/style/admin.css       |   6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 phpBB/adm/images/phpbb_logo.gif
 create mode 100644 phpBB/adm/images/phpbb_logo.png

diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif
deleted file mode 100644
index 239993182be84e618e95bd214c904a8ff3f8cb24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3883
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

diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f9248ed79bb8e6ddaded8f136091ba9ac42051
GIT binary patch
literal 9313
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

literal 0
HcmV?d00001

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 666f4921ba..b9996fd1d1 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -142,15 +142,15 @@ li {
 #page-header {
 	clear: both;
 	text-align: right;
-	background: url("../images/phpbb_logo.gif") top left no-repeat;
-	height: 49px;
+	background: url("../images/phpbb_logo.png") top left no-repeat;
+	height: 54px;
 	font-size: 0.85em;
 	margin-bottom: 10px;
 }
 
 .rtl #page-header {
 	text-align: left;
-	background: url("../images/phpbb_logo.gif") top right no-repeat;
+	background: url("../images/phpbb_logo.png") top right no-repeat;
 }
 
 #page-header h1 {

From 81d5327e4411a7044f1c90e002505cad309372d6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jun 2012 13:56:11 +0200
Subject: [PATCH 259/279] [ticket/10937] Comment removal functions: Restore
 backward compatibility

PHPBB3-10937
---
 phpBB/includes/functions_admin.php            | 15 +++++++
 phpBB/includes/functions_install.php          | 42 ++++++++++++++++---
 phpBB/install/install_install.php             |  4 +-
 ...phpbb_database_test_connection_manager.php |  2 +-
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 204fa9a43d..7352b3d1f3 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2293,6 +2293,21 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
 	return;
 }
 
+/**
+* remove_comments will strip the sql comment lines out of an uploaded sql file
+* specifically for mssql and postgres type files in the install....
+*
+* @deprecated		Use phpbb_remove_comments() instead.
+*/
+function remove_comments(&$output)
+{
+	// Remove /* */ comments (http://ostermiller.org/findcomment.html)
+	$output = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $output);
+
+	// Return by reference and value.
+	return $output;
+}
+
 /**
 * Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username
 * and group names must be carried through for the moderators table
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 9e9c48ff58..f8437e0055 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -50,6 +50,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'firebird',
 			'MODULE'		=> 'interbase',
 			'DELIM'			=> ';;',
+			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'firebird',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -59,6 +60,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql_41',
 			'MODULE'		=> 'mysqli',
 			'DELIM'			=> ';',
+			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'mysqli',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -68,6 +70,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql',
 			'MODULE'		=> 'mysql',
 			'DELIM'			=> ';',
+			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'mysql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -77,6 +80,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'mssql',
 			'DELIM'			=> 'GO',
+			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -86,6 +90,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'odbc',
 			'DELIM'			=> 'GO',
+			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssql_odbc',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -95,6 +100,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'sqlsrv',
 			'DELIM'			=> 'GO',
+			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'mssqlnative',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -104,6 +110,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'oracle',
 			'MODULE'		=> 'oci8',
 			'DELIM'			=> '/',
+			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'oracle',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -113,6 +120,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql',
 			'DELIM'			=> ';',
+			'COMMENTS'		=> 'remove_comments',
 			'DRIVER'		=> 'postgres',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
@@ -122,6 +130,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'sqlite',
 			'MODULE'		=> 'sqlite',
 			'DELIM'			=> ';',
+			'COMMENTS'		=> 'remove_remarks',
 			'DRIVER'		=> 'sqlite',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -465,16 +474,39 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 
 /**
 * Removes comments from schema files
+*
+* @deprecated		Use phpbb_remove_comments() instead.
 */
-function remove_comments($sql)
+function remove_remarks(&$sql)
 {
-	// Remove /* */ comments (http://ostermiller.org/findcomment.html)
-	$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
-
 	// Remove # style comments
 	$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
 
-	return $sql;
+	// Return by reference
+}
+
+/**
+* Removes comments from $input.
+*
+* @param string $input		Input string
+*
+* @return string			Input string with comments removed
+*/
+function phpbb_remove_comments($input)
+{
+	if (!function_exists('remove_comments'))
+	{
+		global $phpbb_root_path, $phpEx;
+		require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+	}
+
+	// Remove /* */ comments
+	remove_comments($input);
+
+	// Remove # style comments
+	remove_remarks($input);
+
+	return $input;
 }
 
 /**
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 8e3fe0387c..f1003b07d7 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1164,7 +1164,7 @@ class install_install extends module
 
 		$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
 
-		$sql_query = remove_comments($sql_query);
+		$sql_query = phpbb_remove_comments($sql_query);
 
 		$sql_query = split_sql_file($sql_query, $delimiter);
 
@@ -1202,7 +1202,7 @@ class install_install extends module
 		// Change language strings...
 		$sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query);
 
-		$sql_query = remove_comments($sql_query);
+		$sql_query = phpbb_remove_comments($sql_query);
 		$sql_query = split_sql_file($sql_query, ';');
 
 		foreach ($sql_query as $sql)
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index c734c90a1a..dd022451b7 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -243,7 +243,7 @@ class phpbb_database_test_connection_manager
 		$filename = $directory . $schema . '_schema.sql';
 
 		$queries = file_get_contents($filename);
-		$sql = remove_comments($queries);
+		$sql = phpbb_remove_comments($queries);
 		
 		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 

From 2c12f31cdf5f4c459d4f282acb92829e11accfd2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 1 Jul 2012 00:48:40 +0200
Subject: [PATCH 260/279] [ticket/10937] Update documentation to say which
 comment styles are removed.

PHPBB3-10937
---
 phpBB/includes/functions_install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index f8437e0055..89dfb7cd2f 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -486,7 +486,7 @@ function remove_remarks(&$sql)
 }
 
 /**
-* Removes comments from $input.
+* Removes "/* style" as well as "# style" comments from $input.
 *
 * @param string $input		Input string
 *

From 5d0aa8e516d15122fcdcee351aa44cacf02ca4ff Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Mon, 2 Jul 2012 21:38:27 -0500
Subject: [PATCH 261/279] [ticket/10441] Make CDB linking more consistent

PHPBB3-10441
---
 phpBB/docs/README.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 6b6b21d8ae..86340ac882 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -134,7 +134,7 @@
 
 	<p>A number of language packs with included style localisations are available. You can find them listed in the <a href="http://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="http://www.phpbb.com/customise/db/language_packs-25/">Language Packs</a> section of the <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
-	<p><a href="http://www.phpbb.com/languages/">http://www.phpbb.com/languages/</a></p>
+	<p>For more information about language packs, please see: <a href="http://www.phpbb.com/languages/">http://www.phpbb.com/languages/</a></p>
 
 	<p>This is the <em>official</em> location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!</p>
 
@@ -144,9 +144,9 @@
 
 	<a name="styles"></a><h3>2.ii. Styles</h3>
 
-	<p>Although the phpBB Group is rather proud of the included styles, we realise that they may not be to everyone's taste. Therefore, phpBB3 allows styles to be switched with relative ease. First, you need to locate and download a style you like. We maintain such a section in the <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
+	<p>Although the phpBB Group is rather proud of the included styles, we realise that they may not be to everyone's taste. Therefore, phpBB3 allows styles to be switched with relative ease. First, you need to locate and download a style you like. You can find them listed in the <a href="http://www.phpbb.com/customise/db/styles-2/">Styles</a> section of our <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
-	<p><a href="http://www.phpbb.com/customise/db/styles-2/">http://www.phpbb.com/customise/db/styles-2/</a></p>
+	<p>For more information about styles, please see: <a href="http://www.phpbb.com/styles/">http://www.phpbb.com/styles/</a></p>
 
 	<p><strong>Please note</strong> that 3rd party styles downloaded for versions of phpBB2 will <strong>not</strong> work in phpBB3. It is also important to ensure that the style is updated to match the current version of the phpBB software you are using.</p>
 
@@ -156,9 +156,9 @@
 
 	<a name="mods"></a><h3>2.iii. Modifications</h3>
 
-	<p>Although not officially supported by the phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB software, known as <strong>MODs</strong>, extend its capabilities still further. Information on MODs can be found at:</p>
+	<p>Although not officially supported by the phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB software, known as <strong>MODs</strong>, extend its capabilities still further. You can browse through many of the MODs in the <a href="http://www.phpbb.com/customise/db/modifications-1/">Modifications</a> section of our <a href="http://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
-	<p><a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods</a></p>
+	<p>For more information about MODs, please see: <a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods/</a></p>
 
 	<p><strong>Please remember</strong> that any bugs or other issues that occur after you have added any modification should <strong>NOT</strong> be reported to the bug tracker (see below). First remove the MOD and see if the problem is resolved. Any support for a MOD should only be sought in the &quot;Discussion/Support&quot; forum for that MOD.</p>
 

From 7988045bda2b9fbf0dc9482ed985b5b680ce4e95 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 13:00:04 +0200
Subject: [PATCH 262/279] [ticket/10950] Fix unit tests to reflect desired
 behaviour

See http://wiki.phpbb.com/Deleting_Private_Messages for further explanation.

PHPBB3-10950
---
 tests/privmsgs/delete_user_pms_test.php     | 29 +++++++-
 tests/privmsgs/fixtures/delete_user_pms.xml | 80 ++++++++++++++++++++-
 2 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
index b399d94c6d..e5c0e82712 100644
--- a/tests/privmsgs/delete_user_pms_test.php
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -28,14 +28,23 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 				2,
 				array(
 					array('msg_id' => 1),
-					array('msg_id' => 2),
+					//array('msg_id' => 2),
+					//array('msg_id' => 3),
+					//array('msg_id' => 4),
+					//array('msg_id' => 5),
 				),
 				array(
 					//array('msg_id' => 1, 'user_id' => 2),
 					array('msg_id' => 1, 'user_id' => 3),
 					array('msg_id' => 1, 'user_id' => 4),
 					//array('msg_id' => 2, 'user_id' => 2),
-					array('msg_id' => 2, 'user_id' => 4),
+					//array('msg_id' => 2, 'user_id' => 4),
+					//array('msg_id' => 4, 'user_id' => 3),
+					//array('msg_id' => 3, 'user_id' => 2),
+					//array('msg_id' => 4, 'user_id' => 3),
+					//array('msg_id' => 5, 'user_id' => 2),
+					//array('msg_id' => 5, 'user_id' => 3),
+					//array('msg_id' => 5, 'user_id' => 4),
 				),
 			),
 			array(
@@ -43,6 +52,9 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 				array(
 					array('msg_id' => 1),
 					array('msg_id' => 2),
+					array('msg_id' => 3),
+					//array('msg_id' => 4),
+					array('msg_id' => 5),
 				),
 				array(
 					array('msg_id' => 1, 'user_id' => 2),
@@ -50,6 +62,11 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 					array('msg_id' => 1, 'user_id' => 4),
 					array('msg_id' => 2, 'user_id' => 2),
 					array('msg_id' => 2, 'user_id' => 4),
+					array('msg_id' => 3, 'user_id' => 2),
+					//array('msg_id' => 4, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 2),
+					//array('msg_id' => 5, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 4),
 				),
 			),
 			array(
@@ -57,6 +74,9 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 				array(
 					array('msg_id' => 1),
 					array('msg_id' => 2),
+					array('msg_id' => 3),
+					array('msg_id' => 4),
+					array('msg_id' => 5),
 				),
 				array(
 					array('msg_id' => 1, 'user_id' => 2),
@@ -64,6 +84,11 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 					array('msg_id' => 1, 'user_id' => 4),
 					array('msg_id' => 2, 'user_id' => 2),
 					array('msg_id' => 2, 'user_id' => 4),
+					array('msg_id' => 3, 'user_id' => 2),
+					array('msg_id' => 4, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 2),
+					array('msg_id' => 5, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 4),
 				),
 			),
 		);
diff --git a/tests/privmsgs/fixtures/delete_user_pms.xml b/tests/privmsgs/fixtures/delete_user_pms.xml
index 848164080c..56970689a3 100644
--- a/tests/privmsgs/fixtures/delete_user_pms.xml
+++ b/tests/privmsgs/fixtures/delete_user_pms.xml
@@ -66,14 +66,50 @@
 			<value>0</value>
 			<value>2</value>
 			<value>#1</value>
-			<value>#1</value>
+			<value>
+				2 - outbox
+				3 - inbox
+				4 - nobox
+			</value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>0</value>
 			<value>2</value>
 			<value>#2</value>
-			<value>#2</value>
+			<value>
+				2 - outbox
+				4 - nobox
+			</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#3</value>
+			<value>
+				2 - outbox
+			</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#4</value>
+			<value>
+				3 - nobox
+			</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#5</value>
+			<value>
+				2 - outbox
+				3 - nobox
+				4 - nobox
+			</value>
 		</row>
 	</table>
 	<table name="phpbb_privmsgs_to">
@@ -123,5 +159,45 @@
 			<value>0</value>
 			<value>-3</value>
 		</row>
+		<row>
+			<value>3</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
 	</table>
 </dataset>

From 5c8c7b1352454fc8d1bb6e689d52d31b346d5fdb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 13:10:15 +0200
Subject: [PATCH 263/279] [ticket/10950] Recreated the behaviour of
 phpbb_delete_user_pms()

- Get delete_ids, pms of the user as receipt
- Get undelivered_msg, pms of the user as sender
- Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links
- Correct the _new and _unread user values for the receipts
- Delete delete_ids, if there are no links to them anymore
- Reset _new and _unread values for the user we delete

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 134 ++++++++++++++------------
 1 file changed, 75 insertions(+), 59 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index afd254d6ea..88388841ed 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1103,10 +1103,10 @@ function phpbb_delete_user_pms($user_id)
 
 	// Get PM Information for later deleting
 	// The two queries where split, so we can use our indexes
-	$undelivered_msg = $undelivered_user = $delete_ids = array();
+	$undelivered_msg = $delete_ids = array();
 
 	// Part 1: get PMs the user received
-	$sql = 'SELECT msg_id, user_id, author_id, folder_id
+	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE user_id = ' . $user_id;
 	$result = $db->sql_query($sql);
@@ -1115,26 +1115,13 @@ function phpbb_delete_user_pms($user_id)
 	{
 		$msg_id = (int) $row['msg_id'];
 		$delete_ids[$msg_id] = $msg_id;
-
-		if ($row['author_id'] == $user_id && $row['folder_id'] == PRIVMSGS_NO_BOX)
-		{
-			// Undelivered messages
-			$undelivered_msg[] = $msg_id;
-
-			if (isset($undelivered_user[$row['user_id']]))
-			{
-				++$undelivered_user[$row['user_id']];
-			}
-			else
-			{
-				$undelivered_user[$row['user_id']] = 1;
-			}
-		}
 	}
 	$db->sql_freeresult($result);
 
 	// Part 2: get PMs the user sent, but has yet to be received
-	$sql = 'SELECT msg_id, user_id
+	// We can not simply delete them. First we have to check,
+	// whether another user already received and read the message.
+	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
 		WHERE author_id = ' . $user_id . '
 			AND folder_id = ' . PRIVMSGS_NO_BOX;
@@ -1143,61 +1130,90 @@ function phpbb_delete_user_pms($user_id)
 	while ($row = $db->sql_fetchrow($result))
 	{
 		$msg_id = (int) $row['msg_id'];
-		$delete_ids[$msg_id] = $msg_id;
-
-		// Undelivered messages
-		$undelivered_msg[] = $msg_id;
-
-		if (isset($undelivered_user[$row['user_id']]))
-		{
-			++$undelivered_user[$row['user_id']];
-		}
-		else
-		{
-			$undelivered_user[$row['user_id']] = 1;
-		}
+		$undelivered_msg[$msg_id] = $msg_id;
 	}
 	$db->sql_freeresult($result);
 
-	if (empty($delete_ids))
+	if (empty($delete_ids) && empty($undelivered_msg))
 	{
 		return false;
 	}
 
 	$db->sql_transaction('begin');
 
-	if (sizeof($undelivered_msg))
+	if (!empty($undelivered_msg))
 	{
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-			WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
-		$db->sql_query($sql);
+		// A pm is not undelivered, if for any receipt the message was moved
+		// from their NO_BOX to another folder.
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TO_TABLE . '
+			WHERE author_id = ' . $user_id . '
+				AND folder_id <> ' . PRIVMSGS_NO_BOX . '
+				AND folder_id <> ' . PRIVMSGS_OUTBOX . '
+				AND folder_id <> ' . PRIVMSGS_SENTBOX;
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$msg_id = (int) $row['msg_id'];
+			unset($undelivered_msg[$msg_id]);
+		}
+		$db->sql_freeresult($result);
+
+		if (!empty($undelivered_msg))
+		{
+			$undelivered_user = array();
+
+			// Count the messages we delete, so we can correct the user pm data
+			$sql = 'SELECT user_id
+				FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE author_id = ' . $user_id . '
+					AND folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				if (isset($undelivered_user[$row['user_id']]))
+				{
+					++$undelivered_user[$row['user_id']];
+				}
+				else
+				{
+					$undelivered_user[$row['user_id']] = 1;
+				}
+			}
+			$db->sql_freeresult($result);
+
+			foreach ($undelivered_user as $undelivered_user_id => $count)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_new_privmsg = user_new_privmsg - ' . $count . ',
+						user_unread_privmsg = user_unread_privmsg - ' . $count . '
+					WHERE user_id = ' . $undelivered_user_id;
+				$db->sql_query($sql);
+			}
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$db->sql_query($sql);
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
+			$db->sql_query($sql);
+		}
 	}
 
 	// Reset the user's pm count to 0
-	if (isset($undelivered_user[$user_id]))
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = 0,
-				user_unread_privmsg = 0
-			WHERE user_id = ' . $user_id;
-		$db->sql_query($sql);
+	$sql = 'UPDATE ' . USERS_TABLE . '
+		SET user_new_privmsg = 0,
+			user_unread_privmsg = 0
+		WHERE user_id = ' . $user_id;
+	$db->sql_query($sql);
 
-		unset($undelivered_user[$user_id]);
-	}
-
-	foreach ($undelivered_user as $_user_id => $count)
-	{
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_new_privmsg = user_new_privmsg - ' . $count . ',
-				user_unread_privmsg = user_unread_privmsg - ' . $count . '
-			WHERE user_id = ' . $_user_id;
-		$db->sql_query($sql);
-	}
-
-	// Delete private message data
-	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . "
-		WHERE user_id = $user_id
-			AND " . $db->sql_in_set('msg_id', $delete_ids);
+	// Delete private message data of the user
+	$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+		WHERE user_id = ' . (int) $user_id;
 	$db->sql_query($sql);
 
 	// Now we have to check which messages we can delete completely

From 338d29072fd5581968f404576c6faa2dffc4f883 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 4 Jul 2012 13:14:19 +0200
Subject: [PATCH 264/279] [ticket/10950] Check $delete_ids to be not empty

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 47 ++++++++++++++-------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 88388841ed..6c0adccbed 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1216,31 +1216,34 @@ function phpbb_delete_user_pms($user_id)
 		WHERE user_id = ' . (int) $user_id;
 	$db->sql_query($sql);
 
-	// Now we have to check which messages we can delete completely
-	$sql = 'SELECT msg_id
-		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		unset($delete_ids[$row['msg_id']]);
-	}
-	$db->sql_freeresult($result);
-
 	if (!empty($delete_ids))
 	{
-		// Check if there are any attachments we need to remove
-		if (!function_exists('delete_attachments'))
-		{
-			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-		}
-
-		delete_attachments('message', $delete_ids, false);
-
-		$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+		// Now we have to check which messages we can delete completely
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TO_TABLE . '
 			WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
-		$db->sql_query($sql);
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			unset($delete_ids[$row['msg_id']]);
+		}
+		$db->sql_freeresult($result);
+
+		if (!empty($delete_ids))
+		{
+			// Check if there are any attachments we need to remove
+			if (!function_exists('delete_attachments'))
+			{
+				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+			}
+
+			delete_attachments('message', $delete_ids, false);
+
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
+			$db->sql_query($sql);
+		}
 	}
 
 	// Set the remaining author id to anonymous

From dd6955f833b3574af70d32350d746c1b46ac1717 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Mon, 9 Jul 2012 19:29:17 -0500
Subject: [PATCH 265/279] [ticket/10978] Fix typo in prosilver
 ucp_groups_membership.html

PHPBB3-10978
---
 phpBB/styles/prosilver/template/ucp_groups_membership.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html
index a147dbf89f..ef595dd62d 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_membership.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_membership.html
@@ -93,7 +93,7 @@
 				<!-- IF pending.GROUP_DESC --><br />{pending.GROUP_DESC}<!-- ENDIF -->
 				<!-- IF not pending.GROUP_SPECIAL --><br /><i>{pending.GROUP_STATUS}</i><!-- ENDIF -->
 				</dt>
-				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="diabled"<!-- ENDIF --> /></dd>
+				<dd class="mark"><input type="radio" name="selected" value="{pending.GROUP_ID}" <!-- IF pending.GROUP_SPECIAL -->disabled="disabled"<!-- ENDIF --> /></dd>
 			</dl>
 		</li>
 		<!-- END pending -->

From e68c1fb9e4d5de214c1e483531706ec300ffdb0d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 11 Jul 2012 12:58:57 +0200
Subject: [PATCH 266/279] [ticket/10950] Use database count() and group by
 instead of doing that in php

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 6c0adccbed..1d45961ac4 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1143,7 +1143,7 @@ function phpbb_delete_user_pms($user_id)
 
 	if (!empty($undelivered_msg))
 	{
-		// A pm is not undelivered, if for any receipt the message was moved
+		// A pm is delivered, if for any receipt the message was moved
 		// from their NO_BOX to another folder.
 		$sql = 'SELECT msg_id
 			FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1165,23 +1165,17 @@ function phpbb_delete_user_pms($user_id)
 			$undelivered_user = array();
 
 			// Count the messages we delete, so we can correct the user pm data
-			$sql = 'SELECT user_id
+			$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
 				FROM ' . PRIVMSGS_TO_TABLE . '
 				WHERE author_id = ' . $user_id . '
 					AND folder_id = ' . PRIVMSGS_NO_BOX . '
-					AND ' . $db->sql_in_set('msg_id', $undelivered_msg);
+					AND ' . $db->sql_in_set('msg_id', $undelivered_msg) . '
+				GROUP BY user_id';
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				if (isset($undelivered_user[$row['user_id']]))
-				{
-					++$undelivered_user[$row['user_id']];
-				}
-				else
-				{
-					$undelivered_user[$row['user_id']] = 1;
-				}
+				$undelivered_user[$row['user_id']] = (int) $row['num_undelivered_privmsgs'];
 			}
 			$db->sql_freeresult($result);
 

From d883535b102ffba8781f485ba94fae237d8376b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 11 Jul 2012 13:05:36 +0200
Subject: [PATCH 267/279] [ticket/10950] Remove deleted entries in tests
 instead of commenting them out

PHPBB3-10950
---
 tests/privmsgs/delete_user_pms_test.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
index e5c0e82712..a586d691e9 100644
--- a/tests/privmsgs/delete_user_pms_test.php
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -28,23 +28,10 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 				2,
 				array(
 					array('msg_id' => 1),
-					//array('msg_id' => 2),
-					//array('msg_id' => 3),
-					//array('msg_id' => 4),
-					//array('msg_id' => 5),
 				),
 				array(
-					//array('msg_id' => 1, 'user_id' => 2),
 					array('msg_id' => 1, 'user_id' => 3),
 					array('msg_id' => 1, 'user_id' => 4),
-					//array('msg_id' => 2, 'user_id' => 2),
-					//array('msg_id' => 2, 'user_id' => 4),
-					//array('msg_id' => 4, 'user_id' => 3),
-					//array('msg_id' => 3, 'user_id' => 2),
-					//array('msg_id' => 4, 'user_id' => 3),
-					//array('msg_id' => 5, 'user_id' => 2),
-					//array('msg_id' => 5, 'user_id' => 3),
-					//array('msg_id' => 5, 'user_id' => 4),
 				),
 			),
 			array(
@@ -53,19 +40,15 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 					array('msg_id' => 1),
 					array('msg_id' => 2),
 					array('msg_id' => 3),
-					//array('msg_id' => 4),
 					array('msg_id' => 5),
 				),
 				array(
 					array('msg_id' => 1, 'user_id' => 2),
-					//array('msg_id' => 1, 'user_id' => 3),
 					array('msg_id' => 1, 'user_id' => 4),
 					array('msg_id' => 2, 'user_id' => 2),
 					array('msg_id' => 2, 'user_id' => 4),
 					array('msg_id' => 3, 'user_id' => 2),
-					//array('msg_id' => 4, 'user_id' => 3),
 					array('msg_id' => 5, 'user_id' => 2),
-					//array('msg_id' => 5, 'user_id' => 3),
 					array('msg_id' => 5, 'user_id' => 4),
 				),
 			),

From d9a32ce6143be27b8414072694c969fa16b5329a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 16 Jul 2012 17:22:10 +0200
Subject: [PATCH 268/279] [ticket/10950] Update undelivered pm counts in
 batches not 1 by 1 for each user

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 1d45961ac4..82344d1787 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1175,16 +1175,29 @@ function phpbb_delete_user_pms($user_id)
 
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$undelivered_user[$row['user_id']] = (int) $row['num_undelivered_privmsgs'];
+				$num_pms = (int) $row['num_undelivered_privmsgs'];
+				$undelivered_user[$num_pms][] = (int) $row['user_id'];
+
+				if (sizeof($undelivered_user[$num_pms]) > 50)
+				{
+					// If there are too many users affected the query might get
+					// too long, so we update the value for the first bunch here.
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+							user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+						WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
+					$db->sql_query($sql);
+					unset($undelivered_user[$num_pms]);
+				}
 			}
 			$db->sql_freeresult($result);
 
-			foreach ($undelivered_user as $undelivered_user_id => $count)
+			foreach ($undelivered_user as $num_pms => $undelivered_user_set)
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_new_privmsg = user_new_privmsg - ' . $count . ',
-						user_unread_privmsg = user_unread_privmsg - ' . $count . '
-					WHERE user_id = ' . $undelivered_user_id;
+					SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+						user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+					WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
 				$db->sql_query($sql);
 			}
 

From a9c091fad47a3b6936bc7a08617e27163189a20f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jul 2012 16:10:40 +0200
Subject: [PATCH 269/279] [ticket/10950] Fix unit tests to fit the new pm
 deleting behaviour

Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
---
 tests/privmsgs/delete_user_pms_test.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
index a586d691e9..265df1596a 100644
--- a/tests/privmsgs/delete_user_pms_test.php
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -31,7 +31,6 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
 				),
 				array(
 					array('msg_id' => 1, 'user_id' => 3),
-					array('msg_id' => 1, 'user_id' => 4),
 				),
 			),
 			array(

From a3517232f943fd8070c98a78f2cf731339b76a74 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jul 2012 16:13:08 +0200
Subject: [PATCH 270/279] [ticket/10950] Delete PMs for users that have not yet
 read the pm

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 78 +++++++++++++++------------
 phpBB/language/en/acp/users.php       |  2 +-
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 82344d1787..0890f057d2 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1144,7 +1144,9 @@ function phpbb_delete_user_pms($user_id)
 	if (!empty($undelivered_msg))
 	{
 		// A pm is delivered, if for any receipt the message was moved
-		// from their NO_BOX to another folder.
+		// from their NO_BOX to another folder. We do not delete such
+		// messages, but only delete them for users, who have not yet
+		// received them.
 		$sql = 'SELECT msg_id
 			FROM ' . PRIVMSGS_TO_TABLE . '
 			WHERE author_id = ' . $user_id . '
@@ -1153,54 +1155,64 @@ function phpbb_delete_user_pms($user_id)
 				AND folder_id <> ' . PRIVMSGS_SENTBOX;
 		$result = $db->sql_query($sql);
 
+		$delivered_msg = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$msg_id = (int) $row['msg_id'];
+			$delivered_msg[$msg_id] = $msg_id;
 			unset($undelivered_msg[$msg_id]);
 		}
 		$db->sql_freeresult($result);
 
-		if (!empty($undelivered_msg))
+		$undelivered_user = array();
+
+		// Count the messages we delete, so we can correct the user pm data
+		$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
+			FROM ' . PRIVMSGS_TO_TABLE . '
+			WHERE author_id = ' . $user_id . '
+				AND folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', array_merge($undelivered_msg, $delivered_msg)) . '
+			GROUP BY user_id';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$undelivered_user = array();
+			$num_pms = (int) $row['num_undelivered_privmsgs'];
+			$undelivered_user[$num_pms][] = (int) $row['user_id'];
 
-			// Count the messages we delete, so we can correct the user pm data
-			$sql = 'SELECT user_id, COUNT(msg_id) as num_undelivered_privmsgs
-				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE author_id = ' . $user_id . '
-					AND folder_id = ' . PRIVMSGS_NO_BOX . '
-					AND ' . $db->sql_in_set('msg_id', $undelivered_msg) . '
-				GROUP BY user_id';
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$num_pms = (int) $row['num_undelivered_privmsgs'];
-				$undelivered_user[$num_pms][] = (int) $row['user_id'];
-
-				if (sizeof($undelivered_user[$num_pms]) > 50)
-				{
-					// If there are too many users affected the query might get
-					// too long, so we update the value for the first bunch here.
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
-							user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
-						WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
-					$db->sql_query($sql);
-					unset($undelivered_user[$num_pms]);
-				}
-			}
-			$db->sql_freeresult($result);
-
-			foreach ($undelivered_user as $num_pms => $undelivered_user_set)
+			if (sizeof($undelivered_user[$num_pms]) > 50)
 			{
+				// If there are too many users affected the query might get
+				// too long, so we update the value for the first bunch here.
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
 						user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
-					WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
+					WHERE ' . $db->sql_in_set('user_id', $undelivered_user[$num_pms]);
 				$db->sql_query($sql);
+				unset($undelivered_user[$num_pms]);
 			}
+		}
+		$db->sql_freeresult($result);
 
+		foreach ($undelivered_user as $num_pms => $undelivered_user_set)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_new_privmsg = user_new_privmsg - ' . $num_pms . ',
+					user_unread_privmsg = user_unread_privmsg - ' . $num_pms . '
+				WHERE ' . $db->sql_in_set('user_id', $undelivered_user_set);
+			$db->sql_query($sql);
+		}
+
+		if (!empty($delivered_msg))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
+				WHERE folder_id = ' . PRIVMSGS_NO_BOX . '
+					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
+			$db->sql_query($sql);
+		}
+
+		if (!empty($undelivered_msg))
+		{
 			$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 785283faea..3b82a7022d 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -59,7 +59,7 @@ $lang = array_merge($lang, array(
 
 	'DELETE_POSTS'			=> 'Delete posts',
 	'DELETE_USER'			=> 'Delete user',
-	'DELETE_USER_EXPLAIN'	=> 'Please note that deleting a user is final, they cannot be recovered.',
+	'DELETE_USER_EXPLAIN'	=> 'Please note that deleting a user is final, they cannot be recovered. Unread private messages sent by this user will be deleted and will not be available to their recipients.',
 
 	'FORCE_REACTIVATION_SUCCESS'	=> 'Successfully forced reactivation.',
 	'FOUNDER'						=> 'Founder',

From 3036db481a40a395f9021b991dd3d659649ec831 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jul 2012 18:01:06 +0200
Subject: [PATCH 271/279] [ticket/10950] Fix grammar in comments

PHPBB3-10950
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 0890f057d2..b08d6e7f5c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1118,8 +1118,8 @@ function phpbb_delete_user_pms($user_id)
 	}
 	$db->sql_freeresult($result);
 
-	// Part 2: get PMs the user sent, but has yet to be received
-	// We can not simply delete them. First we have to check,
+	// Part 2: get PMs the user sent, but have yet to be received
+	// We cannot simply delete them. First we have to check,
 	// whether another user already received and read the message.
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1143,7 +1143,7 @@ function phpbb_delete_user_pms($user_id)
 
 	if (!empty($undelivered_msg))
 	{
-		// A pm is delivered, if for any receipt the message was moved
+		// A pm is delivered, if for any recipient the message was moved
 		// from their NO_BOX to another folder. We do not delete such
 		// messages, but only delete them for users, who have not yet
 		// received them.

From 6ed63088feb21ebce3c6fe826ab2642ba4976765 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 19:28:17 +0200
Subject: [PATCH 272/279] [ticket/10667] Fix tests under MySQL 5.5 strict mode
 (once again)

PHPBB3-10667
---
 tests/privmsgs/fixtures/delete_user_pms.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/privmsgs/fixtures/delete_user_pms.xml b/tests/privmsgs/fixtures/delete_user_pms.xml
index 56970689a3..9a86501b7a 100644
--- a/tests/privmsgs/fixtures/delete_user_pms.xml
+++ b/tests/privmsgs/fixtures/delete_user_pms.xml
@@ -61,6 +61,8 @@
 		<column>author_id</column>
 		<column>message_subject</column>
 		<column>message_text</column>
+		<column>to_address</column>
+		<column>bcc_address</column>
 		<row>
 			<value>1</value>
 			<value>0</value>
@@ -71,6 +73,8 @@
 				3 - inbox
 				4 - nobox
 			</value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
@@ -81,6 +85,8 @@
 				2 - outbox
 				4 - nobox
 			</value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
@@ -90,6 +96,8 @@
 			<value>
 				2 - outbox
 			</value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
@@ -99,6 +107,8 @@
 			<value>
 				3 - nobox
 			</value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>5</value>
@@ -110,6 +120,8 @@
 				3 - nobox
 				4 - nobox
 			</value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_privmsgs_to">

From 10172887fd47e86eefbabd6f5e755cd93279960d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 18:48:10 +0200
Subject: [PATCH 273/279] [ticket/10965] Introduce a new profile field option
 to display no value

By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
---
 phpBB/adm/style/acp_profile.html            |  4 +++
 phpBB/develop/create_schema_files.php       |  1 +
 phpBB/includes/acp/acp_profile.php          |  6 +++-
 phpBB/includes/functions_profile_fields.php | 31 +++++++++++++--------
 phpBB/install/database_update.php           |  8 ++++++
 phpBB/install/schemas/firebird_schema.sql   |  1 +
 phpBB/install/schemas/mssql_schema.sql      |  1 +
 phpBB/install/schemas/mysql_40_schema.sql   |  1 +
 phpBB/install/schemas/mysql_41_schema.sql   |  1 +
 phpBB/install/schemas/oracle_schema.sql     |  1 +
 phpBB/install/schemas/postgres_schema.sql   |  1 +
 phpBB/install/schemas/sqlite_schema.sql     |  1 +
 phpBB/language/en/acp/profile.php           |  2 ++
 13 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html
index 85d37568c2..1c9c038f8f 100644
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -63,6 +63,10 @@
 			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
+		<dl>
+			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}:</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
+			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
 		<dl>
 			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index d44efb8870..496ac22e90 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1448,6 +1448,7 @@ function get_schema_struct()
 			'field_default_value'	=> array('VCHAR_UNI', ''),
 			'field_validation'		=> array('VCHAR_UNI:20', ''),
 			'field_required'		=> array('BOOL', 0),
+			'field_show_novalue'	=> array('BOOL', 0),
 			'field_show_on_reg'		=> array('BOOL', 0),
 			'field_show_on_vt'		=> array('BOOL', 0),
 			'field_show_profile'	=> array('BOOL', 0),
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index a591474fce..19223847f0 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -365,6 +365,7 @@ class acp_profile
 					$field_row = array_merge($default_values[$field_type], array(
 						'field_ident'		=> str_replace(' ', '_', utf8_clean_string(request_var('field_ident', '', true))),
 						'field_required'	=> 0,
+						'field_show_novalue'=> 0,
 						'field_hide'		=> 0,
 						'field_show_profile'=> 0,
 						'field_no_view'		=> 0,
@@ -380,7 +381,7 @@ class acp_profile
 
 				// $exclude contains the data we gather in each step
 				$exclude = array(
-					1	=> array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_vt', 'field_required', 'field_hide', 'field_show_profile', 'field_no_view'),
+					1	=> array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_vt', 'field_required', 'field_show_novalue', 'field_hide', 'field_show_profile', 'field_no_view'),
 					2	=> array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'),
 					3	=> array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
 				);
@@ -405,6 +406,7 @@ class acp_profile
 				// Visibility Options...
 				$visibility_ary = array(
 					'field_required',
+					'field_show_novalue',
 					'field_show_on_reg',
 					'field_show_on_vt',
 					'field_show_profile',
@@ -757,6 +759,7 @@ class acp_profile
 						$template->assign_vars(array(
 							'S_STEP_ONE'		=> true,
 							'S_FIELD_REQUIRED'	=> ($cp->vars['field_required']) ? true : false,
+							'S_FIELD_SHOW_NOVALUE'=> ($cp->vars['field_show_novalue']) ? true : false,
 							'S_SHOW_ON_REG'		=> ($cp->vars['field_show_on_reg']) ? true : false,
 							'S_SHOW_ON_VT'		=> ($cp->vars['field_show_on_vt']) ? true : false,
 							'S_FIELD_HIDE'		=> ($cp->vars['field_hide']) ? true : false,
@@ -1073,6 +1076,7 @@ class acp_profile
 			'field_default_value'	=> $cp->vars['field_default_value'],
 			'field_validation'		=> $cp->vars['field_validation'],
 			'field_required'		=> $cp->vars['field_required'],
+			'field_show_novalue'	=> $cp->vars['field_show_novalue'],
 			'field_show_on_reg'		=> $cp->vars['field_show_on_reg'],
 			'field_show_on_vt'		=> $cp->vars['field_show_on_vt'],
 			'field_hide'			=> $cp->vars['field_hide'],
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 16c193c15a..5391b781fa 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -122,7 +122,7 @@ class custom_profile
 
 			case FIELD_BOOL:
 				$field_value = (bool) $field_value;
-			
+
 				if (!$field_value && $field_data['field_required'])
 				{
 					return 'FIELD_REQUIRED';
@@ -134,7 +134,7 @@ class custom_profile
 				{
 					return false;
 				}
-				
+
 				$field_value = (int) $field_value;
 
 				if ($field_value < $field_data['field_minlen'])
@@ -521,7 +521,7 @@ class custom_profile
 		switch ($this->profile_types[$field_type])
 		{
 			case 'int':
-				if ($value === '')
+				if ($value === '' && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -530,7 +530,7 @@ class custom_profile
 
 			case 'string':
 			case 'text':
-				if (!$value)
+				if (!$value && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -548,7 +548,7 @@ class custom_profile
 				$month = (isset($date[1])) ? (int) $date[1] : 0;
 				$year = (isset($date[2])) ? (int) $date[2] : 0;
 
-				if (!$day && !$month && !$year)
+				if (!$day && !$month && !$year && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -571,12 +571,7 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
 				}
 
-				// If a dropdown field is required, users
-				// cannot choose the "no value" option.
-				// They must choose one of the other options.
-				// Therefore, here we treat a value equal to
-				// the "no value" as a lack of value, i.e. NULL.
-				if ($value == $ident_ary['data']['field_novalue'] && $ident_ary['data']['field_required'])
+				if ($value == $ident_ary['data']['field_novalue'] && !$ident_ary['data']['field_show_novalue'])
 				{
 					return NULL;
 				}
@@ -586,7 +581,14 @@ class custom_profile
 				// User not having a value assigned
 				if (!isset($this->options_lang[$field_id][$lang_id][$value]))
 				{
-					return NULL;
+					if ($ident_ary['data']['field_show_novalue'])
+					{
+						$value = $ident_ary['data']['field_novalue'];
+					}
+					else
+					{
+						return NULL;
+					}
 				}
 
 				return $this->options_lang[$field_id][$lang_id][$value];
@@ -600,6 +602,11 @@ class custom_profile
 					$this->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);
 				}
 
+				if (!$value && $ident_ary['data']['field_show_novalue'])
+				{
+					$value = $ident_ary['data']['field_default_value'];
+				}
+
 				if ($ident_ary['data']['field_length'] == 1)
 				{
 					return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c1fe144c62..2901bc76ee 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -995,6 +995,14 @@ function database_update_info()
 		'3.0.10-RC3'	=> array(),
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
+		// Changes from 3.0.11-RC1 to 3.0.11-RC2
+		'3.0.5'		=> array(
+			'add_columns'		=> array(
+				PROFILE_FIELDS_TABLE			=> array(
+					'field_show_novalue'		=> array('BOOL', 0),
+				),
+			),
+		),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 73052f0a22..eae692f529 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -807,6 +807,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	field_validation VARCHAR(20) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	field_required INTEGER DEFAULT 0 NOT NULL,
+	field_show_novalue INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_reg INTEGER DEFAULT 0 NOT NULL,
 	field_show_on_vt INTEGER DEFAULT 0 NOT NULL,
 	field_show_profile INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 8ed3ba7e12..0b2f8368de 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -974,6 +974,7 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_default_value] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[field_validation] [varchar] (20) DEFAULT ('') NOT NULL ,
 	[field_required] [int] DEFAULT (0) NOT NULL ,
+	[field_show_novalue] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_reg] [int] DEFAULT (0) NOT NULL ,
 	[field_show_on_vt] [int] DEFAULT (0) NOT NULL ,
 	[field_show_profile] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 42b7291d9d..969cbe0472 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value blob NOT NULL,
 	field_validation varbinary(60) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 7a6d0ae188..15d34894d8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -571,6 +571,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) DEFAULT '' NOT NULL,
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	field_show_novalue tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_vt tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_profile tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 6e7ec31efc..af7b2b60ec 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1085,6 +1085,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar2(765) DEFAULT '' ,
 	field_validation varchar2(60) DEFAULT '' ,
 	field_required number(1) DEFAULT '0' NOT NULL,
+	field_show_novalue number(1) DEFAULT '0' NOT NULL,
 	field_show_on_reg number(1) DEFAULT '0' NOT NULL,
 	field_show_on_vt number(1) DEFAULT '0' NOT NULL,
 	field_show_profile number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 38f167bc7b..0a05a7cd75 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -761,6 +761,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) DEFAULT '' NOT NULL,
 	field_validation varchar(20) DEFAULT '' NOT NULL,
 	field_required INT2 DEFAULT '0' NOT NULL CHECK (field_required >= 0),
+	field_show_novalue INT2 DEFAULT '0' NOT NULL CHECK (field_show_novalue >= 0),
 	field_show_on_reg INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_reg >= 0),
 	field_show_on_vt INT2 DEFAULT '0' NOT NULL CHECK (field_show_on_vt >= 0),
 	field_show_profile INT2 DEFAULT '0' NOT NULL CHECK (field_show_profile >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index c0574244ca..be7faa4688 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -554,6 +554,7 @@ CREATE TABLE phpbb_profile_fields (
 	field_default_value varchar(255) NOT NULL DEFAULT '',
 	field_validation varchar(20) NOT NULL DEFAULT '',
 	field_required INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	field_show_novalue INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_reg INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_on_vt INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	field_show_profile INTEGER UNSIGNED NOT NULL DEFAULT '0',
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index a25dcd174b..e193d9303c 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -131,6 +131,8 @@ $lang = array_merge($lang, array(
 
 	'SAVE'							=> 'Save',
 	'SECOND_OPTION'					=> 'Second option',
+	'SHOW_NOVALUE_FIELD'			=> 'Show field if no value was selected',
+	'SHOW_NOVALUE_FIELD_EXPLAIN'	=> 'Determines if the profile field should be displayed if no value was selected for optional fields or if no value has been selected yet for required fields.',
 	'STEP_1_EXPLAIN_CREATE'			=> 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.',
 	'STEP_1_EXPLAIN_EDIT'			=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.',
 	'STEP_1_TITLE_CREATE'			=> 'Add profile field',

From 19237f561396c9a2f096c9d01acc857fe92b89ba Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 17 Jul 2012 20:28:01 +0200
Subject: [PATCH 274/279] [ticket/10965] Database update was referring to 3.0.5
 instead of 3.0.11-RC1

PHPBB3-10965
---
 phpBB/install/database_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2901bc76ee..c51286f25f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -996,7 +996,7 @@ function database_update_info()
 		// No changes from 3.0.10 to 3.0.11-RC1
 		'3.0.10'		=> array(),
 		// Changes from 3.0.11-RC1 to 3.0.11-RC2
-		'3.0.5'		=> array(
+		'3.0.11-RC1'	=> array(
 			'add_columns'		=> array(
 				PROFILE_FIELDS_TABLE			=> array(
 					'field_show_novalue'		=> array('BOOL', 0),

From 2f5692d4bbdf3e5a39d9a22b83354f5db9638fa8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 23 Jul 2012 22:38:38 +0200
Subject: [PATCH 275/279] [ticket/10965] Make sure all profile fields are
 always grabbed on viewtopic

PHPBB3-10965
---
 phpBB/includes/functions_profile_fields.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 5391b781fa..8a5571fcce 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -456,6 +456,8 @@ class custom_profile
 
 			$user_fields = array();
 
+			$user_ids = $user_id;
+
 			// Go through the fields in correct order
 			foreach (array_keys($this->profile_cache) as $used_ident)
 			{
@@ -464,6 +466,12 @@ class custom_profile
 					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
 					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
 				}
+
+				foreach ($user_ids as $user_id)
+				{
+					$user_fields[$user_id][$used_ident]['value'] = '';
+					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+				}
 			}
 
 			return $user_fields;

From 296fadfca463327752395ff2124e4a2c99cbacbe Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 23 Jul 2012 23:35:48 +0200
Subject: [PATCH 276/279] [ticket/10965] Profile data is only grabbed when
 show_novalue is enabled

PHPBB3-10965
---
 phpBB/includes/functions_profile_fields.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 8a5571fcce..8573533c2c 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -469,8 +469,11 @@ class custom_profile
 
 				foreach ($user_ids as $user_id)
 				{
-					$user_fields[$user_id][$used_ident]['value'] = '';
-					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+					if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
+					{
+						$user_fields[$user_id][$used_ident]['value'] = '';
+						$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+					}
 				}
 			}
 

From 9f073e4c75cbb214eca6a4342c8a1dfe9fd9b94c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 23 Jul 2012 23:30:20 +0200
Subject: [PATCH 277/279] [prep-release-3.0.11] Bumping version number for
 3.0.11-RC2.

---
 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 6 +++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index c1179015eb..a624050750 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.11-RC1" />
+	<property name="newversion" value="3.0.11-RC2" />
 	<property name="prevversion" value="3.0.10" />
-	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 5b72d89795..f8296a8e84 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.11-RC1');
+define('PHPBB_VERSION', '3.0.11-RC2');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c51286f25f..95b3401a7e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC1');
+define('UPDATES_TO_VERSION', '3.0.11-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -2098,6 +2098,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.11-RC1 to 3.0.11-RC2
+		case '3.0.11-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 99b8f7f96d..cdfb4edc66 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC2');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 

From ece4a2edb7f098bb4f0db7d1e2b6d8d405260b13 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 23 Jul 2012 23:36:15 +0200
Subject: [PATCH 278/279] [prep-release-3.0.11] Update Changelog for 3.0.11-RC2
 release.

---
 phpBB/docs/CHANGELOG.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 71e28be9bc..4d44a88634 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -158,6 +158,14 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10890">PHPBB3-10890</a>] - test_sql_fetchrow_returns_false_when_empty() fails on MSSQL and Oracle</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10908">PHPBB3-10908</a>] - No remote avatar size limit results in files limited only by PHP memory limit</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10913">PHPBB3-10913</a>] - Admin is logged out when accessing any url under adm/ without session id</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10441">PHPBB3-10441</a>] - Update to docs/README.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10773">PHPBB3-10773</a>] - ACP phpBB logo needs registered trademark symbol</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10935">PHPBB3-10935</a>] - Limit number of PM rules per user</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10937">PHPBB3-10937</a>] - Comment removal functions: Backward compatibility broken</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10950">PHPBB3-10950</a>] - Deleting user with undelivered PMs causes SQL error</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10952">PHPBB3-10952</a>] - includes/constants.php version number incorrect</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10965">PHPBB3-10965</a>] - Dropdown CPF now shows in profile when no value is selected</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10978">PHPBB3-10978</a>] - Typo in prosilvers ucp_groups_membership.html</li>
 </ul>
 <h4>Improvement</h4>
 <ul>
@@ -188,6 +196,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10891">PHPBB3-10891</a>] - Allow specifying test config file name via environment variable</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10892">PHPBB3-10892</a>] - Cosmetic improvements to RUNNING_TESTS.txt</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10898">PHPBB3-10898</a>] - Do not write ?&gt; into config.php to avoid whitespace output</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10925">PHPBB3-10925</a>] - Clarify that SQLite3 is not supported for phpBB 3.0.x</li>
 </ul>
 <h4>New Feature</h4>
 <ul>

From 6da03913bfcd2ac964116a42cdc7d5e7d4b4c6fd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 20 Aug 2012 16:32:34 +0200
Subject: [PATCH 279/279] [prep-release-3.0.11] Bumping version number for
 3.0.11 final.

---
 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index a624050750..0dea17784c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.11-RC2" />
+	<property name="newversion" value="3.0.11" />
 	<property name="prevversion" value="3.0.10" />
-	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1, 3.0.11-RC2" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index f8296a8e84..54e5e2632d 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.11-RC2');
+define('PHPBB_VERSION', '3.0.11');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 95b3401a7e..b7aaefb1d0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.11-RC2');
+define('UPDATES_TO_VERSION', '3.0.11');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -1003,6 +1003,8 @@ function database_update_info()
 				),
 			),
 		),
+		// No changes from 3.0.11-RC2 to 3.0.11
+		'3.0.11-RC2'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 	);
@@ -2102,6 +2104,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.11-RC1 to 3.0.11-RC2
 		case '3.0.11-RC1':
 		break;
+
+		// No changes from 3.0.11-RC2 to 3.0.11
+		case '3.0.11-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cdfb4edc66..d2d8d95b34 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');