From 4091f873eaa108cebd3192ede979ce61ead09238 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 18 Oct 2010 21:25:52 +0800
Subject: [ticket/6712] Bump does not create new topic icon on index.

Handle the topic bumping process more properly.

PHPBB3-6712
---
 phpBB/includes/functions_posting.php | 91 ++++++++++++++++++++++++++++++++++++
 phpBB/posting.php                    | 30 +-----------
 2 files changed, 92 insertions(+), 29 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6fd87db663..041b549cd6 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2611,4 +2611,95 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	return $url;
 }
 
+/*
+* Handle topic bumping
+*/
+function bump_topic($forum_id, $topic_id, &$post_data, $current_time = false)
+{
+	global $config, $db, $user, $phpEx, $phpbb_root_path;
+
+	if ($current_time === false)
+	{
+		$current_time = time();
+	}
+
+	// Begin bumping
+	$db->sql_transaction('begin');
+
+	// Update the topic's last post post_time
+	$sql = 'UPDATE ' . POSTS_TABLE . "
+		SET post_time = $current_time
+		WHERE post_id = {$post_data['topic_last_post_id']}
+			AND topic_id = $topic_id";
+	$db->sql_query($sql);
+
+	// Sync the topic's last post time, the rest of the topic's last post data isn't changed
+	$sql = 'UPDATE ' . TOPICS_TABLE . "
+		SET topic_last_post_time = $current_time,
+			topic_bumped = 1,
+			topic_bumper = " . $user->data['user_id'] . "
+		WHERE topic_id = $topic_id";
+	$db->sql_query($sql);
+
+	// Update the forum's last post info
+	$sql = 'UPDATE ' . FORUMS_TABLE . "
+		SET forum_last_post_id = " . $post_data['topic_last_post_id'] . ",
+			forum_last_poster_id = " . $post_data['topic_last_poster_id'] . ",
+			forum_last_post_subject = '" . $db->sql_escape($post_data['topic_last_post_subject']) . "',
+			forum_last_post_time = $current_time,
+			forum_last_poster_name = '" . $db->sql_escape($post_data['topic_last_poster_name']) . "',
+			forum_last_poster_colour = '" . $db->sql_escape($post_data['topic_last_poster_colour']) . "'
+		WHERE forum_id = $forum_id";
+	$db->sql_query($sql);
+
+	// Update bumper's time of the last posting to prevent flood
+	$sql = 'UPDATE ' . USERS_TABLE . "
+		SET user_lastpost_time = $current_time
+		WHERE user_id = " . $user->data['user_id'];
+	$db->sql_query($sql);
+
+	$db->sql_transaction('commit');
+
+	// Mark this topic as posted to
+	markread('post', $forum_id, $topic_id, $current_time);
+
+	// Mark this topic as read
+	markread('topic', $forum_id, $topic_id, $current_time);
+
+	// Update forum tracking info
+	if ($config['load_db_lastread'] && $user->data['is_registered'])
+	{
+		$sql = 'SELECT mark_time
+			FROM ' . FORUMS_TRACK_TABLE . '
+			WHERE user_id = ' . $user->data['user_id'] . '
+				AND forum_id = ' . $forum_id;
+		$result = $db->sql_query($sql);
+		$f_mark_time = (int) $db->sql_fetchfield('mark_time');
+		$db->sql_freeresult($result);
+	}
+	else if ($config['load_anon_lastread'] || $user->data['is_registered'])
+	{
+		$f_mark_time = false;
+	}
+
+	if (($config['load_db_lastread'] && $user->data['is_registered']) || $config['load_anon_lastread'] || $user->data['is_registered'])
+	{
+		// Update forum info
+		$sql = 'SELECT forum_last_post_time
+			FROM ' . FORUMS_TABLE . '
+			WHERE forum_id = ' . $forum_id;
+		$result = $db->sql_query($sql);
+		$forum_last_post_time = (int) $db->sql_fetchfield('forum_last_post_time');
+		$db->sql_freeresult($result);
+
+		update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time, false);
+	}
+
+	add_log('mod', $forum_id, $topic_id, 'LOG_BUMP_TOPIC', $post_data['topic_title']);
+
+	$url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;p={$post_data['topic_last_post_id']}") . "#p{$post_data['topic_last_post_id']}";
+
+	return $url;
+}
+
 ?>
\ No newline at end of file
diff --git a/phpBB/posting.php b/phpBB/posting.php
index f775699cee..89f2dfa2a6 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -321,35 +321,7 @@ if ($mode == 'bump')
 	if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
 	   && check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
 	{
-		$db->sql_transaction('begin');
-
-		$sql = 'UPDATE ' . POSTS_TABLE . "
-			SET post_time = $current_time
-			WHERE post_id = {$post_data['topic_last_post_id']}
-				AND topic_id = $topic_id";
-		$db->sql_query($sql);
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . "
-			SET topic_last_post_time = $current_time,
-				topic_bumped = 1,
-				topic_bumper = " . $user->data['user_id'] . "
-			WHERE topic_id = $topic_id";
-		$db->sql_query($sql);
-
-		update_post_information('forum', $forum_id);
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_lastpost_time = $current_time
-			WHERE user_id = " . $user->data['user_id'];
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-
-		markread('post', $forum_id, $topic_id, $current_time);
-
-		add_log('mod', $forum_id, $topic_id, 'LOG_BUMP_TOPIC', $post_data['topic_title']);
-
-		$meta_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;p={$post_data['topic_last_post_id']}") . "#p{$post_data['topic_last_post_id']}";
+		$meta_url = bump_topic($forum_id, $topic_id, $post_data, $current_time);
 		meta_refresh(3, $meta_url);
 
 		$message = $user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
-- 
cgit v1.2.1


From ac26bb458f2a2ea60848921826c69bfe03e676db Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 28 Oct 2010 21:41:14 +0200
Subject: [ticket/9764] Allow $config['mime_triggers'] to be an empty string.

explode('|', '') and explode('|', NULL) both return array(0 => '') which can
cause filespec::check_content() to reject everything starting with a '<'
character in case $config['mime_triggers'] is an empty string or not set.

fileupload::set_disallowed_content() now filters out empty strings by calling
array_diff() on the passed array, so setting $config['mime_triggers'] to an
empty string will turn off mime checking completely.

On the other side we want to fail safe if $config['mime_triggers'] is not set
at all. To do this, the array fileupload::$disallowed_content now contains some
default strings to be filtered out.

PHPBB3-9764
---
 phpBB/includes/functions_posting.php | 2 +-
 phpBB/includes/functions_upload.php  | 4 ++--
 phpBB/includes/functions_user.php    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6fd87db663..72331a73c6 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -388,7 +388,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
 	$upload = new fileupload();
 
-	if ($config['check_attachment_content'])
+	if ($config['check_attachment_content'] && isset($config['mime_triggers']))
 	{
 		$upload->set_disallowed_content(explode('|', $config['mime_triggers']));
 	}
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 7f09cc1640..d5bbd80242 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -458,7 +458,7 @@ class fileerror extends filespec
 class fileupload
 {
 	var $allowed_extensions = array();
-	var $disallowed_content = array();
+	var $disallowed_content = array('body', 'head', 'html', 'img', 'plaintext', 'a href', 'pre', 'script', 'table', 'title'); 
 	var $max_filesize = 0;
 	var $min_width = 0;
 	var $min_height = 0;
@@ -539,7 +539,7 @@ class fileupload
 	{
 		if ($disallowed_content !== false && is_array($disallowed_content))
 		{
-			$this->disallowed_content = $disallowed_content;
+			$this->disallowed_content = array_diff($disallowed_content, array(''));
 		}
 	}
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index f2c80705ba..90341cd926 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2080,7 +2080,7 @@ function avatar_upload($data, &$error)
 
 	// Init upload class
 	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-	$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], explode('|', $config['mime_triggers']));
+	$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false));
 
 	if (!empty($_FILES['uploadfile']['name']))
 	{
-- 
cgit v1.2.1


From 87aa611a8e4b944ad3ba2cde1d3256570c5f45af Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 11 Nov 2010 11:49:17 +0100
Subject: [develop-olympus] Incrementing the version number to 3.0.9-dev.

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

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index a4635895b0..90440f74b8 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.8-RC1');
+define('PHPBB_VERSION', '3.0.9-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
@@ -275,4 +275,4 @@ define('ZEBRA_TABLE',				$table_prefix . 'zebra');
 // Additional tables
 
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 01e8ef7658..87a80f6a30 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.8-RC1';
+$updates_to_version = '3.0.9-dev';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index cbee2c9ba1..355af802ef 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -242,7 +242,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.8-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-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');
 
@@ -829,4 +829,4 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mp3');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg');
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm');
 
-# POSTGRES COMMIT #
\ No newline at end of file
+# POSTGRES COMMIT #
-- 
cgit v1.2.1


From 396af3853fc2d86b255db0f71e56a9f880ee2509 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 11 Nov 2010 12:07:45 +0100
Subject: [develop-olympus] Remove accidentally added trailing newlines.

---
 phpBB/includes/constants.php      |  2 +-
 phpBB/install/database_update.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 90440f74b8..2b19aa185d 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -275,4 +275,4 @@ define('ZEBRA_TABLE',				$table_prefix . 'zebra');
 // Additional tables
 
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 87a80f6a30..78d9067003 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.9-dev';
+$updates_to_version = '3.0.8-RC1';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
@@ -477,7 +477,7 @@ else
 
 	<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
 
-	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
+	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
 
 <?php
 }
@@ -1672,7 +1672,7 @@ function change_database_data(&$no_updates, $version)
 					"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
 					"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
 				);
-				
+
 				foreach ($lang_files as $lang_file)
 				{
 					if (!file_exists($lang_file))
@@ -1998,7 +1998,7 @@ class updater_db_tools
 			'VCHAR_CI'	=> '[varchar] (255)',
 			'VARBINARY'	=> '[varchar] (255)',
 		),
-		
+
 		'mssqlnative'	=> array(
 			'INT:'		=> '[int]',
 			'BINT'		=> '[float]',
@@ -2028,7 +2028,7 @@ class updater_db_tools
 			'VCHAR_CI'	=> '[varchar] (255)',
 			'VARBINARY'	=> '[varchar] (255)',
 		),
-		
+
 		'oracle'	=> array(
 			'INT:'		=> 'number(%d)',
 			'BINT'		=> 'number(20)',
@@ -2175,7 +2175,7 @@ class updater_db_tools
 			case 'mssql_odbc':
 				$this->sql_layer = 'mssql';
 			break;
-			
+
 			case 'mssqlnative':
 				$this->sql_layer = 'mssqlnative';
 			break;
@@ -3797,4 +3797,4 @@ class updater_db_tools
 	}
 }
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From b02cec86d40345f7ad28d0cca4e409766f0e65c2 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 11 Nov 2010 12:13:51 +0100
Subject: [develop-olympus] Revert accidental revert of db update lang fix and
 version

Really not my day, is it?
---
 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 78d9067003..8d1755f8a6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.8-RC1';
+$updates_to_version = '3.0.9-dev';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
@@ -477,7 +477,7 @@ else
 
 	<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
 
-	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
+	<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&amp;sub=file_check&amp;language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
 
 <?php
 }
-- 
cgit v1.2.1


From 217e77d16be62baf6d9a43c311d5b52d700cfa52 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 21 Nov 2010 23:18:09 +0100
Subject: [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs

PHPBB3-9910
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 16700c490c..b91636a9c8 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -172,6 +172,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// Number of "to" recipients
 	$num_recipients = (int) preg_match_all('/:?(u|g)_([0-9]+):?/', $message_row['to_address'], $match);
 
+	$bbcode_status	= ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')) ? true : false;
+
 	$template->assign_vars(array(
 		'MESSAGE_AUTHOR_FULL'		=> get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
 		'MESSAGE_AUTHOR_COLOUR'		=> get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
@@ -229,6 +231,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'S_AUTHOR_DELETED'	=> ($author_id == ANONYMOUS) ? true : false,
 		'S_SPECIAL_FOLDER'	=> in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
 		'S_PM_RECIPIENTS'	=> $num_recipients,
+		'S_BBCODE_ALLOWED'	=> ($bbcode_status) ? 1 : 0,
 
 		'U_PRINT_PM'		=> ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
 		'U_FORWARD_PM'		=> ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
-- 
cgit v1.2.1


From 7e934c6362a219bd3e9c11c6461bc6a32a9cf930 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Thu, 11 Nov 2010 18:50:08 -0500
Subject: [ticket/9897] A few language fixes

PHPBB3-9897
---
 phpBB/language/en/acp/board.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 753decd517..5293b835d6 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -51,7 +51,7 @@ $lang = array_merge($lang, array(
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
-	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in user control panel.',
+	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
 	'WARNINGS_EXPIRE'				=> 'Warning duration',
 	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
 ));
@@ -325,7 +325,7 @@ $lang = array_merge($lang, array(
 	'VISUAL_CONFIRM_REG'					=> 'Enable spambot countermeasures for registrations',
 	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to pass the anti-spambot task to help prevent automated registrations.',
 	'VISUAL_CONFIRM_REFRESH'				=> 'Allow users to refresh the anti-spambot task',
-	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request a new anti-spambot task if they are unable to solve the currunt task during registration. Some plugins might not support this option.',
+	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request a new anti-spambot task if they are unable to solve the current task during registration. Some plugins might not support this option.',
 ));
 
 // Cookie Settings
@@ -394,7 +394,7 @@ $lang = array_merge($lang, array(
 	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
 	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
 	'LDAP_PASSWORD'					=> 'LDAP password',
-	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
+	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding, otherwise fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'LDAP_PORT'						=> 'LDAP server port',
 	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
 	'LDAP_SERVER'					=> 'LDAP server name',
-- 
cgit v1.2.1


From 053cf790a93e9cfb521f484901d79c72783f868f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 23 Nov 2010 16:09:09 +0100
Subject: [ticket/9924] Pass template instance into $template->display hook

PHPBB3-9924
---
 phpBB/docs/hook_system.html | 2 ++
 phpBB/includes/template.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
index 1bf4630a9f..34055c4661 100644
--- a/phpBB/docs/hook_system.html
+++ b/phpBB/docs/hook_system.html
@@ -380,6 +380,8 @@ a:active	{ color: #368AD2; }
 <code>$template-&gt;display($handle, $include_once = true);</code> which is called directly before outputting the (not-yet-compiled) template.<br />
 <code>exit_handler();</code> which is called at the very end of phpBB3's execution.</p>
 
+<p>Please note: The <code>$template-&gt;display</code> hook takes a third <code>$template</code> argument, which is the template instance being used, which should be used instead of the global.</p>
+
 <p>There are also valid external constants you may want to use if you embed phpBB3 into your application:</p>
 
 <div class="codebox"><pre>
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index f1c8094a9b..6347633b14 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -205,7 +205,7 @@ class template
 	{
 		global $user, $phpbb_hook;
 
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once))
+		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once, $this))
 		{
 			if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__)))
 			{
-- 
cgit v1.2.1


From 5ec1c887959be5629c8a4c712b152d58058929a8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Nov 2010 23:29:12 +0100
Subject: [ticket/9930] Redirect failes with open_basedir enabled.

Open_basedir does not allow file_exists() for "." and directories without a
trayling-slash. Therefor we must append it on the check.

PHPBB3-9930
---
 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 561a9906c4..c7f19b709d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2353,12 +2353,12 @@ function redirect($url, $return = false, $disable_cd_check = false)
 		// Relative uri
 		$pathinfo = pathinfo($url);
 
-		if (!$disable_cd_check && !file_exists($pathinfo['dirname']))
+		if (!$disable_cd_check && !file_exists($pathinfo['dirname'] . '/'))
 		{
 			$url = str_replace('../', '', $url);
 			$pathinfo = pathinfo($url);
 
-			if (!file_exists($pathinfo['dirname']))
+			if (!file_exists($pathinfo['dirname'] . '/'))
 			{
 				// fallback to "last known user page"
 				// at least this way we know the user does not leave the phpBB root
-- 
cgit v1.2.1


From 23765fa6684ab8a4764ce944ac0469d2973eb12f Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Sun, 28 Nov 2010 13:32:35 +0100
Subject: [ticket/9932] Add the Bing bot when converting

PHPBB3-9932
---
 phpBB/includes/functions_convert.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 9e26043b39..4a359dcade 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1816,6 +1816,7 @@ function add_bots()
 		'Alta Vista [Bot]'			=> array('Scooter/', ''),
 		'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
 		'Baidu [Spider]'			=> array('Baiduspider+(', ''),
+		'Bing [Bot]'				=> array('bingbot/', ''),
 		'Exabot [Bot]'				=> array('Exabot/', ''),
 		'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
 		'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
-- 
cgit v1.2.1


From 90ff30b7a08fa3c80314f12bf5bcf8ff23cf860b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 23 Nov 2010 22:10:07 +0100
Subject: [task/github-readme] Add README file for GitHub

PHPBB3-9788
---
 README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..6b94f898a3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+[![phpBB](http://www.phpbb.com/theme/images/logos/blue/160x52.png)](http://www.phpbb.com)
+
+## ABOUT
+
+phpBB is a free bulletin board written in PHP.
+
+## COMMUNITY
+
+Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).
+
+## CONTRIBUTE
+
+1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
+2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
+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
+
+## LICENSE
+
+[GNU General Public License v2](http://opensource.org/licenses/gpl-2.0.php)
-- 
cgit v1.2.1


From b017f54ac9c923e74325f8cca96b11c6b684f115 Mon Sep 17 00:00:00 2001
From: Ingo Migliarina <mungo@phpbb.de>
Date: Wed, 1 Dec 2010 18:33:53 +0100
Subject: [ticket/9921] Adding sample configuration file for the lighttpd
 webserver.

PHPBB3-9921
---
 phpBB/docs/lighttpd.sample.conf | 60 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 phpBB/docs/lighttpd.sample.conf

diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf
new file mode 100644
index 0000000000..5873d1c945
--- /dev/null
+++ b/phpBB/docs/lighttpd.sample.conf
@@ -0,0 +1,60 @@
+# Sample lighttpd configuration file for phpBB.
+# Global settings have been removed, copy them
+# from your system's lighttpd.conf.
+# Tested with lighttpd 1.4.26
+
+# Load moules
+server.modules += ( 
+	"mod_access",
+	"mod_fastcgi",
+	"mod_accesslog"
+)
+
+# If you have domains with and without www prefix,
+# redirect one to the other.
+$HTTP["host"] =~ "^(myforums\.com)$" {
+	url.redirect = (
+		".*"	=> "http://www.%1$0"
+	)
+}
+
+$HTTP["host"] == "www.myforums.com" {
+	server.name				= "www.myforums.com"
+	server.document-root	= "/path/to/phpbb"
+	server.dir-listing		= "disable"
+	
+	index-file.names		= ( "index.php", "index.htm", "index.html" )
+	accesslog.filename		= "/var/log/lighttpd/access-www.myforums.com.log"
+	
+	# Deny access to internal phpbb files.	
+	$HTTP["url"] =~ "^/(config\.php|common\.php|includes|cache|files|store|images/avatars/upload)" {
+		url.access-deny = ( "" )
+	}
+
+	# Deny access to version control system directories.
+	$HTTP["url"] =~ "/\.svn|/\.git" {
+		url.access-deny = ( "" )
+	}
+	
+	# Deny access to apache configuration files.
+	$HTTP["url"] =~ "/\.htaccess|/\.htpasswd|/\.htgroups" {
+		url.access-deny = ( "" )
+	}
+
+	fastcgi.server = ( ".php" => 
+		((
+			"bin-path" => "/usr/bin/php-cgi",
+			"socket" => "/tmp/php.socket",
+			"max-procs" => 4,
+			"idle-timeout" => 30,
+			"bin-environment" => ( 
+				"PHP_FCGI_CHILDREN" => "10",
+				"PHP_FCGI_MAX_REQUESTS" => "10000"
+			),
+			"bin-copy-environment" => (
+				"PATH", "SHELL", "USER"
+			),
+			"broken-scriptfilename" => "enable"
+		))
+	)
+}
-- 
cgit v1.2.1


From 8b3d068e8321a16451dddcef6da2cf1245506e55 Mon Sep 17 00:00:00 2001
From: Adam Reyher <adamr@phpbb.com>
Date: Wed, 1 Dec 2010 14:14:46 -0500
Subject: [ticket/9575] Change 'administrate' to 'administer'

PHPBB3-9575
---
 phpBB/language/en/acp/common.php | 2 +-
 phpBB/language/en/acp/groups.php | 2 +-
 phpBB/language/en/memberlist.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2c549f8130..8c71e936b3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -255,7 +255,7 @@ $lang = array_merge($lang, array(
 	'MOVE_UP'				=> 'Move up',
 
 	'NOTIFY'				=> 'Notification',
-	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
+	'NO_ADMIN'				=> 'You are not authorised to administer this board.',
 	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
 	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
 
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index e8c1a3c494..3444b98303 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -36,7 +36,7 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
+	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
 	'ADD_USERS'						=> 'Add users',
 	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index e7a9c6b88d..213f766610 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -131,7 +131,7 @@ $lang = array_merge($lang, array(
 	'SORT_POST_COUNT'		=> 'Post count',
 
 	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
-	'USER_ADMIN'			=> 'Administrate user',
+	'USER_ADMIN'			=> 'Administer user',
 	'USER_BAN'				=> 'Banning',
 	'USER_FORUM'			=> 'User statistics',
 	'USER_LAST_REMINDED'	=> array(
-- 
cgit v1.2.1


From e6a6f00562953f507bb05f4c61d40a0800f70bff Mon Sep 17 00:00:00 2001
From: Adam Reyher <adamr@phpbb.com>
Date: Wed, 1 Dec 2010 14:29:28 -0500
Subject: [ticket/9928] Do not link "login to your board" to the "send
 statistics" page.

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 14923e836e..91ecb10848 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
 
 // Updater
 $lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
+	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
 	'ARCHIVE_FILE'				=> 'Source file within archive',
 
 	'BACK'				=> 'Back',
-- 
cgit v1.2.1


From 7a3d6a8168c7cd7da4f3ff462579ed562d0432a1 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Mon, 29 Nov 2010 07:10:19 -0500
Subject: [ticket/8736] guest can have 255 chars long username

when you post as a guest (anonymous) you can fill the field username with 255
chars. that will destroy the prosilver and subsilver2 style at viewtopic.
settings for username in ACP: 6-16 Chars

PHPBB3-8736
---
 phpBB/posting.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index f775699cee..7368026136 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -861,11 +861,18 @@ if ($submit || $preview || $refresh)
 	{
 		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 
+		$user->add_lang('ucp');
+
 		if (($result = validate_username($post_data['username'], (!empty($post_data['post_username'])) ? $post_data['post_username'] : '')) !== false)
 		{
-			$user->add_lang('ucp');
 			$error[] = $user->lang[$result . '_USERNAME'];
 		}
+
+		if (($result = validate_string($post_data['username'], false, $config['min_name_chars'], $config['max_name_chars'])) !== false)
+		{
+			$min_max_amount = ($result == 'TOO_SHORT') ? $config['min_name_chars'] : $config['max_name_chars'];
+			$error[] = sprintf($user->lang['FIELD_' . $result], $user->lang['USERNAME'], $min_max_amount);
+		}
 	}
 
 	if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply')))
-- 
cgit v1.2.1


From 0491bfbc2d5e7d98a7a15b5d0096c2647b821709 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 5 Dec 2010 14:09:39 +0100
Subject: [ticket/9575] Also change 'administrate' to 'administer' in templates

PHPBB3-9575
---
 phpBB/adm/style/acp_forums.html | 2 +-
 phpBB/adm/style/acp_styles.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9f9216a068..d27cea28f7 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -58,7 +58,7 @@
 
 		/**
 		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
+		* If javascript is not available, the user is still able to properly administer.
 		*/
 		onload = function()
 		{
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 5bde4008ad..cb4361dd6f 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -77,7 +77,7 @@
 
 		/**
 		* Init the wanted display functionality if javascript is enabled.
-		* If javascript is not available, the user is still able to properly administrate.
+		* If javascript is not available, the user is still able to properly administer.
 		*/
 		onload = function()
 		{
-- 
cgit v1.2.1


From 7dd06e8113d4a571d8681a9a11f2b06ca7a7beb8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 5 Dec 2010 14:35:19 +0100
Subject: [ticket/9939] Fix JavaScript error in admin recaptcha template

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

diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index 586c494868..d3038fd714 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -5,7 +5,7 @@
 		// <![CDATA[
 		var RecaptchaOptions = {
 			lang : '{LA_RECAPTCHA_LANG}',
-			theme : 'clean',
+			theme : 'clean'
 		};
 		// ]]>
 		</script>
-- 
cgit v1.2.1


From d7287ec633577886e5f92543c2a610d4aaa93d53 Mon Sep 17 00:00:00 2001
From: ChrisTX <ChrisTX@code.phpbb.com>
Date: Sun, 21 Nov 2010 23:02:56 +0100
Subject: [feature/acm-wincache] Adding caching module for WinCache's User
 Cache.

PHPBB3-9942
---
 phpBB/includes/acm/acm_wincache.php | 84 +++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 phpBB/includes/acm/acm_wincache.php

diff --git a/phpBB/includes/acm/acm_wincache.php b/phpBB/includes/acm/acm_wincache.php
new file mode 100644
index 0000000000..0501ab74c5
--- /dev/null
+++ b/phpBB/includes/acm/acm_wincache.php
@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* @package acm
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Include the abstract base
+if (!class_exists('acm_memory'))
+{
+	require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
+}
+
+/**
+* ACM for WinCache
+* @package acm
+*/
+class acm extends acm_memory
+{
+	var $extension = 'wincache';
+
+	/**
+	* Purge cache data
+	*
+	* @return void
+	*/
+	function purge()
+	{
+		wincache_ucache_clear();
+
+		parent::purge();
+	}
+
+	/**
+	* Fetch an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return mixed Cached data
+	*/
+	function _read($var)
+	{
+		$success = false;
+		$result = wincache_ucache_get($this->key_prefix . $var, $success);
+
+		return ($success) ? $result : false;
+	}
+
+	/**
+	* Store data in the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @param mixed $data Data to store
+	* @param int $ttl Time-to-live of cached data
+	* @return bool True if the operation succeeded
+	*/
+	function _write($var, $data, $ttl = 2592000)
+	{
+		return wincache_ucache_set($this->key_prefix . $var, $data, $ttl);
+	}
+
+	/**
+	* Remove an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if the operation succeeded
+	*/
+	function _delete($var)
+	{
+		return wincache_ucache_delete($this->key_prefix . $var);
+	}
+}
-- 
cgit v1.2.1


From 41184e5d7621d19f8349facb9c1cc9217ae7189e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Dec 2010 14:21:32 +0100
Subject: [task/phpdoc] Added a configuration file for phpDocumentor.

PHPBB3-9943
---
 build/phpdoc-phpbb.ini | 106 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 build/phpdoc-phpbb.ini

diff --git a/build/phpdoc-phpbb.ini b/build/phpdoc-phpbb.ini
new file mode 100644
index 0000000000..86d33549c0
--- /dev/null
+++ b/build/phpdoc-phpbb.ini
@@ -0,0 +1,106 @@
+;; phpDocumentor parse configuration file
+;;
+;; This file is designed to cut down on repetitive typing on the command-line or web interface
+;; You can copy this file to create a number of configuration files that can be used with the
+;; command-line switch -c, as in phpdoc -c default.ini or phpdoc -c myini.ini.  The web
+;; interface will automatically generate a list of .ini files that can be used.
+;;
+;; default.ini is used to generate the online manual at http://www.phpdoc.org/docs
+;;
+;; ALL .ini files must be in the user subdirectory of phpDocumentor with an extension of .ini
+;;
+;; Copyright 2002, Greg Beaver <cellog@users.sourceforge.net>
+;;
+;; WARNING: do not change the name of any command-line parameters, phpDocumentor will ignore them
+
+[Parse Data]
+;; title of all the documentation
+;; legal values: any string
+title = phpBB3 Sourcecode Documentation
+
+;; parse files that start with a . like .bash_profile
+;; legal values: true, false
+hidden = false
+
+;; show elements marked @access private in documentation by setting this to on
+;; legal values: on, off
+parseprivate = on
+
+;; parse with javadoc-like description (first sentence is always the short description)
+;; legal values: on, off
+javadocdesc = off
+
+;; add any custom @tags separated by commas here
+;; legal values: any legal tagname separated by commas.
+;customtags = mytag1,mytag2
+
+;; This is only used by the XML:DocBook/peardoc2 converter
+defaultcategoryname = sourcecode
+
+;; what is the main package?
+;; legal values: alphanumeric string plus - and _
+defaultpackagename = phpBB3
+
+;; output any parsing information?  set to on for cron jobs
+;; legal values: on
+;quiet = on
+
+;; parse a PEAR-style repository.  Do not turn this on if your project does
+;; not have a parent directory named "pear"
+;; legal values: on/off
+;pear = on
+
+;; where should the documentation be written?
+;; legal values: a legal path
+target = api
+
+;; Which files should be parsed out as special documentation files, such as README,
+;; INSTALL and CHANGELOG?  This overrides the default files found in
+;; phpDocumentor.ini (this file is not a user .ini file, but the global file)
+readmeinstallchangelog = README.html, INSTALL.html, CHANGELOG.html, COPYING
+
+;; limit output to the specified packages, even if others are parsed
+;; legal values: package names separated by commas
+;packageoutput = phpBB3,ACP,SEARCH,DBAL,ACM,MCP,UCP,LOGIN,lang_english
+
+;; comma-separated list of files to parse
+;; legal values: paths separated by commas
+;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
+
+;; comma-separated list of directories to parse
+;; legal values: directory paths separated by commas
+;directory = /path1,/path2,.,..,subdirectory
+;directory = /home/jeichorn/cvs/pear
+directory = ../phpBB/
+
+;; template base directory (the equivalent directory of <installdir>/phpDocumentor)
+;templatebase = /path/to/my/templates
+
+;; directory to find any example files in through @example and {@example} tags
+;examplesdir = c:\wamp\www\examples
+
+;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
+;; legal values: any wildcard strings separated by commas
+;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
+ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*
+
+;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
+;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
+;;               HTML:frames:earthli,
+;;               HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,
+;;               HTML:frames:DOM/phphtmllib,HTML:frames:DOM/earthli
+;;               HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
+;;               PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default
+;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default,PDF:default:default
+;output=HTML:frames:DOM/default,XML:DocBook/peardoc2:default,CHM:default:default,HTML:frames:DOM/earthli,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/phphtmllib,HTML:frames:phphtmllib
+;HTML:frames:earthli
+;output=XML:DocBook/peardoc2:default
+
+;output=HTML:frames:DOM/earthli
+;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default,PDF:default:default
+;output=HTML:Smarty:PHP
+output=HTML:frames:earthli
+
+;; turn this option on if you want highlighted source code for every file
+;; legal values: on/off
+sourcecode = off
-- 
cgit v1.2.1


From 03c52e79b909158a1461bc1c6a48b44fd4a2a97a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Dec 2010 14:24:33 +0100
Subject: [task/phpdoc] Added a phpdoc task to the build process

PHPBB3-9943
---
 build/build.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index bf77d82f6c..8d2afcb00c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -12,7 +12,7 @@
 
 	<!-- These are the main targets which you will probably want to use -->
 	<target name="package" depends="clean,prepare,create-package" />
-	<target name="all" depends="clean,prepare,test,create-package" />
+	<target name="all" depends="clean,prepare,test,docs,create-package" />
 
 	<target name="prepare">
 		<mkdir dir="build/logs" />
@@ -64,6 +64,12 @@
 		-->
 	</target>
 
+	<target name="docs">
+		<exec dir="build"
+			command="phpdoc -c phpdoc-phpbb.ini"
+			passthru="true" />
+	</target>
+
 	<target name="old-version-diffs">
 		<foreach list="${oldversions}" param="version" target="old-version-diff" />
 	</target>
-- 
cgit v1.2.1


From b88582199d09931e23b939784fc266fbc0473d30 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 17 Oct 2010 15:42:13 +0800
Subject: [ticket/9851] "Search new posts" should require login.

The newposts search uses user_lastvisit, so it should require user to log in.

PHPBB3-9851
---
 phpBB/language/en/search.php |  1 +
 phpBB/search.php             | 56 +++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index d93fe6b56a..cd38cd615f 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -54,6 +54,7 @@ $lang = array_merge($lang, array(
 
 	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
 	'LOGIN_EXPLAIN_UNREADSEARCH'=> 'The board requires you to be registered and logged in to view your unread posts.',
+	'LOGIN_EXPLAIN_NEWPOSTS'	=> 'The board requires you to be registered and logged in to view new posts since your last visit.',
 
 	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
 
diff --git a/phpBB/search.php b/phpBB/search.php
index 2a13e20477..2aa61401cf 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -47,32 +47,44 @@ $sort_dir		= request_var('sd', 'd');
 $return_chars	= request_var('ch', ($topic_id) ? -1 : 300);
 $search_forum	= request_var('fid', array(0));
 
-// We put login boxes for the case if search_id is egosearch or unreadposts
+// We put login boxes for the case if search_id is newposts, egosearch or unreadposts
 // because a guest should be able to log in even if guests search is not permitted
 
-// Egosearch is an author search
-if ($search_id == 'egosearch')
+switch ($search_id)
 {
-	$author_id = $user->data['user_id'];
-
-	if ($user->data['user_id'] == ANONYMOUS)
-	{
-		login_box('', $user->lang['LOGIN_EXPLAIN_EGOSEARCH']);
-	}
-}
+	// Egosearch is an author search
+	case 'egosearch':
+		$author_id = $user->data['user_id'];
+		if ($user->data['user_id'] == ANONYMOUS)
+		{
+			login_box('', $user->lang['LOGIN_EXPLAIN_EGOSEARCH']);
+		}
+	break;
 
-// Search for unread posts needs to be allowed and user to be logged in if topics tracking for guests is disabled
-if ($search_id == 'unreadposts')
-{
-	if (!$config['load_unreads_search'])
-	{
-		$template->assign_var('S_NO_SEARCH', true);
-		trigger_error('NO_SEARCH_UNREADS');
-	}
-	else if (!$config['load_anon_lastread'] && !$user->data['is_registered'])
-	{
-		login_box('', $user->lang['LOGIN_EXPLAIN_UNREADSEARCH']);
-	}
+	// Search for unread posts needs to be allowed and user to be logged in if topics tracking for guests is disabled
+	case 'unreadposts':
+		if (!$config['load_unreads_search'])
+		{
+			$template->assign_var('S_NO_SEARCH', true);
+			trigger_error('NO_SEARCH_UNREADS');
+		}
+		else if (!$config['load_anon_lastread'] && !$user->data['is_registered'])
+		{
+			login_box('', $user->lang['LOGIN_EXPLAIN_UNREADSEARCH']);
+		}
+	break;
+	
+	// The "new posts" search uses user_lastvisit which is user based, so it should require user to log in.
+	case 'newposts':
+		if ($user->data['user_id'] == ANONYMOUS)
+		{
+			login_box('', $user->lang['LOGIN_EXPLAIN_NEWPOSTS']);
+		}
+	break;
+	
+	default:
+		// There's nothing to do here for now ;)
+	break;
 }
 
 // Is user able to search? Has search been disabled?
-- 
cgit v1.2.1


From e4488fe78819b5dd7b1e7edd8c8defe07d264b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 15 Dec 2010 09:39:28 +0100
Subject: [ticket/9948] Inline quicktime files won't show

When attaching a quicktime file and placing it
inline the movie won't be shown due to the size
the movie box is being given.

PHPBB3-9948
---
 phpBB/styles/prosilver/template/attachment.html  | 4 ++--
 phpBB/styles/subsilver2/template/attachment.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html
index cc5aacff2f..4c0a326f1e 100644
--- a/phpBB/styles/prosilver/template/attachment.html
+++ b/phpBB/styles/prosilver/template/attachment.html
@@ -70,12 +70,12 @@
 				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
 			</object>
 		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="0" height="16">
+			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="320" height="285">
 				<param name="src" value="{_file.U_DOWNLOAD_LINK}" />
 				<param name="controller" value="true" />
 				<param name="autoplay" value="false" />
 				<param name="type" value="video/quicktime" />
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="0" height="16" type="video/quicktime" autoplay="false"></embed>
+				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed>
 			</object>
 		<!-- ELSEIF _file.S_RM_FILE -->
 			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html
index 833bd4d55f..b5b547b2e6 100644
--- a/phpBB/styles/subsilver2/template/attachment.html
+++ b/phpBB/styles/subsilver2/template/attachment.html
@@ -67,12 +67,12 @@
 				<embed src="{_file.U_VIEW_LINK}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{_file.WIDTH}" height="{_file.HEIGHT}" play="true" loop="true" quality="high" allowscriptaccess="never" allownetworking="internal"></embed>
 			</object>
 		<!-- ELSEIF _file.S_QUICKTIME_FILE -->
-			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="0" height="16">
+			<object id="qtstream_{_file.ATTACH_ID}" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0" width="320" height="285">
 				<param name="src" value="{_file.U_DOWNLOAD_LINK}">
 				<param name="controller" value="true">
 				<param name="autoplay" value="false" />
 				<param name="type" value="video/quicktime">
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="0" height="16" type="video/quicktime" autoplay="false"> 
+				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"> 
 			</object>
 		<!-- ELSEIF _file.S_RM_FILE -->
 			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-- 
cgit v1.2.1


From fc9516a2e3e4b039b8f4f07604b6914a54a71757 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 16 Dec 2010 01:19:40 +0100
Subject: [ticket/9859] Remove years from the credit line.

PHPBB3-9859
---
 phpBB/styles/prosilver/template/overall_footer.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 4da1308e14..aeb6dc9ba3 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -30,7 +30,7 @@
 	The phpBB Group : 2006
 //-->
 
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
+	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 		<!-- 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/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 64201ff2b9..187d0f4366 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -14,7 +14,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> &copy; 2000, 2002, 2005, 2007 phpBB Group
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
-- 
cgit v1.2.1


From d1cf7ff24a3d6da8de9aff89d1c371aa69510353 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 19 Dec 2010 17:31:02 +0100
Subject: [ticket/9925] prosilver logo margin bug in IE 6-7-8

PHPBB3-9925
---
 phpBB/styles/prosilver/theme/tweaks.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 782e682b9d..30fe5fb986 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -90,3 +90,12 @@ dl.icon {
 * html .forumbg table.table1 {
 	margin: 0 -2px 0px -1px;
 }
+
+/* Headerbar height fix for IE7 and below */
+* html #site-description p {
+	margin-bottom: 1.0em;
+}
+
+*:first-child+html #site-description p {
+	margin-bottom: 1.0em;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 8a07e8a4f8092e0123f16e9b4acf15d7d54d4c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 21 Dec 2010 15:08:07 +0100
Subject: [ticket/9954] Remove unneeded never permission

The `ROLE_USER_NOAVATAR` role gets a *never* permission assigned
for the two "u_masspm*" permissions. Due to this, this role changes
behaviour it isn't intended to change. It should assign "no" as is
done in the `ROLE_USER_LIMITED` role.

PHPBB3-9954
---
 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 355af802ef..700d4d63d1 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -565,7 +565,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
 
 # No Avatar (u_)
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group');
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar', 'u_masspm', 'u_masspm_group');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar');
 
 # Full Moderator (m_)
 INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%';
-- 
cgit v1.2.1


From 3f27cb2ea78dd571591db6d0886395f313c9fe5e Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Mon, 20 Dec 2010 07:58:37 -0500
Subject: [ticket/9937] The feed icon displays on External links...which we
 don't want

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 2de7e1b169..7989b74c55 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -456,7 +456,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'S_LOCKED_FORUM'	=> ($row['forum_status'] == ITEM_LOCKED) ? true : false,
 			'S_LIST_SUBFORUMS'	=> ($row['display_subforum_list']) ? true : false,
 			'S_SUBFORUMS'		=> (sizeof($subforums_list)) ? true : false,
-			'S_FEED_ENABLED'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options'])) ? true : false,
+			'S_FEED_ENABLED'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] != FORUM_LINK) ? true : false,
 
 			'FORUM_ID'				=> $row['forum_id'],
 			'FORUM_NAME'			=> $row['forum_name'],
-- 
cgit v1.2.1


From cdbb609c2002cc5db5953bc89d46696aa9bdd069 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 21 Dec 2010 22:44:10 +0100
Subject: [ticket/9937] Make sure feed icon only shows for FORUM_POST

This is cleaner, since feed.php only supports FORUM_POST.

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7989b74c55..acaef49fe8 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -456,7 +456,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'S_LOCKED_FORUM'	=> ($row['forum_status'] == ITEM_LOCKED) ? true : false,
 			'S_LIST_SUBFORUMS'	=> ($row['display_subforum_list']) ? true : false,
 			'S_SUBFORUMS'		=> (sizeof($subforums_list)) ? true : false,
-			'S_FEED_ENABLED'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] != FORUM_LINK) ? true : false,
+			'S_FEED_ENABLED'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['forum_options']) && $row['forum_type'] == FORUM_POST) ? true : false,
 
 			'FORUM_ID'				=> $row['forum_id'],
 			'FORUM_NAME'			=> $row['forum_name'],
-- 
cgit v1.2.1


From 4c076bfdc1890cfdd7cfdba606db77142ae86467 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 19 Dec 2010 17:48:12 -0600
Subject: [ticket/9905] Add SQLite to the DSN description

The installer's DSN field has additional meanings for ODBC, PostgreSQL, and
SQLite, but only the first two are mentioned. SQLite uses it for the file path.

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 91ecb10848..11c5d78359 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -128,7 +128,7 @@ $lang = array_merge($lang, array(
 	'DB_ERR_QUERY_FIRST_TABLE'	=> 'Error while executing <var>query_first</var>, %s (“%s”).',
 	'DB_ERR_SELECT'				=> 'Error while running <code>SELECT</code> query.',
 	'DB_HOST'					=> 'Database server hostname or DSN',
-	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP.',
+	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP. For SQLite, enter the full path to your database file.',
 	'DB_NAME'					=> 'Database name',
 	'DB_PASSWORD'				=> 'Database password',
 	'DB_PORT'					=> 'Database server port',
-- 
cgit v1.2.1


From 7f0f08bcc497d04746b209510a55ebfadcfe13bb Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 19 Dec 2010 20:43:35 -0600
Subject: [ticket/9953] Set focus to password on re-authentication

Sets the login focus to the password field when prompting for admin
re-authentication, rather than the username field.

PHPBB3-9953
---
 phpBB/styles/prosilver/template/login_body.html  | 2 +-
 phpBB/styles/subsilver2/template/login_body.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index 26e425a1d0..36c2eae349 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -2,7 +2,7 @@
 
 <script type="text/javascript">
 // <![CDATA[
-	onload_functions.push('document.getElementById("{USERNAME_CREDENTIAL}").focus();');
+	onload_functions.push('document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();');
 // ]]>
 </script>
 
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 90bbf8c139..262341e0c0 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -92,7 +92,7 @@
 // <![CDATA[
 	(function()
 	{
-		var elements = document.getElementsByName("{USERNAME_CREDENTIAL}");
+		var elements = document.getElementsByName("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->");
 		for (var i = 0; i < elements.length; ++i)
 		{
 			if (elements[i].tagName.toLowerCase() == 'input')
-- 
cgit v1.2.1


From 90c8803d59f05038ba1546c3976d8bddccc389f4 Mon Sep 17 00:00:00 2001
From: Richard Foote <dicky@phpbb.com>
Date: Tue, 28 Dec 2010 21:33:34 +0100
Subject: [ticket/9348] Call phpbb_set_encoding() on config value
 'default_dateformat'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode
non-ascii characters that might be in default_dateformat.

E.g. "d M Y à H:i"

PHPBB3-9348
---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index efe2bc2962..b6eee8d621 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -134,7 +134,7 @@ $config_schema = array(
 		'avatar_filesize'		=> 'avatar_filesize',
 		'avatar_max_width'		=> 'avatar_max_width',
 		'avatar_max_height'		=> 'avatar_max_height',
-		'default_dateformat'	=> 'default_dateformat',
+		'default_dateformat'	=> 'phpbb_set_encoding(default_dateformat)',
 		'board_timezone'		=> 'board_timezone',
 		'allow_privmsg'			=> 'not(privmsg_disable)',
 		'gzip_compress'			=> 'gzip_compress',
-- 
cgit v1.2.1


From 9a52bd030189280f48a35d3b9e52f9d77071cb5e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 3 Jan 2011 22:21:54 +0100
Subject: [task/phpunit-xml] Use phpunit.xml for test suite

PHPBB3-9967
---
 .gitignore                                        |  1 +
 build/build.xml                                   | 11 ++-
 phpunit.xml.dist                                  | 34 +++++++++
 tests/RUNNING_TESTS.txt                           |  8 +--
 tests/all_tests.php                               | 69 ------------------
 tests/bootstrap.php                               | 30 ++++++++
 tests/dbal/all_tests.php                          | 42 -----------
 tests/dbal/select.php                             |  3 +-
 tests/dbal/write.php                              |  3 +-
 tests/network/all_tests.php                       | 40 -----------
 tests/network/checkdnsrr.php                      |  3 +-
 tests/random/all_tests.php                        | 40 -----------
 tests/random/gen_rand_string.php                  |  3 +-
 tests/regex/all_tests.php                         | 46 ------------
 tests/regex/email.php                             |  3 +-
 tests/regex/ipv4.php                              |  3 +-
 tests/regex/ipv6.php                              |  3 +-
 tests/regex/url.php                               |  3 +-
 tests/request/all_tests.php                       | 41 -----------
 tests/request/request_var.php                     |  3 +-
 tests/security/all_tests.php                      | 86 -----------------------
 tests/security/base.php                           | 54 ++++++++++++++
 tests/security/extract_current_page.php           |  8 +--
 tests/security/redirect.php                       | 12 ++--
 tests/template/all_tests.php                      | 40 -----------
 tests/template/template.php                       |  4 +-
 tests/template/templates/_dummy_include.php       |  3 -
 tests/template/templates/_dummy_include.php.inc   |  3 +
 tests/template/templates/includephp.html          |  2 +-
 tests/test_framework/framework.php                | 43 ------------
 tests/test_framework/phpbb_database_test_case.php | 10 +--
 tests/text_processing/all_tests.php               | 41 -----------
 tests/text_processing/make_clickable.php          |  6 +-
 tests/utf/all_tests.php                           | 43 ------------
 tests/utf/utf8_clean_string_test.php              |  3 +-
 tests/utf/utf8_wordwrap_test.php                  |  3 +-
 36 files changed, 162 insertions(+), 588 deletions(-)
 create mode 100644 phpunit.xml.dist
 delete mode 100644 tests/all_tests.php
 create mode 100644 tests/bootstrap.php
 delete mode 100644 tests/dbal/all_tests.php
 delete mode 100644 tests/network/all_tests.php
 delete mode 100644 tests/random/all_tests.php
 delete mode 100644 tests/regex/all_tests.php
 delete mode 100644 tests/request/all_tests.php
 delete mode 100644 tests/security/all_tests.php
 create mode 100644 tests/security/base.php
 delete mode 100644 tests/template/all_tests.php
 delete mode 100644 tests/template/templates/_dummy_include.php
 create mode 100644 tests/template/templates/_dummy_include.php.inc
 delete mode 100644 tests/test_framework/framework.php
 delete mode 100644 tests/text_processing/all_tests.php
 delete mode 100644 tests/utf/all_tests.php

diff --git a/.gitignore b/.gitignore
index 871d17b386..39b9e0a7f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+phpunit.xml
 phpBB/cache/*.php
 phpBB/config.php
 phpBB/files/*
diff --git a/build/build.xml b/build/build.xml
index 8d2afcb00c..8321edf374 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -42,12 +42,11 @@
 		<delete dir="build/save" />
 	</target>
 
-	<target name="test">
-		<exec dir="tests"
-			command="phpunit --log-junit ../build/logs/phpunit.xml
-			--coverage-clover ../build/logs/clover.xml
-			--coverage-html ../build/coverage
-			phpbb_all_tests all_tests.php"
+	<target name="test" depends="clean,prepare">
+		<exec dir="."
+			command="phpunit --log-junit build/logs/phpunit.xml
+			--coverage-clover build/logs/clover.xml
+			--coverage-html build/coverage"
 			passthru="true" />
 
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000000..e3416c6db3
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="phpBB Test Suite">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    
+    <filter>
+        <blacklist>
+            <directory>./tests/</directory>
+            <directory>./phpBB/</directory>
+        </blacklist>
+        <whitelist>
+            <directory>./phpBB/includes/db/</directory>
+            <file>./phpBB/includes/utf/utf_tools.php</file>
+            <file>./phpBB/includes/functions.php</file>
+            <file>./phpBB/includes/functions_content.php</file>
+            <file>./phpBB/includes/session.php</file>
+            <file>./phpBB/includes/template.php</file>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 74a0635c1a..ac07978d3e 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -7,7 +7,7 @@ Prerequisites
 PHPUnit
 -------
 
-phpBB unit tests use PHPUnit framework. Version 3.3 or better is required
+phpBB unit tests use PHPUnit framework. Version 3.5 or better is required
 to run the tests. PHPUnit prefers to be installed via PEAR; refer to
 http://www.phpunit.de/ for more information.
 
@@ -41,14 +41,14 @@ 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' \
-      PHPBB_TEST_DBPASSWD='password' phpunit all_tests.php
+      PHPBB_TEST_DBPASSWD='password' phpunit
 
 Running
 =======
 
-Once the prerequisites are installed, run the tests from tests directory:
+Once the prerequisites are installed, run the tests from the project root directory (above phpBB):
 
-    $ phpunit all_tests.php
+    $ phpunit
 
 More Information
 ================
diff --git a/tests/all_tests.php b/tests/all_tests.php
deleted file mode 100644
index d1d711c4d7..0000000000
--- a/tests/all_tests.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-error_reporting(E_ALL);
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'utf/all_tests.php';
-require_once 'request/all_tests.php';
-require_once 'security/all_tests.php';
-require_once 'template/all_tests.php';
-require_once 'text_processing/all_tests.php';
-require_once 'dbal/all_tests.php';
-require_once 'regex/all_tests.php';
-require_once 'network/all_tests.php';
-require_once 'random/all_tests.php';
-
-// exclude the test directory from code coverage reports
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0)
-{
-	PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist('./');
-}
-else
-{
-	PHPUnit_Util_Filter::addDirectoryToFilter('./');
-}
-
-class phpbb_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB');
-
-		$suite->addTest(phpbb_utf_all_tests::suite());
-		$suite->addTest(phpbb_request_all_tests::suite());
-		$suite->addTest(phpbb_security_all_tests::suite());
-		$suite->addTest(phpbb_template_all_tests::suite());
-		$suite->addTest(phpbb_text_processing_all_tests::suite());
-		$suite->addTest(phpbb_dbal_all_tests::suite());
-		$suite->addTest(phpbb_regex_all_tests::suite());
-		$suite->addTest(phpbb_network_all_tests::suite());
-		$suite->addTest(phpbb_random_all_tests::suite());
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_all_tests::main')
-{
-	phpbb_all_tests::main();
-}
-
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000000..9683ba0d47
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+define('IN_PHPBB', true);
+$phpbb_root_path = 'phpBB/';
+$phpEx = 'php';
+$table_prefix = '';
+
+// 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';
+require_once 'test_framework/phpbb_test_case.php';
+require_once 'test_framework/phpbb_database_test_case.php';
diff --git a/tests/dbal/all_tests.php b/tests/dbal/all_tests.php
deleted file mode 100644
index cfa8176246..0000000000
--- a/tests/dbal/all_tests.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_dbal_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'dbal/select.php';
-require_once 'dbal/write.php';
-
-class phpbb_dbal_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Database Abstraction Layer');
-
-		$suite->addTestSuite('phpbb_dbal_select_test');
-		$suite->addTestSuite('phpbb_dbal_write_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_dbal_all_tests::main')
-{
-	phpbb_dbal_all_tests::main();
-}
diff --git a/tests/dbal/select.php b/tests/dbal/select.php
index 70f27549d2..987de5cbff 100644
--- a/tests/dbal/select.php
+++ b/tests/dbal/select.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
diff --git a/tests/dbal/write.php b/tests/dbal/write.php
index 01deacda69..a24b6efcc4 100644
--- a/tests/dbal/write.php
+++ b/tests/dbal/write.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_write_test extends phpbb_database_test_case
 {
diff --git a/tests/network/all_tests.php b/tests/network/all_tests.php
deleted file mode 100644
index b500647f81..0000000000
--- a/tests/network/all_tests.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_network_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'network/checkdnsrr.php';
-
-class phpbb_network_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Network Functions');
-
-		$suite->addTestSuite('phpbb_network_checkdnsrr_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_network_all_tests::main')
-{
-	phpbb_network_all_tests::main();
-}
diff --git a/tests/network/checkdnsrr.php b/tests/network/checkdnsrr.php
index 57fe2761cc..427132e508 100644
--- a/tests/network/checkdnsrr.php
+++ b/tests/network/checkdnsrr.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_network_checkdnsrr_test extends phpbb_test_case
 {
diff --git a/tests/random/all_tests.php b/tests/random/all_tests.php
deleted file mode 100644
index c6ffe78024..0000000000
--- a/tests/random/all_tests.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_random_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'random/gen_rand_string.php';
-
-class phpbb_random_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Random Functions');
-
-		$suite->addTestSuite('phpbb_random_gen_rand_string_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_random_all_tests::main')
-{
-	phpbb_random_all_tests::main();
-}
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string.php
index cd58d14ed3..fa519f134c 100644
--- a/tests/random/gen_rand_string.php
+++ b/tests/random/gen_rand_string.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_random_gen_rand_string_test extends phpbb_test_case
 {
diff --git a/tests/regex/all_tests.php b/tests/regex/all_tests.php
deleted file mode 100644
index 316a9d4a58..0000000000
--- a/tests/regex/all_tests.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_regex_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'regex/email.php';
-require_once 'regex/ipv4.php';
-require_once 'regex/ipv6.php';
-require_once 'regex/url.php';
-
-class phpbb_regex_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Regular Expressions');
-
-		$suite->addTestSuite('phpbb_regex_email_test');
-		$suite->addTestSuite('phpbb_regex_ipv4_test');
-		$suite->addTestSuite('phpbb_regex_ipv6_test');
-		$suite->addTestSuite('phpbb_regex_url_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_regex_all_tests::main')
-{
-	phpbb_regex_all_tests::main();
-}
diff --git a/tests/regex/email.php b/tests/regex/email.php
index 8658b8af36..5d6e207cbb 100644
--- a/tests/regex/email.php
+++ b/tests/regex/email.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_email_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv4.php b/tests/regex/ipv4.php
index 9d131ad0ca..735a2c4384 100644
--- a/tests/regex/ipv4.php
+++ b/tests/regex/ipv4.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv4_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv6.php b/tests/regex/ipv6.php
index 3d7a72e492..187588f861 100644
--- a/tests/regex/ipv6.php
+++ b/tests/regex/ipv6.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv6_test extends phpbb_test_case
 {
diff --git a/tests/regex/url.php b/tests/regex/url.php
index 678b7d108f..246cbf549c 100644
--- a/tests/regex/url.php
+++ b/tests/regex/url.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_url_test extends phpbb_test_case
 {
diff --git a/tests/request/all_tests.php b/tests/request/all_tests.php
deleted file mode 100644
index 1ee3029b36..0000000000
--- a/tests/request/all_tests.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_request_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'request/request_var.php';
-
-class phpbb_request_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Request Parameter Handling');
-
-		$suite->addTestSuite('phpbb_request_request_var_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_request_all_tests::main')
-{
-	phpbb_request_all_tests::main();
-}
-
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index b1dacef3fd..804e5d6390 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_request_request_var_test extends phpbb_test_case
 {
diff --git a/tests/security/all_tests.php b/tests/security/all_tests.php
deleted file mode 100644
index 8e3916733f..0000000000
--- a/tests/security/all_tests.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_security_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'security/extract_current_page.php';
-require_once 'security/redirect.php';
-
-class phpbb_security_all_tests extends PHPUnit_Framework_TestSuite
-{
-	/**
-	* Set up the required user object and server variables for the suites
-	*/
-	protected function setUp()
-	{
-		global $user, $phpbb_root_path;
-
-		// Put this into a global function being run by every test to init a proper user session
-		$_SERVER['HTTP_HOST']		= 'localhost';
-		$_SERVER['SERVER_NAME']		= 'localhost';
-		$_SERVER['SERVER_ADDR']		= '127.0.0.1';
-		$_SERVER['SERVER_PORT']		= 80;
-		$_SERVER['REMOTE_ADDR']		= '127.0.0.1';
-		$_SERVER['QUERY_STRING']	= '';
-		$_SERVER['REQUEST_URI']		= '/tests/';
-		$_SERVER['SCRIPT_NAME']		= '/tests/index.php';
-		$_SERVER['PHP_SELF']		= '/tests/index.php';
-		$_SERVER['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14';
-		$_SERVER['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';
-
-/*
-		[HTTP_ACCEPT_ENCODING] => gzip,deflate
-		[HTTP_ACCEPT_CHARSET] => ISO-8859-1,utf-8;q=0.7,*;q=0.7
-		DOCUMENT_ROOT] => /var/www/
-		[SCRIPT_FILENAME] => /var/www/tests/index.php
-*/
-
-		// Set no user and trick a bit to circumvent errors
-		$user = new user();
-		$user->lang = true;
-		$user->browser				= (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
-		$user->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
-		$user->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
-		$user->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-		$user->page = session::extract_current_page($phpbb_root_path);
-	}
-
-	protected function tearDown()
-	{
-		global $user;
-		$user = NULL;
-	}
-
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		// I bet there is a better method calling this... :)
-		$suite = new phpbb_security_all_tests('phpBB Security Fixes');
-
-		$suite->addTestSuite('phpbb_security_extract_current_page_test');
-		$suite->addTestSuite('phpbb_security_redirect_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_security_all_tests::main')
-{
-	phpbb_security_all_tests::main();
-}
diff --git a/tests/security/base.php b/tests/security/base.php
new file mode 100644
index 0000000000..db9c884cf4
--- /dev/null
+++ b/tests/security/base.php
@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+abstract class phpbb_security_test_base extends phpbb_test_case
+{
+	/**
+	* Set up the required user object and server variables for the suites
+	*/
+	protected function setUp()
+	{
+		global $user, $phpbb_root_path;
+
+		// Put this into a global function being run by every test to init a proper user session
+		$_SERVER['HTTP_HOST']		= 'localhost';
+		$_SERVER['SERVER_NAME']		= 'localhost';
+		$_SERVER['SERVER_ADDR']		= '127.0.0.1';
+		$_SERVER['SERVER_PORT']		= 80;
+		$_SERVER['REMOTE_ADDR']		= '127.0.0.1';
+		$_SERVER['QUERY_STRING']	= '';
+		$_SERVER['REQUEST_URI']		= '/tests/';
+		$_SERVER['SCRIPT_NAME']		= '/tests/index.php';
+		$_SERVER['PHP_SELF']		= '/tests/index.php';
+		$_SERVER['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14';
+		$_SERVER['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';
+
+/*
+		[HTTP_ACCEPT_ENCODING] => gzip,deflate
+		[HTTP_ACCEPT_CHARSET] => ISO-8859-1,utf-8;q=0.7,*;q=0.7
+		DOCUMENT_ROOT] => /var/www/
+		[SCRIPT_FILENAME] => /var/www/tests/index.php
+*/
+
+		// Set no user and trick a bit to circumvent errors
+		$user = new user();
+		$user->lang = true;
+		$user->browser				= (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
+		$user->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
+		$user->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
+		$user->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
+		$user->page = session::extract_current_page($phpbb_root_path);
+	}
+
+	protected function tearDown()
+	{
+		global $user;
+		$user = NULL;
+	}
+}
diff --git a/tests/security/extract_current_page.php b/tests/security/extract_current_page.php
index 8c72fe1440..ff0ab4d1bb 100644
--- a/tests/security/extract_current_page.php
+++ b/tests/security/extract_current_page.php
@@ -7,12 +7,12 @@
 *
 */
 
-require_once 'test_framework/framework.php';
+require_once __DIR__ . '/base.php';
 
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/session.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
 
-class phpbb_security_extract_current_page_test extends phpbb_test_case
+class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
 	public static function security_variables()
 	{
diff --git a/tests/security/redirect.php b/tests/security/redirect.php
index 37b0a5bb41..c53414e7df 100644
--- a/tests/security/redirect.php
+++ b/tests/security/redirect.php
@@ -7,12 +7,12 @@
 *
 */
 
-require_once 'test_framework/framework.php';
+require_once __DIR__ . '/base.php';
 
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/session.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
 
-class phpbb_security_redirect_test extends phpbb_test_case
+class phpbb_security_redirect_test extends phpbb_security_test_base
 {
 	public static function provider()
 	{
@@ -22,13 +22,15 @@ class phpbb_security_redirect_test extends phpbb_test_case
 			array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false),
 			array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
 			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false),
-			array('javascript:test', false, 'http://localhost/phpBB/../tests/javascript:test'),
+			array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
 			array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
 		);
 	}
 
 	protected function setUp()
 	{
+		parent::setUp();
+		
 		$GLOBALS['config'] = array(
 			'force_server_vars'	=> '0',
 		);
diff --git a/tests/template/all_tests.php b/tests/template/all_tests.php
deleted file mode 100644
index ea258c1680..0000000000
--- a/tests/template/all_tests.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_template_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'template/template.php';
-
-class phpbb_template_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Template Engine');
-
-		$suite->addTestSuite('phpbb_template_template_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_template_all_tests::main')
-{
-	phpbb_template_all_tests::main();
-}
diff --git a/tests/template/template.php b/tests/template/template.php
index 0c2ca8a032..861adf63e8 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -7,9 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-
-require_once '../phpBB/includes/template.php';
+require_once __DIR__ . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case
 {
diff --git a/tests/template/templates/_dummy_include.php b/tests/template/templates/_dummy_include.php
deleted file mode 100644
index 1de5dddf59..0000000000
--- a/tests/template/templates/_dummy_include.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo "testing included php";
diff --git a/tests/template/templates/_dummy_include.php.inc b/tests/template/templates/_dummy_include.php.inc
new file mode 100644
index 0000000000..aacb6b2045
--- /dev/null
+++ b/tests/template/templates/_dummy_include.php.inc
@@ -0,0 +1,3 @@
+<?php
+// extension is .php.inc so PHPUnit ignores it
+echo "testing included php";
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp.html
index 3e13fa33fa..117d4273f0 100644
--- a/tests/template/templates/includephp.html
+++ b/tests/template/templates/includephp.html
@@ -1 +1 @@
-<!-- INCLUDEPHP ../templates/_dummy_include.php -->
+<!-- INCLUDEPHP ../templates/_dummy_include.php.inc -->
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php
deleted file mode 100644
index 3a11cc6df9..0000000000
--- a/tests/test_framework/framework.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-define('IN_PHPBB', true);
-$phpbb_root_path = '../phpBB/';
-$phpEx = 'php';
-$table_prefix = '';
-
-// 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 at least PHPUnit 3.3.0
-require_once 'PHPUnit/Runner/Version.php';
-if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
-{
-	trigger_error('PHPUnit >= 3.3.0 required');
-}
-
-if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<'))
-{
-	require_once 'PHPUnit/Framework.php';
-	require_once 'PHPUnit/Extensions/Database/TestCase.php';
-}
-
-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';
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index a64bae8c57..81c4a4f94e 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -96,9 +96,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
 			);
 		}
-		else if (file_exists('test_config.php'))
+		else if (file_exists(__DIR__ . '/../test_config.php'))
 		{
-			include('test_config.php');
+			include(__DIR__ . '/../test_config.php');
 
 			return array(
 				'dbms'		=> $dbms,
@@ -114,7 +114,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			// Silently use sqlite
 			return array(
 				'dbms'		=> 'sqlite',
-				'dbhost'	=> 'phpbb_unit_tests.sqlite2', // filename
+				'dbhost'	=> __DIR__ . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
 				'dbuser'	=> '',
@@ -325,7 +325,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			}
 		}
 
-		$sql = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
+		$sql = $this->split_sql_file(file_get_contents(__DIR__ . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
 
 		foreach ($sql as $query)
 		{
@@ -361,7 +361,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		$config = $this->get_database_config();
 
-		require_once '../phpBB/includes/db/' . $config['dbms'] . '.php';
+		require_once __DIR__ . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
 		$dbal = 'dbal_' . $config['dbms'];
 		$db = new $dbal();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
diff --git a/tests/text_processing/all_tests.php b/tests/text_processing/all_tests.php
deleted file mode 100644
index 5e759c72ee..0000000000
--- a/tests/text_processing/all_tests.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_text_processing_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'text_processing/make_clickable.php';
-
-class phpbb_text_processing_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Text Processing Tools');
-
-		$suite->addTestSuite('phpbb_text_processing_make_clickable_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_text_processing_all_tests::main')
-{
-	phpbb_text_processing_all_tests::main();
-}
-
diff --git a/tests/text_processing/make_clickable.php b/tests/text_processing/make_clickable.php
index a667dd705e..75a35daf82 100644
--- a/tests/text_processing/make_clickable.php
+++ b/tests/text_processing/make_clickable.php
@@ -7,10 +7,8 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/functions_content.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
diff --git a/tests/utf/all_tests.php b/tests/utf/all_tests.php
deleted file mode 100644
index 0d5d44d695..0000000000
--- a/tests/utf/all_tests.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_utf_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'utf/utf8_wordwrap_test.php';
-require_once 'utf/utf8_clean_string_test.php';
-
-class phpbb_utf_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Unicode Transformation Format');
-
-		$suite->addTestSuite('phpbb_utf_utf8_wordwrap_test');
-		$suite->addTestSuite('phpbb_utf_utf8_clean_string_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_utf_all_tests::main')
-{
-	phpbb_utf_all_tests::main();
-}
-
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 870ad76fc4..148297ad4b 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index ef1165a897..fbc947b92a 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -7,8 +7,7 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once '../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
 {
-- 
cgit v1.2.1


From cdeffdd59f79310e68d8931e54877359ba58c8e1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 5 Jan 2011 00:40:07 +0100
Subject: [ticket/9589] nginx.conf.sample -> nginx.sample.conf

PHPBB3-9589
---
 phpBB/docs/nginx.conf.sample | 70 --------------------------------------------
 phpBB/docs/nginx.sample.conf | 70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100644 phpBB/docs/nginx.conf.sample
 create mode 100644 phpBB/docs/nginx.sample.conf

diff --git a/phpBB/docs/nginx.conf.sample b/phpBB/docs/nginx.conf.sample
deleted file mode 100644
index a22a126ff4..0000000000
--- a/phpBB/docs/nginx.conf.sample
+++ /dev/null
@@ -1,70 +0,0 @@
-# Sample nginx configuration file for phpBB.
-# Global settings have been removed, copy them
-# from your system's nginx.conf.
-# Tested with nginx 0.8.35.
-
-http {
-    # Compression - requires gzip and gzip static modules.
-    gzip on;
-    gzip_static on;
-    gzip_vary on;
-    gzip_http_version 1.1;
-    gzip_min_length 700;
-    gzip_comp_level 6;
-    gzip_disable "MSIE [1-6]\.";
-
-    # Catch-all server for requests to invalid hosts.
-    # Also catches vulnerability scanners probing IP addresses.
-    # Should be first.
-    server {
-        listen 80;
-        server_name bogus;
-        return 444;
-        root /var/empty;
-    }
-
-    # If you have domains with and without www prefix,
-    # redirect one to the other.
-    server {
-        listen 80;
-        server_name myforums.com;
-        rewrite ^(.*)$ http://www.myforums.com$1 permanent;
-    }
-
-    # The actual board domain.
-    server {
-        listen 80;
-        server_name www.myforums.com;
-
-        root /path/to/phpbb;
-
-        location / {
-            # phpbb uses index.htm
-            index index.php index.html index.htm;
-        }
-
-        # Deny access to internal phpbb files.
-        location ~ /(config\.php|common\.php|includes|cache|files|store|images/avatars/upload) {
-            deny all;
-        }
-
-        # Pass the php scripts to fastcgi server specified in upstream declaration.
-        location ~ \.php$ {
-            fastcgi_pass php;
-            # Necessary for php.
-            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            # Unmodified fastcgi_params from nginx distribution.
-            include fastcgi_params;
-        }
-
-        # Deny access to version control system directories.
-        location ~ /\.svn|/\.git {
-            deny all;
-        }
-    }
-
-    # If running php as fastcgi, specify php upstream.
-    upstream php {
-        server unix:/tmp/php.sock;
-    }
-}
diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
new file mode 100644
index 0000000000..a22a126ff4
--- /dev/null
+++ b/phpBB/docs/nginx.sample.conf
@@ -0,0 +1,70 @@
+# Sample nginx configuration file for phpBB.
+# Global settings have been removed, copy them
+# from your system's nginx.conf.
+# Tested with nginx 0.8.35.
+
+http {
+    # Compression - requires gzip and gzip static modules.
+    gzip on;
+    gzip_static on;
+    gzip_vary on;
+    gzip_http_version 1.1;
+    gzip_min_length 700;
+    gzip_comp_level 6;
+    gzip_disable "MSIE [1-6]\.";
+
+    # Catch-all server for requests to invalid hosts.
+    # Also catches vulnerability scanners probing IP addresses.
+    # Should be first.
+    server {
+        listen 80;
+        server_name bogus;
+        return 444;
+        root /var/empty;
+    }
+
+    # If you have domains with and without www prefix,
+    # redirect one to the other.
+    server {
+        listen 80;
+        server_name myforums.com;
+        rewrite ^(.*)$ http://www.myforums.com$1 permanent;
+    }
+
+    # The actual board domain.
+    server {
+        listen 80;
+        server_name www.myforums.com;
+
+        root /path/to/phpbb;
+
+        location / {
+            # phpbb uses index.htm
+            index index.php index.html index.htm;
+        }
+
+        # Deny access to internal phpbb files.
+        location ~ /(config\.php|common\.php|includes|cache|files|store|images/avatars/upload) {
+            deny all;
+        }
+
+        # Pass the php scripts to fastcgi server specified in upstream declaration.
+        location ~ \.php$ {
+            fastcgi_pass php;
+            # Necessary for php.
+            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+            # Unmodified fastcgi_params from nginx distribution.
+            include fastcgi_params;
+        }
+
+        # Deny access to version control system directories.
+        location ~ /\.svn|/\.git {
+            deny all;
+        }
+    }
+
+    # If running php as fastcgi, specify php upstream.
+    upstream php {
+        server unix:/tmp/php.sock;
+    }
+}
-- 
cgit v1.2.1


From b720edb05bafb1a5f75da049226c2c8270511f92 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 7 Jan 2011 00:16:28 +0100
Subject: [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.

PHPBB3-9967
---
 tests/bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9683ba0d47..99f145e427 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -12,6 +12,8 @@ $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
 $table_prefix = '';
 
+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', '>='))
 {
-- 
cgit v1.2.1


From b4f95deefc9d456c5a2d0f6338f6dcecc0829652 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 7 Jan 2011 00:29:44 +0100
Subject: [task/phpunit-xml] Only blacklist the tests directory and do not
 whitelist.

It would be ideal if we could whitelist the entire phpBB directory or at least
includes, but at present that still breaks because of classes with the same
name.

PHPBB3-9967
---
 phpunit.xml.dist | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e3416c6db3..d1d8adbdd5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -20,15 +20,6 @@
     <filter>
         <blacklist>
             <directory>./tests/</directory>
-            <directory>./phpBB/</directory>
         </blacklist>
-        <whitelist>
-            <directory>./phpBB/includes/db/</directory>
-            <file>./phpBB/includes/utf/utf_tools.php</file>
-            <file>./phpBB/includes/functions.php</file>
-            <file>./phpBB/includes/functions_content.php</file>
-            <file>./phpBB/includes/session.php</file>
-            <file>./phpBB/includes/template.php</file>
-        </whitelist>
     </filter>
 </phpunit>
-- 
cgit v1.2.1


From b48b90977382e936a4d98981e55b02c8e574e07b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 7 Jan 2011 01:07:21 +0100
Subject: [task/phpunit-xml] Manually blacklisting a few PHPUnit classes from
 backups.

The blacklisting of these static variables is necessary because code coverage
will otherwise consume too much memory. The problem did not exist in earlier
PHPUnit versions because all classes beginning with PHPUnit are automatically
blacklisted, and code coverage as well as a few other internal classes were
still internal parts of PHPunit. These were now moved to PHP_ namespace,
causing the problem with backupStaticAttributes.

PHPBB3-9967
---
 tests/test_framework/phpbb_database_test_case.php | 15 +++++++++++++++
 tests/test_framework/phpbb_test_case.php          | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 81c4a4f94e..9752ec2fe6 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -13,6 +13,21 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	protected $test_case_helpers;
 
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+		$this->backupStaticAttributesBlacklist += array(
+			'PHP_CodeCoverage' => array('instance'),
+			'PHP_CodeCoverage_Filter' => array('instance'),
+			'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'),
+			'PHP_Timer' => array('startTimes',),
+			'PHP_Token_Stream' => array('customTokens'),
+			'PHP_Token_Stream_CachingFactory' => array('cache'),
+
+			'phpbb_database_test_case' => array('already_connected'),
+		);
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index fe90d321dc..f189da3671 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -11,6 +11,21 @@ class phpbb_test_case extends PHPUnit_Framework_TestCase
 {
 	protected $test_case_helpers;
 
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+		$this->backupStaticAttributesBlacklist += array(
+			'PHP_CodeCoverage' => array('instance'),
+			'PHP_CodeCoverage_Filter' => array('instance'),
+			'PHP_CodeCoverage_Util' => array('ignoredLines', 'templateMethods'),
+			'PHP_Timer' => array('startTimes',),
+			'PHP_Token_Stream' => array('customTokens'),
+			'PHP_Token_Stream_CachingFactory' => array('cache'),
+
+			'phpbb_database_test_case' => array('already_connected'),
+		);
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
-- 
cgit v1.2.1


From a1731d5e6ec5b7cb6687e6302eb7daaa515f3369 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 7 Jan 2011 02:25:06 +0100
Subject: [task/phpdoc] Switching from phpDocumentor to phpdoctor.

You can get phpdoctor from https://github.com/peej/phpdoctor

PHPBB3-9943
---
 build/build.xml        |   8 +-
 build/phpdoc-phpbb.ini | 247 ++++++++++++++++++++++++++++---------------------
 2 files changed, 150 insertions(+), 105 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 8d2afcb00c..8d4e333e17 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -65,8 +65,14 @@
 	</target>
 
 	<target name="docs">
+		<!-- only works if you setup phpdoctor:
+                     git clone https://github.com/peej/phpdoctor.git
+                     and then create an executable phpdoctor in your path containing
+                     #!/bin/sh
+                     php -f /path/to/phpdoctor/phpdoc.php $@
+                -->
 		<exec dir="build"
-			command="phpdoc -c phpdoc-phpbb.ini"
+			command="phpdoctor phpdoc-phpbb.ini"
 			passthru="true" />
 	</target>
 
diff --git a/build/phpdoc-phpbb.ini b/build/phpdoc-phpbb.ini
index 86d33549c0..deaae4c19c 100644
--- a/build/phpdoc-phpbb.ini
+++ b/build/phpdoc-phpbb.ini
@@ -1,106 +1,145 @@
-;; phpDocumentor parse configuration file
-;;
-;; This file is designed to cut down on repetitive typing on the command-line or web interface
-;; You can copy this file to create a number of configuration files that can be used with the
-;; command-line switch -c, as in phpdoc -c default.ini or phpdoc -c myini.ini.  The web
-;; interface will automatically generate a list of .ini files that can be used.
-;;
-;; default.ini is used to generate the online manual at http://www.phpdoc.org/docs
-;;
-;; ALL .ini files must be in the user subdirectory of phpDocumentor with an extension of .ini
-;;
-;; Copyright 2002, Greg Beaver <cellog@users.sourceforge.net>
-;;
-;; WARNING: do not change the name of any command-line parameters, phpDocumentor will ignore them
-
-[Parse Data]
-;; title of all the documentation
-;; legal values: any string
-title = phpBB3 Sourcecode Documentation
-
-;; parse files that start with a . like .bash_profile
-;; legal values: true, false
-hidden = false
-
-;; show elements marked @access private in documentation by setting this to on
-;; legal values: on, off
-parseprivate = on
-
-;; parse with javadoc-like description (first sentence is always the short description)
-;; legal values: on, off
-javadocdesc = off
-
-;; add any custom @tags separated by commas here
-;; legal values: any legal tagname separated by commas.
-;customtags = mytag1,mytag2
-
-;; This is only used by the XML:DocBook/peardoc2 converter
-defaultcategoryname = sourcecode
-
-;; what is the main package?
-;; legal values: alphanumeric string plus - and _
-defaultpackagename = phpBB3
-
-;; output any parsing information?  set to on for cron jobs
-;; legal values: on
+; Default configuration file for PHPDoctor
+
+; This config file will cause PHPDoctor to generate API documentation of
+; itself.
+
+
+; PHPDoctor settings
+; -----------------------------------------------------------------------------
+
+; Names of files to parse. This can be a single filename, or a comma separated
+; list of filenames. Wildcards are allowed.
+
+files = "*.php"
+
+; Names of files or directories to ignore. This can be a single filename, or a
+; comma separated list of filenames. Wildcards are NOT allowed.
+
+;ignore = "CVS, .svn, .git, _compiled"
+ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*,acm_xcache.php
+
+; The directory to look for files in, if not used the PHPDoctor will look in
+; the current directory (the directory it is run from).
+
+source_path = "../phpBB/"
+
+; If you do not want PHPDoctor to look in each sub directory for files
+; uncomment this line.
+
+;subdirs = off
+
+; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
+; than warnings and errors. Verbose mode outputs additional messages during
+; execution.
+
 ;quiet = on
+verbose = on
+
+; Select the doclet to use for generating output.
+
+doclet = standard
+;doclet = debug
+
+; The directory to find the doclet in. Doclets control the HTML output of
+; phpDoctor and can be modified to suit your needs. They are expected to be 
+; in a directory named after themselves at the location given.
+
+;doclet_path = ./doclets
+
+; Select the formatter to use for generating output.
+
+;formatter = htmlStandardFormatter
+
+; The directory to find the formatter in. Formatters convert textual markup
+; for use by the doclet.
+
+;formatter_path = ./formatters
+
+; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
+; new tags and to alter the behavour of existing tags and their output.
+
+;taglet_path = ./taglets
+
+; If the code you are parsing does not use package tags or not all elements
+; have package tags, use this setting to place unbound elements into a
+; particular package.
+
+default_package = "phpBB"
+
+use_class_path_as_package = off
+
+ignore_package_tags = off
+
+; Specifies the name of a HTML file containing text for the overview
+; documentation to be placed on the overview page. The path is relative to
+; "source_path" unless an absolute path is given.
+
+overview = ../README.md
+
+; Package comments will be looked for in a file named package.html in the same
+; directory as the first source file parsed in that package or in the directory
+; given below. If package comments are placed in the directory given below then
+; they should be named "<packageName>.html".
+
+package_comment_dir = ./
+
+; Parse out global variables and/or global constants?
+
+;globals = off
+;constants = off
+
+; Generate documentation for all class members
+
+;private = on
+
+; Generate documentation for public and protected class members
+
+;protected = on
+
+; Generate documentation for only public class members
+
+;public = on
+
+; Use the PEAR compatible handling of the docblock first sentence
+
+;pear_compat = on
+
+; Standard doclet settings
+; -----------------------------------------------------------------------------
+
+; The directory to place generated documentation in. If the given path is
+; relative to it will be relative to "source_path".
+
+d = "../build/api/"
+
+; Specifies the title to be placed in the HTML <title> tag.
+
+windowtitle = "phpBB3"
+
+; Specifies the title to be placed near the top of the overview summary file.
+
+doctitle = "phpBB3 Sourcecode Documentation"
+
+; Specifies the header text to be placed at the top of each output file. The
+; header will be placed to the right of the upper navigation bar. 
+
+header = "phpBB3"
+
+; Specifies the footer text to be placed at the bottom of each output file. The
+; footer will be placed to the right of the lower navigation bar.
+
+footer = "phpBB3"
+
+; Specifies the text to be placed at the bottom of each output file. The text
+; will be placed at the bottom of the page, below the lower navigation bar.
+
+;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"
+
+; Create a class tree?
+
+;tree = off
+
+; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.
+
+include_source = off
 
-;; parse a PEAR-style repository.  Do not turn this on if your project does
-;; not have a parent directory named "pear"
-;; legal values: on/off
-;pear = on
-
-;; where should the documentation be written?
-;; legal values: a legal path
-target = api
-
-;; Which files should be parsed out as special documentation files, such as README,
-;; INSTALL and CHANGELOG?  This overrides the default files found in
-;; phpDocumentor.ini (this file is not a user .ini file, but the global file)
-readmeinstallchangelog = README.html, INSTALL.html, CHANGELOG.html, COPYING
-
-;; limit output to the specified packages, even if others are parsed
-;; legal values: package names separated by commas
-;packageoutput = phpBB3,ACP,SEARCH,DBAL,ACM,MCP,UCP,LOGIN,lang_english
-
-;; comma-separated list of files to parse
-;; legal values: paths separated by commas
-;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
-
-;; comma-separated list of directories to parse
-;; legal values: directory paths separated by commas
-;directory = /path1,/path2,.,..,subdirectory
-;directory = /home/jeichorn/cvs/pear
-directory = ../phpBB/
-
-;; template base directory (the equivalent directory of <installdir>/phpDocumentor)
-;templatebase = /path/to/my/templates
-
-;; directory to find any example files in through @example and {@example} tags
-;examplesdir = c:\wamp\www\examples
-
-;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
-;; legal values: any wildcard strings separated by commas
-;ignore = /path/to/ignore*,*list.php,myfile.php,subdirectory/
-ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*
-
-;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
-;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,
-;;               HTML:frames:earthli,
-;;               HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,
-;;               HTML:frames:DOM/phphtmllib,HTML:frames:DOM/earthli
-;;               HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS
-;;               PDF:default:default,CHM:default:default,XML:DocBook/peardoc2:default
-;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default,PDF:default:default
-;output=HTML:frames:DOM/default,XML:DocBook/peardoc2:default,CHM:default:default,HTML:frames:DOM/earthli,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/phphtmllib,HTML:frames:phphtmllib
-;HTML:frames:earthli
-;output=XML:DocBook/peardoc2:default
-
-;output=HTML:frames:DOM/earthli
-;output=HTML:frames:earthli,HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de,HTML:frames:DOM/earthli,HTML:frames:DOM/phphtmllib,HTML:frames:phpedit,HTML:Smarty:default,HTML:Smarty:PHP,HTML:Smarty:HandS,CHM:default:default,PDF:default:default
-;output=HTML:Smarty:PHP
-output=HTML:frames:earthli
-
-;; turn this option on if you want highlighted source code for every file
-;; legal values: on/off
-sourcecode = off
-- 
cgit v1.2.1


From c3fe0d99f913b105a5ac9d3c74905f756fcb2b4b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 7 Jan 2011 14:15:22 +0100
Subject: [task/phpdoc] Make phpdoctor output quiet instead of verbose.

PHPBB3-9943
---
 build/phpdoc-phpbb.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/phpdoc-phpbb.ini b/build/phpdoc-phpbb.ini
index deaae4c19c..f1a7a4bee5 100644
--- a/build/phpdoc-phpbb.ini
+++ b/build/phpdoc-phpbb.ini
@@ -32,8 +32,8 @@ source_path = "../phpBB/"
 ; than warnings and errors. Verbose mode outputs additional messages during
 ; execution.
 
-;quiet = on
-verbose = on
+quiet = on
+;verbose = on
 
 ; Select the doclet to use for generating output.
 
-- 
cgit v1.2.1


From 9a25e4ad8956f46fa41a6057a8af53f2955fb532 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 4 Jan 2011 11:54:10 +0700
Subject: [ticket/9933] Wrong handling consecutive multiple asterisks in word
 censor

Fix consecutive asterisks issue in word censor.

PHPBB3-9933
---
 phpBB/includes/acp/acp_words.php | 3 +++
 phpBB/includes/cache.php         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php
index 1cb9545967..88c5bbe592 100644
--- a/phpBB/includes/acp/acp_words.php
+++ b/phpBB/includes/acp/acp_words.php
@@ -95,6 +95,9 @@ class acp_words
 					trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
+				// Replace multiple consecutive asterisks with single one as those are not needed
+				$word = preg_replace('#\*{2,}#', '*', $word);
+
 				$sql_ary = array(
 					'word'			=> $word,
 					'replacement'	=> $replacement
diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index b50fab4ca2..9b90483b50 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -90,9 +90,9 @@ class cache extends acm
 				{
 					// Unescape the asterisk to simplify further conversions
 					$row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#'));
-					
+
 					// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
-					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*(?=[\p{Nd}\p{L}_])#iu', '#^\*#', '#\*$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
+					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
 
 					// Generate the final substitution
 					$censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu';
-- 
cgit v1.2.1


From 951b7b22e002571f1c304fcd63049aae77551a7b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 5 Jan 2011 21:13:33 +0700
Subject: [ticket/9933] Move word censor regex into separate function in
 functions.php

PHPBB3-9933
---
 phpBB/includes/cache.php     | 19 +------------------
 phpBB/includes/functions.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index 9b90483b50..612adcca4f 100644
--- a/phpBB/includes/cache.php
+++ b/phpBB/includes/cache.php
@@ -82,26 +82,9 @@ class cache extends acm
 			$result = $db->sql_query($sql);
 
 			$censors = array();
-			$unicode = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
-
 			while ($row = $db->sql_fetchrow($result))
 			{
-				if ($unicode)
-				{
-					// Unescape the asterisk to simplify further conversions
-					$row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#'));
-
-					// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
-					$row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']);
-
-					// Generate the final substitution
-					$censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu';
-				}
-				else
-				{
-					$censors['match'][] = '#(?<!\S)(' . str_replace('\*', '\S*?', preg_quote($row['word'], '#')) . ')(?!\S)#iu';
-				}
-
+				$censors['match'][] = get_censor_preg_expression($row['word']);
 				$censors['replace'][] = $row['replacement'];
 			}
 			$db->sql_freeresult($result);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c7f19b709d..69be1627cf 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3428,6 +3428,48 @@ function get_preg_expression($mode)
 	return '';
 }
 
+/**
+* Generate regexp for naughty words censoring
+* Depends on whether installed PHP version supports unicode properties
+*
+* @param string	$word	word template to be replaced
+*
+* @return string $preg_expr		regex to use with word censor
+*/
+function get_censor_preg_expression($word)
+{
+	static $unicode = null;
+
+	if (empty($word))
+	{
+		return '';
+	}
+
+	// Check whether PHP version supports unicode properties
+	if (is_null($unicode))
+	{
+		$unicode = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
+	}
+
+	if ($unicode)
+	{
+		// Unescape the asterisk to simplify further conversions
+		$word = str_replace('\*', '*', preg_quote($word, '#'));
+
+		// Replace asterisk(s) inside the pattern, at the start and at the end of it with regexes
+		$word = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $word);
+
+		// Generate the final substitution
+		$preg_expr = '#(?<![\p{Nd}\p{L}_-])(' . $word . ')(?![\p{Nd}\p{L}_-])#iu';
+	}
+	else
+	{
+		$preg_expr = '#(?<!\S)(' . str_replace('\*', '\S*?', preg_quote($word, '#')) . ')(?!\S)#iu';
+	}
+
+	return $preg_expr;
+}
+
 /**
 * Returns the first block of the specified IPv6 address and as many additional
 * ones as specified in the length paramater.
-- 
cgit v1.2.1


From 95cf47c4ef41b1ad7c5dc27eb9a078769851acf8 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 5 Jan 2011 21:19:50 +0700
Subject: [ticket/9933] Create unit test for word censor regular expression.

PHPBB3-9933
---
 tests/regex/censor.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 tests/regex/censor.php

diff --git a/tests/regex/censor.php b/tests/regex/censor.php
new file mode 100644
index 0000000000..ae2d86e07e
--- /dev/null
+++ b/tests/regex/censor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_censor_test extends phpbb_test_case
+{
+	public function censor_test_data()
+	{
+		return array(
+			array('bad*word', 'bad word'),
+			array('bad***word', 'bad word'),
+			array('bad**word', 'bad word'),
+			array('*bad*word*', 'bad word'),
+			array('b*d', 'bad'),
+			array('*bad*', 'bad'),
+			array('*b*d*', 'bad'),
+			array('*b*d*', 'b d'),
+			array('b*d*word', 'bad word'),
+			array('**b**d**word**', 'bad word'),
+			array('**b**d**word**', 'the bad word catched'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_test_data
+	*/
+	public function test_censor($pattern, $subject)
+	{
+		$regex = get_censor_preg_expression($pattern);
+
+		$this->assertRegExp($regex, $subject);
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 69616db1ed2ed21db14e2253851a9d76998072d0 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 7 Jan 2011 22:45:39 +0100
Subject: [ticket/9981] Fix unit test dependencies

PHPBB3-9981
---
 tests/request/request_var.php | 1 +
 tests/template/template.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/request/request_var.php b/tests/request/request_var.php
index 804e5d6390..0901b43920 100644
--- a/tests/request/request_var.php
+++ b/tests/request/request_var.php
@@ -8,6 +8,7 @@
 */
 
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_request_request_var_test extends phpbb_test_case
 {
diff --git a/tests/template/template.php b/tests/template/template.php
index 861adf63e8..35df17e4c6 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -7,6 +7,7 @@
 *
 */
 
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case
-- 
cgit v1.2.1


From 6a7c85382828dc95b5190ab6dde5ae25149e6025 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Fri, 7 Jan 2011 23:47:17 +0100
Subject: [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH
 instead of T_TEMPLATE_PATH

PHPBB3-9980
---
 phpBB/styles/prosilver/template/memberlist_search.html | 2 +-
 phpBB/styles/prosilver/template/overall_header.html    | 4 ++--
 phpBB/styles/prosilver/template/posting_buttons.html   | 2 +-
 phpBB/styles/prosilver/template/posting_smilies.html   | 2 +-
 phpBB/styles/prosilver/template/simple_header.html     | 4 ++--
 phpBB/styles/subsilver2/template/posting_buttons.html  | 2 +-
 phpBB/styles/subsilver2/template/posting_smilies.html  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index b95185a6f2..9df648f644 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -37,7 +37,7 @@ function insert_single(user)
 }
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 <!-- ENDIF -->
 
 <h2 class="solo">{L_FIND_USERNAME}</h2>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 44857dbc41..e607b6f489 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -85,8 +85,8 @@
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 5d21229611..19d55d1a4a 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -38,7 +38,7 @@
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
index fdd0d7ada1..86ac24aa53 100644
--- a/phpBB/styles/prosilver/template/posting_smilies.html
+++ b/phpBB/styles/prosilver/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = 'message';
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <h2>{L_SMILIES}</h2>
 <div class="panel">
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 0e2409586c..ef9b0a5573 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -47,8 +47,8 @@
 
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/styleswitcher.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js"></script>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 621fa87fd4..92b4bd3e39 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -33,7 +33,7 @@
 
 		// ]]>
 		</script>
-		<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+		<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <!-- IF S_BBCODE_ALLOWED -->
 		<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
index 2586530e55..fcab578bd9 100644
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ b/phpBB/styles/subsilver2/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = 'message';
 // ]]>
 </script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>
+<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
 
 <table width="100%" cellspacing="1" cellpadding="4" border="0">
 <tr>
-- 
cgit v1.2.1


From 01fe91c5c4e897801f5c179cd4060e686762f105 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 10 Jan 2011 00:18:37 +0100
Subject: [ticket/9987] Rename test files to include a _test suffix

PHPBB3-9987
---
 phpunit.xml.dist                              |   2 +-
 tests/dbal/select.php                         | 320 ------------
 tests/dbal/select_test.php                    | 320 ++++++++++++
 tests/dbal/write.php                          | 171 -------
 tests/dbal/write_test.php                     | 171 +++++++
 tests/network/checkdnsrr.php                  |  62 ---
 tests/network/checkdnsrr_test.php             |  62 +++
 tests/random/gen_rand_string.php              |  62 ---
 tests/random/gen_rand_string_test.php         |  62 +++
 tests/regex/censor.php                        |  40 --
 tests/regex/censor_test.php                   |  40 ++
 tests/regex/email.php                         | 118 -----
 tests/regex/email_test.php                    | 118 +++++
 tests/regex/ipv4.php                          |  71 ---
 tests/regex/ipv4_test.php                     |  71 +++
 tests/regex/ipv6.php                          | 142 ------
 tests/regex/ipv6_test.php                     | 142 ++++++
 tests/regex/url.php                           |  33 --
 tests/regex/url_test.php                      |  33 ++
 tests/request/request_var.php                 | 180 -------
 tests/request/request_var_test.php            | 180 +++++++
 tests/security/extract_current_page.php       |  53 --
 tests/security/extract_current_page_test.php  |  53 ++
 tests/security/redirect.php                   |  60 ---
 tests/security/redirect_test.php              |  60 +++
 tests/template/template.php                   | 689 --------------------------
 tests/template/template_test.php              | 689 ++++++++++++++++++++++++++
 tests/text_processing/make_clickable.php      | 104 ----
 tests/text_processing/make_clickable_test.php | 104 ++++
 29 files changed, 2106 insertions(+), 2106 deletions(-)
 delete mode 100644 tests/dbal/select.php
 create mode 100644 tests/dbal/select_test.php
 delete mode 100644 tests/dbal/write.php
 create mode 100644 tests/dbal/write_test.php
 delete mode 100644 tests/network/checkdnsrr.php
 create mode 100644 tests/network/checkdnsrr_test.php
 delete mode 100644 tests/random/gen_rand_string.php
 create mode 100644 tests/random/gen_rand_string_test.php
 delete mode 100644 tests/regex/censor.php
 create mode 100644 tests/regex/censor_test.php
 delete mode 100644 tests/regex/email.php
 create mode 100644 tests/regex/email_test.php
 delete mode 100644 tests/regex/ipv4.php
 create mode 100644 tests/regex/ipv4_test.php
 delete mode 100644 tests/regex/ipv6.php
 create mode 100644 tests/regex/ipv6_test.php
 delete mode 100644 tests/regex/url.php
 create mode 100644 tests/regex/url_test.php
 delete mode 100644 tests/request/request_var.php
 create mode 100644 tests/request/request_var_test.php
 delete mode 100644 tests/security/extract_current_page.php
 create mode 100644 tests/security/extract_current_page_test.php
 delete mode 100644 tests/security/redirect.php
 create mode 100644 tests/security/redirect_test.php
 delete mode 100644 tests/template/template.php
 create mode 100644 tests/template/template_test.php
 delete mode 100644 tests/text_processing/make_clickable.php
 create mode 100644 tests/text_processing/make_clickable_test.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d1d8adbdd5..78c7fdd93a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,7 @@
 >
     <testsuites>
         <testsuite name="phpBB Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix="_test.php">./tests/</directory>
         </testsuite>
     </testsuites>
     
diff --git a/tests/dbal/select.php b/tests/dbal/select.php
deleted file mode 100644
index 987de5cbff..0000000000
--- a/tests/dbal/select.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_dbal_select_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
-	}
-
-	public static function return_on_error_select_data()
-	{
-		return array(
-			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
-			array('phpbb_users', 'username_clean syntax_error', false),
-		);
-	}
-
-	/**
-	* @dataProvider return_on_error_select_data
-	*/
-	public function test_return_on_error_select($table, $where, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$db->sql_return_on_error(true);
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM ' . $table . '
-			WHERE ' . $where . '
-			ORDER BY user_id ASC');
-
-		$db->sql_return_on_error(false);
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-	}
-
-	public static function fetchrow_data()
-	{
-		return array(
-			array('', array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array('user_id = 2', array(array('username_clean' => 'foobar'))),
-			array("username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
-			array("username_clean = 'phpBB'", array()),
-		);
-	}
-
-	/**
-	* @dataProvider fetchrow_data
-	*/
-	public function test_fetchrow($where, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM phpbb_users
-			' . (($where) ? ' WHERE ' . $where : '') . '
-			ORDER BY user_id ASC');
-
-		$ary = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$ary[] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$this->assertEquals($expected, $ary);
-	}
-
-	/**
-	* @dataProvider fetchrow_data
-	*/
-	public function test_fetchrowset($where, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM phpbb_users
-			' . (($where) ? ' WHERE ' . $where : '') . '
-			ORDER BY user_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-
-	public static function fetchfield_data()
-	{
-		return array(
-			array('', array('barfoo', 'foobar', 'bertie')),
-			array('user_id = 2', array('foobar')),
-		);
-	}
-
-	/**
-	* @dataProvider fetchfield_data
-	*/
-	public function test_fetchfield($where, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM phpbb_users
-			' . (($where) ? ' WHERE ' . $where : '') . '
-			ORDER BY user_id ASC');
-
-		$ary = array();
-		while ($row = $db->sql_fetchfield('username_clean'))
-		{
-			$ary[] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$this->assertEquals($expected, $ary);
-	}
-
-	public static function query_limit_data()
-	{
-		return array(
-			array(0, 0, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array(0, 1, array(array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array(1, 0, array(array('username_clean' => 'barfoo'))),
-			array(1, 2, array(array('username_clean' => 'bertie'))),
-			array(2, 0, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array(2, 2, array(array('username_clean' => 'bertie'))),
-			array(2, 5, array()),
-			array(10, 1, array(array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array(10, 5, array()),
-		);
-	}
-
-	/**
-	* @dataProvider query_limit_data
-	*/
-	public function test_query_limit($total, $offset, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$result = $db->sql_query_limit('SELECT username_clean
-			FROM phpbb_users
-			ORDER BY user_id ASC', $total, $offset);
-
-		$ary = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$ary[] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		$this->assertEquals($expected, $ary);
-	}
-
-	public static function like_expression_data()
-	{
-		// * = any_char; # = one_char
-		return array(
-			array('barfoo', array(array('username_clean' => 'barfoo'))),
-			array('bar', array()),
-			array('bar*', array(array('username_clean' => 'barfoo'))),
-			array('*bar*', array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('b*r', array()),
-			array('b*e', array(array('username_clean' => 'bertie'))),
-			array('#b*e', array()),
-			array('b####e', array(array('username_clean' => 'bertie'))),
-		);
-	}
-
-	/**
-	* @dataProvider like_expression_data
-	*/
-	public function test_like_expression($like_expression, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$like_expression = str_replace('*', $db->any_char, $like_expression);
-		$like_expression = str_replace('#', $db->one_char, $like_expression);
-		$where = ($like_expression) ? 'username_clean ' . $db->sql_like_expression($like_expression) : '';
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM phpbb_users
-			' . (($where) ? ' WHERE ' . $where : '') . '
-			ORDER BY user_id ASC');
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-
-	public static function in_set_data()
-	{
-		return array(
-			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
-			array('user_id', 3, false, true, array(array('username_clean' => 'bertie'))),
-			array('user_id', 3, true, false, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('user_id', 3, true, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('username_clean', 'bertie', false, false, array(array('username_clean' => 'bertie'))),
-			array('username_clean', 'bertie', false, true, array(array('username_clean' => 'bertie'))),
-			array('username_clean', 'bertie', true, false, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('username_clean', 'bertie', true, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('user_id', array(3), false, false, array(array('username_clean' => 'bertie'))),
-			array('user_id', array(3), false, true, array(array('username_clean' => 'bertie'))),
-			array('user_id', array(3), true, false, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('user_id', array(3), true, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'))),
-			array('user_id', array(1, 3), false, false, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'bertie'))),
-			array('user_id', array(1, 3), false, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'bertie'))),
-			array('user_id', array(1, 3), true, false, array(array('username_clean' => 'foobar'))),
-			array('user_id', array(1, 3), true, true, array(array('username_clean' => 'foobar'))),
-			array('username_clean', '', false, false, array()),
-			array('username_clean', '', false, true, array()),
-			array('username_clean', '', true, false, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array('username_clean', '', true, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-			array('user_id', array(), false, true, array()),
-			array('user_id', array(), true, true, array(array('username_clean' => 'barfoo'),
-				array('username_clean' => 'foobar'),
-				array('username_clean' => 'bertie'))),
-
-			// These here would throw errors and therefor $result should be false.
-			// Removing for now because SQLite accepts empty IN() syntax
-			/*array('user_id', array(), false, false, false, true),
-			array('user_id', array(), true, false, false, true),*/
-		);
-	}
-
-	/**
-	* @dataProvider in_set_data
-	*/
-	public function test_in_set($field, $array, $negate, $allow_empty_set, $expected, $catch_error = false)
-	{
-		$db = $this->new_dbal();
-
-		if ($catch_error)
-		{
-			$db->sql_return_on_error(true);
-		}
-
-		$result = $db->sql_query('SELECT username_clean
-			FROM phpbb_users
-			WHERE ' . $db->sql_in_set($field, $array, $negate, $allow_empty_set) . '
-			ORDER BY user_id ASC');
-
-		if ($catch_error)
-		{
-			$db->sql_return_on_error(false);
-		}
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-
-	public static function build_array_data()
-	{
-		return array(
-			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
-			array(array('username_clean' => 'barfoo', 'user_id' => 1), array(array('username_clean' => 'barfoo'))),
-			array(array('username_clean' => 'barfoo', 'user_id' => 2), array()),
-
-			// These here would throw errors and therefor $result should be false.
-			array(array(), false, true),
-			array('no_array', false, true),
-			array(0, false, true),
-		);
-	}
-
-	/**
-	* @dataProvider build_array_data
-	*/
-	public function test_build_array($assoc_ary, $expected, $catch_error = false)
-	{
-		$db = $this->new_dbal();
-
-		if ($catch_error)
-		{
-			$db->sql_return_on_error(true);
-		}
-
-		$sql = 'SELECT username_clean
-			FROM phpbb_users
-			WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . '
-			ORDER BY user_id ASC';
-		$result = $db->sql_query($sql);
-
-		if ($catch_error)
-		{
-			$db->sql_return_on_error(false);
-		}
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-}
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
new file mode 100644
index 0000000000..987de5cbff
--- /dev/null
+++ b/tests/dbal/select_test.php
@@ -0,0 +1,320 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_dbal_select_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
+	}
+
+	public static function return_on_error_select_data()
+	{
+		return array(
+			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
+			array('phpbb_users', 'username_clean syntax_error', false),
+		);
+	}
+
+	/**
+	* @dataProvider return_on_error_select_data
+	*/
+	public function test_return_on_error_select($table, $where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$db->sql_return_on_error(true);
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM ' . $table . '
+			WHERE ' . $where . '
+			ORDER BY user_id ASC');
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+	}
+
+	public static function fetchrow_data()
+	{
+		return array(
+			array('', array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('user_id = 2', array(array('username_clean' => 'foobar'))),
+			array("username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
+			array("username_clean = 'phpBB'", array()),
+		);
+	}
+
+	/**
+	* @dataProvider fetchrow_data
+	*/
+	public function test_fetchrow($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	/**
+	* @dataProvider fetchrow_data
+	*/
+	public function test_fetchrowset($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function fetchfield_data()
+	{
+		return array(
+			array('', array('barfoo', 'foobar', 'bertie')),
+			array('user_id = 2', array('foobar')),
+		);
+	}
+
+	/**
+	* @dataProvider fetchfield_data
+	*/
+	public function test_fetchfield($where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$ary = array();
+		while ($row = $db->sql_fetchfield('username_clean'))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	public static function query_limit_data()
+	{
+		return array(
+			array(0, 0, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(0, 1, array(array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(1, 0, array(array('username_clean' => 'barfoo'))),
+			array(1, 2, array(array('username_clean' => 'bertie'))),
+			array(2, 0, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array(2, 2, array(array('username_clean' => 'bertie'))),
+			array(2, 5, array()),
+			array(10, 1, array(array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array(10, 5, array()),
+		);
+	}
+
+	/**
+	* @dataProvider query_limit_data
+	*/
+	public function test_query_limit($total, $offset, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query_limit('SELECT username_clean
+			FROM phpbb_users
+			ORDER BY user_id ASC', $total, $offset);
+
+		$ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$ary[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $ary);
+	}
+
+	public static function like_expression_data()
+	{
+		// * = any_char; # = one_char
+		return array(
+			array('barfoo', array(array('username_clean' => 'barfoo'))),
+			array('bar', array()),
+			array('bar*', array(array('username_clean' => 'barfoo'))),
+			array('*bar*', array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('b*r', array()),
+			array('b*e', array(array('username_clean' => 'bertie'))),
+			array('#b*e', array()),
+			array('b####e', array(array('username_clean' => 'bertie'))),
+		);
+	}
+
+	/**
+	* @dataProvider like_expression_data
+	*/
+	public function test_like_expression($like_expression, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$like_expression = str_replace('*', $db->any_char, $like_expression);
+		$like_expression = str_replace('#', $db->one_char, $like_expression);
+		$where = ($like_expression) ? 'username_clean ' . $db->sql_like_expression($like_expression) : '';
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			' . (($where) ? ' WHERE ' . $where : '') . '
+			ORDER BY user_id ASC');
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function in_set_data()
+	{
+		return array(
+			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
+			array('user_id', 3, false, true, array(array('username_clean' => 'bertie'))),
+			array('user_id', 3, true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', 3, true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('username_clean', 'bertie', false, false, array(array('username_clean' => 'bertie'))),
+			array('username_clean', 'bertie', false, true, array(array('username_clean' => 'bertie'))),
+			array('username_clean', 'bertie', true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('username_clean', 'bertie', true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(3), false, false, array(array('username_clean' => 'bertie'))),
+			array('user_id', array(3), false, true, array(array('username_clean' => 'bertie'))),
+			array('user_id', array(3), true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(3), true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'))),
+			array('user_id', array(1, 3), false, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(1, 3), false, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(1, 3), true, false, array(array('username_clean' => 'foobar'))),
+			array('user_id', array(1, 3), true, true, array(array('username_clean' => 'foobar'))),
+			array('username_clean', '', false, false, array()),
+			array('username_clean', '', false, true, array()),
+			array('username_clean', '', true, false, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('username_clean', '', true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+			array('user_id', array(), false, true, array()),
+			array('user_id', array(), true, true, array(array('username_clean' => 'barfoo'),
+				array('username_clean' => 'foobar'),
+				array('username_clean' => 'bertie'))),
+
+			// These here would throw errors and therefor $result should be false.
+			// Removing for now because SQLite accepts empty IN() syntax
+			/*array('user_id', array(), false, false, false, true),
+			array('user_id', array(), true, false, false, true),*/
+		);
+	}
+
+	/**
+	* @dataProvider in_set_data
+	*/
+	public function test_in_set($field, $array, $negate, $allow_empty_set, $expected, $catch_error = false)
+	{
+		$db = $this->new_dbal();
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(true);
+		}
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			WHERE ' . $db->sql_in_set($field, $array, $negate, $allow_empty_set) . '
+			ORDER BY user_id ASC');
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(false);
+		}
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function build_array_data()
+	{
+		return array(
+			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
+			array(array('username_clean' => 'barfoo', 'user_id' => 1), array(array('username_clean' => 'barfoo'))),
+			array(array('username_clean' => 'barfoo', 'user_id' => 2), array()),
+
+			// These here would throw errors and therefor $result should be false.
+			array(array(), false, true),
+			array('no_array', false, true),
+			array(0, false, true),
+		);
+	}
+
+	/**
+	* @dataProvider build_array_data
+	*/
+	public function test_build_array($assoc_ary, $expected, $catch_error = false)
+	{
+		$db = $this->new_dbal();
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(true);
+		}
+
+		$sql = 'SELECT username_clean
+			FROM phpbb_users
+			WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . '
+			ORDER BY user_id ASC';
+		$result = $db->sql_query($sql);
+
+		if ($catch_error)
+		{
+			$db->sql_return_on_error(false);
+		}
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+}
diff --git a/tests/dbal/write.php b/tests/dbal/write.php
deleted file mode 100644
index a24b6efcc4..0000000000
--- a/tests/dbal/write.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_dbal_write_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
-	}
-
-	public static function build_array_insert_data()
-	{
-		return array(
-			array(array(
-				'config_name'	=> 'test_version',
-				'config_value'	=> '0.0.0',
-				'is_dynamic'	=> 1,
-			)),
-			array(array(
-				'config_name'	=> 'second config',
-				'config_value'	=> '10',
-				'is_dynamic'	=> 0,
-			)),
-		);
-	}
-
-	/**
-	* @dataProvider build_array_insert_data
-	*/
-	public function test_build_array_insert($sql_ary)
-	{
-		$db = $this->new_dbal();
-
-		$sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT *
-			FROM phpbb_config
-			WHERE config_name = '" . $sql_ary['config_name'] . "'";
-		$result = $db->sql_query_limit($sql, 1);
-
-		$this->assertEquals($sql_ary, $db->sql_fetchrow($result));
-
-		$db->sql_freeresult($result);
-	}
-
-	public function test_delete()
-	{
-		$db = $this->new_dbal();
-
-		$sql = "DELETE FROM phpbb_config
-			WHERE config_name = 'config1'";
-		$result = $db->sql_query($sql);
-
-		$sql = 'SELECT *
-			FROM phpbb_config';
-		$result = $db->sql_query($sql);
-		$rows = $db->sql_fetchrowset($result);
-		
-		$this->assertEquals(1, sizeof($rows));
-		$this->assertEquals('config2', $rows[0]['config_name']);
-
-		$db->sql_freeresult($result);
-	}
-
-	public function test_multiple_insert()
-	{
-		$db = $this->new_dbal();
-
-		// empty the table
-		$sql = 'DELETE FROM phpbb_config';
-		$db->sql_query($sql);
-
-		$batch_ary = array(
-			array(
-				'config_name'	=> 'batch one',
-				'config_value'	=> 'b1',
-				'is_dynamic'	=> 0,
-			),
-			array(
-				'config_name'	=> 'batch two',
-				'config_value'	=> 'b2',
-				'is_dynamic'	=> 1,
-			),
-		);
-
-		$result = $db->sql_multi_insert('phpbb_config', $batch_ary);
-
-		$sql = 'SELECT *
-			FROM phpbb_config
-			ORDER BY config_name ASC';
-		$result = $db->sql_query($sql);
-
-		$this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-
-	public static function update_data()
-	{
-		return array(
-			array(
-				array(
-					'config_value'	=> '23',
-					'is_dynamic'	=> 0,
-				),
-				" WHERE config_name = 'config1'",
-				array(
-					array(
-						'config_name'	=> 'config1',
-						'config_value'	=> '23',
-						'is_dynamic'	=> 0,
-					),
-					array(
-						'config_name'	=> 'config2',
-						'config_value'	=> 'bar',
-						'is_dynamic'	=> 1,
-					),
-				),
-			),
-			array(
-				array(
-					'config_value'	=> '0',
-					'is_dynamic'	=> 1,
-				),
-				'',
-				array(
-					array(
-						'config_name'	=> 'config1',
-						'config_value'	=> '0',
-						'is_dynamic'	=> 1,
-					),
-					array(
-						'config_name'	=> 'config2',
-						'config_value'	=> '0',
-						'is_dynamic'	=> 1,
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	* @dataProvider update_data
-	*/
-	public function test_update($sql_ary, $where, $expected)
-	{
-		$db = $this->new_dbal();
-
-		$sql = 'UPDATE phpbb_config
-			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
-		$result = $db->sql_query($sql);
-
-		$sql = 'SELECT *
-			FROM phpbb_config
-			ORDER BY config_name ASC';
-		$result = $db->sql_query($sql);
-
-		$this->assertEquals($expected, $db->sql_fetchrowset($result));
-
-		$db->sql_freeresult($result);
-	}
-}
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
new file mode 100644
index 0000000000..a24b6efcc4
--- /dev/null
+++ b/tests/dbal/write_test.php
@@ -0,0 +1,171 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_dbal_write_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public static function build_array_insert_data()
+	{
+		return array(
+			array(array(
+				'config_name'	=> 'test_version',
+				'config_value'	=> '0.0.0',
+				'is_dynamic'	=> 1,
+			)),
+			array(array(
+				'config_name'	=> 'second config',
+				'config_value'	=> '10',
+				'is_dynamic'	=> 0,
+			)),
+		);
+	}
+
+	/**
+	* @dataProvider build_array_insert_data
+	*/
+	public function test_build_array_insert($sql_ary)
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT *
+			FROM phpbb_config
+			WHERE config_name = '" . $sql_ary['config_name'] . "'";
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals($sql_ary, $db->sql_fetchrow($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public function test_delete()
+	{
+		$db = $this->new_dbal();
+
+		$sql = "DELETE FROM phpbb_config
+			WHERE config_name = 'config1'";
+		$result = $db->sql_query($sql);
+
+		$sql = 'SELECT *
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+		$rows = $db->sql_fetchrowset($result);
+		
+		$this->assertEquals(1, sizeof($rows));
+		$this->assertEquals('config2', $rows[0]['config_name']);
+
+		$db->sql_freeresult($result);
+	}
+
+	public function test_multiple_insert()
+	{
+		$db = $this->new_dbal();
+
+		// empty the table
+		$sql = 'DELETE FROM phpbb_config';
+		$db->sql_query($sql);
+
+		$batch_ary = array(
+			array(
+				'config_name'	=> 'batch one',
+				'config_value'	=> 'b1',
+				'is_dynamic'	=> 0,
+			),
+			array(
+				'config_name'	=> 'batch two',
+				'config_value'	=> 'b2',
+				'is_dynamic'	=> 1,
+			),
+		);
+
+		$result = $db->sql_multi_insert('phpbb_config', $batch_ary);
+
+		$sql = 'SELECT *
+			FROM phpbb_config
+			ORDER BY config_name ASC';
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+
+	public static function update_data()
+	{
+		return array(
+			array(
+				array(
+					'config_value'	=> '23',
+					'is_dynamic'	=> 0,
+				),
+				" WHERE config_name = 'config1'",
+				array(
+					array(
+						'config_name'	=> 'config1',
+						'config_value'	=> '23',
+						'is_dynamic'	=> 0,
+					),
+					array(
+						'config_name'	=> 'config2',
+						'config_value'	=> 'bar',
+						'is_dynamic'	=> 1,
+					),
+				),
+			),
+			array(
+				array(
+					'config_value'	=> '0',
+					'is_dynamic'	=> 1,
+				),
+				'',
+				array(
+					array(
+						'config_name'	=> 'config1',
+						'config_value'	=> '0',
+						'is_dynamic'	=> 1,
+					),
+					array(
+						'config_name'	=> 'config2',
+						'config_value'	=> '0',
+						'is_dynamic'	=> 1,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider update_data
+	*/
+	public function test_update($sql_ary, $where, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'UPDATE phpbb_config
+			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
+		$result = $db->sql_query($sql);
+
+		$sql = 'SELECT *
+			FROM phpbb_config
+			ORDER BY config_name ASC';
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($expected, $db->sql_fetchrowset($result));
+
+		$db->sql_freeresult($result);
+	}
+}
diff --git a/tests/network/checkdnsrr.php b/tests/network/checkdnsrr.php
deleted file mode 100644
index 427132e508..0000000000
--- a/tests/network/checkdnsrr.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_network_checkdnsrr_test extends phpbb_test_case
-{
-	public function data_provider()
-	{
-		return array(
-			// Existing MX record
-			array('phpbb.com', 'MX', true),
-
-			// Non-existing MX record
-			array('does-not-exist.phpbb.com', 'MX', false),
-
-			// Existing A record
-			array('www.phpbb.com', 'A', true),
-
-			// Non-existing A record
-			array('does-not-exist.phpbb.com', 'A', false),
-
-			// Existing AAAA record
-			array('www.six.heise.de', 'AAAA', true),
-
-			// Non-existing AAAA record
-			array('does-not-exist.phpbb.com', 'AAAA', false),
-
-			// Existing CNAME record
-			array('news.cnet.com', 'CNAME', true),
-
-			// Non-existing CNAME record
-			array('does-not-exist.phpbb.com', 'CNAME', false),
-
-			// Existing NS record
-			array('phpbb.com', 'NS', true),
-
-			// Non-existing NS record
-			array('does-not-exist', 'NS', false),
-
-			// Existing TXT record
-			array('phpbb.com', 'TXT', true),
-
-			// Non-existing TXT record
-			array('does-not-exist', 'TXT', false),
-		);
-	}
-
-	/**
-	* @dataProvider data_provider
-	*/
-	public function test_checkdnsrr($host, $type, $expected)
-	{
-		$this->assertEquals($expected, phpbb_checkdnsrr($host, $type));
-	}
-}
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
new file mode 100644
index 0000000000..427132e508
--- /dev/null
+++ b/tests/network/checkdnsrr_test.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_network_checkdnsrr_test extends phpbb_test_case
+{
+	public function data_provider()
+	{
+		return array(
+			// Existing MX record
+			array('phpbb.com', 'MX', true),
+
+			// Non-existing MX record
+			array('does-not-exist.phpbb.com', 'MX', false),
+
+			// Existing A record
+			array('www.phpbb.com', 'A', true),
+
+			// Non-existing A record
+			array('does-not-exist.phpbb.com', 'A', false),
+
+			// Existing AAAA record
+			array('www.six.heise.de', 'AAAA', true),
+
+			// Non-existing AAAA record
+			array('does-not-exist.phpbb.com', 'AAAA', false),
+
+			// Existing CNAME record
+			array('news.cnet.com', 'CNAME', true),
+
+			// Non-existing CNAME record
+			array('does-not-exist.phpbb.com', 'CNAME', false),
+
+			// Existing NS record
+			array('phpbb.com', 'NS', true),
+
+			// Non-existing NS record
+			array('does-not-exist', 'NS', false),
+
+			// Existing TXT record
+			array('phpbb.com', 'TXT', true),
+
+			// Non-existing TXT record
+			array('does-not-exist', 'TXT', false),
+		);
+	}
+
+	/**
+	* @dataProvider data_provider
+	*/
+	public function test_checkdnsrr($host, $type, $expected)
+	{
+		$this->assertEquals($expected, phpbb_checkdnsrr($host, $type));
+	}
+}
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string.php
deleted file mode 100644
index fa519f134c..0000000000
--- a/tests/random/gen_rand_string.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_random_gen_rand_string_test extends phpbb_test_case
-{
-	const TEST_COUNT = 100;
-	const MIN_STRING_LENGTH = 1;
-	const MAX_STRING_LENGTH = 15;
-
-	public function setUp()
-	{
-		global $config;
-
-		if (!is_array($config))
-		{
-			$config = array();
-		}
-
-		$config['rand_seed'] = '';
-		$config['rand_seed_last_update'] = time() + 600;
-	}
-
-	public function test_gen_rand_string()
-	{
-		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
-		{
-			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
-			{
-				$random_string = gen_rand_string($num_chars);
-				$random_string_length = strlen($random_string);
-
-				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
-				$this->assertTrue($random_string_length <= $num_chars);
-				$this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
-			}
-		}
-	}
-
-	public function test_gen_rand_string_friendly()
-	{
-		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
-		{
-			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
-			{
-				$random_string = gen_rand_string_friendly($num_chars);
-				$random_string_length = strlen($random_string);
-
-				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
-				$this->assertTrue($random_string_length <= $num_chars);
-				$this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
-			}
-		}
-	}
-}
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
new file mode 100644
index 0000000000..fa519f134c
--- /dev/null
+++ b/tests/random/gen_rand_string_test.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_random_gen_rand_string_test extends phpbb_test_case
+{
+	const TEST_COUNT = 100;
+	const MIN_STRING_LENGTH = 1;
+	const MAX_STRING_LENGTH = 15;
+
+	public function setUp()
+	{
+		global $config;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+	}
+
+	public function test_gen_rand_string()
+	{
+		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
+		{
+			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
+			{
+				$random_string = gen_rand_string($num_chars);
+				$random_string_length = strlen($random_string);
+
+				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
+				$this->assertTrue($random_string_length <= $num_chars);
+				$this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
+			}
+		}
+	}
+
+	public function test_gen_rand_string_friendly()
+	{
+		for ($tests = 0; $tests <= self::TEST_COUNT; ++$tests)
+		{
+			for ($num_chars = self::MIN_STRING_LENGTH; $num_chars <= self::MAX_STRING_LENGTH; ++$num_chars)
+			{
+				$random_string = gen_rand_string_friendly($num_chars);
+				$random_string_length = strlen($random_string);
+
+				$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
+				$this->assertTrue($random_string_length <= $num_chars);
+				$this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
+			}
+		}
+	}
+}
diff --git a/tests/regex/censor.php b/tests/regex/censor.php
deleted file mode 100644
index ae2d86e07e..0000000000
--- a/tests/regex/censor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_regex_censor_test extends phpbb_test_case
-{
-	public function censor_test_data()
-	{
-		return array(
-			array('bad*word', 'bad word'),
-			array('bad***word', 'bad word'),
-			array('bad**word', 'bad word'),
-			array('*bad*word*', 'bad word'),
-			array('b*d', 'bad'),
-			array('*bad*', 'bad'),
-			array('*b*d*', 'bad'),
-			array('*b*d*', 'b d'),
-			array('b*d*word', 'bad word'),
-			array('**b**d**word**', 'bad word'),
-			array('**b**d**word**', 'the bad word catched'),
-		);
-	}
-
-	/**
-	* @dataProvider censor_test_data
-	*/
-	public function test_censor($pattern, $subject)
-	{
-		$regex = get_censor_preg_expression($pattern);
-
-		$this->assertRegExp($regex, $subject);
-	}
-}
\ No newline at end of file
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
new file mode 100644
index 0000000000..ae2d86e07e
--- /dev/null
+++ b/tests/regex/censor_test.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_censor_test extends phpbb_test_case
+{
+	public function censor_test_data()
+	{
+		return array(
+			array('bad*word', 'bad word'),
+			array('bad***word', 'bad word'),
+			array('bad**word', 'bad word'),
+			array('*bad*word*', 'bad word'),
+			array('b*d', 'bad'),
+			array('*bad*', 'bad'),
+			array('*b*d*', 'bad'),
+			array('*b*d*', 'b d'),
+			array('b*d*word', 'bad word'),
+			array('**b**d**word**', 'bad word'),
+			array('**b**d**word**', 'the bad word catched'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_test_data
+	*/
+	public function test_censor($pattern, $subject)
+	{
+		$regex = get_censor_preg_expression($pattern);
+
+		$this->assertRegExp($regex, $subject);
+	}
+}
\ No newline at end of file
diff --git a/tests/regex/email.php b/tests/regex/email.php
deleted file mode 100644
index 5d6e207cbb..0000000000
--- a/tests/regex/email.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_regex_email_test extends phpbb_test_case
-{
-	protected $regex;
-
-	public function setUp()
-	{
-		$this->regex = '#^' . get_preg_expression('email') . '$#i';
-	}
-
-	public function positive_match_data()
-	{
-		return array(
-			array('nobody@phpbb.com'),
-			array('Nobody@sub.phpbb.com'),
-			array('alice.bob@foo.phpbb.com'),
-			array('alice-foo@bar.phpbb.com'),
-			array('alice_foo@bar.phpbb.com'),
-			array('alice+tag@foo.phpbb.com'),
-			array('alice&amp;tag@foo.phpbb.com'),
-
-			//array('"John Doe"@example.com'),
-			//array('Alice@[192.168.2.1]'),		// IPv4
-			//array('Bob@[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]'), // IPv6
-			
-			// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
-			array('l3tt3rsAndNumb3rs@domain.com'),
-			array('has-dash@domain.com'),
-			array('hasApostrophe.o\'leary@domain.org'),
-			array('uncommonTLD@domain.museum'),
-			array('uncommonTLD@domain.travel'),
-			array('uncommonTLD@domain.mobi'),
-			array('countryCodeTLD@domain.uk'),
-			array('countryCodeTLD@domain.rw'),
-			array('numbersInDomain@911.com'),
-			array('underscore_inLocal@domain.net'),
-			array('IPInsteadOfDomain@127.0.0.1'),
-			array('IPAndPort@127.0.0.1:25'),
-			array('subdomain@sub.domain.com'),
-			array('local@dash-inDomain.com'),
-			array('dot.inLocal@foo.com'),
-			array('a@singleLetterLocal.org'),
-			array('singleLetterDomain@x.org'),
-			array('&amp;*=?^+{}\'~@validCharsInLocal.net'),
-			array('foor@bar.newTLD'),
-		);
-	}
-
-	public function negative_match_data()
-	{
-		return array(
-			array('foo.example.com'),			// @ is missing
-			array('.foo.example.com'),			// . as first character
-			array('Foo.@example.com'),			// . is last in local part
-			array('foo..123@example.com'),		// . doubled
-			array('a@b@c@example.com'),			// @ doubled
-
-			array('()[]\;:,<>@example.com'),	// invalid characters
-			array('abc(def@example.com'),		// invalid character (
-			array('abc)def@example.com'),		// invalid character )
-			array('abc[def@example.com'),		// invalid character [
-			array('abc]def@example.com'),		// invalid character ]
-			array('abc\def@example.com'),		// invalid character \
-			array('abc;def@example.com'),		// invalid character ;
-			array('abc:def@example.com'),		// invalid character :
-			array('abc,def@example.com'),		// invalid character ,
-			array('abc<def@example.com'),		// invalid character <
-			array('abc>def@example.com'),		// invalid character >
-			
-			// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
-			array('missingDomain@.com'),
-			array('@missingLocal.org'),
-			array('missingatSign.net'),
-			array('missingDot@com'),
-			array('two@@signs.com'),
-			array('colonButNoPort@127.0.0.1:'),
-			array(''),
-			array('someone-else@127.0.0.1.26'),
-			array('.localStartsWithDot@domain.com'),
-			array('localEndsWithDot.@domain.com'),
-			array('two..consecutiveDots@domain.com'),
-			array('domainStartsWithDash@-domain.com'),
-			array('domainEndsWithDash@domain-.com'),
-			array('numbersInTLD@domain.c0m'),
-			array('missingTLD@domain.'),
-			array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
-			array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
-			array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
-		);
-	}
-
-	/**
-	* @dataProvider positive_match_data
-	*/
-	public function test_positive_match($email)
-	{
-		$this->assertEquals(1, preg_match($this->regex, $email));
-	}
-
-	/**
-	* @dataProvider negative_match_data
-	*/
-	public function test_negative_match($email)
-	{
-		$this->assertEquals(0, preg_match($this->regex, $email));
-	}
-}
-
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
new file mode 100644
index 0000000000..5d6e207cbb
--- /dev/null
+++ b/tests/regex/email_test.php
@@ -0,0 +1,118 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_email_test extends phpbb_test_case
+{
+	protected $regex;
+
+	public function setUp()
+	{
+		$this->regex = '#^' . get_preg_expression('email') . '$#i';
+	}
+
+	public function positive_match_data()
+	{
+		return array(
+			array('nobody@phpbb.com'),
+			array('Nobody@sub.phpbb.com'),
+			array('alice.bob@foo.phpbb.com'),
+			array('alice-foo@bar.phpbb.com'),
+			array('alice_foo@bar.phpbb.com'),
+			array('alice+tag@foo.phpbb.com'),
+			array('alice&amp;tag@foo.phpbb.com'),
+
+			//array('"John Doe"@example.com'),
+			//array('Alice@[192.168.2.1]'),		// IPv4
+			//array('Bob@[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]'), // IPv6
+			
+			// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
+			array('l3tt3rsAndNumb3rs@domain.com'),
+			array('has-dash@domain.com'),
+			array('hasApostrophe.o\'leary@domain.org'),
+			array('uncommonTLD@domain.museum'),
+			array('uncommonTLD@domain.travel'),
+			array('uncommonTLD@domain.mobi'),
+			array('countryCodeTLD@domain.uk'),
+			array('countryCodeTLD@domain.rw'),
+			array('numbersInDomain@911.com'),
+			array('underscore_inLocal@domain.net'),
+			array('IPInsteadOfDomain@127.0.0.1'),
+			array('IPAndPort@127.0.0.1:25'),
+			array('subdomain@sub.domain.com'),
+			array('local@dash-inDomain.com'),
+			array('dot.inLocal@foo.com'),
+			array('a@singleLetterLocal.org'),
+			array('singleLetterDomain@x.org'),
+			array('&amp;*=?^+{}\'~@validCharsInLocal.net'),
+			array('foor@bar.newTLD'),
+		);
+	}
+
+	public function negative_match_data()
+	{
+		return array(
+			array('foo.example.com'),			// @ is missing
+			array('.foo.example.com'),			// . as first character
+			array('Foo.@example.com'),			// . is last in local part
+			array('foo..123@example.com'),		// . doubled
+			array('a@b@c@example.com'),			// @ doubled
+
+			array('()[]\;:,<>@example.com'),	// invalid characters
+			array('abc(def@example.com'),		// invalid character (
+			array('abc)def@example.com'),		// invalid character )
+			array('abc[def@example.com'),		// invalid character [
+			array('abc]def@example.com'),		// invalid character ]
+			array('abc\def@example.com'),		// invalid character \
+			array('abc;def@example.com'),		// invalid character ;
+			array('abc:def@example.com'),		// invalid character :
+			array('abc,def@example.com'),		// invalid character ,
+			array('abc<def@example.com'),		// invalid character <
+			array('abc>def@example.com'),		// invalid character >
+			
+			// http://fightingforalostcause.net/misc/2006/compare-email-regex.php
+			array('missingDomain@.com'),
+			array('@missingLocal.org'),
+			array('missingatSign.net'),
+			array('missingDot@com'),
+			array('two@@signs.com'),
+			array('colonButNoPort@127.0.0.1:'),
+			array(''),
+			array('someone-else@127.0.0.1.26'),
+			array('.localStartsWithDot@domain.com'),
+			array('localEndsWithDot.@domain.com'),
+			array('two..consecutiveDots@domain.com'),
+			array('domainStartsWithDash@-domain.com'),
+			array('domainEndsWithDash@domain-.com'),
+			array('numbersInTLD@domain.c0m'),
+			array('missingTLD@domain.'),
+			array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
+			array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
+			array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
+		);
+	}
+
+	/**
+	* @dataProvider positive_match_data
+	*/
+	public function test_positive_match($email)
+	{
+		$this->assertEquals(1, preg_match($this->regex, $email));
+	}
+
+	/**
+	* @dataProvider negative_match_data
+	*/
+	public function test_negative_match($email)
+	{
+		$this->assertEquals(0, preg_match($this->regex, $email));
+	}
+}
+
diff --git a/tests/regex/ipv4.php b/tests/regex/ipv4.php
deleted file mode 100644
index 735a2c4384..0000000000
--- a/tests/regex/ipv4.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_regex_ipv4_test extends phpbb_test_case
-{
-	protected $regex;
-
-	public function setUp()
-	{
-		$this->regex = get_preg_expression('ipv4');
-	}
-
-	public function positive_match_data()
-	{
-		return array(
-			array('0.0.0.0'),
-			array('127.0.0.1'),
-			array('192.168.0.1'),
-			array('255.255.255.255'),
-		);
-	}
-
-	public function negative_match_data()
-	{
-		return array(
-			// IPv6 addresses
-			array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
-			array('2001:db8:85a3:c:d:8a2e:370:1337'),
-			array('2001:db8:85a3::8a2e:370:1337'),
-			array('2001:db8:0:1::192.168.0.2'),
-			array('0:0:0:0:0:0:0:1'),
-			array('0:0::0:0:1'),
-			array('::1'),
-
-			// Out of scope
-			array('255.255.255.256'),
-
-			// Other tests
-			array('a.b.c.d'),
-			array('11.22.33.'),
-			array('11.22.33'),
-			array('11.22'),
-			array('11'),
-		);
-	}
-
-	/**
-	* @dataProvider positive_match_data
-	*/
-	public function test_positive_match($address)
-	{
-		$this->assertEquals(1, preg_match($this->regex, $address));
-	}
-
-	/**
-	* @dataProvider negative_match_data
-	*/
-	public function test_negative_match($address)
-	{
-		$this->assertEquals(0, preg_match($this->regex, $address));
-	}
-}
-
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
new file mode 100644
index 0000000000..735a2c4384
--- /dev/null
+++ b/tests/regex/ipv4_test.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_ipv4_test extends phpbb_test_case
+{
+	protected $regex;
+
+	public function setUp()
+	{
+		$this->regex = get_preg_expression('ipv4');
+	}
+
+	public function positive_match_data()
+	{
+		return array(
+			array('0.0.0.0'),
+			array('127.0.0.1'),
+			array('192.168.0.1'),
+			array('255.255.255.255'),
+		);
+	}
+
+	public function negative_match_data()
+	{
+		return array(
+			// IPv6 addresses
+			array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
+			array('2001:db8:85a3:c:d:8a2e:370:1337'),
+			array('2001:db8:85a3::8a2e:370:1337'),
+			array('2001:db8:0:1::192.168.0.2'),
+			array('0:0:0:0:0:0:0:1'),
+			array('0:0::0:0:1'),
+			array('::1'),
+
+			// Out of scope
+			array('255.255.255.256'),
+
+			// Other tests
+			array('a.b.c.d'),
+			array('11.22.33.'),
+			array('11.22.33'),
+			array('11.22'),
+			array('11'),
+		);
+	}
+
+	/**
+	* @dataProvider positive_match_data
+	*/
+	public function test_positive_match($address)
+	{
+		$this->assertEquals(1, preg_match($this->regex, $address));
+	}
+
+	/**
+	* @dataProvider negative_match_data
+	*/
+	public function test_negative_match($address)
+	{
+		$this->assertEquals(0, preg_match($this->regex, $address));
+	}
+}
+
diff --git a/tests/regex/ipv6.php b/tests/regex/ipv6.php
deleted file mode 100644
index 187588f861..0000000000
--- a/tests/regex/ipv6.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_regex_ipv6_test extends phpbb_test_case
-{
-	protected $regex;
-
-	public function setUp()
-	{
-		$this->regex = get_preg_expression('ipv6');
-	}
-
-	public function positive_match_data()
-	{
-		return array(
-			// Full length IPv6 address
-			array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
-			array('0000:0000:0000:0000:0000:0000:0000:0001'),
-			array('3FFE:0b00:0000:0000:0001:0000:0000:000a'),
-			array('3ffe:0b00:0000:0000:0001:0000:0000:000a'),
-			array('2002:0db8:0000:0000:0000:dead:1337:d00d'),
-
-			// No leading zeroes in the group
-			array('2001:db8:85a3:0:0:8a2e:370:1337'),
-			array('2001:db8:85a3:c:d:8a2e:370:1337'),
-
-			// Consecutive all-zero groups
-			array('2001:db8:85a3::8a2e:370:1337'),
-			array('1::2:3:4:5:6:7'),
-			array('1::2:3:4:5:6'),
-			array('1::2:3:4:5'),
-			array('1::2:3:4'),
-			array('1::2:3'),
-			array('1::2'),
-
-			// Last 32bit in dotted quad notation
-			array('2001:db8:0:1::192.168.0.2'),
-
-			// IPv4-compatible IPv6 address
-			array('::13.1.68.3'),
-			array('0:0:0:0:0:0:13.1.68.3'),
-
-			// IPv4-mapped IPv6 address
-			array('::ffff:c000:280'),
-			array('::ffff:c000:0280'),
-			array('::ffff:192.0.2.128'),
-			array('0:0:0:0:0:ffff:c000:280'),
-			array('0:0:0:0:0:ffff:c000:0280'),
-			array('0:0:0:0:0:ffff:192.0.2.128'),
-			array('0000:0000:0000:0000:0000:ffff:c000:280'),
-			array('0000:0000:0000:0000:0000:ffff:c000:0280'),
-			array('0000:0000:0000:0000:0000:ffff:192.0.2.128'),
-
-			// No trailing zeroes
-			array('fe80::'),
-			array('2002::'),
-			array('2001:db8::'),
-			array('2001:0db8:1234::'),
-			array('1:2:3:4:5:6::'),
-			array('1:2:3:4:5::'),
-			array('1:2:3:4::'),
-			array('1:2:3::'),
-			array('1:2::'),
-
-			// No leading zeroes
-			array('::2:3:4:5:6:7:8'),
-			array('::2:3:4:5:6:7'),
-			array('::2:3:4:5:6'),
-			array('::2:3:4:5'),
-			array('::2:3:4'),
-			array('::2:3'),
-			array('::1'),
-			array('::8'),
-			array('::c'),
-			array('::abcd'),
-
-			// All zeroes
-			array('::'),
-			array('0:0:0:0:0:0:0:0'),
-			array('0000:0000:0000:0000:0000:0000:0000:0000'),
-
-			// More tests
-			array('2::10'),
-			array('0:0::0:0:1'),
-			array('0:0:0:0:0:0:0:1'),
-			array('::ffff:0:0'),
-		);
-	}
-
-	public function negative_match_data()
-	{
-		return array(
-			// Empty address
-			array(''),
-
-			// IPv4 address
-			array('192.168.0.2'),
-
-			// Out of scope
-			array('abcd:efgh:0000::0'),
-			array('::ffff:192.168.255.256'),
-
-			// Double ::
-			array('2001::23de::2002'),
-			array('3ffe:b00::1::b'),
-			array('::1111:2222:3333:4444:5555:6666::'),
-
-			// Too many blocks
-			array('2001:0db8:85a3:08d3:1319:8a2e:0370:1337:4430'),
-
-			// More tests
-			array('02001:0000:1234:0000:0000:C1C0:ABCD:9876'),
-			array('2001:0000:1234: 0000:0000:C1C0:ABCD:9876'),
-			array('::ffff:192x168.255.255'),
-		);
-	}
-
-	/**
-	* @dataProvider positive_match_data
-	*/
-	public function test_positive_match($address)
-	{
-		$this->assertEquals(1, preg_match($this->regex, $address));
-	}
-
-	/**
-	* @dataProvider negative_match_data
-	*/
-	public function test_negative_match($address)
-	{
-		$this->assertEquals(0, preg_match($this->regex, $address));
-	}
-}
-
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
new file mode 100644
index 0000000000..187588f861
--- /dev/null
+++ b/tests/regex/ipv6_test.php
@@ -0,0 +1,142 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_ipv6_test extends phpbb_test_case
+{
+	protected $regex;
+
+	public function setUp()
+	{
+		$this->regex = get_preg_expression('ipv6');
+	}
+
+	public function positive_match_data()
+	{
+		return array(
+			// Full length IPv6 address
+			array('2001:0db8:85a3:0000:0000:8a2e:0370:1337'),
+			array('0000:0000:0000:0000:0000:0000:0000:0001'),
+			array('3FFE:0b00:0000:0000:0001:0000:0000:000a'),
+			array('3ffe:0b00:0000:0000:0001:0000:0000:000a'),
+			array('2002:0db8:0000:0000:0000:dead:1337:d00d'),
+
+			// No leading zeroes in the group
+			array('2001:db8:85a3:0:0:8a2e:370:1337'),
+			array('2001:db8:85a3:c:d:8a2e:370:1337'),
+
+			// Consecutive all-zero groups
+			array('2001:db8:85a3::8a2e:370:1337'),
+			array('1::2:3:4:5:6:7'),
+			array('1::2:3:4:5:6'),
+			array('1::2:3:4:5'),
+			array('1::2:3:4'),
+			array('1::2:3'),
+			array('1::2'),
+
+			// Last 32bit in dotted quad notation
+			array('2001:db8:0:1::192.168.0.2'),
+
+			// IPv4-compatible IPv6 address
+			array('::13.1.68.3'),
+			array('0:0:0:0:0:0:13.1.68.3'),
+
+			// IPv4-mapped IPv6 address
+			array('::ffff:c000:280'),
+			array('::ffff:c000:0280'),
+			array('::ffff:192.0.2.128'),
+			array('0:0:0:0:0:ffff:c000:280'),
+			array('0:0:0:0:0:ffff:c000:0280'),
+			array('0:0:0:0:0:ffff:192.0.2.128'),
+			array('0000:0000:0000:0000:0000:ffff:c000:280'),
+			array('0000:0000:0000:0000:0000:ffff:c000:0280'),
+			array('0000:0000:0000:0000:0000:ffff:192.0.2.128'),
+
+			// No trailing zeroes
+			array('fe80::'),
+			array('2002::'),
+			array('2001:db8::'),
+			array('2001:0db8:1234::'),
+			array('1:2:3:4:5:6::'),
+			array('1:2:3:4:5::'),
+			array('1:2:3:4::'),
+			array('1:2:3::'),
+			array('1:2::'),
+
+			// No leading zeroes
+			array('::2:3:4:5:6:7:8'),
+			array('::2:3:4:5:6:7'),
+			array('::2:3:4:5:6'),
+			array('::2:3:4:5'),
+			array('::2:3:4'),
+			array('::2:3'),
+			array('::1'),
+			array('::8'),
+			array('::c'),
+			array('::abcd'),
+
+			// All zeroes
+			array('::'),
+			array('0:0:0:0:0:0:0:0'),
+			array('0000:0000:0000:0000:0000:0000:0000:0000'),
+
+			// More tests
+			array('2::10'),
+			array('0:0::0:0:1'),
+			array('0:0:0:0:0:0:0:1'),
+			array('::ffff:0:0'),
+		);
+	}
+
+	public function negative_match_data()
+	{
+		return array(
+			// Empty address
+			array(''),
+
+			// IPv4 address
+			array('192.168.0.2'),
+
+			// Out of scope
+			array('abcd:efgh:0000::0'),
+			array('::ffff:192.168.255.256'),
+
+			// Double ::
+			array('2001::23de::2002'),
+			array('3ffe:b00::1::b'),
+			array('::1111:2222:3333:4444:5555:6666::'),
+
+			// Too many blocks
+			array('2001:0db8:85a3:08d3:1319:8a2e:0370:1337:4430'),
+
+			// More tests
+			array('02001:0000:1234:0000:0000:C1C0:ABCD:9876'),
+			array('2001:0000:1234: 0000:0000:C1C0:ABCD:9876'),
+			array('::ffff:192x168.255.255'),
+		);
+	}
+
+	/**
+	* @dataProvider positive_match_data
+	*/
+	public function test_positive_match($address)
+	{
+		$this->assertEquals(1, preg_match($this->regex, $address));
+	}
+
+	/**
+	* @dataProvider negative_match_data
+	*/
+	public function test_negative_match($address)
+	{
+		$this->assertEquals(0, preg_match($this->regex, $address));
+	}
+}
+
diff --git a/tests/regex/url.php b/tests/regex/url.php
deleted file mode 100644
index 246cbf549c..0000000000
--- a/tests/regex/url.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-
-class phpbb_regex_url_test extends phpbb_test_case
-{
-	public function url_test_data()
-	{
-		return array(
-			array('http://www.phpbb.com/community/', 1),
-			array('http://www.phpbb.com/path/file.ext#section', 1),
-			array('ftp://ftp.phpbb.com/', 1),
-			array('sip://bantu@phpbb.com', 1),
-
-			array('www.phpbb.com/community/', 0),
-		);
-	}
-
-	/**
-	* @dataProvider url_test_data
-	*/
-	public function test_url($url, $expected)
-	{
-		$this->assertEquals($expected, preg_match('#^' . get_preg_expression('url') . '$#i', $url));
-	}
-}
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
new file mode 100644
index 0000000000..246cbf549c
--- /dev/null
+++ b/tests/regex/url_test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_url_test extends phpbb_test_case
+{
+	public function url_test_data()
+	{
+		return array(
+			array('http://www.phpbb.com/community/', 1),
+			array('http://www.phpbb.com/path/file.ext#section', 1),
+			array('ftp://ftp.phpbb.com/', 1),
+			array('sip://bantu@phpbb.com', 1),
+
+			array('www.phpbb.com/community/', 0),
+		);
+	}
+
+	/**
+	* @dataProvider url_test_data
+	*/
+	public function test_url($url, $expected)
+	{
+		$this->assertEquals($expected, preg_match('#^' . get_preg_expression('url') . '$#i', $url));
+	}
+}
diff --git a/tests/request/request_var.php b/tests/request/request_var.php
deleted file mode 100644
index 0901b43920..0000000000
--- a/tests/request/request_var.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
-
-class phpbb_request_request_var_test extends phpbb_test_case
-{
-	/**
-	* @dataProvider request_variables
-	*/
-	public function test_post($variable_value, $default, $multibyte, $expected)
-	{
-		$variable_name = 'name';
-		$this->unset_variables($variable_name);
-
-		$_POST[$variable_name] = $variable_value;
-		$_REQUEST[$variable_name] = $variable_value;
-
-		$result = request_var($variable_name, $default, $multibyte);
-
-		$label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
-		$this->assertEquals($expected, $result, $label);
-	}
-
-	/**
-	* @dataProvider request_variables
-	*/
-	public function test_get($variable_value, $default, $multibyte, $expected)
-	{
-		$variable_name = 'name';
-		$this->unset_variables($variable_name);
-
-		$_GET[$variable_name] = $variable_value;
-		$_REQUEST[$variable_name] = $variable_value;
-
-		$result = request_var($variable_name, $default, $multibyte);
-
-		$label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
-		$this->assertEquals($expected, $result, $label);
-	}
-
-	/**
-	* @dataProvider request_variables
-	*/
-	public function test_cookie($variable_value, $default, $multibyte, $expected)
-	{
-		$variable_name = 'name';
-		$this->unset_variables($variable_name);
-
-		$_GET[$variable_name] = false;
-		$_POST[$variable_name] = false;
-		$_REQUEST[$variable_name] = false;
-		$_COOKIE[$variable_name] = $variable_value;
-
-		$result = request_var($variable_name, $default, $multibyte, true);
-
-		$label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
-		$this->assertEquals($expected, $result, $label);
-	}
-
-	/**
-	* Helper for unsetting globals
-	*/
-	private function unset_variables($var)
-	{
-		unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
-	}
-
-	public static function request_variables()
-	{
-		return array(
-			// strings
-			array('abc', '', false, 'abc'),
-			array('  some  spaces  ', '', true, 'some  spaces'),
-			array("\r\rsome\rcarriage\r\rreturns\r", '', true, "some\ncarriage\n\nreturns"),
-			array("\n\nsome\ncarriage\n\nreturns\n", '', true, "some\ncarriage\n\nreturns"),
-			array("\r\n\r\nsome\r\ncarriage\r\n\r\nreturns\r\n", '', true, "some\ncarriage\n\nreturns"),
-			array("we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters", '', true, "we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters"),
-			array("we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters", '', false, "we??rd???ch??r??acters"),
-			array("Some <html> \"entities\" like &", '', true, "Some &lt;html&gt; &quot;entities&quot; like &amp;"),
-
-			// integers
-			array('1234', 0, false, 1234),
-			array('abc', 12, false, 0),
-			array('324abc', 0, false, 324),
-
-			// string to array
-			array('123', array(0), false, array()),
-			array('123', array(''), false, array()),
-
-			// 1 dimensional arrays
-			array(
-				// input:
-				array('123', 'abc'),
-				// default:
-				array(''),
-				false,
-				// expected:
-				array('123', 'abc')
-			),
-			array(
-				// input:
-				array('123', 'abc'),
-				// default:
-				array(999),
-				false,
-				// expected:
-				array(123, 0)
-			),
-			array(
-				// input:
-				array('xyz' => '123', 'abc' => 'abc'),
-				// default:
-				array('' => ''),
-				false,
-				// expected:
-				array('xyz' => '123', 'abc' => 'abc')
-			),
-			array(
-				// input:
-				array('xyz' => '123', 'abc' => 'abc'),
-				// default:
-				array('' => 0),
-				false,
-				// expected:
-				array('xyz' => 123, 'abc' => 0)
-			),
-
-			// 2 dimensional arrays
-			array(
-				// input:
-				'',
-				// default:
-				array(array(0)),
-				false,
-				// expected:
-				array()
-			),
-			array(
-				// input:
-				array(
-					'xyz' => array('123', 'def'),
-					'abc' => 'abc'
-				),
-				// default:
-				array('' => array('')),
-				false,
-				// expected:
-				array(
-					'xyz' => array('123', 'def'),
-					'abc' => array()
-				)
-			),
-			array(
-				// input:
-				array(
-					'xyz' => array('123', 'def'),
-					'abc' => 'abc'
-				),
-				// default:
-				array('' => array(0)),
-				false,
-				// expected:
-				array(
-					'xyz' => array(123, 0),
-					'abc' => array()
-				)
-			),
-		);
-	}
-
-}
-
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
new file mode 100644
index 0000000000..0901b43920
--- /dev/null
+++ b/tests/request/request_var_test.php
@@ -0,0 +1,180 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+
+class phpbb_request_request_var_test extends phpbb_test_case
+{
+	/**
+	* @dataProvider request_variables
+	*/
+	public function test_post($variable_value, $default, $multibyte, $expected)
+	{
+		$variable_name = 'name';
+		$this->unset_variables($variable_name);
+
+		$_POST[$variable_name] = $variable_value;
+		$_REQUEST[$variable_name] = $variable_value;
+
+		$result = request_var($variable_name, $default, $multibyte);
+
+		$label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
+		$this->assertEquals($expected, $result, $label);
+	}
+
+	/**
+	* @dataProvider request_variables
+	*/
+	public function test_get($variable_value, $default, $multibyte, $expected)
+	{
+		$variable_name = 'name';
+		$this->unset_variables($variable_name);
+
+		$_GET[$variable_name] = $variable_value;
+		$_REQUEST[$variable_name] = $variable_value;
+
+		$result = request_var($variable_name, $default, $multibyte);
+
+		$label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
+		$this->assertEquals($expected, $result, $label);
+	}
+
+	/**
+	* @dataProvider request_variables
+	*/
+	public function test_cookie($variable_value, $default, $multibyte, $expected)
+	{
+		$variable_name = 'name';
+		$this->unset_variables($variable_name);
+
+		$_GET[$variable_name] = false;
+		$_POST[$variable_name] = false;
+		$_REQUEST[$variable_name] = false;
+		$_COOKIE[$variable_name] = $variable_value;
+
+		$result = request_var($variable_name, $default, $multibyte, true);
+
+		$label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : '');
+		$this->assertEquals($expected, $result, $label);
+	}
+
+	/**
+	* Helper for unsetting globals
+	*/
+	private function unset_variables($var)
+	{
+		unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
+	}
+
+	public static function request_variables()
+	{
+		return array(
+			// strings
+			array('abc', '', false, 'abc'),
+			array('  some  spaces  ', '', true, 'some  spaces'),
+			array("\r\rsome\rcarriage\r\rreturns\r", '', true, "some\ncarriage\n\nreturns"),
+			array("\n\nsome\ncarriage\n\nreturns\n", '', true, "some\ncarriage\n\nreturns"),
+			array("\r\n\r\nsome\r\ncarriage\r\n\r\nreturns\r\n", '', true, "some\ncarriage\n\nreturns"),
+			array("we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters", '', true, "we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters"),
+			array("we\xC2\xA1rd\xE1\x9A\x80ch\xCE\xB1r\xC2\xADacters", '', false, "we??rd???ch??r??acters"),
+			array("Some <html> \"entities\" like &", '', true, "Some &lt;html&gt; &quot;entities&quot; like &amp;"),
+
+			// integers
+			array('1234', 0, false, 1234),
+			array('abc', 12, false, 0),
+			array('324abc', 0, false, 324),
+
+			// string to array
+			array('123', array(0), false, array()),
+			array('123', array(''), false, array()),
+
+			// 1 dimensional arrays
+			array(
+				// input:
+				array('123', 'abc'),
+				// default:
+				array(''),
+				false,
+				// expected:
+				array('123', 'abc')
+			),
+			array(
+				// input:
+				array('123', 'abc'),
+				// default:
+				array(999),
+				false,
+				// expected:
+				array(123, 0)
+			),
+			array(
+				// input:
+				array('xyz' => '123', 'abc' => 'abc'),
+				// default:
+				array('' => ''),
+				false,
+				// expected:
+				array('xyz' => '123', 'abc' => 'abc')
+			),
+			array(
+				// input:
+				array('xyz' => '123', 'abc' => 'abc'),
+				// default:
+				array('' => 0),
+				false,
+				// expected:
+				array('xyz' => 123, 'abc' => 0)
+			),
+
+			// 2 dimensional arrays
+			array(
+				// input:
+				'',
+				// default:
+				array(array(0)),
+				false,
+				// expected:
+				array()
+			),
+			array(
+				// input:
+				array(
+					'xyz' => array('123', 'def'),
+					'abc' => 'abc'
+				),
+				// default:
+				array('' => array('')),
+				false,
+				// expected:
+				array(
+					'xyz' => array('123', 'def'),
+					'abc' => array()
+				)
+			),
+			array(
+				// input:
+				array(
+					'xyz' => array('123', 'def'),
+					'abc' => 'abc'
+				),
+				// default:
+				array('' => array(0)),
+				false,
+				// expected:
+				array(
+					'xyz' => array(123, 0),
+					'abc' => array()
+				)
+			),
+		);
+	}
+
+}
+
diff --git a/tests/security/extract_current_page.php b/tests/security/extract_current_page.php
deleted file mode 100644
index ff0ab4d1bb..0000000000
--- a/tests/security/extract_current_page.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/base.php';
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
-
-class phpbb_security_extract_current_page_test extends phpbb_security_test_base
-{
-	public static function security_variables()
-	{
-		return array(
-			array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),
-			array('http://localhost/phpBB/index.php', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),
-		);
-	}
-
-	/**
-	* @dataProvider security_variables
-	*/
-	public function test_query_string_php_self($url, $query_string, $expected)
-	{
-		$_SERVER['PHP_SELF'] = $url;
-		$_SERVER['QUERY_STRING'] = $query_string;
-
-		$result = session::extract_current_page('./');
-
-		$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';
-		$this->assertEquals($expected, $result['query_string'], $label);
-	}
-
-	/**
-	* @dataProvider security_variables
-	*/
-	public function test_query_string_request_uri($url, $query_string, $expected)
-	{
-		$_SERVER['REQUEST_URI'] = $url . '?' . $query_string;
-		$_SERVER['QUERY_STRING'] = $query_string;
-
-		$result = session::extract_current_page('./');
-
-		$label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.';
-		$this->assertEquals($expected, $result['query_string'], $label);
-	}
-}
-
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
new file mode 100644
index 0000000000..ff0ab4d1bb
--- /dev/null
+++ b/tests/security/extract_current_page_test.php
@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/base.php';
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
+
+class phpbb_security_extract_current_page_test extends phpbb_security_test_base
+{
+	public static function security_variables()
+	{
+		return array(
+			array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),
+			array('http://localhost/phpBB/index.php', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),
+		);
+	}
+
+	/**
+	* @dataProvider security_variables
+	*/
+	public function test_query_string_php_self($url, $query_string, $expected)
+	{
+		$_SERVER['PHP_SELF'] = $url;
+		$_SERVER['QUERY_STRING'] = $query_string;
+
+		$result = session::extract_current_page('./');
+
+		$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';
+		$this->assertEquals($expected, $result['query_string'], $label);
+	}
+
+	/**
+	* @dataProvider security_variables
+	*/
+	public function test_query_string_request_uri($url, $query_string, $expected)
+	{
+		$_SERVER['REQUEST_URI'] = $url . '?' . $query_string;
+		$_SERVER['QUERY_STRING'] = $query_string;
+
+		$result = session::extract_current_page('./');
+
+		$label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.';
+		$this->assertEquals($expected, $result['query_string'], $label);
+	}
+}
+
diff --git a/tests/security/redirect.php b/tests/security/redirect.php
deleted file mode 100644
index c53414e7df..0000000000
--- a/tests/security/redirect.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/base.php';
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
-
-class phpbb_security_redirect_test extends phpbb_security_test_base
-{
-	public static function provider()
-	{
-		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
-		return array(
-			array('data://x', false, 'http://localhost/phpBB'),
-			array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false),
-			array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
-			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false),
-			array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
-			array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
-		);
-	}
-
-	protected function setUp()
-	{
-		parent::setUp();
-		
-		$GLOBALS['config'] = array(
-			'force_server_vars'	=> '0',
-		);
-	}
-
-	/**
-	* @dataProvider provider
-	*/
-	public function test_redirect($test, $expected_error, $expected_result)
-	{
-		global $user;
-
-		if ($expected_error !== false)
-		{
-			$this->setExpectedTriggerError(E_USER_ERROR, $expected_error);
-		}
-
-		$result = redirect($test, true);
-
-		// only verify result if we did not expect an error
-		if ($expected_error === false)
-		{
-			$this->assertEquals($expected_result, $result);
-		}
-	}
-}
-
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
new file mode 100644
index 0000000000..c53414e7df
--- /dev/null
+++ b/tests/security/redirect_test.php
@@ -0,0 +1,60 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/base.php';
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/session.php';
+
+class phpbb_security_redirect_test extends phpbb_security_test_base
+{
+	public static function provider()
+	{
+		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
+		return array(
+			array('data://x', false, 'http://localhost/phpBB'),
+			array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false),
+			array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
+			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false),
+			array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
+			array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
+		);
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+		
+		$GLOBALS['config'] = array(
+			'force_server_vars'	=> '0',
+		);
+	}
+
+	/**
+	* @dataProvider provider
+	*/
+	public function test_redirect($test, $expected_error, $expected_result)
+	{
+		global $user;
+
+		if ($expected_error !== false)
+		{
+			$this->setExpectedTriggerError(E_USER_ERROR, $expected_error);
+		}
+
+		$result = redirect($test, true);
+
+		// only verify result if we did not expect an error
+		if ($expected_error === false)
+		{
+			$this->assertEquals($expected_result, $result);
+		}
+	}
+}
+
diff --git a/tests/template/template.php b/tests/template/template.php
deleted file mode 100644
index 35df17e4c6..0000000000
--- a/tests/template/template.php
+++ /dev/null
@@ -1,689 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/template.php';
-
-class phpbb_template_template_test extends phpbb_test_case
-{
-	private $template;
-	private $template_path;
-
-	// Keep the contents of the cache for debugging?
-	const PRESERVE_CACHE = true;
-
-	private function display($handle)
-	{
-		// allow the templates to throw notices
-		$error_level = error_reporting();
-		error_reporting($error_level & ~E_NOTICE);
-
-		ob_start();
-
-		try
-		{
-			$this->assertTrue($this->template->display($handle, false));
-		}
-		catch (Exception $exception)
-		{
-			// reset the error level even when an error occured
-			// PHPUnit turns trigger_error into exceptions as well
-			error_reporting($error_level);
-			ob_end_clean();
-			throw $exception;
-		}
-
-		$result = self::trim_template_result(ob_get_clean());
-
-		// reset error level
-		error_reporting($error_level);
-		return $result;
-	}
-
-	private static function trim_template_result($result)
-	{
-		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result)))));
-	}
-
-	private function setup_engine()
-	{
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->template = new template();
-		$this->template->set_custom_template($this->template_path, 'tests');
-	}
-
-	protected function setUp()
-	{
-		// Test the engine can be used
-		$this->setup_engine();
-
-		if (!is_writable(dirname($this->template->cachepath)))
-		{
-			$this->markTestSkipped("Template cache directory is not writable.");
-		}
-
-		foreach (glob($this->template->cachepath . '*') as $file)
-		{
-			unlink($file);
-		}
-
-		$GLOBALS['config'] = array(
-			'load_tplcompile'	=> true,
-			'tpl_allow_php'		=> false,
-		);
-	}
-
-	protected function tearDown()
-	{
-		if (is_object($this->template))
-		{
-			foreach (glob($this->template->cachepath . '*') as $file)
-			{
-				unlink($file);
-			}
-		}
-	}
-
-	/**
-	 * @todo put test data into templates/xyz.test
-	 */
-	public static function template_data()
-	{
-		return array(
-			/*
-			array(
-				'', // File
-				array(), // vars
-				array(), // block vars
-				array(), // destroy
-				'', // Expected result
-			),
-			*/
-			array(
-				'basic.html',
-				array(),
-				array(),
-				array(),
-				"pass\npass\n<!-- DUMMY var -->",
-			),
-			array(
-				'variable.html',
-				array('VARIABLE' => 'value'),
-				array(),
-				array(),
-				'value',
-			),
-			array(
-				'if.html',
-				array(),
-				array(),
-				array(),
-				'0',
-			),
-			array(
-				'if.html',
-				array('S_VALUE' => true),
-				array(),
-				array(),
-				"1\n0",
-			),
-			array(
-				'if.html',
-				array('S_VALUE' => true, 'S_OTHER_VALUE' => true),
-				array(),
-				array(),
-				'1',
-			),
-			array(
-				'if.html',
-				array('S_VALUE' => false, 'S_OTHER_VALUE' => true),
-				array(),
-				array(),
-				'2',
-			),
-			array(
-				'loop.html',
-				array(),
-				array(),
-				array(),
-				"noloop\nnoloop",
-			),
-			array(
-				'loop.html',
-				array(),
-				array('loop' => array(array())),
-				array(),
-				"loop\nloop",
-			),
-			array(
-				'loop.html',
-				array(),
-				array('loop' => array(array(), array()), 'loop.block' => array(array())),
-				array(),
-				"loop\nloop\nloop\nloop",
-			),
-			array(
-				'loop.html',
-				array(),
-				array('loop' => array(array(), array()), 'loop.block' => array(array()), 'block' => array(array(), array())),
-				array(),
-				"loop\nloop\nloop\nloop\nloop#0-block#0\nloop#0-block#1\nloop#1-block#0\nloop#1-block#1",
-			),
-			array(
-				'loop_vars.html',
-				array(),
-				array('loop' => array(array('VARIABLE' => 'x'))),
-				array(),
-				"first\n0\nx\nset\nlast",
-			),/* no nested top level loops
-			array(
-				'loop_vars.html',
-				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
-				array(),
-				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
-			),
-			array(
-				'loop_vars.html',
-				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
-				array(),
-				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast\n0\n\n1\nlast inner\ninner loop",
-			),*/
-			array(
-				'loop_advanced.html',
-				array(),
-				array('loop' => array(array(), array(), array(), array(), array(), array(), array())),
-				array(),
-				"101234561\nx\n101234561\nx\n101234561\nx\n1234561\nx\n1\nx\n101\nx\n234\nx\n10\nx\n561\nx\n561",
-			),
-			array(
-				'define.html',
-				array(),
-				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
-				array(),
-				"xyz\nabc",
-			),
-			array(
-				'expressions.html',
-				array(),
-				array(),
-				array(),
-				trim(str_repeat("pass", 39)),
-			),
-			array(
-				'php.html',
-				array(),
-				array(),
-				array(),
-				'',
-			),
-			array(
-				'include.html',
-				array('VARIABLE' => 'value'),
-				array(),
-				array(),
-				'value',
-			),
-			array(
-				'loop_vars.html',
-				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
-				array('loop'),
-				'',
-			),/* no top level nested loops
-			array(
-				'loop_vars.html',
-				array(),
-				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
-				array('loop.inner'),
-				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
-			),*/
-			array(
-				'lang.html',
-				array(),
-				array(),
-				array(),
-				"{ VARIABLE }\n{ VARIABLE }",
-			),
-			array(
-				'lang.html',
-				array('L_VARIABLE' => "Value'"),
-				array(),
-				array(),
-				"Value'\nValue\'",
-			),
-			array(
-				'lang.html',
-				array('LA_VARIABLE' => "Value'"),
-				array(),
-				array(),
-				"{ VARIABLE }\nValue'",
-			),
-		);
-	}
-
-	public function test_missing_file()
-	{
-		$filename = 'file_not_found.html';
-
-		$this->template->set_filenames(array('test' => $filename));
-		$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
-
-		$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename);
-		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
-
-		$this->display('test');
-	}
-
-	public function test_empty_file()
-	{
-		$expecting = 'template->set_filenames: Empty filename specified for test';
-
-		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
-		$this->template->set_filenames(array('test' => ''));
-	}
-
-	public function test_invalid_handle()
-	{
-		$expecting = 'template->_tpl_load(): No file specified for handle test';
-		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
-
-		$this->display('test');
-	}
-
-	private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
-	{
-		$this->template->set_filenames(array('test' => $file));
-		$this->template->assign_vars($vars);
-
-		foreach ($block_vars as $block => $loops)
-		{
-			foreach ($loops as $_vars)
-			{
-				$this->template->assign_block_vars($block, $_vars);
-			}
-		}
-
-		foreach ($destroy as $block)
-		{
-			$this->template->destroy_block_vars($block);
-		}
-
-		try
-		{
-			$this->assertEquals($expected, $this->display('test'), "Testing $file");
-			$this->assertFileExists($cache_file);
-		}
-		catch (ErrorException $e)
-		{
-			if (file_exists($cache_file))
-			{
-				copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
-			}
-
-			throw $e;
-		}
-
-		// For debugging
-		if (self::PRESERVE_CACHE)
-		{
-			copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
-		}
-	}
-
-	/**
-	* @dataProvider template_data
-	*/
-	public function test_template($file, array $vars, array $block_vars, array $destroy, $expected)
-	{
-		global $phpEx;
-		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.' . $phpEx;
-
-		$this->assertFileNotExists($cache_file);
-
-		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
-
-		// Reset the engine state
-		$this->setup_engine();
-
-		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
-	}
-
-	/**
-	* @dataProvider template_data
-	*/
-	public function test_assign_display($file, array $vars, array $block_vars, array $destroy, $expected)
-	{
-		$this->template->set_filenames(array(
-			'test' => $file,
-			'container' => 'variable.html',
-		));
-		$this->template->assign_vars($vars);
-
-		foreach ($block_vars as $block => $loops)
-		{
-			foreach ($loops as $_vars)
-			{
-				$this->template->assign_block_vars($block, $_vars);
-			}
-		}
-
-		foreach ($destroy as $block)
-		{
-			$this->template->destroy_block_vars($block);
-		}
-
-		$error_level = error_reporting();
-		error_reporting($error_level & ~E_NOTICE);
-
-		$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)");
-
-		$this->template->assign_display('test', 'VARIABLE', false);
-
-		error_reporting($error_level);
-
-		$this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)");
-	}
-
-	public function test_php()
-	{
-		global $phpEx;
-
-		$GLOBALS['config']['tpl_allow_php'] = true;
-
-		$cache_file = $this->template->cachepath . 'php.html.' . $phpEx;
-
-		$this->assertFileNotExists($cache_file);
-
-		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
-
-		$GLOBALS['config']['tpl_allow_php'] = false;
-	}
-
-	public function test_includephp()
-	{
-		$this->markTestIncomplete('Include PHP test file paths are broken');
-
-		$GLOBALS['config']['tpl_allow_php'] = true;
-
-		$cache_file = $this->template->cachepath . 'includephp.html.' . PHP_EXT;
-
-		$cwd = getcwd();
-		chdir(dirname(__FILE__) . '/templates');
-
-		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file);
-
-		$this->template->set_filenames(array('test' => 'includephp.html'));
-		$this->assertEquals('testing included php', $this->display('test'), "Testing $file");
-
-		chdir($cwd);
-
-		$GLOBALS['config']['tpl_allow_php'] = false;
-	}
-
-	public static function alter_block_array_data()
-	{
-		return array(
-			array(
-				'outer',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/4 - before
-outer - 1/4
-middle - 0/2
-middle - 1/2
-outer - 2/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 3/4
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting before on top level block',
-			),
-			array(
-				'outer',
-				array('VARIABLE' => 'after'),
-				true,
-				'insert',
-				<<<EOT
-outer - 0/4
-middle - 0/2
-middle - 1/2
-outer - 1/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/4
-middle - 0/2
-middle - 1/2
-outer - 3/4 - after
-EOT
-,
-				'Test inserting after on top level block',
-			),
-			array(
-				'outer',
-				array('VARIABLE' => 'pos #1'),
-				1,
-				'insert',
-				<<<EOT
-outer - 0/4
-middle - 0/2
-middle - 1/2
-outer - 1/4 - pos #1
-outer - 2/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 3/4
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting at 1 on top level block',
-			),
-			array(
-				'outer',
-				array('VARIABLE' => 'pos #1'),
-				0,
-				'change',
-				<<<EOT
-outer - 0/3 - pos #1
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting at 1 on top level block',
-			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting before on nested block',
-			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'after'),
-				true,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3
-middle - 1/3
-middle - 2/3 - after
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting after on nested block',
-			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'pos #1'),
-				1,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3
-middle - 1/3 - pos #1
-middle - 2/3
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting at pos 1 on nested block',
-			),
-			array(
-				'outer[1].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/4 - before
-middle - 1/4
-middle - 2/4
-middle - 3/4
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting before on nested block (pos 1)',
-			),
-			array(
-				'outer[].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-EOT
-,
-				'Test inserting before on nested block (end)',
-			),
-			array(
-				'outer.middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-EOT
-,
-				'Test inserting before on nested block (end)',
-			),
-		);
-	}
-
-/*
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-*/
-
-	/**
-	* @dataProvider alter_block_array_data
-	*/
-	public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description)
-	{
-		$this->markTestIncomplete('Alter Block Test is broken');
-
-		$this->template->set_filenames(array('test' => 'loop_nested.html'));
-
-		// @todo Change this
-		$this->template->assign_block_vars('outer', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer', array());
-		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer.middle', array());
-
-		$this->assertEquals("outer - 0/3\nmiddle - 0/2\nmiddle - 1/2\nouter - 1/3\nmiddle - 0/3\nmiddle - 1/3\nmiddle - 2/3\nouter - 2/3\nmiddle - 0/2\nmiddle - 1/2", $this->display('test'), 'Ensuring template is built correctly before modification');
-
-		$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
-		$this->assertEquals($expect, $this->display('test'), $description);
-	}
-}
-
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
new file mode 100644
index 0000000000..35df17e4c6
--- /dev/null
+++ b/tests/template/template_test.php
@@ -0,0 +1,689 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/template.php';
+
+class phpbb_template_template_test extends phpbb_test_case
+{
+	private $template;
+	private $template_path;
+
+	// Keep the contents of the cache for debugging?
+	const PRESERVE_CACHE = true;
+
+	private function display($handle)
+	{
+		// allow the templates to throw notices
+		$error_level = error_reporting();
+		error_reporting($error_level & ~E_NOTICE);
+
+		ob_start();
+
+		try
+		{
+			$this->assertTrue($this->template->display($handle, false));
+		}
+		catch (Exception $exception)
+		{
+			// reset the error level even when an error occured
+			// PHPUnit turns trigger_error into exceptions as well
+			error_reporting($error_level);
+			ob_end_clean();
+			throw $exception;
+		}
+
+		$result = self::trim_template_result(ob_get_clean());
+
+		// reset error level
+		error_reporting($error_level);
+		return $result;
+	}
+
+	private static function trim_template_result($result)
+	{
+		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result)))));
+	}
+
+	private function setup_engine()
+	{
+		$this->template_path = dirname(__FILE__) . '/templates';
+		$this->template = new template();
+		$this->template->set_custom_template($this->template_path, 'tests');
+	}
+
+	protected function setUp()
+	{
+		// Test the engine can be used
+		$this->setup_engine();
+
+		if (!is_writable(dirname($this->template->cachepath)))
+		{
+			$this->markTestSkipped("Template cache directory is not writable.");
+		}
+
+		foreach (glob($this->template->cachepath . '*') as $file)
+		{
+			unlink($file);
+		}
+
+		$GLOBALS['config'] = array(
+			'load_tplcompile'	=> true,
+			'tpl_allow_php'		=> false,
+		);
+	}
+
+	protected function tearDown()
+	{
+		if (is_object($this->template))
+		{
+			foreach (glob($this->template->cachepath . '*') as $file)
+			{
+				unlink($file);
+			}
+		}
+	}
+
+	/**
+	 * @todo put test data into templates/xyz.test
+	 */
+	public static function template_data()
+	{
+		return array(
+			/*
+			array(
+				'', // File
+				array(), // vars
+				array(), // block vars
+				array(), // destroy
+				'', // Expected result
+			),
+			*/
+			array(
+				'basic.html',
+				array(),
+				array(),
+				array(),
+				"pass\npass\n<!-- DUMMY var -->",
+			),
+			array(
+				'variable.html',
+				array('VARIABLE' => 'value'),
+				array(),
+				array(),
+				'value',
+			),
+			array(
+				'if.html',
+				array(),
+				array(),
+				array(),
+				'0',
+			),
+			array(
+				'if.html',
+				array('S_VALUE' => true),
+				array(),
+				array(),
+				"1\n0",
+			),
+			array(
+				'if.html',
+				array('S_VALUE' => true, 'S_OTHER_VALUE' => true),
+				array(),
+				array(),
+				'1',
+			),
+			array(
+				'if.html',
+				array('S_VALUE' => false, 'S_OTHER_VALUE' => true),
+				array(),
+				array(),
+				'2',
+			),
+			array(
+				'loop.html',
+				array(),
+				array(),
+				array(),
+				"noloop\nnoloop",
+			),
+			array(
+				'loop.html',
+				array(),
+				array('loop' => array(array())),
+				array(),
+				"loop\nloop",
+			),
+			array(
+				'loop.html',
+				array(),
+				array('loop' => array(array(), array()), 'loop.block' => array(array())),
+				array(),
+				"loop\nloop\nloop\nloop",
+			),
+			array(
+				'loop.html',
+				array(),
+				array('loop' => array(array(), array()), 'loop.block' => array(array()), 'block' => array(array(), array())),
+				array(),
+				"loop\nloop\nloop\nloop\nloop#0-block#0\nloop#0-block#1\nloop#1-block#0\nloop#1-block#1",
+			),
+			array(
+				'loop_vars.html',
+				array(),
+				array('loop' => array(array('VARIABLE' => 'x'))),
+				array(),
+				"first\n0\nx\nset\nlast",
+			),/* no nested top level loops
+			array(
+				'loop_vars.html',
+				array(),
+				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
+				array(),
+				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
+			),
+			array(
+				'loop_vars.html',
+				array(),
+				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
+				array(),
+				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast\n0\n\n1\nlast inner\ninner loop",
+			),*/
+			array(
+				'loop_advanced.html',
+				array(),
+				array('loop' => array(array(), array(), array(), array(), array(), array(), array())),
+				array(),
+				"101234561\nx\n101234561\nx\n101234561\nx\n1234561\nx\n1\nx\n101\nx\n234\nx\n10\nx\n561\nx\n561",
+			),
+			array(
+				'define.html',
+				array(),
+				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
+				array(),
+				"xyz\nabc",
+			),
+			array(
+				'expressions.html',
+				array(),
+				array(),
+				array(),
+				trim(str_repeat("pass", 39)),
+			),
+			array(
+				'php.html',
+				array(),
+				array(),
+				array(),
+				'',
+			),
+			array(
+				'include.html',
+				array('VARIABLE' => 'value'),
+				array(),
+				array(),
+				'value',
+			),
+			array(
+				'loop_vars.html',
+				array(),
+				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
+				array('loop'),
+				'',
+			),/* no top level nested loops
+			array(
+				'loop_vars.html',
+				array(),
+				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
+				array('loop.inner'),
+				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
+			),*/
+			array(
+				'lang.html',
+				array(),
+				array(),
+				array(),
+				"{ VARIABLE }\n{ VARIABLE }",
+			),
+			array(
+				'lang.html',
+				array('L_VARIABLE' => "Value'"),
+				array(),
+				array(),
+				"Value'\nValue\'",
+			),
+			array(
+				'lang.html',
+				array('LA_VARIABLE' => "Value'"),
+				array(),
+				array(),
+				"{ VARIABLE }\nValue'",
+			),
+		);
+	}
+
+	public function test_missing_file()
+	{
+		$filename = 'file_not_found.html';
+
+		$this->template->set_filenames(array('test' => $filename));
+		$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
+
+		$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename);
+		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
+
+		$this->display('test');
+	}
+
+	public function test_empty_file()
+	{
+		$expecting = 'template->set_filenames: Empty filename specified for test';
+
+		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
+		$this->template->set_filenames(array('test' => ''));
+	}
+
+	public function test_invalid_handle()
+	{
+		$expecting = 'template->_tpl_load(): No file specified for handle test';
+		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
+
+		$this->display('test');
+	}
+
+	private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
+	{
+		$this->template->set_filenames(array('test' => $file));
+		$this->template->assign_vars($vars);
+
+		foreach ($block_vars as $block => $loops)
+		{
+			foreach ($loops as $_vars)
+			{
+				$this->template->assign_block_vars($block, $_vars);
+			}
+		}
+
+		foreach ($destroy as $block)
+		{
+			$this->template->destroy_block_vars($block);
+		}
+
+		try
+		{
+			$this->assertEquals($expected, $this->display('test'), "Testing $file");
+			$this->assertFileExists($cache_file);
+		}
+		catch (ErrorException $e)
+		{
+			if (file_exists($cache_file))
+			{
+				copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
+			}
+
+			throw $e;
+		}
+
+		// For debugging
+		if (self::PRESERVE_CACHE)
+		{
+			copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
+		}
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($file, array $vars, array $block_vars, array $destroy, $expected)
+	{
+		global $phpEx;
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.' . $phpEx;
+
+		$this->assertFileNotExists($cache_file);
+
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+
+		// Reset the engine state
+		$this->setup_engine();
+
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_assign_display($file, array $vars, array $block_vars, array $destroy, $expected)
+	{
+		$this->template->set_filenames(array(
+			'test' => $file,
+			'container' => 'variable.html',
+		));
+		$this->template->assign_vars($vars);
+
+		foreach ($block_vars as $block => $loops)
+		{
+			foreach ($loops as $_vars)
+			{
+				$this->template->assign_block_vars($block, $_vars);
+			}
+		}
+
+		foreach ($destroy as $block)
+		{
+			$this->template->destroy_block_vars($block);
+		}
+
+		$error_level = error_reporting();
+		error_reporting($error_level & ~E_NOTICE);
+
+		$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)");
+
+		$this->template->assign_display('test', 'VARIABLE', false);
+
+		error_reporting($error_level);
+
+		$this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)");
+	}
+
+	public function test_php()
+	{
+		global $phpEx;
+
+		$GLOBALS['config']['tpl_allow_php'] = true;
+
+		$cache_file = $this->template->cachepath . 'php.html.' . $phpEx;
+
+		$this->assertFileNotExists($cache_file);
+
+		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
+
+		$GLOBALS['config']['tpl_allow_php'] = false;
+	}
+
+	public function test_includephp()
+	{
+		$this->markTestIncomplete('Include PHP test file paths are broken');
+
+		$GLOBALS['config']['tpl_allow_php'] = true;
+
+		$cache_file = $this->template->cachepath . 'includephp.html.' . PHP_EXT;
+
+		$cwd = getcwd();
+		chdir(dirname(__FILE__) . '/templates');
+
+		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file);
+
+		$this->template->set_filenames(array('test' => 'includephp.html'));
+		$this->assertEquals('testing included php', $this->display('test'), "Testing $file");
+
+		chdir($cwd);
+
+		$GLOBALS['config']['tpl_allow_php'] = false;
+	}
+
+	public static function alter_block_array_data()
+	{
+		return array(
+			array(
+				'outer',
+				array('VARIABLE' => 'before'),
+				false,
+				'insert',
+				<<<EOT
+outer - 0/4 - before
+outer - 1/4
+middle - 0/2
+middle - 1/2
+outer - 2/4
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 3/4
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting before on top level block',
+			),
+			array(
+				'outer',
+				array('VARIABLE' => 'after'),
+				true,
+				'insert',
+				<<<EOT
+outer - 0/4
+middle - 0/2
+middle - 1/2
+outer - 1/4
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/4
+middle - 0/2
+middle - 1/2
+outer - 3/4 - after
+EOT
+,
+				'Test inserting after on top level block',
+			),
+			array(
+				'outer',
+				array('VARIABLE' => 'pos #1'),
+				1,
+				'insert',
+				<<<EOT
+outer - 0/4
+middle - 0/2
+middle - 1/2
+outer - 1/4 - pos #1
+outer - 2/4
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 3/4
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting at 1 on top level block',
+			),
+			array(
+				'outer',
+				array('VARIABLE' => 'pos #1'),
+				0,
+				'change',
+				<<<EOT
+outer - 0/3 - pos #1
+middle - 0/2
+middle - 1/2
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting at 1 on top level block',
+			),
+			array(
+				'outer[0].middle',
+				array('VARIABLE' => 'before'),
+				false,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/3 - before
+middle - 1/3
+middle - 2/3
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting before on nested block',
+			),
+			array(
+				'outer[0].middle',
+				array('VARIABLE' => 'after'),
+				true,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/3
+middle - 1/3
+middle - 2/3 - after
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting after on nested block',
+			),
+			array(
+				'outer[0].middle',
+				array('VARIABLE' => 'pos #1'),
+				1,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/3
+middle - 1/3 - pos #1
+middle - 2/3
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting at pos 1 on nested block',
+			),
+			array(
+				'outer[1].middle',
+				array('VARIABLE' => 'before'),
+				false,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/2
+middle - 1/2
+outer - 1/3
+middle - 0/4 - before
+middle - 1/4
+middle - 2/4
+middle - 3/4
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+				'Test inserting before on nested block (pos 1)',
+			),
+			array(
+				'outer[].middle',
+				array('VARIABLE' => 'before'),
+				false,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/2
+middle - 1/2
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/3 - before
+middle - 1/3
+middle - 2/3
+EOT
+,
+				'Test inserting before on nested block (end)',
+			),
+			array(
+				'outer.middle',
+				array('VARIABLE' => 'before'),
+				false,
+				'insert',
+				<<<EOT
+outer - 0/3
+middle - 0/2
+middle - 1/2
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/3 - before
+middle - 1/3
+middle - 2/3
+EOT
+,
+				'Test inserting before on nested block (end)',
+			),
+		);
+	}
+
+/*
+				<<<EOT
+outer - 0/3
+middle - 0/2
+middle - 1/2
+outer - 1/3
+middle - 0/3
+middle - 1/3
+middle - 2/3
+outer - 2/3
+middle - 0/2
+middle - 1/2
+EOT
+,
+*/
+
+	/**
+	* @dataProvider alter_block_array_data
+	*/
+	public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description)
+	{
+		$this->markTestIncomplete('Alter Block Test is broken');
+
+		$this->template->set_filenames(array('test' => 'loop_nested.html'));
+
+		// @todo Change this
+		$this->template->assign_block_vars('outer', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer', array());
+		$this->template->assign_block_vars('outer.middle', array());
+		$this->template->assign_block_vars('outer.middle', array());
+
+		$this->assertEquals("outer - 0/3\nmiddle - 0/2\nmiddle - 1/2\nouter - 1/3\nmiddle - 0/3\nmiddle - 1/3\nmiddle - 2/3\nouter - 2/3\nmiddle - 0/2\nmiddle - 1/2", $this->display('test'), 'Ensuring template is built correctly before modification');
+
+		$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
+		$this->assertEquals($expect, $this->display('test'), $description);
+	}
+}
+
diff --git a/tests/text_processing/make_clickable.php b/tests/text_processing/make_clickable.php
deleted file mode 100644
index 75a35daf82..0000000000
--- a/tests/text_processing/make_clickable.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
-
-class phpbb_text_processing_make_clickable_test extends phpbb_test_case
-{
-	public static function make_clickable_data()
-	{
-		// value => whether it should work
-		$prefix_texts = array(
-			'' => true,
-			"np \n" => true,
-			'bp text ' => true,
-			'cp text>' => true,
-			'ep text.' => array('w' => false), // doesn't work for www. type urls, but for everything else
-		);
-		$suffix_texts = array(
-			'' => true,
-			"\n ns" => true,
-			' bs text.' => true,
-			'&gt;cs text' => true,
-			'&quot;ds text' => true,
-			'. es text.' => true,
-			', fs text.' => true,
-		);
-
-		$urls = array(
-			'http://example.com' => array('tag' => 'm', 'url' => false, 'text' => false), // false means same as key
-			'http://example.com/' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://example.com/path?query=abc' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://example.com/1' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://example.com/some/very/long/path/with/over/55/characters?and=a&amp;long=query&amp;too=1' => array('tag' => 'm', 'url' => false, 'text' => 'http://example.com/some/very/long/path/ ... uery&amp;too=1'),
-			'http://localhost' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://localhost/#abc' => array('tag' => 'm', 'url' => false, 'text' => false),
-
-			'www.example.com/path/' => array('tag' => 'w', 'url' => 'http://www.example.com/path/', 'text' => false),
-			'randomwww.example.com/path/' => false,
-
-			'http://thisdomain.org' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://thisdomain.org/' => array('tag' => 'm', 'url' => false, 'text' => false),
-			'http://thisdomain.org/1' => array('tag' => 'l', 'url' => false, 'text' => '1'),
-			'http://thisdomain.org/path/some?query=abc#test' => array('tag' => 'l', 'url' => false, 'text' => 'path/some?query=abc#test'),
-
-			'javascript:www.example.com/' => false,
-		);
-
-		$test_data = array();
-
-		// run the test for each combination
-		foreach ($prefix_texts as $prefix => $prefix_success)
-		{
-			foreach ($suffix_texts as $suffix => $suffix_success)
-			{
-				foreach ($urls as $url => $url_type)
-				{
-					$input = $prefix . $url . $suffix;
-					// no valid url => no change
-					$output = $input;
-
-					if (
-						($prefix_success && $suffix_success && is_array($url_type)) &&
-						// handle except syntax for prefix/suffix
-						(!is_array($prefix_success) || !isset($prefix_success[$url_type['tag']]) || $prefix_success[$url_type['tag']] == true) &&
-						(!is_array($suffix_success) || !isset($suffix_success[$url_type['tag']]) || $suffix_success[$url_type['tag']] == true)
-					)
-					{
-						// false means it's the same as the url, less typing
-						$url_type['url'] = ($url_type['url']) ? $url_type['url'] : $url;
-						$url_type['text'] = ($url_type['text']) ? $url_type['text'] : $url;
-
-						$class = ($url_type['tag'] === 'l') ? 'postlink-local' : 'postlink';
-
-						// replace the url with the desired output format
-						$output = $prefix . '<!-- ' . $url_type['tag'] . ' --><a class="' . $class . '" href="' . $url_type['url'] . '">' . $url_type['text'] . '</a><!-- ' . $url_type['tag'] . ' -->' . $suffix;
-					}
-					$test_data[] = array($input, $output);
-				}
-			}
-		}
-
-		return $test_data;
-	}
-
-	/**
-	* @dataProvider make_clickable_data
-	*/
-	public function test_make_clickable($input, $expected)
-	{
-		$result = make_clickable($input, 'http://thisdomain.org');
-
-		$label = 'Making text clickable: ' . $input;
-		$this->assertEquals($expected, $result, $label);
-	}
-
-}
-
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
new file mode 100644
index 0000000000..75a35daf82
--- /dev/null
+++ b/tests/text_processing/make_clickable_test.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_text_processing_make_clickable_test extends phpbb_test_case
+{
+	public static function make_clickable_data()
+	{
+		// value => whether it should work
+		$prefix_texts = array(
+			'' => true,
+			"np \n" => true,
+			'bp text ' => true,
+			'cp text>' => true,
+			'ep text.' => array('w' => false), // doesn't work for www. type urls, but for everything else
+		);
+		$suffix_texts = array(
+			'' => true,
+			"\n ns" => true,
+			' bs text.' => true,
+			'&gt;cs text' => true,
+			'&quot;ds text' => true,
+			'. es text.' => true,
+			', fs text.' => true,
+		);
+
+		$urls = array(
+			'http://example.com' => array('tag' => 'm', 'url' => false, 'text' => false), // false means same as key
+			'http://example.com/' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://example.com/path?query=abc' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://example.com/1' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://example.com/some/very/long/path/with/over/55/characters?and=a&amp;long=query&amp;too=1' => array('tag' => 'm', 'url' => false, 'text' => 'http://example.com/some/very/long/path/ ... uery&amp;too=1'),
+			'http://localhost' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://localhost/#abc' => array('tag' => 'm', 'url' => false, 'text' => false),
+
+			'www.example.com/path/' => array('tag' => 'w', 'url' => 'http://www.example.com/path/', 'text' => false),
+			'randomwww.example.com/path/' => false,
+
+			'http://thisdomain.org' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://thisdomain.org/' => array('tag' => 'm', 'url' => false, 'text' => false),
+			'http://thisdomain.org/1' => array('tag' => 'l', 'url' => false, 'text' => '1'),
+			'http://thisdomain.org/path/some?query=abc#test' => array('tag' => 'l', 'url' => false, 'text' => 'path/some?query=abc#test'),
+
+			'javascript:www.example.com/' => false,
+		);
+
+		$test_data = array();
+
+		// run the test for each combination
+		foreach ($prefix_texts as $prefix => $prefix_success)
+		{
+			foreach ($suffix_texts as $suffix => $suffix_success)
+			{
+				foreach ($urls as $url => $url_type)
+				{
+					$input = $prefix . $url . $suffix;
+					// no valid url => no change
+					$output = $input;
+
+					if (
+						($prefix_success && $suffix_success && is_array($url_type)) &&
+						// handle except syntax for prefix/suffix
+						(!is_array($prefix_success) || !isset($prefix_success[$url_type['tag']]) || $prefix_success[$url_type['tag']] == true) &&
+						(!is_array($suffix_success) || !isset($suffix_success[$url_type['tag']]) || $suffix_success[$url_type['tag']] == true)
+					)
+					{
+						// false means it's the same as the url, less typing
+						$url_type['url'] = ($url_type['url']) ? $url_type['url'] : $url;
+						$url_type['text'] = ($url_type['text']) ? $url_type['text'] : $url;
+
+						$class = ($url_type['tag'] === 'l') ? 'postlink-local' : 'postlink';
+
+						// replace the url with the desired output format
+						$output = $prefix . '<!-- ' . $url_type['tag'] . ' --><a class="' . $class . '" href="' . $url_type['url'] . '">' . $url_type['text'] . '</a><!-- ' . $url_type['tag'] . ' -->' . $suffix;
+					}
+					$test_data[] = array($input, $output);
+				}
+			}
+		}
+
+		return $test_data;
+	}
+
+	/**
+	* @dataProvider make_clickable_data
+	*/
+	public function test_make_clickable($input, $expected)
+	{
+		$result = make_clickable($input, 'http://thisdomain.org');
+
+		$label = 'Making text clickable: ' . $input;
+		$this->assertEquals($expected, $result, $label);
+	}
+
+}
+
-- 
cgit v1.2.1


From e00c5544d260741c6639d9a005ea933888ee8317 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 10 Jan 2011 23:20:06 +0100
Subject: [ticket/9990] Integrate utf normalizer tests into test suite

PHPBB3-9990
---
 .gitignore                        |   1 +
 phpunit.xml.dist                  |  10 +-
 tests/network/checkdnsrr_test.php |   3 +
 tests/utf/data/.gitkeep           |   0
 tests/utf/normalizer_test.php     | 318 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 330 insertions(+), 2 deletions(-)
 create mode 100644 tests/utf/data/.gitkeep
 create mode 100644 tests/utf/normalizer_test.php

diff --git a/.gitignore b/.gitignore
index 39b9e0a7f4..c417bf01c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ phpBB/images/avatars/upload/*
 phpBB/store/*
 tests/phpbb_unit_tests.sqlite2
 tests/test_config.php
+tests/utf/data/*.txt
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 78c7fdd93a..de8134da8e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit backupGlobals="true"
          backupStaticAttributes="true"
-         colors="false"
+         colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
@@ -16,7 +16,13 @@
             <directory suffix="_test.php">./tests/</directory>
         </testsuite>
     </testsuites>
-    
+
+    <groups>
+        <exclude>
+            <group>slow</group>
+        </exclude>
+    </groups>
+
     <filter>
         <blacklist>
             <directory>./tests/</directory>
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
index 427132e508..9410deaf64 100644
--- a/tests/network/checkdnsrr_test.php
+++ b/tests/network/checkdnsrr_test.php
@@ -9,6 +9,9 @@
 
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
+/**
+* @group slow
+*/
 class phpbb_network_checkdnsrr_test extends phpbb_test_case
 {
 	public function data_provider()
diff --git a/tests/utf/data/.gitkeep b/tests/utf/data/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
new file mode 100644
index 0000000000..9a9011c0fe
--- /dev/null
+++ b/tests/utf/normalizer_test.php
@@ -0,0 +1,318 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_normalizer.php';
+
+/**
+* @group slow
+*/
+class phpbb_utf_normalizer_test extends phpbb_test_case
+{
+	static public function setUpBeforeClass()
+	{
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', __DIR__.'/data');
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', __DIR__.'/data');
+	}
+
+	public function test_normalizer()
+	{
+		$test_suite = array(
+			/**
+			* NFC
+			*   c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
+			*   c4 ==  NFC(c4) ==  NFC(c5)
+			*/
+			'NFC'	=>	array(
+				'c2'	=>	array('c1', 'c2', 'c3'),
+				'c4'	=>	array('c4', 'c5')
+			),
+
+			/**
+			* NFD
+			*   c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
+			*   c5 ==  NFD(c4) ==  NFD(c5)
+			*/
+			'NFD'	=>	array(
+				'c3'	=>	array('c1', 'c2', 'c3'),
+				'c5'	=>	array('c4', 'c5')
+			),
+
+			/**
+			* NFKC
+			*   c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
+			*/
+			'NFKC'	=>	array(
+				'c4'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+			),
+
+			/**
+			* NFKD
+			*   c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
+			*/
+			'NFKD'	=>	array(
+				'c5'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
+			)
+		);
+
+		$tested_chars = array();
+
+		$fp = fopen(__DIR__.'/data/NormalizationTest.txt', 'rb');
+		while (!feof($fp))
+		{
+			$line = fgets($fp);
+
+			if ($line[0] == '@')
+			{
+				continue;
+			}
+
+			if (!strpos(' 0123456789ABCDEF', $line[0]))
+			{
+				continue;
+			}
+
+			list($c1, $c2, $c3, $c4, $c5) = explode(';', $line);
+
+			if (!strpos($c1, ' '))
+			{
+				/**
+				* We are currently testing a single character, we add it to the list of
+				* characters we have processed so that we can exclude it when testing
+				* for invariants
+				*/
+				$tested_chars[$c1] = 1;
+			}
+
+			foreach ($test_suite as $form => $serie)
+			{
+				foreach ($serie as $expected => $tests)
+				{
+					$hex_expected = ${$expected};
+					$utf_expected = $this->hexseq_to_utf($hex_expected);
+
+					foreach ($tests as $test)
+					{
+						$utf_result = $utf_expected;
+						call_user_func(array('utf_normalizer', $form), &$utf_result);
+
+						$hex_result = $this->utf_to_hexseq($utf_result);
+						$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
+					}
+				}
+			}
+		}
+		fclose($fp);
+
+		return $tested_chars;
+	}
+
+	/**
+	* @depends test_normalizer
+	*/
+	public function test_invariants(array $tested_chars)
+	{
+		$fp = fopen(__DIR__.'/data/UnicodeData.txt', 'rb');
+
+		while (!feof($fp))
+		{
+			$line = fgets($fp, 1024);
+
+			if (!$pos = strpos($line, ';'))
+			{
+				continue;
+			}
+
+			$hex_tested = $hex_expected = substr($line, 0, $pos);
+
+			if (isset($tested_chars[$hex_tested]))
+			{
+				continue;
+			}
+
+			$utf_expected = $this->hex_to_utf($hex_expected);
+
+			if ($utf_expected >= UTF8_SURROGATE_FIRST
+			 && $utf_expected <= UTF8_SURROGATE_LAST)
+			{
+				/**
+				* Surrogates are illegal on their own, we expect the normalizer
+				* to return a replacement char
+				*/
+				$utf_expected = UTF8_REPLACEMENT;
+				$hex_expected = $this->utf_to_hexseq($utf_expected);
+			}
+
+			foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
+			{
+				$utf_result = $utf_expected;
+				call_user_func(array('utf_normalizer', $form), &$utf_result);
+				$hex_result = $this->utf_to_hexseq($utf_result);
+
+				$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
+			}
+		}
+		fclose($fp);
+	}
+
+	/**
+	* Convert a UTF string to a sequence of codepoints in hexadecimal
+	*
+	* @param	string	$utf	UTF string
+	* @return	integer			Unicode codepoints in hex
+	*/
+	protected function utf_to_hexseq($str)
+	{
+		$pos = 0;
+		$len = strlen($str);
+		$ret = array();
+
+		while ($pos < $len)
+		{
+			$c = $str[$pos];
+			switch ($c & "\xF0")
+			{
+				case "\xC0":
+				case "\xD0":
+					$utf_char = substr($str, $pos, 2);
+					$pos += 2;
+					break;
+
+				case "\xE0":
+					$utf_char = substr($str, $pos, 3);
+					$pos += 3;
+					break;
+
+				case "\xF0":
+					$utf_char = substr($str, $pos, 4);
+					$pos += 4;
+					break;
+
+				default:
+					$utf_char = $c;
+					++$pos;
+			}
+
+			$hex = dechex($this->utf_to_cp($utf_char));
+
+			if (!isset($hex[3]))
+			{
+				$hex = substr('000' . $hex, -4);
+			}
+
+			$ret[] = $hex;
+		}
+
+		return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF');
+	}
+
+	/**
+	* Convert a UTF-8 char to its codepoint
+	*
+	* @param	string	$utf_char	UTF-8 char
+	* @return	integer				Unicode codepoint
+	*/
+	protected function utf_to_cp($utf_char)
+	{
+		switch (strlen($utf_char))
+		{
+			case 1:
+				return ord($utf_char);
+
+			case 2:
+				return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F);
+
+			case 3:
+				return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F);
+
+			case 4:
+				return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F);
+
+			default:
+				throw new RuntimeException('UTF-8 chars can only be 1-4 bytes long');
+		}
+	}
+
+	/**
+	* Return a UTF string formed from a sequence of codepoints in hexadecimal
+	*
+	* @param	string	$seq		Sequence of codepoints, separated with a space
+	* @return	string				UTF-8 string
+	*/
+	protected function hexseq_to_utf($seq)
+	{
+		return implode('', array_map(array($this, 'hex_to_utf'), explode(' ', $seq)));
+	}
+
+	/**
+	* Convert a codepoint in hexadecimal to a UTF-8 char
+	*
+	* @param	string	$hex		Codepoint, in hexadecimal
+	* @return	string				UTF-8 char
+	*/
+	protected function hex_to_utf($hex)
+	{
+		return $this->cp_to_utf(hexdec($hex));
+	}
+
+	/**
+	* Convert a codepoint to a UTF-8 char
+	*
+	* @param	integer	$cp			Unicode codepoint
+	* @return	string				UTF-8 string
+	*/
+	protected function cp_to_utf($cp)
+	{
+		if ($cp > 0xFFFF)
+		{
+			return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+		}
+		else if ($cp > 0x7FF)
+		{
+			return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
+		}
+		else if ($cp > 0x7F)
+		{
+			return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
+		}
+		else
+		{
+			return chr($cp);
+		}
+	}
+
+	// chunked download helper
+	static protected function download($url, $to)
+	{
+		$target = $to . '/' . basename($url);
+
+		if (file_exists($target))
+		{
+			return;
+		}
+
+		if (!$fpr = fopen($url, 'rb'))
+		{
+			throw new RuntimeException("Failed to download $url");
+		}
+
+		if (!$fpw = fopen($target, 'wb'))
+		{
+			throw new RuntimeException("Failed to open $target for writing");
+		}
+
+		$chunk = 32768;
+
+		while (!feof($fpr))
+		{
+			fwrite($fpw, fread($fpr, $chunk));
+		}
+		fclose($fpr);
+		fclose($fpw);
+	}
+}
-- 
cgit v1.2.1


From 42cf9a9895bf36ee6a0a1821aefd6e567b251552 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 12 Jan 2011 02:22:37 +0100
Subject: [ticket/9990] Add docs for running slow tests

PHPBB3-9990
---
 phpunit.xml.all         | 25 +++++++++++++++++++++++++
 tests/RUNNING_TESTS.txt |  9 +++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 phpunit.xml.all

diff --git a/phpunit.xml.all b/phpunit.xml.all
new file mode 100644
index 0000000000..1be2830729
--- /dev/null
+++ b/phpunit.xml.all
@@ -0,0 +1,25 @@
+<?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>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <blacklist>
+            <directory>./tests/</directory>
+        </blacklist>
+    </filter>
+</phpunit>
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index ac07978d3e..59197acc0f 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -50,6 +50,15 @@ Once the prerequisites are installed, run the tests from the project root direct
 
     $ phpunit
 
+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:
+
+    $ phpunit --group slow
+
 More Information
 ================
 
-- 
cgit v1.2.1


From be3a0b269a7ddff2e5f0f2ae364cf2e50c780980 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 15 Jan 2011 02:06:23 +0100
Subject: [ticket/9805] Script for easily cloning a whole github network.

PHPBB3-9805
---
 git-tools/setup_github_network.php | 179 +++++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 git-tools/setup_github_network.php

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
new file mode 100644
index 0000000000..bc8e70cfbd
--- /dev/null
+++ b/git-tools/setup_github_network.php
@@ -0,0 +1,179 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if ($argc < 2)
+{
+	show_usage($argv);
+}
+
+if (file_exists('.git'))
+{
+	echo "[error] git repository already exists\n";
+	exit(1);
+}
+
+// Handle arguments
+$scope		= get_arg($argv, 1, '');
+$developer	= get_arg($argv, 2, '');
+
+// Github setup
+$username = 'phpbb';
+$repository = 'phpbb3';
+
+// Get some basic data
+$network		= get_network($username, $repository);
+$collaborators	= get_collaborators($username, $repository);
+
+// Clone the blessed repository
+clone_repository($username, $repository, isset($collaborators[$developer]));
+
+switch ($scope)
+{
+	case 'collaborators':
+		$remotes = array_intersect_key($network, $collaborators);
+	break;
+
+	case 'organisation':
+		$remotes = array_intersect_key($network, get_organisation_members($username));
+	break;
+
+	case 'contributors':
+		$remotes = array_intersect_key($network, get_contributors($username, $repository));
+	break;
+
+	case 'network':
+		$remotes = $network;
+	break;
+
+	default:
+		show_usage();
+}
+
+foreach ($remotes as $remote)
+{
+	if ($remote['username'] == $username)
+	{
+		// Skip blessed repository.
+		continue;
+	}
+
+	add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
+}
+
+run('git remote update');
+
+function clone_repository($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git clone $url ./");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push origin $ssh_url");
+	}
+}
+
+function add_remote($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git remote add $username $url");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function get_repository_url($username, $repository, $ssh = false)
+{
+	$url_base = ($ssh) ? 'git@github.com:' : 'git://github.com/';
+
+	return $url_base . $username . '/' . $repository . '.git';
+}
+
+function api_request($query)
+{
+	return json_decode(file_get_contents("http://github.com/api/v2/json/$query"));
+}
+
+function get_contributors($username, $repository)
+{
+	$request = api_request("repos/show/$username/$repository/contributors");
+
+	$usernames = array();
+	foreach ($request->contributors as $contributor)
+	{
+		$usernames[$contributor->login] = $contributor->login;
+	}
+
+	return $usernames;
+}
+
+function get_organisation_members($username)
+{
+	$request = api_request("organizations/$username/public_members");
+
+	$usernames = array();
+	foreach ($request->users as $member)
+	{
+		$usernames[$member->login] = $member->login;
+	}
+
+	return $usernames;
+}
+
+function get_collaborators($username, $repository)
+{
+	$request = api_request("repos/show/$username/$repository/collaborators");
+
+	$usernames = array();
+	foreach ($request->collaborators as $collaborator)
+	{
+		$usernames[$collaborator] = $collaborator;
+	}
+
+	return $usernames;
+}
+
+function get_network($username, $repository)
+{
+	$request = api_request("repos/show/$username/$repository/network");
+
+	$usernames = array();
+	foreach ($request->network as $network)
+	{
+		$usernames[$network->owner] = array(
+			'username'		=> $network->owner,
+			'repository'	=> $network->name,
+		);
+	}
+
+	return $usernames;
+}
+
+function show_usage($argv)
+{
+	printf(
+		"usage: php %s collaborators|organisation|contributors|network [your_github_username]\n",
+		basename($argv[0])
+	);
+	exit(1);
+}
+
+function get_arg($argv, $index, $default)
+{
+	return isset($argv[$index]) ? $argv[$index] : $default;
+}
+
+function run($cmd)
+{
+	passthru(escapeshellcmd($cmd));
+}
-- 
cgit v1.2.1


From 2a703b40550129c668e7781aaa1a25612fd42902 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:27:08 +0100
Subject: [ticket/9859] Remove years in credit line from some more files.

Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
---
 phpBB/adm/style/install_footer.html                            | 2 +-
 phpBB/adm/style/overall_footer.html                            | 2 +-
 phpBB/adm/style/simple_footer.html                             | 2 +-
 phpBB/develop/create_variable_overview.php                     | 2 +-
 phpBB/includes/db/dbal.php                                     | 2 +-
 phpBB/includes/functions.php                                   | 2 +-
 phpBB/install/database_update.php                              | 2 +-
 phpBB/install/index.php                                        | 2 +-
 phpBB/styles/prosilver/template/simple_footer.html             | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html           | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 4df43eaaa0..20fca423bf 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -19,7 +19,7 @@
 	// -->
 	
 	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 8af299ad57..ac9e826dd8 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -20,7 +20,7 @@
 	
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
-			Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+			Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 			<!-- 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 65cf724c2f..c7b8282d3f 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -16,7 +16,7 @@
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
-		<br />Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
diff --git a/phpBB/develop/create_variable_overview.php b/phpBB/develop/create_variable_overview.php
index 3782f53e4c..b5ed090a75 100644
--- a/phpBB/develop/create_variable_overview.php
+++ b/phpBB/develop/create_variable_overview.php
@@ -528,7 +528,7 @@ foreach ($lang_fp as $filepointer)
 
 $html_data .= '
 <br><br>
-<div class="copyright" align="center">Powered by phpBB 2.2 &copy; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a>, 2003</div>
+<div class="copyright" align="center">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group</div>
 
 		<br clear="all" /></td>
 	</tr>
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index eeddf1f41b..5d8d5fbd47 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -767,7 +767,7 @@ class dbal
 							</div>
 						</div>
 						<div id="page-footer">
-							Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+							Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 						</div>
 					</div>
 					</body>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 69be1627cf..5def593bd6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3834,7 +3834,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			echo '	</div>';
 			echo '	</div>';
 			echo '	<div id="page-footer">';
-			echo '		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>';
+			echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
 			echo '	</div>';
 			echo '</div>';
 			echo '</body>';
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 10308826e0..25b50c724e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -511,7 +511,7 @@ function _print_footer()
 	</div>
 
 	<div id="page-footer">
-		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>
+		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index eb51ca5fb2..49c99da0d7 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -652,7 +652,7 @@ class module
 		echo '		</div>';
 		echo '	</div>';
 		echo '	<div id="page-footer">';
-		echo '		Powered by phpBB &copy; 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>';
+		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
 		echo '	</div>';
 		echo '</div>';
 		echo '</body>';
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index e64e209368..2d7ed97fe9 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,7 +10,7 @@
 	The phpBB Group : 2006
 //-->
 
-	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
+	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index 45ee6d1fae..dc941a5b10 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -122,7 +122,7 @@ hr.sep	{
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 03102dd351..0d7dd3bd9f 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -55,7 +55,7 @@
 //-->
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</div>
 	</div>
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index c8b69dd5ad..11ea83e729 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -13,7 +13,7 @@
 //-->
 
 <div id="wrapfooter">
-	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group</span>
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group</span>
 </div>
 
 </body>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index f1c59df1c8..5ade7e5fc2 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -123,7 +123,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index cfd78b6fc7..43da4620ae 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -137,7 +137,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2000, 2002, 2005, 2007 phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
-- 
cgit v1.2.1


From c617400f95e3dc231f1706f34191c00cdbbc6aea Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:36:40 +0100
Subject: [ticket/9859] Remove the credit line comment from all html files.

PHPBB3-9859
---
 phpBB/adm/style/install_footer.html                         | 13 +------------
 phpBB/adm/style/overall_footer.html                         | 13 +------------
 phpBB/adm/style/simple_footer.html                          | 11 -----------
 phpBB/styles/prosilver/template/overall_footer.html         | 11 -----------
 phpBB/styles/prosilver/template/simple_footer.html          | 10 ----------
 .../styles/prosilver/template/ucp_pm_viewmessage_print.html | 10 ----------
 phpBB/styles/prosilver/template/viewtopic_print.html        | 10 ----------
 phpBB/styles/subsilver2/template/overall_footer.html        | 11 -----------
 phpBB/styles/subsilver2/template/simple_footer.html         | 11 -----------
 .../subsilver2/template/ucp_pm_viewmessage_print.html       |  9 ---------
 phpBB/styles/subsilver2/template/viewtopic_print.html       |  9 ---------
 11 files changed, 2 insertions(+), 116 deletions(-)

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 20fca423bf..9b5494b8b6 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -6,18 +6,7 @@
 		</div>
 		</div>
 	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
+
 	<div id="page-footer">
 		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 	</div>
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index ac9e826dd8..03ca369562 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -6,18 +6,7 @@
 		</div>
 		</div>
 	</div>
-	
-	<!--
-		We request you retain the full copyright notice below including the link to www.phpbb.com.
-		This not only gives respect to the large amount of time given freely by the developers
-		but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-		the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-		"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-		forums may be affected.
-	
-		The phpBB Group : 2006
-	// -->
-	
+
 	<div id="page-footer">
 		<!-- IF S_COPYRIGHT_HTML -->
 			Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html
index c7b8282d3f..7276fb4b63 100644
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -2,17 +2,6 @@
 	<br /><br />
 </div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-// -->
-
 <div id="page-footer">
 
 	<!-- IF S_COPYRIGHT_HTML -->
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index aeb6dc9ba3..1a044b0ca1 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -19,17 +19,6 @@
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
 	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 2d7ed97fe9..daeb786fcb 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -1,14 +1,4 @@
 	</div>
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
 
 	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index dc941a5b10..c69bb82382 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -105,16 +105,6 @@ hr.sep	{
 </table>
 
 <hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 0d7dd3bd9f..eeb5956075 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -43,16 +43,6 @@
 		<!-- END postrow -->
 	</div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
 		<div class="copyright">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</div>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 187d0f4366..b53fff9f7f 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -1,17 +1,6 @@
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
 <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> &copy; phpBB Group
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 11ea83e729..1bd146b599 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -1,17 +1,6 @@
 
 </div>
 
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line, with
-	"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
-	forums may be affected.
-
-	The phpBB Group : 2006
-//-->
-
 <div id="wrapfooter">
 	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group</span>
 </div>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 5ade7e5fc2..eff4a2a7dd 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -107,15 +107,6 @@ hr.sep {
 </table>
 
 <hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line. If you
-	refuse to include even this then support on our forums may be affected.
-
-	The phpBB Group : 2006
-// -->
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 43da4620ae..38ec10fad8 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -121,15 +121,6 @@ hr.sep {
 <!-- END postrow -->
 
 <hr width="85%" />
-<!--
-	We request you retain the full copyright notice below including the link to www.phpbb.com.
-	This not only gives respect to the large amount of time given freely by the developers
-	but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain
-	the full copyright we ask you at least leave in place the "Powered by phpBB" line. If you
-	refuse to include even this then support on our forums may be affected.
-
-	The phpBB Group : 2006
-// -->
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
-- 
cgit v1.2.1


From 732fd5980e0cb7106a7c819efa5294cd2d1800e8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:41:51 +0100
Subject: [ticket/9859] Remove the meta copyright tag as well.

PHPBB3-9859
---
 phpBB/styles/prosilver/template/overall_header.html  | 1 -
 phpBB/styles/prosilver/template/simple_header.html   | 1 -
 phpBB/styles/prosilver/template/viewtopic_print.html | 1 -
 phpBB/styles/subsilver2/template/overall_header.html | 1 -
 phpBB/styles/subsilver2/template/simple_header.html  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 44857dbc41..e537aabf56 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -8,7 +8,6 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 0e2409586c..66aae004a0 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -8,7 +8,6 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index eeb5956075..541c48a53d 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -8,7 +8,6 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 <meta name="robots" content="noindex" />
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 874beb8e2b..48f6202c4f 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -8,7 +8,6 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index bcef9a7059..b0dc908bc6 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -8,7 +8,6 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
 {META}
-- 
cgit v1.2.1


From 180e97abdccf0ebb0075b46f1edfdc8a48e92676 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:51:12 +0100
Subject: [ticket/9859] Remove the year from the copyright meta tag in
 docs/*.html

PHPBB3-9859
---
 phpBB/docs/CHANGELOG.html         | 2 +-
 phpBB/docs/FAQ.html               | 2 +-
 phpBB/docs/INSTALL.html           | 2 +-
 phpBB/docs/README.html            | 2 +-
 phpBB/docs/auth_api.html          | 2 +-
 phpBB/docs/coding-guidelines.html | 2 +-
 phpBB/docs/hook_system.html       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 66915b18fa..811c7201d5 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="phpBB 3.0.x Changelog" />
 <title>phpBB3 &bull; Changelog</title>
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index f91d4bc223..f9a1888ad2 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="phpBB 3.0.x frequently asked questions" />
 <title>phpBB3 &bull; FAQ</title>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 5857163759..f33e7346a8 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="phpBB 3.0.x Installation, updating and conversion informations" />
 <title>phpBB3 &bull; Install</title>
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index bb88fdc01f..c9197292ac 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="phpBB 3.0.x Readme" />
 <title>phpBB3 &bull; Readme</title>
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index 8973582bdb..b19cd52222 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
 <title>phpBB3 &bull; Auth API</title>
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 5a73554741..99c192180c 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="Olympus coding guidelines document" />
 <title>phpBB3 &bull; Coding Guidelines</title>
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
index 34055c4661..fd4096c9fc 100644
--- a/phpBB/docs/hook_system.html
+++ b/phpBB/docs/hook_system.html
@@ -8,7 +8,7 @@
 <meta http-equiv="imagetoolbar" content="no" />
 <meta name="resource-type" content="document" />
 <meta name="distribution" content="global" />
-<meta name="copyright" content="2007 phpBB Group" />
+<meta name="copyright" content="phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="Hook System explanation" />
 <title>phpBB3 &bull; Hook System</title>
-- 
cgit v1.2.1


From 60eff4e59a529e389c03c54085530dce5fbd99db Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:52:36 +0100
Subject: [ticket/9859] Remove the years from the copyright statements in docs
 files.

PHPBB3-9859
---
 phpBB/docs/AUTHORS                | 2 +-
 phpBB/docs/CHANGELOG.html         | 2 +-
 phpBB/docs/FAQ.html               | 2 +-
 phpBB/docs/INSTALL.html           | 2 +-
 phpBB/docs/README.html            | 2 +-
 phpBB/docs/auth_api.html          | 2 +-
 phpBB/docs/coding-guidelines.html | 2 +-
 phpBB/docs/hook_system.html       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index b3166313c3..1dfb80141c 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -1,6 +1,6 @@
 /**
 *
-* phpBB3 © Copyright 2000, 2002, 2005, 2007 phpBB Group
+* phpBB3 © Copyright phpBB Group
 * http://www.phpbb.com
 *
 * This program is free software: you can redistribute it and/or modify
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 811c7201d5..253df4ac56 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -1676,7 +1676,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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index f9a1888ad2..83d7a342e0 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index f33e7346a8..4af185beb3 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -424,7 +424,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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index c9197292ac..7a0a42b34f 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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index b19cd52222..88618fa640 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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 99c192180c..7434fa4870 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -2369,7 +2369,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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html
index fd4096c9fc..a5fad0d530 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) 2000, 2002, 2005, 2007 <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-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>
 
 		</div>
 
-- 
cgit v1.2.1


From 8c1866bc0c1ac4a3b58edfaf3f3914361deb1fab Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 8 Jan 2011 12:11:02 +0700
Subject: [ticket/9933] Adjust word censor regex for non-unicode mode.

PHPBB3-9933
---
 phpBB/includes/functions.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 69be1627cf..20d9d4e0f5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3451,11 +3451,11 @@ function get_censor_preg_expression($word)
 		$unicode = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
 	}
 
+	// Unescape the asterisk to simplify further conversions
+	$word = str_replace('\*', '*', preg_quote($word, '#'));
+
 	if ($unicode)
 	{
-		// Unescape the asterisk to simplify further conversions
-		$word = str_replace('\*', '*', preg_quote($word, '#'));
-
 		// Replace asterisk(s) inside the pattern, at the start and at the end of it with regexes
 		$word = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $word);
 
@@ -3464,7 +3464,11 @@ function get_censor_preg_expression($word)
 	}
 	else
 	{
-		$preg_expr = '#(?<!\S)(' . str_replace('\*', '\S*?', preg_quote($word, '#')) . ')(?!\S)#iu';
+		// Replace the asterisk inside the pattern, at the start and at the end of it with regexes
+		$word = preg_replace(array('#(?<=\S)\*+(?=\S)#iu', '#^\*+#', '#\*+$#'), array('(\x20*?\S*?)', '\S*?', '\S*?'), $word);
+
+		// Generate the final substitution
+		$preg_expr = '#(?<!\S)(' . $word . ')(?!\S)#iu';
 	}
 
 	return $preg_expr;
-- 
cgit v1.2.1


From 97be6e794647d0853274c5d8e68a9fbe727dba51 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 20:03:08 +0100
Subject: [ticket/9933] Add $use_unicode parameter to
 get_censor_preg_expression().

Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true.

In unit tests we can now pass in $use_unicode as false and also test the code
path that is taken when PCRE does not support unicode.

PHPBB3-9933
---
 phpBB/includes/functions.php | 13 +++++++------
 tests/regex/censor_test.php  | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 20d9d4e0f5..1bcbfd2a83 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3432,13 +3432,14 @@ function get_preg_expression($mode)
 * Generate regexp for naughty words censoring
 * Depends on whether installed PHP version supports unicode properties
 *
-* @param string	$word	word template to be replaced
+* @param string	$word			word template to be replaced
+* @param bool	$use_unicode	whether or not to take advantage of PCRE supporting unicode 
 *
 * @return string $preg_expr		regex to use with word censor
 */
-function get_censor_preg_expression($word)
+function get_censor_preg_expression($word, $use_unicode = true)
 {
-	static $unicode = null;
+	static $unicode_support = null;
 
 	if (empty($word))
 	{
@@ -3446,15 +3447,15 @@ function get_censor_preg_expression($word)
 	}
 
 	// Check whether PHP version supports unicode properties
-	if (is_null($unicode))
+	if (is_null($unicode_support))
 	{
-		$unicode = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
+		$unicode_support = ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) ? true : false;
 	}
 
 	// Unescape the asterisk to simplify further conversions
 	$word = str_replace('\*', '*', preg_quote($word, '#'));
 
-	if ($unicode)
+	if ($use_unicode && $unicode_support)
 	{
 		// Replace asterisk(s) inside the pattern, at the start and at the end of it with regexes
 		$word = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $word);
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index ae2d86e07e..93c761c8d0 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -31,9 +31,19 @@ class phpbb_regex_censor_test extends phpbb_test_case
 	/**
 	* @dataProvider censor_test_data
 	*/
-	public function test_censor($pattern, $subject)
+	public function test_censor_unicode($pattern, $subject)
 	{
-		$regex = get_censor_preg_expression($pattern);
+		$regex = get_censor_preg_expression($pattern, true);
+
+		$this->assertRegExp($regex, $subject);
+	}
+
+	/**
+	* @dataProvider censor_test_data
+	*/
+	public function test_censor_no_unicode($pattern, $subject)
+	{
+		$regex = get_censor_preg_expression($pattern, false);
 
 		$this->assertRegExp($regex, $subject);
 	}
-- 
cgit v1.2.1


From 2b37a4fe56f86430733fd5757f6c8a4907f51a3f Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 16 Jan 2011 20:14:35 +0100
Subject: [ticket/9933] Remove empty word check.

PHPBB3-9933
---
 phpBB/includes/functions.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1bcbfd2a83..8697a0a472 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3441,11 +3441,6 @@ function get_censor_preg_expression($word, $use_unicode = true)
 {
 	static $unicode_support = null;
 
-	if (empty($word))
-	{
-		return '';
-	}
-
 	// Check whether PHP version supports unicode properties
 	if (is_null($unicode_support))
 	{
-- 
cgit v1.2.1


From 74f537e89d899831c606b9abe218383a4e71408e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 4 Jan 2011 17:14:36 +0100
Subject: [task/session-tests] Added tests for the session class.

Two first simple tests to check functionality of session_begin and
session_create.

Added a mock class for the cache as well as a subclass of session
which has its cookie handling function mocked out to avoid header
sending problems.

PHPBB3-9732
---
 tests/bootstrap.php                               |  2 +-
 tests/mock/cache.php                              | 61 +++++++++++++++++
 tests/mock/session_testable.php                   | 56 +++++++++++++++
 tests/session/fixtures/sessions_empty.xml         | 19 ++++++
 tests/session/fixtures/sessions_full.xml          | 37 ++++++++++
 tests/session/session_continue.php                | 83 +++++++++++++++++++++++
 tests/session/session_init.php                    | 76 +++++++++++++++++++++
 tests/test_framework/phpbb_database_test_case.php | 11 +++
 8 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 tests/mock/cache.php
 create mode 100644 tests/mock/session_testable.php
 create mode 100644 tests/session/fixtures/sessions_empty.xml
 create mode 100644 tests/session/fixtures/sessions_full.xml
 create mode 100644 tests/session/session_continue.php
 create mode 100644 tests/session/session_init.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 99f145e427..1fba323277 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,7 +10,7 @@
 define('IN_PHPBB', true);
 $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
-$table_prefix = '';
+$table_prefix = 'phpbb_';
 
 error_reporting(E_ALL & ~E_DEPRECATED);
 
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
new file mode 100644
index 0000000000..2ac46f7090
--- /dev/null
+++ b/tests/mock/cache.php
@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_mock_cache
+{
+	public function __construct($data = array())
+	{
+		$this->data = $data;
+
+		if (!isset($this->data['_bots']))
+		{
+			$this->data['_bots'] = array();
+		}
+	}
+
+	public function get($var_name)
+	{
+		if (isset($this->data[$var_name]))
+		{
+			return $this->data[$var_name];
+		}
+
+		return false;
+	}
+
+	public function put($var_name, $var, $ttl = 0)
+	{
+		$this->data[$var_name] = $var;
+	}
+
+	/**
+	* Obtain active bots
+	*/
+	public function obtain_bots()
+	{
+		return $this->data['_bots'];
+	}
+
+	public function set_bots($bots)
+	{
+		$this->data['_bots'] = $bots;
+	}
+
+	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
+	{
+		$test->assertTrue(isset($this->data[$var_name]));
+		$test->assertEquals($data, $this->data[$var_name]);
+	}
+
+	public function check(PHPUnit_Framework_Assert $test, $data)
+	{
+		$test->assertEquals($data, $this->data);
+	}
+}
+
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
new file mode 100644
index 0000000000..2d7d42f82a
--- /dev/null
+++ b/tests/mock/session_testable.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once '../phpBB/includes/functions.php';
+require_once '../phpBB/includes/session.php';
+
+class phpbb_mock_session_testable extends session
+{
+	private $_cookies = array();
+
+	public function set_cookie($name, $data, $time)
+	{
+		$this->_cookies[$name] = array($data, $time);
+	}
+
+	/**
+	* Checks if the cookies were set correctly.
+	*
+	* @param PHPUnit_Framework_Assert test    The test from which this is called
+	* @param array(string => mixed)   cookies The cookie data to check against.
+	*				The keys are cookie names, the values can either be null to
+	*				check only the existance of the cookie, or an array(d, t),
+	*				where d is the cookie data to check, or null to skip the
+	*				check and t is the cookie time to check, or null to skip.
+	*/
+	public function check_cookies(PHPUnit_Framework_Assert $test, $cookies)
+	{
+		$test->assertEquals(array_keys($cookies), array_keys($this->_cookies), 'Incorrect cookies were set');
+
+		foreach ($cookies as $name => $cookie)
+		{
+			if (!is_null($cookie))
+			{
+				$data = $cookie[0];
+				$time = $cookie[1];
+
+				if (!is_null($data))
+				{
+					$test->assertEquals($data, $this->_cookies[$name][0], "Cookie $name contains incorrect data");
+				}
+
+				if (!is_null($time))
+				{
+					$test->assertEquals($time, $this->_cookies[$name][1], "Cookie $name expires at the wrong time");
+				}
+			}
+		}
+	}
+}
+
diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml
new file mode 100644
index 0000000000..66fa585b18
--- /dev/null
+++ b/tests/session/fixtures/sessions_empty.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>anonymous</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>foo</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>bar</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
new file mode 100644
index 0000000000..4559a08c55
--- /dev/null
+++ b/tests/session/fixtures/sessions_full.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>anonymous</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>foo</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>bar</value>
+		</row>
+	</table>
+	<table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_ip</column>
+		<column>session_browser</column>
+		<row>
+			<value>anon_session</value>
+			<value>1</value>
+			<value>127.0.0.1</value>
+			<value>anonymous user agent</value>
+		</row>
+		<row>
+			<value>bar_session</value>
+			<value>4</value>
+			<value>127.0.0.1</value>
+			<value>user agent</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/session/session_continue.php b/tests/session/session_continue.php
new file mode 100644
index 0000000000..15be667325
--- /dev/null
+++ b/tests/session/session_continue.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once 'mock/cache.php';
+require_once 'mock/session_testable.php';
+
+class phpbb_session_continue_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+	}
+
+	public function test_session_begin_valid_session()
+	{
+		$session = new phpbb_mock_session_testable;
+		$session->page = array('page' => 'page', 'forum' => 0);
+
+		// set up all the global variables used in session_create
+		global $SID, $_SID, $db, $config, $cache;
+
+		$config = $this->get_config();
+		$db = $this->new_dbal();
+		$cache_data = array(
+			'_bots' => array(),
+		);
+		$cache = new phpbb_mock_cache;
+		$SID = $_SID = null;
+
+		$_COOKIE['_sid'] = 'bar_session';
+		$_COOKIE['_u'] = '4';
+		$_SERVER['HTTP_USER_AGENT'] = 'user agent';
+
+		$config['session_length'] = time(); // need to do this to allow sessions started at time 0
+		$session->session_begin();
+
+		$sql = 'SELECT session_id, session_user_id
+			FROM phpbb_sessions';
+
+		$this->assertResultEquals(
+			$sql,
+			array(
+				array('session_id' => 'anon_session', 'session_user_id' => 1),
+				array('session_id' => 'bar_session', 'session_user_id' => 4)
+			),
+			'Check if no new session was created'
+		);
+
+		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
+
+		$session->check_cookies($this, array());
+
+		$cache->check($this, $cache_data);
+	}
+
+	static public function get_config()
+	{
+		return array(
+			'allow_autologin' => false,
+			'auth_method' => 'db',
+			'forwarded_for_check' => true,
+			'active_sessions' => 0, // disable
+			'rand_seed' => 'foo',
+			'rand_seed_last_update' => 0,
+			'max_autologin_time' => 0,
+			'session_length' => 100,
+			'form_token_lifetime' => 100,
+			'cookie_name' => '',
+			'limit_load' => 0,
+			'limit_search_load' => 0,
+			'ip_check' => 3,
+			'browser_check' => 1,
+		);
+	}
+}
+
diff --git a/tests/session/session_init.php b/tests/session/session_init.php
new file mode 100644
index 0000000000..f6fa564880
--- /dev/null
+++ b/tests/session/session_init.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once 'mock/cache.php';
+require_once 'mock/session_testable.php';
+
+class phpbb_session_init_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	// also see security/extract_current_page.php
+
+	public function test_login_session_create()
+	{
+		$session = new phpbb_mock_session_testable;
+		$session->page = array('page' => 'page', 'forum' => 0);
+
+		// set up all the global variables used in session_create
+		global $SID, $_SID, $db, $config, $cache;
+
+		$config = $this->get_config();
+		$db = $this->new_dbal();
+		$cache_data = array(
+			'_bots' => array(),
+		);
+		$cache = new phpbb_mock_cache;
+		$SID = $_SID = null;
+
+		$session->session_create(3);
+
+		$sql = 'SELECT session_user_id
+			FROM phpbb_sessions';
+
+		$this->assertResultEquals(
+			$sql,
+			array(array('session_user_id' => 3)),
+			'Check if exacly one session for user id 3 was created'
+		);
+
+		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
+
+		$session->check_cookies($this, array(
+			'u' => array(null, $cookie_expire),
+			'k' => array(null, $cookie_expire),
+			'sid' => array($_SID, $cookie_expire),
+		));
+
+		$cache->check($this, $cache_data);
+	}
+
+	static public function get_config()
+	{
+		return array(
+			'allow_autologin' => false,
+			'auth_method' => 'db',
+			'forwarded_for_check' => true,
+			'active_sessions' => 0, // disable
+			'rand_seed' => 'foo',
+			'rand_seed_last_update' => 0,
+			'max_autologin_time' => 0,
+			'session_length' => 100,
+			'form_token_lifetime' => 100,
+		);
+	}
+}
+
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 9752ec2fe6..9f1703b477 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -384,6 +384,17 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		return $db;
 	}
 
+	public function assertResultEquals($sql, $expected, $message = '')
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query($sql);
+		$rows = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $rows, $message);
+	}
+
 	public function setExpectedTriggerError($errno, $message = '')
 	{
 		$this->get_test_case_helpers()->setExpectedTriggerError($errno, $message);
-- 
cgit v1.2.1


From 8538561b31d4d7cc995d6948062b496f260ae05a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 6 Jan 2011 23:06:59 +0100
Subject: [task/session-tests] Test additional combinations of session_begin.

PHPBB3-9732
---
 tests/session/session_continue.php | 58 ++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/tests/session/session_continue.php b/tests/session/session_continue.php
index 15be667325..58956c18a9 100644
--- a/tests/session/session_continue.php
+++ b/tests/session/session_continue.php
@@ -18,7 +18,38 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
 	}
 
-	public function test_session_begin_valid_session()
+	static public function session_begin_attempts()
+	{
+		return array(
+			array(
+				'bar_session', '4', 'user agent',
+				array(
+					array('session_id' => 'anon_session', 'session_user_id' => 1),
+					array('session_id' => 'bar_session', 'session_user_id' => 4)
+				),
+				array(),
+				'Check if no new session was created',
+			),
+			array(
+				'anon_session', '4', 'user agent',
+				array(
+					array('session_id' => 'bar_session', 'session_user_id' => 4),
+					array('session_id' => null, 'session_user_id' => 1) // use generated SID
+				),
+				array(
+					'u' => array('1', null),
+					'k' => array(null, null),
+					'sid' => array($_SID, null),
+				),
+				'Check if an anonymous new session was created',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider session_begin_attempts
+	*/
+	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message)
 	{
 		$session = new phpbb_mock_session_testable;
 		$session->page = array('page' => 'page', 'forum' => 0);
@@ -34,9 +65,9 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		$cache = new phpbb_mock_cache;
 		$SID = $_SID = null;
 
-		$_COOKIE['_sid'] = 'bar_session';
-		$_COOKIE['_u'] = '4';
-		$_SERVER['HTTP_USER_AGENT'] = 'user agent';
+		$_COOKIE['_sid'] = $session_id;
+		$_COOKIE['_u'] = $user_id;
+		$_SERVER['HTTP_USER_AGENT'] = $user_agent;
 
 		$config['session_length'] = time(); // need to do this to allow sessions started at time 0
 		$session->session_begin();
@@ -44,22 +75,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		$sql = 'SELECT session_id, session_user_id
 			FROM phpbb_sessions';
 
+		// little tickery to allow using a dataProvider with dynamic expected result
+		foreach ($expected_sessions as $i => $s)
+		{
+			if (is_null($s['session_id']))
+			{
+				$expected_sessions[$i]['session_id'] = $session->session_id;
+			}
+		}
+
 		$this->assertResultEquals(
 			$sql,
-			array(
-				array('session_id' => 'anon_session', 'session_user_id' => 1),
-				array('session_id' => 'bar_session', 'session_user_id' => 4)
-			),
+			$expected_sessions,
 			'Check if no new session was created'
 		);
 
-		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
-
-		$session->check_cookies($this, array());
+		$session->check_cookies($this, $expected_cookies);
 
 		$cache->check($this, $cache_data);
 	}
-
 	static public function get_config()
 	{
 		return array(
-- 
cgit v1.2.1


From cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 21 Jan 2011 21:31:41 +0100
Subject: [task/session-tests] Renamed assertSqlResultEquals and fixed its
 param order

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

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 9f1703b477..a325855da4 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -384,7 +384,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		return $db;
 	}
 
-	public function assertResultEquals($sql, $expected, $message = '')
+	public function assertSqlResultEquals($expected, $sql, $message = '')
 	{
 		$db = $this->new_dbal();
 
-- 
cgit v1.2.1


From ab9d4b3b638ca02d026dc23574a88d510e5d2291 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 24 Jan 2011 00:01:18 +0700
Subject: [ticket/8779] Slow search for 'View unread posts'

Adjust SQL query to speedup search for unread posts (thanks naderman).

PHPBB3-8779
---
 phpBB/includes/functions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 65b9f22d12..9a8cc5d6b3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1698,7 +1698,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
 	if ($config['load_db_lastread'] && $user->data['is_registered'])
 	{
 		// Get list of the unread topics
-		$last_mark = $user->data['user_lastmark'];
+		$last_mark = (int) $user->data['user_lastmark'];
 
 		$sql_array = array(
 			'SELECT'		=> 't.topic_id, t.topic_last_post_time, tt.mark_time as topic_mark_time, ft.mark_time as forum_mark_time',
@@ -1717,10 +1717,11 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
 			),
 
 			'WHERE'			=> "
+				 t.topic_last_post_time > $last_mark AND
 				(
 				(tt.mark_time IS NOT NULL AND t.topic_last_post_time > tt.mark_time) OR
 				(tt.mark_time IS NULL AND ft.mark_time IS NOT NULL AND t.topic_last_post_time > ft.mark_time) OR
-				(tt.mark_time IS NULL AND ft.mark_time IS NULL AND t.topic_last_post_time > $last_mark)
+				(tt.mark_time IS NULL AND ft.mark_time IS NULL)
 				)
 				$sql_extra
 				$sql_sort",
-- 
cgit v1.2.1


From a970219d61204b2e8e5d937d448ac25c44ce5fd0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 24 Jan 2011 17:35:10 +0100
Subject: [ticket/10007] Add directive 'internal' to blocked folders in nginx
 config.

The "deny" and "access" directives are IP-based in general. Both directives
only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those
directives have no effect on IPv6 requests. Thus they do not block access for
IPv6 requests.

Adding the "internal" directive blocks external access in general (both IPv4
and IPv6) and makes the web server return a status code 404 (Not Found)
response.

See:
http://nginx.org/en/CHANGES
http://wiki.nginx.org/HttpCoreModule#internal

PHPBB3-10007
---
 phpBB/docs/nginx.sample.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index a22a126ff4..2a11e057c5 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -45,6 +45,7 @@ http {
 
         # Deny access to internal phpbb files.
         location ~ /(config\.php|common\.php|includes|cache|files|store|images/avatars/upload) {
+            internal;
             deny all;
         }
 
@@ -59,6 +60,7 @@ http {
 
         # Deny access to version control system directories.
         location ~ /\.svn|/\.git {
+            internal;
             deny all;
         }
     }
-- 
cgit v1.2.1


From 4890006cbb13635c97b03ab2c7d06ed613b8b16b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Jan 2011 17:24:03 +0100
Subject: [ticket/9944] Extension groups naming don't use users' language in
 ACP

Only happens on boards which were installed with 3.0.8

PHPBB3-9944
---
 phpBB/install/database_update.php     | 25 +++++++++++++++++++++++++
 phpBB/install/schemas/schema_data.sql | 18 +++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 25b50c724e..fb1024be99 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -916,6 +916,8 @@ function database_update_info()
 		'3.0.7-PL1'		=> array(),
 		// No changes from 3.0.8-RC1 to 3.0.8
 		'3.0.8-RC1'		=> array(),
+		// No changes from 3.0.8 to 3.0.9-RC1
+		'3.0.8'		=> array(),
 	);
 }
 
@@ -1858,6 +1860,29 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.8-RC1 to 3.0.8
 		case '3.0.8-RC1':
 		break;
+
+		// Changes from 3.0.8 to 3.0.9-RC1
+		case '3.0.8':
+			// Update file extension group names to use language strings, again.
+			$sql = 'SELECT group_id, group_name
+				FROM ' . EXTENSION_GROUPS_TABLE . '
+				WHERE group_name ' . $db->sql_like_expression('EXT_GROUP_' . $db->any_char);
+			$result = $db->sql_query($sql);
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$sql_ary = array(
+					'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+				);
+
+				$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE group_id = ' . $row['group_id'];
+				_sql($sql, $errored, $error_ary);
+			}
+			$db->sql_freeresult($result);
+
+			$no_updates = false;
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 355af802ef..ade523a7f3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -743,15 +743,15 @@ INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_orde
 INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('other', '{L_REPORT_OTHER}', 4);
 
 # -- extension_groups
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_IMAGES}', 1, 1, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_ARCHIVES}', 0, 1, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_PLAIN_TEXT}', 0, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_DOCUMENTS}', 0, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_REAL_MEDIA}', 3, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_WINDOWS_MEDIA}', 2, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_FLASH_FILES}', 5, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_QUICKTIME_MEDIA}', 6, 0, 1, '', 0, '');
-INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_DOWNLOADABLE_FILES}', 0, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('IMAGES', 1, 1, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('ARCHIVES', 0, 1, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('PLAIN_TEXT', 0, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('DOCUMENTS', 0, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('REAL_MEDIA', 3, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('WINDOWS_MEDIA', 2, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('FLASH_FILES', 5, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('QUICKTIME_MEDIA', 6, 0, 1, '', 0, '');
+INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('DOWNLOADABLE_FILES', 0, 0, 1, '', 0, '');
 
 # -- extensions
 INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'gif');
-- 
cgit v1.2.1


From 03f117ea309fef9b13d08349487d574bf29bff2e Mon Sep 17 00:00:00 2001
From: Schnorrer42 <Schnorrer42@code.phpbb.com>
Date: Wed, 28 Apr 2010 16:43:38 -0400
Subject: [ticket/9166] Fixed CSS element order in prosilver.

PHPBB3-9166
---
 phpBB/styles/prosilver/theme/colours.css | 16 +++++++++++++---
 phpBB/styles/prosilver/theme/links.css   | 12 ++++++++++--
 phpBB/styles/prosilver/theme/print.css   |  4 ++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 5d74ff9d8f..3f215def72 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -171,7 +171,7 @@ dl.details dd {
 	border-color: #4692BF;
 }
 
-.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active {
+.pagination span a, .pagination span a:link, .pagination span a:visited {
 	color: #5C758C;
 	background-color: #ECEDEE;
 	border-color: #B4BAC0;
@@ -183,6 +183,12 @@ dl.details dd {
 	color: #FFF;
 }
 
+.pagination span a:active {
+	color: #5C758C;
+	background-color: #ECEDEE;
+	border-color: #B4BAC0;
+}
+
 /* Pagination in viewforum for multipage topics */
 .row .pagination {
 	background-image: url("{T_THEME_PATH}/images/icon_pages.gif");
@@ -304,12 +310,12 @@ a.topictitle:active {
 	color: #0D4473;
 }
 
-.signature a, .signature a:visited, .signature a:active, .signature a:hover {
+.signature a, .signature a:visited, .signature a:hover, .signature a:active {
 	background-color: transparent;
 }
 
 /* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
+.postprofile a:link, .postprofile a:visited, .postprofile dt.author a {
 	color: #105289;
 }
 
@@ -317,6 +323,10 @@ a.topictitle:active {
 	color: #D31141;
 }
 
+.postprofile a:active {
+	color: #105289;
+}
+
 /* Profile searchresults */	
 .search .postprofile a {
 	color: #105289;
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index ea9ca8f4b1..a406114054 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -103,14 +103,14 @@ a.topictitle:active {
 	color: #404040;
 }
 
-.signature a, .signature a:visited, .signature a:active, .signature a:hover {
+.signature a, .signature a:visited, .signature a:hover, .signature a:active {
 	border: none;
 	text-decoration: underline;
 	background-color: transparent;
 }
 
 /* Profile links */
-.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a {
+.postprofile a:link, .postprofile a:visited, .postprofile dt.author a {
 	font-weight: bold;
 	color: #898989;
 	text-decoration: none;
@@ -121,6 +121,14 @@ a.topictitle:active {
 	color: #d3d3d3;
 }
 
+/* CSS spec requires a:link, a:visited, a:hover and a:active rules to be specified in this order. */
+/* See http://www.phpbb.com/bugs/phpbb3/59685 */
+.postprofile a:active {
+	font-weight: bold;
+	color: #898989;
+	text-decoration: none;
+}
+
 
 /* Profile searchresults */	
 .search .postprofile a {
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
index 68600b030b..2cfcd4da20 100644
--- a/phpBB/styles/prosilver/theme/print.css
+++ b/phpBB/styles/prosilver/theme/print.css
@@ -60,7 +60,7 @@ h3 { font-size: 14pt; margin-top: 1em; }
 }
 
 /* CSS2 Print tip from: http://www.alistapart.com/articles/goingtoprint/ */
-.postbody a:link, .postbody a:visited, .postbody a:active, .postbody a:hover {
+.postbody a:link, .postbody a:visited, .postbody a:hover, .postbody a:active {
 	text-decoration: underline;
 	padding: 0.1em 0.2em;
 	margin: -0.1em -0.2em;
@@ -141,4 +141,4 @@ div.spacer { clear: both; }
 /* Accessibility tweaks: Mozilla.org */
 .skip_link { display: none; }
 
-dl.codebox dt { display: none; }
\ No newline at end of file
+dl.codebox dt { display: none; }
-- 
cgit v1.2.1


From ee478ec4f44c4fc5e2106edc0f099d3a49dd90a8 Mon Sep 17 00:00:00 2001
From: Schnorrer42 <Schnorrer42@code.phpbb.com>
Date: Wed, 28 Apr 2010 16:42:46 -0400
Subject: [ticket/9166] Fixed CSS element order in subsilver.

PHPBB3-9166
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 726efdca0a..c2b6718d87 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -210,13 +210,13 @@ p.topicdetails {
 	margin: 1px 0;
 }
 
-.postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active {
+.postreported, .postreported a:link, .postreported a:visited, .postreported a:hover, .postreported a:active {
 	margin: 1px 0;
 	color: red;
 	font-weight:bold;
 }
 
-.postapprove, .postapprove a:visited, .postapprove a:hover, .postapprove a:link, .postapprove a:active {
+.postapprove, .postapprove a:link, .postapprove a:visited, .postapprove a:hover, .postapprove a:active {
 	color: green;
 	font-weight:bold;
 }
@@ -386,12 +386,13 @@ hr {
 	unicode-bidi: embed;
 }
 
+/* CSS spec requires a:link, a:visited, a:hover and a:active rules to be specified in this order. */
+/* See http://www.phpbb.com/bugs/phpbb3/59685 */
 a:link {
 	color: #006597;
 	text-decoration: none;
 }
 
-a:active,
 a:visited {
 	color: #005784;
 	text-decoration: none;
@@ -402,6 +403,11 @@ a:hover {
 	text-decoration: underline;
 }
 
+a:active {
+	color: #005784;
+	text-decoration: none;
+}
+
 a.forumlink {
 	color: #069;
 	font-weight: bold;
@@ -667,4 +673,4 @@ pre {
 
 .username-coloured {
 	font-weight: bold;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 5e97dd74c7a84869ac6f3b1bcd91122be8fddb50 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 27 Jan 2011 23:19:09 -0500
Subject: [ticket/10014] Clearly indicate fatal errors in file acm.

If acm_file cannot open the cache file for writing, it prints a message
to that effect and calls die(). The message itself does not indicate that
it is a fatal error, and someone seeing the message might expect that
inability to write to cache is not fatal.

Make it clear that the error is fatal by printing the word "Fatal" before
the message.

PHPBB3-10014
---
 phpBB/includes/acm/acm_file.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 5c1876d006..524a28561e 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -88,11 +88,11 @@ class acm
 			if (!phpbb_is_writable($this->cache_dir))
 			{
 				// We need to use die() here, because else we may encounter an infinite loop (the message handler calls $cache->unload())
-				die($this->cache_dir . ' is NOT writable.');
+				die('Fatal: ' . $this->cache_dir . ' is NOT writable.');
 				exit;
 			}
 
-			die('Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx);
+			die('Fatal: Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx);
 			exit;
 		}
 
-- 
cgit v1.2.1


From 56c202127c1eb66029c461c946a36ba1a0158474 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 28 Jan 2011 21:06:49 -0500
Subject: [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.

PHPBB3-10016
---
 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 9a8cc5d6b3..7632d8790d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -176,7 +176,7 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
 	{
 		case 'firebird':
 		case 'postgres':
-			$sql_update = 'CAST(CAST(config_value as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
+			$sql_update = 'CAST(CAST(config_value::text as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
 		break;
 
 		// MySQL, SQlite, mssql, mssql_odbc, oracle
-- 
cgit v1.2.1


From 90f5e4e2b12f933b4816b01ab5091107766f49f0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Jan 2011 16:13:36 +0100
Subject: [ticket/9989] Skip PM popup in overall_header.html, if there are no
 new PMs.

PHPBB3-9989
---
 phpBB/styles/prosilver/template/overall_header.html  | 9 +++------
 phpBB/styles/subsilver2/template/overall_header.html | 7 ++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e537aabf56..009b514e52 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -46,12 +46,9 @@
 	var onload_functions = new Array();
 	var onunload_functions = new Array();
 
-	<!-- IF S_USER_PM_POPUP -->
-		if ({S_NEW_PM})
-		{
-			var url = '{UA_POPUP_PM}';
-			window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
-		}
+	<!-- IF S_USER_PM_POPUP and S_NEW_PM -->
+		var url = '{UA_POPUP_PM}';
+		window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
 	<!-- ENDIF -->
 
 	/**
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 48f6202c4f..be4c7b5b4c 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -28,11 +28,8 @@
 
 <script type="text/javascript">
 // <![CDATA[
-<!-- IF S_USER_PM_POPUP -->
-	if ({S_NEW_PM})
-	{
-		popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
-	}
+<!-- IF S_USER_PM_POPUP and S_NEW_PM -->
+	popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
 <!-- ENDIF -->
 
 function popup(url, width, height, name)
-- 
cgit v1.2.1


From 72fbd4dffaf35df9740aad558bd8075581492c8b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Jan 2011 17:08:20 +0100
Subject: [ticket/9966] Language download in ACP creates index.html and misses
 captcha_*

The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6.

PHPBB3-9966
---
 phpBB/includes/acp/acp_language.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index c2cb2f9c11..598b390302 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -1055,14 +1055,14 @@ class acp_language
 				$iso_src .= htmlspecialchars_decode($row['lang_author']);
 				$compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt');
 
-				// index.html files
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html');
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html');
-				$compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html');
+				// index.htm files
+				$compress->add_data('', 'language/' . $row['lang_iso'] . '/index.htm');
+				$compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.htm');
+				$compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.htm');
 
 				if (sizeof($mod_files))
 				{
-					$compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.html');
+					$compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.htm');
 				}
 
 				$compress->close();
@@ -1217,7 +1217,7 @@ $lang = array_merge($lang, array(
 ';
 
 		// Language files in language root directory
-		$this->main_files = array("common.$phpEx", "groups.$phpEx", "install.$phpEx", "mcp.$phpEx", "memberlist.$phpEx", "posting.$phpEx", "search.$phpEx", "ucp.$phpEx", "viewforum.$phpEx", "viewtopic.$phpEx", "help_bbcode.$phpEx", "help_faq.$phpEx");
+		$this->main_files = array("captcha_qa.$phpEx", "captcha_recaptcha.$phpEx", "common.$phpEx", "groups.$phpEx", "install.$phpEx", "mcp.$phpEx", "memberlist.$phpEx", "posting.$phpEx", "search.$phpEx", "ucp.$phpEx", "viewforum.$phpEx", "viewtopic.$phpEx", "help_bbcode.$phpEx", "help_faq.$phpEx");
 	}
 
 	/**
-- 
cgit v1.2.1


From 92f99c97f41cd090743b4ba4e6048bf6b948115b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Jan 2011 17:22:55 +0100
Subject: [ticket/9949] $user->lang() uses last int-value to get the key not
 first

The comment in the code says: "We now get the first number passed and will
select the key based upon this number". But the loop over the arguments is not
left and therefore it uses the last int-value not the first one.

PHPBB3-9949
---
 phpBB/includes/session.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 5f5b39fe27..1dc854caf2 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1966,6 +1966,7 @@ class user extends session
 
 					$key_found = $num;
 				}
+				break;
 			}
 		}
 
-- 
cgit v1.2.1


From b32bf5aa35be3d5d77fc3ee7be418a988bc10d44 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Jan 2011 16:24:32 +0100
Subject: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to
 mt_rand().

PHPBB3-9985
---
 phpBB/includes/captcha/captcha_gd_wave.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
index f706c98d43..27422513d9 100644
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -62,8 +62,8 @@ class captcha
 				'y' => mt_rand(10, 17)
 			),
 			'lower_left'	=> array(
-				'x' => mt_rand($img_x - 5, $img_x - 45),
-				'y' => mt_rand($img_y - 0, $img_y - 15)
+				'x' => mt_rand($img_x - 45, $img_x - 5),
+				'y' => mt_rand($img_y - 15, $img_y - 0),
 			),
 		);
 
-- 
cgit v1.2.1


From 14891cdf4ecf0e3ee164962be6685b8563f37a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Mon, 31 Jan 2011 12:58:18 +0100
Subject: [ticket/10011] Tests don't work on PHP < 5.3

Due to the usage of `__DIR__` for the file includes the tests can't
be ran on systems with PHP < 5.3. Replace all occurances of
`__DIR__` with `dirname(__FILE__)`.

PHPBB3-10011
---
 tests/dbal/select_test.php                        |  2 +-
 tests/dbal/write_test.php                         |  2 +-
 tests/network/checkdnsrr_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/url_test.php                          |  2 +-
 tests/request/request_var_test.php                |  4 ++--
 tests/security/extract_current_page_test.php      |  6 +++---
 tests/security/redirect_test.php                  |  6 +++---
 tests/template/template_test.php                  |  4 ++--
 tests/test_framework/phpbb_database_test_case.php | 10 +++++-----
 tests/text_processing/make_clickable_test.php     |  4 ++--
 tests/utf/normalizer_test.php                     | 10 +++++-----
 tests/utf/utf8_clean_string_test.php              |  2 +-
 tests/utf/utf8_wordwrap_test.php                  |  2 +-
 18 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 987de5cbff..533416f14b 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index a24b6efcc4..4709d45fa5 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_write_test extends phpbb_database_test_case
 {
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
index 9410deaf64..5a756dcef8 100644
--- a/tests/network/checkdnsrr_test.php
+++ b/tests/network/checkdnsrr_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 /**
 * @group slow
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
index fa519f134c..115c55e4e2 100644
--- a/tests/random/gen_rand_string_test.php
+++ b/tests/random/gen_rand_string_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_random_gen_rand_string_test extends phpbb_test_case
 {
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 93c761c8d0..fa9104e71d 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_censor_test extends phpbb_test_case
 {
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 5d6e207cbb..0695b801d5 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_email_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 735a2c4384..9829547508 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv4_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 187588f861..1b2018403c 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv6_test extends phpbb_test_case
 {
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index 246cbf549c..c3a336063a 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_url_test extends phpbb_test_case
 {
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index 0901b43920..fa17b1909f 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_request_request_var_test extends phpbb_test_case
 {
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index ff0ab4d1bb..71c7a3a397 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -7,10 +7,10 @@
 *
 */
 
-require_once __DIR__ . '/base.php';
+require_once dirname(__FILE__) . '/base.php';
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index c53414e7df..70ba8527b1 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -7,10 +7,10 @@
 *
 */
 
-require_once __DIR__ . '/base.php';
+require_once dirname(__FILE__) . '/base.php';
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_redirect_test extends phpbb_security_test_base
 {
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 35df17e4c6..1b2f35f210 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/template.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case
 {
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index a325855da4..32d2696f1c 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -111,9 +111,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
 			);
 		}
-		else if (file_exists(__DIR__ . '/../test_config.php'))
+		else if (file_exists(dirname(__FILE__) . '/../test_config.php'))
 		{
-			include(__DIR__ . '/../test_config.php');
+			include(dirname(__FILE__) . '/../test_config.php');
 
 			return array(
 				'dbms'		=> $dbms,
@@ -129,7 +129,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			// Silently use sqlite
 			return array(
 				'dbms'		=> 'sqlite',
-				'dbhost'	=> __DIR__ . '/../phpbb_unit_tests.sqlite2', // filename
+				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
 				'dbuser'	=> '',
@@ -340,7 +340,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			}
 		}
 
-		$sql = $this->split_sql_file(file_get_contents(__DIR__ . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
+		$sql = $this->split_sql_file(file_get_contents(dirname(__FILE__) . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
 
 		foreach ($sql as $query)
 		{
@@ -376,7 +376,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		$config = $this->get_database_config();
 
-		require_once __DIR__ . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
+		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
 		$dbal = 'dbal_' . $config['dbms'];
 		$db = new $dbal();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 75a35daf82..29b982d709 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 9a9011c0fe..38b4ec1b6b 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_normalizer.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 
 /**
 * @group slow
@@ -16,8 +16,8 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 {
 	static public function setUpBeforeClass()
 	{
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', __DIR__.'/data');
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', __DIR__.'/data');
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', dirname(__FILE__).'/data');
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', dirname(__FILE__).'/data');
 	}
 
 	public function test_normalizer()
@@ -62,7 +62,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		$tested_chars = array();
 
-		$fp = fopen(__DIR__.'/data/NormalizationTest.txt', 'rb');
+		$fp = fopen(dirname(__FILE__).'/data/NormalizationTest.txt', 'rb');
 		while (!feof($fp))
 		{
 			$line = fgets($fp);
@@ -117,7 +117,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 	*/
 	public function test_invariants(array $tested_chars)
 	{
-		$fp = fopen(__DIR__.'/data/UnicodeData.txt', 'rb');
+		$fp = fopen(dirname(__FILE__).'/data/UnicodeData.txt', 'rb');
 
 		while (!feof($fp))
 		{
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 148297ad4b..e5a771eafa 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index fbc947b92a..03fa9dc38c 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
 {
-- 
cgit v1.2.1


From 57bd0c74e50e2171653d45d9723f2417411c71f4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Jan 2011 17:02:19 +0100
Subject: [ticket/9805] Use getopt(), add a few options, extend show_usage().

PHPBB3-9805
---
 git-tools/setup_github_network.php | 52 +++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index bc8e70cfbd..66d7db87da 100644
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -9,7 +9,7 @@
 
 if ($argc < 2)
 {
-	show_usage($argv);
+	show_usage();
 }
 
 if (file_exists('.git'))
@@ -18,13 +18,38 @@ if (file_exists('.git'))
 	exit(1);
 }
 
-// Handle arguments
-$scope		= get_arg($argv, 1, '');
-$developer	= get_arg($argv, 2, '');
+function show_usage()
+{
+	$filename = basename(__FILE__);
+
+	echo "$filename adds repositories of a github network as remotes to a local git repository.\n";
+	echo "\n";
+
+	echo "Usage: php $filename -s collaborators|organisation|contributors|network [OPTIONS]\n";
+	echo "\n";
+
+	echo "Scopes:\n";
+	echo "  collaborators                 Repositories of people who have push access to the specified repository\n";
+	echo "  contributors                  Repositories of people who have contributed to the specified repository\n";
+	echo "  organisation                  Repositories of members of the organisation at github\n";
+	echo "  network                       All repositories of the whole github network\n";
+	echo "\n";
+
+	echo "Options:\n";
+	echo " -s scope                       See description above (mandatory)\n";
+	echo " -u github_username             Overwrites the github username (optional)\n";
+	echo " -r repository_name             Overwrites the repository name (optional)\n";
+	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
+
+	exit(1);
+}
 
-// Github setup
-$username = 'phpbb';
-$repository = 'phpbb3';
+// Handle arguments
+$opts			= getopt('s:u:r:m:');
+$scope			= get_arg($opts, 's', '');
+$username		= get_arg($opts, 'u', 'phpbb');
+$repository 	= get_arg($opts, 'r', 'phpbb3');
+$developer		= get_arg($opts, 'm', '');
 
 // Get some basic data
 $network		= get_network($username, $repository);
@@ -159,18 +184,9 @@ function get_network($username, $repository)
 	return $usernames;
 }
 
-function show_usage($argv)
-{
-	printf(
-		"usage: php %s collaborators|organisation|contributors|network [your_github_username]\n",
-		basename($argv[0])
-	);
-	exit(1);
-}
-
-function get_arg($argv, $index, $default)
+function get_arg($array, $index, $default)
 {
-	return isset($argv[$index]) ? $argv[$index] : $default;
+	return isset($array[$index]) ? $array[$index] : $default;
 }
 
 function run($cmd)
-- 
cgit v1.2.1


From 8eee36dc0f6111c3a4a6a50d0e33833f19430a0e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 25 Jan 2011 18:41:59 +0100
Subject: [ticket/9805] Add dry-run option.

PHPBB3-9805
---
 git-tools/setup_github_network.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index 66d7db87da..04187aaa4a 100644
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -40,16 +40,19 @@ function show_usage()
 	echo " -u github_username             Overwrites the github username (optional)\n";
 	echo " -r repository_name             Overwrites the repository name (optional)\n";
 	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
+	echo " -d                             Outputs the commands instead of running them (optional)\n";
 
 	exit(1);
 }
 
 // Handle arguments
-$opts			= getopt('s:u:r:m:');
+$opts			= getopt('s:u:r:m:d');
 $scope			= get_arg($opts, 's', '');
 $username		= get_arg($opts, 'u', 'phpbb');
 $repository 	= get_arg($opts, 'r', 'phpbb3');
 $developer		= get_arg($opts, 'm', '');
+$dry_run		= !get_arg($opts, 'd', true);
+run(null, $dry_run);
 
 // Get some basic data
 $network		= get_network($username, $repository);
@@ -189,7 +192,20 @@ function get_arg($array, $index, $default)
 	return isset($array[$index]) ? $array[$index] : $default;
 }
 
-function run($cmd)
+function run($cmd, $dry = false)
 {
-	passthru(escapeshellcmd($cmd));
+	static $dry_run;
+
+	if (is_null($cmd))
+	{
+		$dry_run = $dry;
+	}
+	else if (!empty($dry_run))
+	{
+		echo "$cmd\n";
+	}
+	else
+	{
+		passthru(escapeshellcmd($cmd));
+	}
 }
-- 
cgit v1.2.1


From e1ae8c6a71e253f4311c45a6be5b2d93587d2755 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 25 Jan 2011 19:03:32 +0100
Subject: [ticket/9805] Better support for already existing repositories.

PHPBB3-9805
---
 git-tools/setup_github_network.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index 04187aaa4a..f34787c4c4 100644
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -12,12 +12,6 @@ if ($argc < 2)
 	show_usage();
 }
 
-if (file_exists('.git'))
-{
-	echo "[error] git repository already exists\n";
-	exit(1);
-}
-
 function show_usage()
 {
 	$filename = basename(__FILE__);
@@ -58,9 +52,6 @@ run(null, $dry_run);
 $network		= get_network($username, $repository);
 $collaborators	= get_collaborators($username, $repository);
 
-// Clone the blessed repository
-clone_repository($username, $repository, isset($collaborators[$developer]));
-
 switch ($scope)
 {
 	case 'collaborators':
@@ -83,14 +74,20 @@ switch ($scope)
 		show_usage();
 }
 
-foreach ($remotes as $remote)
+if (file_exists('.git'))
 {
-	if ($remote['username'] == $username)
-	{
-		// Skip blessed repository.
-		continue;
-	}
+	add_remote($username, $repository, isset($collaborators[$developer]));
+}
+else
+{
+	clone_repository($username, $repository, isset($collaborators[$developer]));
+}
 
+// Skip blessed repository.
+unset($remotes[$username]);
+
+foreach ($remotes as $remote)
+{
 	add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
 }
 
@@ -99,12 +96,12 @@ run('git remote update');
 function clone_repository($username, $repository, $pushable = false)
 {
 	$url = get_repository_url($username, $repository, false);
-	run("git clone $url ./");
+	run("git clone $url ./ --origin $username");
 
 	if ($pushable)
 	{
 		$ssh_url = get_repository_url($username, $repository, true);
-		run("git remote set-url --push origin $ssh_url");
+		run("git remote set-url --push $username $ssh_url");
 	}
 }
 
-- 
cgit v1.2.1


From 67fe441f7e94aa9f502f3f8d3ff7ad15bb2ae008 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 25 Jan 2011 19:07:29 +0100
Subject: [ticket/9805] Move check lower down.

PHPBB3-9805
---
 git-tools/setup_github_network.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index f34787c4c4..911d336c2d 100644
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -7,11 +7,6 @@
 *
 */
 
-if ($argc < 2)
-{
-	show_usage();
-}
-
 function show_usage()
 {
 	$filename = basename(__FILE__);
@@ -40,7 +35,13 @@ function show_usage()
 }
 
 // Handle arguments
-$opts			= getopt('s:u:r:m:d');
+$opts = getopt('s:u:r:m:d');
+
+if (empty($opts))
+{
+	show_usage();
+}
+
 $scope			= get_arg($opts, 's', '');
 $username		= get_arg($opts, 'u', 'phpbb');
 $repository 	= get_arg($opts, 'r', 'phpbb3');
-- 
cgit v1.2.1


From 50bdb5da89cdbca0d4331a7f4f721f8be712d0ca Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 26 Jan 2011 03:18:31 +0100
Subject: [ticket/9805] Setup security repository for developers.

PHPBB3-9805
---
 git-tools/setup_github_network.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index 911d336c2d..08e99e2f32 100644
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -84,6 +84,12 @@ else
 	clone_repository($username, $repository, isset($collaborators[$developer]));
 }
 
+// Add private security repository for developers
+if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
+{
+	run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
+}
+
 // Skip blessed repository.
 unset($remotes[$username]);
 
-- 
cgit v1.2.1


From 15992ceff99cd147d30b81fa237424160779f916 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Feb 2011 21:50:44 -0500
Subject: [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.

PHPBB3-10020
---
 phpBB/adm/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 92bcf90039..b6ccb6b241 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -573,7 +573,8 @@ function validate_range($value_ary, &$error)
 		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1),
 		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535),
 		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff),
-		'INT'	=> array('php_type' => 'int', 		'min' => (int) 0x80000000, 	'max' => (int) 0x7fffffff),
+		// Do not use (int) 0x80000000 - it evaluates to different values on 32-bit and 64-bit systems.
+		'INT'	=> array('php_type' => 'int', 		'min' => -2147483648,		'max' => (int) 0x7fffffff),
 		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127),
 
 		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255),
-- 
cgit v1.2.1


From d13efa41c5ec0968f9689ac17582106e0673cf8b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Feb 2011 09:59:06 -0500
Subject: [ticket/10020] Fix 32-bit php braindamage around INT_MIN.

On 32-bit php, -2147483648, despite fitting in the int type,
is for some reason made into a floating-point value. Use an
explicit cast to make it an integer.

PHPBB3-10020
---
 phpBB/adm/index.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index b6ccb6b241..dd8f4c279d 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -573,8 +573,11 @@ function validate_range($value_ary, &$error)
 		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1),
 		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535),
 		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff),
-		// Do not use (int) 0x80000000 - it evaluates to different values on 32-bit and 64-bit systems.
-		'INT'	=> array('php_type' => 'int', 		'min' => -2147483648,		'max' => (int) 0x7fffffff),
+		// Do not use (int) 0x80000000 - it evaluates to different
+		// values on 32-bit and 64-bit systems.
+		// Apparently -2147483648 is a float on 32-bit systems,
+		// despite fitting in an int, thus explicit cast is needed.
+		'INT'	=> array('php_type' => 'int', 		'min' => (int) -2147483648,	'max' => (int) 0x7fffffff),
 		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127),
 
 		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255),
-- 
cgit v1.2.1


From 3c04e6db97bb3de860aa42062459f0f44487c557 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Feb 2011 16:29:53 +0100
Subject: [ticket/9949] Unit tests for user::lang()

PHPBB3-9949
---
 tests/user/lang_test.php | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 tests/user/lang_test.php

diff --git a/tests/user/lang_test.php b/tests/user/lang_test.php
new file mode 100644
index 0000000000..6c60583a7b
--- /dev/null
+++ b/tests/user/lang_test.php
@@ -0,0 +1,58 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+
+class phpbb_user_lang_test extends phpbb_test_case
+{
+	public function test_user_lang_sprintf()
+	{
+		$user = new user;
+		$user->lang = array(
+			'FOO'		=> 'BAR',
+			'BARZ'		=> 'PENG',
+			'EMPTY'		=> '',
+			'ZERO'		=> '0',
+			'STR'		=> '%d %s, %d topics',
+			'STR2'		=> '%d foos',
+			'ARRY'		=> array(
+				0		=> 'No posts',		// 0
+				1		=> '1 post',		// 1
+				2		=> '%d posts',		// 2+
+			),
+		);
+
+		// No param
+		$this->assertEquals($user->lang('FOO'), 'BAR');
+		$this->assertEquals($user->lang('EMPTY'), '');
+		$this->assertEquals($user->lang('ZERO'), '0');
+
+		// Invalid index
+		$this->assertEquals($user->lang('VOID'), 'VOID');
+
+		// Unnecessary param
+		$this->assertEquals($user->lang('FOO', 2), 'BAR');
+		$this->assertEquals($user->lang('FOO', 2, 3), 'BAR');
+		$this->assertEquals($user->lang('FOO', 2, 3, 'BARZ'), 'BAR');
+
+		// String
+		$this->assertEquals($user->lang('STR', 24, 'x', 42), '24 x, 42 topics');
+		$this->assertEquals($user->lang('STR2', 64), '64 foos');
+
+		// Array
+		$this->assertEquals($user->lang('ARRY', 0), 'No posts');
+		$this->assertEquals($user->lang('ARRY', 1), '1 post');
+		$this->assertEquals($user->lang('ARRY', 2), '2 posts');
+		$this->assertEquals($user->lang('ARRY', 123), '123 posts');
+
+		// Bug PHPBB3-9949
+		$this->assertEquals($user->lang('ARRY', 1, 2), '1 post');
+		$this->assertEquals($user->lang('ARRY', 1, 's', 2), '1 post');
+	}
+}
-- 
cgit v1.2.1


From ffcd307746af6a578fe771c31c306feb9d393e9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 14 Sep 2010 17:25:46 +0200
Subject: [ticket/9675] Add option to delete template/theme/imageset when
 deleting style.

PHPBB3-9675
---
 phpBB/adm/style/acp_styles.html   |  14 +++++
 phpBB/includes/acp/acp_styles.php | 104 +++++++++++++++++++++++++++++++++++++-
 phpBB/language/en/acp/styles.php  |   5 +-
 3 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index cb4361dd6f..1978537cf4 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -22,6 +22,20 @@
 		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
 		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
 	</dl>
+	<!-- IF S_DELETE_STYLE -->
+		<dl>
+			<dt><label for="new_template_id">{L_REPLACE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt>
+			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="new_theme_id">{L_REPLACE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
+			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="new_imageset_id">{L_REPLACE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt>
+			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
 
 	<p class="quick">
 		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2ccc728031..d9565214db 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1587,7 +1587,7 @@ parse_css_file = {PARSE_CSS_FILE}
 		{
 			case 'style':
 				$sql_from = STYLES_TABLE;
-				$sql_select = 'style_name';
+				$sql_select = 'style_name, template_id, theme_id, imageset_id';
 				$sql_where = 'AND style_active = 1';
 			break;
 
@@ -1678,6 +1678,51 @@ parse_css_file = {PARSE_CSS_FILE}
 				{
 					set_config('default_style', $new_id);
 				}
+
+				// Remove the components
+				$components = array('template', 'theme', 'imageset');
+				foreach ($components as $component)
+				{
+					$new_id = request_var('new_' . $component . '_id', 0);
+					$style_id = $style_row[$component . '_id'];
+
+					if (($new_id == 0) || ($component === 'template' && ($conflicts = $this->check_inheritance($component, $style_id))))
+					{
+						// We can not delete the template, as the selected one is inheriting from this one.
+						continue;
+					}
+
+					if ($component == 'imageset')
+					{
+						$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
+							WHERE imageset_id = $style_id";
+						$db->sql_query($sql);
+					}
+
+					switch ($component)
+					{
+						case 'template':
+							$sql_from = STYLES_TEMPLATE_TABLE;
+						break;
+
+						case 'theme':
+							$sql_from = STYLES_THEME_TABLE;
+						break;
+
+						case 'imageset':
+							$sql_from = STYLES_IMAGESET_TABLE;;
+						break;
+					}
+
+					$sql = "DELETE FROM $sql_from
+						WHERE {$component}_id = $style_id";
+					$db->sql_query($sql);
+
+					$sql = 'UPDATE ' . STYLES_TABLE . "
+						SET {$component}_id = $new_id
+						WHERE {$component}_id = $style_id";
+					$db->sql_query($sql);
+				}
 			}
 			else
 			{
@@ -1718,6 +1763,63 @@ parse_css_file = {PARSE_CSS_FILE}
 			'NAME'			=> $style_row[$mode . '_name'],
 			)
 		);
+
+		if ($mode == 'style')
+		{
+			$template->assign_vars(array(
+				'S_DELETE_STYLE'		=> true,
+			));
+
+			$components = array('template', 'theme', 'imageset');
+			foreach ($components as $mode)
+			{
+				$sql_where = '';
+				switch ($mode)
+				{
+					case 'template':
+						$sql_from = STYLES_TEMPLATE_TABLE;
+						$sql_select = 'template_name, template_path, template_storedb';
+						$sql_where = ' AND template_inherits_id <> ' . $style_row[$mode . '_id'];
+					break;
+
+					case 'theme':
+						$sql_from = STYLES_THEME_TABLE;
+						$sql_select = 'theme_name, theme_path, theme_storedb';
+					break;
+
+					case 'imageset':
+						$sql_from = STYLES_IMAGESET_TABLE;
+						$sql_select = 'imageset_name, imageset_path';
+					break;
+				}
+
+				$sql = "SELECT {$mode}_id, {$mode}_name
+					FROM $sql_from
+					WHERE {$mode}_id <> {$style_row[$mode . '_id']}
+						$sql_where
+					ORDER BY {$mode}_name ASC";
+				$result = $db->sql_query($sql);
+
+				$s_options = '<option value="0">' . $user->lang['KEEP_' . strtoupper($mode)] . '</option>';
+
+				$set_default = true;
+				while ($row = $db->sql_fetchrow($result))
+				{
+					if ($set_default)
+					{
+						$s_options .= '<option value="' . $row[$mode . '_id'] . '" selected="selected">' . $row[$mode . '_name'] . '</option>';
+						$set_default = false;
+					}
+					else
+					{
+						$s_options .= '<option value="' . $row[$mode . '_id'] . '">' . $row[$mode . '_name'] . '</option>';
+					}
+				}
+				$db->sql_freeresult($result);
+
+				$template->assign_var('S_REPLACE_' . strtoupper($mode) . '_OPTIONS', $s_options);
+			}
+		}
 	}
 
 	/**
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f161a7e6e6..f422f96009 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -285,11 +285,14 @@ $lang = array_merge($lang, array(
 	'INSTALLED_TEMPLATE'		=> 'Installed templates',
 	'INSTALLED_THEME'			=> 'Installed themes',
 
+	'KEEP_IMAGESET'				=> 'Keep imageset',
+	'KEEP_TEMPLATE'				=> 'Keep template',
+	'KEEP_THEME'				=> 'Keep theme',
+
 	'LINE_SPACING'				=> 'Line spacing',
 	'LOCALISED_IMAGES'			=> 'Localised',
 	'LOCATION_DISABLED_EXPLAIN'	=> 'This setting is inherited and cannot be changed.',
 
-
 	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
 	'NO_IMAGESET'				=> 'Cannot find imageset on filesystem.',
 	'NO_IMAGE'					=> 'No image',
-- 
cgit v1.2.1


From 18fedfce1739075586aa0e40fabdffba65593793 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 15 Sep 2010 11:21:54 +0200
Subject: [ticket/9675] Adjust the language-string to reflect the changes.

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

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f422f96009..f5531071e4 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
 	'DELETE_IMAGESET'			=> 'Delete imageset',
 	'DELETE_IMAGESET_EXPLAIN'	=> 'Here you can remove the selected imageset from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.',
 	'DELETE_STYLE'				=> 'Delete style',
-	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care when deleting styles, there is no undo facility.',
+	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.',
 	'DELETE_TEMPLATE'			=> 'Delete template',
 	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.',
 	'DELETE_THEME'				=> 'Delete theme',
-- 
cgit v1.2.1


From 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Jan 2011 13:30:59 +0100
Subject: [ticket/9675] Put the code into methods to avoid code duplication.

PHPBB3-9675
---
 phpBB/adm/style/acp_styles.html   |   7 +-
 phpBB/includes/acp/acp_styles.php | 272 +++++++++++++++++++++-----------------
 phpBB/language/en/acp/styles.php  |   7 +-
 3 files changed, 162 insertions(+), 124 deletions(-)

diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 1978537cf4..098cc723d9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -23,16 +23,17 @@
 		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF S_DELETE_STYLE -->
+		<hr />
 		<dl>
-			<dt><label for="new_template_id">{L_REPLACE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt>
+			<dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt>
 			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="new_theme_id">{L_REPLACE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
+			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
 			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="new_imageset_id">{L_REPLACE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt>
+			<dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt>
 			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index d9565214db..2e2807c8cb 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1587,23 +1587,23 @@ parse_css_file = {PARSE_CSS_FILE}
 		{
 			case 'style':
 				$sql_from = STYLES_TABLE;
-				$sql_select = 'style_name, template_id, theme_id, imageset_id';
+				$sql_select = 'style_id, style_name, template_id, theme_id, imageset_id';
 				$sql_where = 'AND style_active = 1';
 			break;
 
 			case 'template':
 				$sql_from = STYLES_TEMPLATE_TABLE;
-				$sql_select = 'template_name, template_path, template_storedb';
+				$sql_select = 'template_id, template_name, template_path, template_storedb';
 			break;
 
 			case 'theme':
 				$sql_from = STYLES_THEME_TABLE;
-				$sql_select = 'theme_name, theme_path, theme_storedb';
+				$sql_select = 'theme_id, theme_name, theme_path, theme_storedb';
 			break;
 
 			case 'imageset':
 				$sql_from = STYLES_IMAGESET_TABLE;
-				$sql_select = 'imageset_name, imageset_path';
+				$sql_select = 'imageset_id, imageset_name, imageset_path';
 			break;
 		}
 
@@ -1633,37 +1633,14 @@ parse_css_file = {PARSE_CSS_FILE}
 			trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
-		$sql = "SELECT {$mode}_id, {$mode}_name
-			FROM $sql_from
-			WHERE {$mode}_id <> $style_id
-			$sql_where
-			ORDER BY {$mode}_name ASC";
-		$result = $db->sql_query($sql);
-
-		$s_options = '';
-
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$s_options .= '<option value="' . $row[$mode . '_id'] . '">' . $row[$mode . '_name'] . '</option>';
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		else
-		{
-			trigger_error($user->lang['ONLY_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-		$db->sql_freeresult($result);
-
 		if ($update)
 		{
-			$sql = "DELETE FROM $sql_from
-				WHERE {$mode}_id = $style_id";
-			$db->sql_query($sql);
-
 			if ($mode == 'style')
 			{
+				$sql = "DELETE FROM $sql_from
+					WHERE {$mode}_id = $style_id";
+				$db->sql_query($sql);
+
 				$sql = 'UPDATE ' . USERS_TABLE . "
 					SET user_style = $new_id
 					WHERE user_style = $style_id";
@@ -1684,58 +1661,13 @@ parse_css_file = {PARSE_CSS_FILE}
 				foreach ($components as $component)
 				{
 					$new_id = request_var('new_' . $component . '_id', 0);
-					$style_id = $style_row[$component . '_id'];
-
-					if (($new_id == 0) || ($component === 'template' && ($conflicts = $this->check_inheritance($component, $style_id))))
-					{
-						// We can not delete the template, as the selected one is inheriting from this one.
-						continue;
-					}
-
-					if ($component == 'imageset')
-					{
-						$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-							WHERE imageset_id = $style_id";
-						$db->sql_query($sql);
-					}
-
-					switch ($component)
-					{
-						case 'template':
-							$sql_from = STYLES_TEMPLATE_TABLE;
-						break;
-
-						case 'theme':
-							$sql_from = STYLES_THEME_TABLE;
-						break;
-
-						case 'imageset':
-							$sql_from = STYLES_IMAGESET_TABLE;;
-						break;
-					}
-
-					$sql = "DELETE FROM $sql_from
-						WHERE {$component}_id = $style_id";
-					$db->sql_query($sql);
-
-					$sql = 'UPDATE ' . STYLES_TABLE . "
-						SET {$component}_id = $new_id
-						WHERE {$component}_id = $style_id";
-					$db->sql_query($sql);
+					$component_id = $style_row[$component . '_id'];
+					$this->remove_component($component, $component_id, $new_id);
 				}
 			}
 			else
 			{
-				if ($mode == 'imageset')
-				{
-					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-						WHERE imageset_id = $style_id";
-					$db->sql_query($sql);
-				}
-				$sql = 'UPDATE ' . STYLES_TABLE . "
-					SET {$mode}_id = $new_id
-					WHERE {$mode}_id = $style_id";
-				$db->sql_query($sql);
+				$this->remove_component($mode, $style_id, $new_id);
 			}
 
 			$cache->destroy('sql', STYLES_TABLE);
@@ -1745,11 +1677,12 @@ parse_css_file = {PARSE_CSS_FILE}
 			trigger_error($user->lang[$message] . adm_back_link($this->u_action));
 		}
 
+		$this->display_component_options($mode, $style_row[$mode . '_id'], $style_row);
+
 		$this->page_title = 'DELETE_' . $l_prefix;
 
 		$template->assign_vars(array(
 			'S_DELETE'			=> true,
-			'S_REPLACE_OPTIONS'	=> $s_options,
 
 			'L_TITLE'			=> $user->lang[$this->page_title],
 			'L_EXPLAIN'			=> $user->lang[$this->page_title . '_EXPLAIN'],
@@ -1769,55 +1702,158 @@ parse_css_file = {PARSE_CSS_FILE}
 			$template->assign_vars(array(
 				'S_DELETE_STYLE'		=> true,
 			));
+		}
+	}
+
+	/**
+	* Remove template/theme/imageset entry from the database
+	*/
+	function remove_component($component, $style_id, $new_id)
+	{
+		global $db;
+
+		if (($new_id == 0) || ($component === 'template' && ($conflicts = $this->check_inheritance($component, $style_id))))
+		{
+			// We can not delete the template, as the selected one is inheriting from this one.
+			return;
+		}
+
+		if ($component == 'imageset')
+		{
+			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
+				WHERE imageset_id = $style_id";
+			$db->sql_query($sql);
+		}
+
+		switch ($component)
+		{
+			case 'template':
+				$sql_from = STYLES_TEMPLATE_TABLE;
+			break;
+
+			case 'theme':
+				$sql_from = STYLES_THEME_TABLE;
+			break;
+
+			case 'imageset':
+				$sql_from = STYLES_IMAGESET_TABLE;;
+			break;
+		}
+
+		$sql = "DELETE FROM $sql_from
+			WHERE {$component}_id = $style_id";
+		$db->sql_query($sql);
+
+		$sql = 'UPDATE ' . STYLES_TABLE . "
+			SET {$component}_id = $new_id
+			WHERE {$component}_id = $style_id";
+		$db->sql_query($sql);
+	}
+
+	/**
+	* Display the options which can be used to replace a style/template/theme/imageset
+	*/
+	function display_component_options($component, $component_id, $style_row = false, $style_id = false)
+	{
+		global $db, $template, $user;
 
-			$components = array('template', 'theme', 'imageset');
-			foreach ($components as $mode)
+		$component_in_use = array();
+		if (($component != 'style') && $style_id)
+		{
+			$sql = 'SELECT style_id, style_name
+				FROM ' . STYLES_TABLE . "
+				WHERE {$component}_id = {$component_id}
+					AND style_id <> {$style_id}
+				ORDER BY style_name ASC";
+			$result = $db->sql_query($sql);
+			while ($row = $db->sql_fetchrow($result))
 			{
-				$sql_where = '';
-				switch ($mode)
+				$component_in_use[] = $row['style_name'];
+			}
+			$db->sql_freeresult($result);
+
+			if ($component === 'template' && ($conflicts = $this->check_inheritance($component, $component_id)))
+			{
+				foreach ($conflicts as $temp_id => $conflict_data)
 				{
-					case 'template':
-						$sql_from = STYLES_TEMPLATE_TABLE;
-						$sql_select = 'template_name, template_path, template_storedb';
-						$sql_where = ' AND template_inherits_id <> ' . $style_row[$mode . '_id'];
-					break;
+					$component_in_use[] = $conflict_data['template_name'];
+				}
+			}
+		}
 
-					case 'theme':
-						$sql_from = STYLES_THEME_TABLE;
-						$sql_select = 'theme_name, theme_path, theme_storedb';
-					break;
+		$sql_where = '';
+		switch ($component)
+		{
+			case 'style':
+				$sql_from = STYLES_TABLE;
+				$sql_where = 'WHERE style_active = 1';
+			break;
 
-					case 'imageset':
-						$sql_from = STYLES_IMAGESET_TABLE;
-						$sql_select = 'imageset_name, imageset_path';
-					break;
-				}
+			case 'template':
+				$sql_from = STYLES_TEMPLATE_TABLE;
+				$sql_where = 'WHERE template_inherits_id <> ' . $component_id;
+			break;
 
-				$sql = "SELECT {$mode}_id, {$mode}_name
-					FROM $sql_from
-					WHERE {$mode}_id <> {$style_row[$mode . '_id']}
-						$sql_where
-					ORDER BY {$mode}_name ASC";
-				$result = $db->sql_query($sql);
+			case 'theme':
+				$sql_from = STYLES_THEME_TABLE;
+			break;
 
-				$s_options = '<option value="0">' . $user->lang['KEEP_' . strtoupper($mode)] . '</option>';
+			case 'imageset':
+				$sql_from = STYLES_IMAGESET_TABLE;
+			break;
+		}
 
-				$set_default = true;
-				while ($row = $db->sql_fetchrow($result))
+		$s_options = '';
+		if (($component != 'style') && empty($component_in_use))
+		{
+			$sql = "SELECT {$component}_id, {$component}_name
+				FROM $sql_from
+				WHERE {$component}_id = {$component_id}";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			$s_options .= '<option value="-1" selected="selected">' . $user->lang['DELETE_' . strtoupper($component)] . '</option>';
+			$s_options .= '<option value="0">' . sprintf($user->lang['KEEP_' . strtoupper($component)], $row[$component . '_name']) . '</option>';
+		}
+		else
+		{
+			$sql = "SELECT {$component}_id, {$component}_name
+				FROM $sql_from
+				$sql_where
+				ORDER BY {$component}_name ASC";
+			$result = $db->sql_query($sql);
+
+			$s_keep_option = $s_options = '';
+			while ($row = $db->sql_fetchrow($result))
+			{
+				if ($row[$component . '_id'] != $component_id)
 				{
-					if ($set_default)
-					{
-						$s_options .= '<option value="' . $row[$mode . '_id'] . '" selected="selected">' . $row[$mode . '_name'] . '</option>';
-						$set_default = false;
-					}
-					else
-					{
-						$s_options .= '<option value="' . $row[$mode . '_id'] . '">' . $row[$mode . '_name'] . '</option>';
-					}
+					$s_options .= '<option value="' . $row[$component . '_id'] . '">' . sprintf($user->lang['REPLACE_WITH_OPTION'], $row[$component . '_name']) . '</option>';
 				}
-				$db->sql_freeresult($result);
+				else if ($component != 'style')
+				{
+					$s_keep_option = '<option value="0" selected="selected">' . sprintf($user->lang['KEEP_' . strtoupper($component)], $row[$component . '_name']) . '</option>';
+				}
+			}
+			$db->sql_freeresult($result);
+			$s_options = $s_keep_option . $s_options;
+		}
 
-				$template->assign_var('S_REPLACE_' . strtoupper($mode) . '_OPTIONS', $s_options);
+		if (!$style_row)
+		{
+			$template->assign_var('S_REPLACE_' . strtoupper($component) . '_OPTIONS', $s_options);
+		}
+		else
+		{
+			$template->assign_var('S_REPLACE_OPTIONS', $s_options);
+			if ($component == 'style')
+			{
+				$components = array('template', 'theme', 'imageset');
+				foreach ($components as $component)
+				{
+					$this->display_component_options($component, $style_row[$component . '_id'], false, $component_id);
+				}
 			}
 		}
 	}
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f5531071e4..8f65b3ef5f 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -285,9 +285,9 @@ $lang = array_merge($lang, array(
 	'INSTALLED_TEMPLATE'		=> 'Installed templates',
 	'INSTALLED_THEME'			=> 'Installed themes',
 
-	'KEEP_IMAGESET'				=> 'Keep imageset',
-	'KEEP_TEMPLATE'				=> 'Keep template',
-	'KEEP_THEME'				=> 'Keep theme',
+	'KEEP_IMAGESET'				=> 'Keep "%s" imageset',
+	'KEEP_TEMPLATE'				=> 'Keep "%s" template',
+	'KEEP_THEME'				=> 'Keep "%s" theme',
 
 	'LINE_SPACING'				=> 'Line spacing',
 	'LOCALISED_IMAGES'			=> 'Localised',
@@ -325,6 +325,7 @@ $lang = array_merge($lang, array(
 	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
 	'REPLACE_THEME'				=> 'Replace theme with',
 	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
+	'REPLACE_WITH_OPTION'		=> 'Replace with "%s"',
 	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
 	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
 	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
-- 
cgit v1.2.1


From 65020fd5c1d71f44ef74824a27eaf4929b19635c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Jan 2011 14:23:33 +0100
Subject: [ticket/9675] Correctly check whether the style/component is still in
 use.

And don't allow to delete it in that case.

PHPBB3-9675
---
 phpBB/includes/acp/acp_styles.php | 92 +++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2e2807c8cb..0f157ceff3 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1662,7 +1662,7 @@ parse_css_file = {PARSE_CSS_FILE}
 				{
 					$new_id = request_var('new_' . $component . '_id', 0);
 					$component_id = $style_row[$component . '_id'];
-					$this->remove_component($component, $component_id, $new_id);
+					$this->remove_component($component, $component_id, $new_id, $style_id);
 				}
 			}
 			else
@@ -1708,20 +1708,32 @@ parse_css_file = {PARSE_CSS_FILE}
 	/**
 	* Remove template/theme/imageset entry from the database
 	*/
-	function remove_component($component, $style_id, $new_id)
+	function remove_component($component, $component_id, $new_id, $style_id = false)
 	{
 		global $db;
 
-		if (($new_id == 0) || ($component === 'template' && ($conflicts = $this->check_inheritance($component, $style_id))))
+		if (($new_id == 0) || ($component === 'template' && ($conflicts = $this->check_inheritance($component, $component_id))))
 		{
-			// We can not delete the template, as the selected one is inheriting from this one.
+			// We can not delete the template, as the user wants to keep the component or an other template is inheriting from this one.
+			return;
+		}
+
+		$component_in_use = array();
+		if ($component != 'style')
+		{
+			$component_in_use = $this->component_in_use($component, $component_id, $style_id);
+		}
+
+		if (($new_id == -1) && !empty($component_in_use))
+		{
+			// We can not delete the component, as it is still in use
 			return;
 		}
 
 		if ($component == 'imageset')
 		{
 			$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . "
-				WHERE imageset_id = $style_id";
+				WHERE imageset_id = $component_id";
 			$db->sql_query($sql);
 		}
 
@@ -1741,12 +1753,12 @@ parse_css_file = {PARSE_CSS_FILE}
 		}
 
 		$sql = "DELETE FROM $sql_from
-			WHERE {$component}_id = $style_id";
+			WHERE {$component}_id = $component_id";
 		$db->sql_query($sql);
 
 		$sql = 'UPDATE ' . STYLES_TABLE . "
 			SET {$component}_id = $new_id
-			WHERE {$component}_id = $style_id";
+			WHERE {$component}_id = $component_id";
 		$db->sql_query($sql);
 	}
 
@@ -1758,27 +1770,9 @@ parse_css_file = {PARSE_CSS_FILE}
 		global $db, $template, $user;
 
 		$component_in_use = array();
-		if (($component != 'style') && $style_id)
+		if ($component != 'style')
 		{
-			$sql = 'SELECT style_id, style_name
-				FROM ' . STYLES_TABLE . "
-				WHERE {$component}_id = {$component_id}
-					AND style_id <> {$style_id}
-				ORDER BY style_name ASC";
-			$result = $db->sql_query($sql);
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$component_in_use[] = $row['style_name'];
-			}
-			$db->sql_freeresult($result);
-
-			if ($component === 'template' && ($conflicts = $this->check_inheritance($component, $component_id)))
-			{
-				foreach ($conflicts as $temp_id => $conflict_data)
-				{
-					$component_in_use[] = $conflict_data['template_name'];
-				}
-			}
+			$component_in_use = $this->component_in_use($component, $component_id, $style_id);
 		}
 
 		$sql_where = '';
@@ -1852,12 +1846,54 @@ parse_css_file = {PARSE_CSS_FILE}
 				$components = array('template', 'theme', 'imageset');
 				foreach ($components as $component)
 				{
-					$this->display_component_options($component, $style_row[$component . '_id'], false, $component_id);
+					$this->display_component_options($component, $style_row[$component . '_id'], false, $component_id, true);
 				}
 			}
 		}
 	}
 
+	/**
+	* Check whether the component is still used by another style or component
+	*/
+	function component_in_use($component, $component_id, $style_id = false)
+	{
+		global $db;
+
+		$component_in_use = array();
+
+		if ($style_id)
+		{
+			$sql = 'SELECT style_id, style_name
+				FROM ' . STYLES_TABLE . "
+				WHERE {$component}_id = {$component_id}
+					AND style_id <> {$style_id}
+				ORDER BY style_name ASC";
+		}
+		else
+		{
+			$sql = 'SELECT style_id, style_name
+				FROM ' . STYLES_TABLE . "
+				WHERE {$component}_id = {$component_id}
+				ORDER BY style_name ASC";
+		}
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$component_in_use[] = $row['style_name'];
+		}
+		$db->sql_freeresult($result);
+
+		if ($component === 'template' && ($conflicts = $this->check_inheritance($component, $component_id)))
+		{
+			foreach ($conflicts as $temp_id => $conflict_data)
+			{
+				$component_in_use[] = $conflict_data['template_name'];
+			}
+		}
+
+		return $component_in_use;
+	}
+
 	/**
 	* Export style or style elements
 	*/
-- 
cgit v1.2.1


From 0e861ac3ab0513ec1c00354bfc8fc8492aa6573c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 9 Feb 2011 02:14:46 -0500
Subject: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP
 version.

PHPBB3-10029
---
 phpBB/includes/functions.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9a8cc5d6b3..398a02380b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2631,8 +2631,14 @@ function send_status_line($code, $message)
 	}
 	else
 	{
-		if (isset($_SERVER['HTTP_VERSION']))
+		if (!empty($_SERVER['SERVER_PROTOCOL']))
 		{
+			$version = $_SERVER['SERVER_PROTOCOL'];
+		}
+		else if (!empty($_SERVER['HTTP_VERSION']))
+		{
+			// I cannot remember where I got this from.
+			// This code path may never be reachable in reality.
 			$version = $_SERVER['HTTP_VERSION'];
 		}
 		else
-- 
cgit v1.2.1


From 23d2798b6daeab2afaa605dfaeb49dfb718e306f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 12 Feb 2011 19:12:51 +0100
Subject: [ticket/10038] Use request_var() in the avatar code path of
 download/file.php

There is no reason not to use request_var() here because it is available anyway
since 3afd2c6948e777fde2f43f00bff1659f2691f4d8.

This change especially prevents submitting an array which might then throw an
error in one of the string functions substr() or strpos() later on.

PHPBB3-10038
---
 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 5f45b88359..f5a766dd57 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -64,7 +64,7 @@ if (isset($_GET['avatar']))
 	$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : 'msie 6.0';
 
 	$config = $cache->obtain_config();
-	$filename = $_GET['avatar'];
+	$filename = request_var('avatar', '');
 	$avatar_group = false;
 	$exit = false;
 
-- 
cgit v1.2.1


From c717e44094ce6d3b3ad4f56519b8f421ec06146e Mon Sep 17 00:00:00 2001
From: Niklas Schmidtmer <niklas.schmidtmer@gmx.de>
Date: Sun, 13 Feb 2011 18:29:30 +0100
Subject: [ticket/8904] Show default value for numeric custom profile fields
 when editing

When displaying the default value for a numeric custom profile field, only use
request_var to obtain the value on creation. When editing, it will always
override the actual value with an empty string, as this is request_var's default
return value.

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

diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 2288a0728b..2e43b0545a 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -512,7 +512,7 @@ class acp_profile
 					else if ($field_type == FIELD_INT && $key == 'field_default_value')
 					{
 						// Permit an empty string
-						if (request_var('field_default_value', '') === '')
+						if ($action == 'create' && request_var('field_default_value', '') === '')
 						{
 							$var = '';
 						}
-- 
cgit v1.2.1


From 6c7f49f56199a5e4de195731c2d7a8aacd33dd53 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 14 Feb 2011 00:00:59 +0100
Subject: [task/refactor-db-testcase] Refactor phpbb_database_test_case

Move most of the methods to a separate connection manager class. The
test case creates a manager to handle database creation, schema loading
and more. Most of the methods could be simplified because they can
access shared pdo, config and dbms data.

PHPBB3-10043
---
 tests/bootstrap.php                                |   1 +
 tests/test_framework/phpbb_database_test_case.php  | 285 +----------------
 .../phpbb_database_test_connection_manager.php     | 336 +++++++++++++++++++++
 3 files changed, 349 insertions(+), 273 deletions(-)
 create mode 100644 tests/test_framework/phpbb_database_test_connection_manager.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1fba323277..c729c6e2d8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -30,3 +30,4 @@ require_once $phpbb_root_path . 'includes/constants.php';
 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';
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 32d2696f1c..e1b368dcea 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -9,7 +9,7 @@
 
 abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_TestCase
 {
-	private static $already_connected;
+	static private $already_connected;
 
 	protected $test_case_helpers;
 
@@ -38,66 +38,6 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		return $this->test_case_helpers;
 	}
 
-	public function get_dbms_data($dbms)
-	{
-		$available_dbms = array(
-			'firebird'	=> array(
-				'SCHEMA'		=> 'firebird',
-				'DELIM'			=> ';;',
-				'PDO'			=> 'firebird',
-			),
-			'mysqli'	=> array(
-				'SCHEMA'		=> 'mysql_41',
-				'DELIM'			=> ';',
-				'PDO'			=> 'mysql',
-			),
-			'mysql'		=> array(
-				'SCHEMA'		=> 'mysql',
-				'DELIM'			=> ';',
-				'PDO'			=> 'mysql',
-			),
-			'mssql'		=> array(
-				'SCHEMA'		=> 'mssql',
-				'DELIM'			=> 'GO',
-				'PDO'			=> 'odbc',
-			),
-			'mssql_odbc'=>	array(
-				'SCHEMA'		=> 'mssql',
-				'DELIM'			=> 'GO',
-				'PDO'			=> 'odbc',
-			),
-			'mssqlnative'		=> array(
-				'SCHEMA'		=> 'mssql',
-				'DELIM'			=> 'GO',
-				'PDO'			=> 'sqlsrv',
-			),
-			'oracle'	=>	array(
-				'SCHEMA'		=> 'oracle',
-				'DELIM'			=> '/',
-				'PDO'			=> 'oci',
-			),
-			'postgres' => array(
-				'SCHEMA'		=> 'postgres',
-				'DELIM'			=> ';',
-				'PDO'			=> 'pgsql',
-			),
-			'sqlite'		=> array(
-				'SCHEMA'		=> 'sqlite',
-				'DELIM'			=> ';',
-				'PDO'			=> 'sqlite2',
-			),
-		);
-
-		if (isset($available_dbms[$dbms]))
-		{
-			return $available_dbms[$dbms];
-		}
-		else
-		{
-			trigger_error('Database unsupported', E_USER_ERROR);
-		}
-	}
-
 	public function get_database_config()
 	{
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -142,232 +82,26 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		}
 	}
 
-	// NOTE: This function is not the same as split_sql_file from functions_install
-	public function split_sql_file($sql, $dbms)
-	{
-		$dbms_data = $this->get_dbms_data($dbms);
-
-		$sql = str_replace("\r" , '', $sql);
-		$data = preg_split('/' . preg_quote($dbms_data['DELIM'], '/') . '$/m', $sql);
-
-		$data = array_map('trim', $data);
-
-		// The empty case
-		$end_data = end($data);
-
-		if (empty($end_data))
-		{
-			unset($data[key($data)]);
-		}
-
-		if ($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;
-	}
-
-	/**
-	* Retrieves a list of all tables from the database.
-	*
-	* @param	PDO $pdo
-	* @param	string $dbms
-	* @return	array(string)
-	*/
-	function get_tables($pdo, $dbms)
-	{
-		switch ($pdo)
-		{
-			case 'mysql':
-			case 'mysql4':
-			case 'mysqli':
-				$sql = 'SHOW TABLES';
-			break;
-
-			case 'sqlite':
-				$sql = 'SELECT name
-					FROM sqlite_master
-					WHERE type = "table"';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-			case 'mssqlnative':
-				$sql = "SELECT name
-					FROM sysobjects
-					WHERE type='U'";
-			break;
-
-			case 'postgres':
-				$sql = 'SELECT relname
-					FROM pg_stat_user_tables';
-			break;
-
-			case 'firebird':
-				$sql = 'SELECT rdb$relation_name
-					FROM rdb$relations
-					WHERE rdb$view_source is null
-						AND rdb$system_flag = 0';
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT table_name
-					FROM USER_TABLES';
-			break;
-		}
-
-		$result = $pdo->query($sql);
-
-		$tables = array();
-		while ($row = $result->fetch(PDO::FETCH_NUM))
-		{
-			$tables[] = current($row);
-		}
-
-		return $tables;
-	}
-
-	/**
-	* Returns a PDO connection for the configured database.
-	*
-	* @param	array	$config		The database configuration
-	* @param	array	$dbms		Information on the used DBMS.
-	* @param	bool	$use_db		Whether the DSN should be tied to a
-	*								particular database making it impossible
-	*								to delete that database.
-	* @return	PDO					The PDO database connection.
-	*/
-	public function new_pdo($config, $dbms, $use_db)
-	{
-		$dsn = $dbms['PDO'] . ':';
-
-		switch ($dbms['PDO'])
-		{
-			case 'sqlite2':
-				$dsn .= $config['dbhost'];
-			break;
-
-			case 'sqlsrv':
-				// prefix the hostname (or DSN) with Server= so using just (local)\SQLExpress
-				// works for example, further parameters can still be appended using ;x=y
-				$dsn .= 'Server=';
-			// no break -> rest like ODBC
-			case 'odbc':
-				// for ODBC assume dbhost is a suitable DSN
-				// e.g. Driver={SQL Server Native Client 10.0};Server=(local)\SQLExpress;
-				$dsn .= $config['dbhost'];
-
-				if ($use_db)
-				{
-					$dsn .= ';Database=' . $config['dbname'];
-				}
-			break;
-
-			default:
-				$dsn .= 'host=' . $config['dbhost'];
-
-				if ($use_db)
-				{
-					$dsn .= ';dbname=' . $config['dbname'];
-				}
-			break;
-		}
-
-		$pdo = new PDO($dsn, $config['dbuser'], $config['dbpasswd']);;
-
-		// good for debug
-		// $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-		return $pdo;
-	}
-
-	private function recreate_db($config, $dbms)
-	{
-		switch ($config['dbms'])
-		{
-			case 'sqlite':
-				if (file_exists($config['dbhost']))
-				{
-					unlink($config['dbhost']);
-				}
-			break;
-
-			default:
-				$pdo = $this->new_pdo($config, $dbms, false);
-
-				try
-				{
-					$pdo->exec('DROP DATABASE ' . $config['dbname']);
-				}
-				catch (PDOException $e)
-                {
-					// try to delete all tables if dropping the database was not possible.
-					foreach ($this->get_tables() as $table)
-					{
-						try
-						{
-							$pdo->exec('DROP TABLE ' . $table);
-						}
-						catch (PDOException $e){} // ignore non-existent tables
-					}
-                }
-
-				$pdo->exec('CREATE DATABASE ' . $config['dbname']);
-			 break;
-		}
-	}
-
-	private function load_schema($pdo, $config, $dbms)
-	{
-		if ($config['dbms'] == 'mysql')
-		{
-			$sth = $pdo->query('SELECT VERSION() AS version');
-			$row = $sth->fetch(PDO::FETCH_ASSOC);
-
-			if (version_compare($row['version'], '4.1.3', '>='))
-			{
-				$dbms['SCHEMA'] .= '_41';
-			}
-			else
-			{
-				$dbms['SCHEMA'] .= '_40';
-			}
-		}
-
-		$sql = $this->split_sql_file(file_get_contents(dirname(__FILE__) . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
-
-		foreach ($sql as $query)
-		{
-			$pdo->exec($query);
-		}
-	}
-
 	public function getConnection()
 	{
 		$config = $this->get_database_config();
-		$dbms = $this->get_dbms_data($config['dbms']);
+
+		$manager = $this->create_connection_manager($config);
 
 		if (!self::$already_connected)
 		{
-			$this->recreate_db($config, $dbms);
+			$manager->recreate_db();
 		}
 
-		$pdo = $this->new_pdo($config, $dbms, true);
+		$manager->connect();
 
 		if (!self::$already_connected)
 		{
-			$this->load_schema($pdo, $config, $dbms);
-
+			$manager->load_schema();
 			self::$already_connected = true;
 		}
 
-		return $this->createDefaultDBConnection($pdo, 'testdb');
+		return $this->createDefaultDBConnection($manager->get_pdo(), 'testdb');
 	}
 
 	public function new_dbal()
@@ -399,4 +133,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	{
 		$this->get_test_case_helpers()->setExpectedTriggerError($errno, $message);
 	}
+
+	protected function create_connection_manager($config)
+	{
+		return new phpbb_database_test_connection_manager($config);
+	}
 }
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
new file mode 100644
index 0000000000..e4b306f13f
--- /dev/null
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -0,0 +1,336 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_database_test_connection_manager
+{
+	private $config;
+	private $dbms;
+	private $pdo;
+
+	/**
+	* Constructor
+	*
+	* @param	array	$config		Tests database configuration as returned by
+	* 								phpbb_database_test_case::get_database_config()
+	*/
+	public function __construct($config)
+	{
+		$this->config = $config;
+		$this->dbms = $this->get_dbms_data($this->config['dbms']);
+	}
+
+	/**
+	* Return the current PDO instance
+	*/
+	public function get_pdo()
+	{
+		return $this->pdo;
+	}
+
+	/**
+	* Creates a PDO connection for the configured database.
+	*
+	* @param	bool	$use_db		Whether the DSN should be tied to a
+	*								particular database making it impossible
+	*								to delete that database.
+	*/
+	public function connect($use_db = true)
+	{
+		$dsn = $this->dbms['PDO'] . ':';
+
+		switch ($this->dbms['PDO'])
+		{
+			case 'sqlite2':
+				$dsn .= $this->config['dbhost'];
+			break;
+
+			case 'sqlsrv':
+				// prefix the hostname (or DSN) with Server= so using just (local)\SQLExpress
+				// works for example, further parameters can still be appended using ;x=y
+				$dsn .= 'Server=';
+			// no break -> rest like ODBC
+			case 'odbc':
+				// for ODBC assume dbhost is a suitable DSN
+				// e.g. Driver={SQL Server Native Client 10.0};Server=(local)\SQLExpress;
+				$dsn .= $this->config['dbhost'];
+
+				if ($use_db)
+				{
+					$dsn .= ';Database=' . $this->config['dbname'];
+				}
+			break;
+
+			default:
+				$dsn .= 'host=' . $this->config['dbhost'];
+
+				if ($use_db)
+				{
+					$dsn .= ';dbname=' . $this->config['dbname'];
+				}
+			break;
+		}
+
+		$this->pdo = new PDO($dsn, $this->config['dbuser'], $this->config['dbpasswd']);;
+
+		// good for debug
+		// $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	}
+
+	/**
+	* Load the phpBB database schema into the database
+	*/
+	public function load_schema()
+	{
+		$this->ensure_connected(__METHOD__);
+
+		$directory = dirname(__FILE__) . '/../../phpBB/install/schemas/';
+		$this->load_schema_from_file($directory);
+	}
+
+	/**
+	* Drop the database if it exists and re-create it
+	*
+	* Note: This does not load the schema, and it is suggested
+	* to re-connect after calling to get use_db isolation.
+	*/
+	public function recreate_db()
+	{
+		switch ($this->config['dbms'])
+		{
+			case 'sqlite':
+				if (file_exists($this->config['dbhost']))
+				{
+					unlink($this->config['dbhost']);
+				}
+			break;
+
+			default:
+				$this->connect(false);
+
+				try
+				{
+					$this->pdo->exec('DROP DATABASE ' . $config['dbname']);
+				}
+				catch (PDOException $e)
+				{
+					// try to delete all tables if dropping the database was not possible.
+					foreach ($this->get_tables() as $table)
+					{
+						$this->pdo->exec('DROP TABLE ' . $table);
+					}
+				}
+
+				$this->pdo->exec('CREATE DATABASE ' . $this->config['dbname']);
+			 break;
+		}
+	}
+
+	/**
+	* Retrieves a list of all tables from the database.
+	*
+	* @return	array(string)
+	*/
+	public function get_tables()
+	{
+		$this->ensure_connected(__METHOD__);
+
+		switch ($this->config['dbms'])
+		{
+			case 'mysql':
+			case 'mysql4':
+			case 'mysqli':
+				$sql = 'SHOW TABLES';
+			break;
+
+			case 'sqlite':
+				$sql = 'SELECT name
+					FROM sqlite_master
+					WHERE type = "table"';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+			case 'mssqlnative':
+				$sql = "SELECT name
+					FROM sysobjects
+					WHERE type='U'";
+			break;
+
+			case 'postgres':
+				$sql = 'SELECT relname
+					FROM pg_stat_user_tables';
+			break;
+
+			case 'firebird':
+				$sql = 'SELECT rdb$relation_name
+					FROM rdb$relations
+					WHERE rdb$view_source is null
+						AND rdb$system_flag = 0';
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT table_name
+					FROM USER_TABLES';
+			break;
+		}
+
+		$result = $this->pdo->query($sql);
+
+		$tables = array();
+		while ($row = $result->fetch(PDO::FETCH_NUM))
+		{
+			$tables[] = current($row);
+		}
+
+		return $tables;
+	}
+
+	/**
+	* Throw an exception if not connected
+	*/
+	protected function ensure_connected($method_name)
+	{
+		if (null === $this->pdo)
+		{
+			throw new Exception(sprintf('You must connect before calling %s', $method_name));
+		}
+	}
+
+	/**
+	* Compile the correct schema filename (as per create_schema_files) and
+	* load it into the database.
+	*/
+	protected function load_schema_from_file($directory)
+	{
+		$schema = $this->dbms['SCHEMA'];
+		
+		if ($this->config['dbms'] == 'mysql')
+		{
+			$sth = $this->pdo->query('SELECT VERSION() AS version');
+			$row = $sth->fetch(PDO::FETCH_ASSOC);
+
+			if (version_compare($row['version'], '4.1.3', '>='))
+			{
+				$schema .= '_41';
+			}
+			else
+			{
+				$schema .= '_40';
+			}
+		}
+
+		$filename = $directory . $schema . '_schema.sql';
+		$sql = $this->split_sql(file_get_contents($filename));
+
+		foreach ($sql as $query)
+		{
+			$this->pdo->exec($query);
+		}
+	}
+
+	/**
+	* 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)]);
+		}
+
+		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;
+	}
+
+	/**
+	* Map a phpBB dbms driver name to dbms data array
+	*/
+	protected function get_dbms_data($dbms)
+	{
+		$available_dbms = array(
+			'firebird'	=> array(
+				'SCHEMA'		=> 'firebird',
+				'DELIM'			=> ';;',
+				'PDO'			=> 'firebird',
+			),
+			'mysqli'	=> array(
+				'SCHEMA'		=> 'mysql_41',
+				'DELIM'			=> ';',
+				'PDO'			=> 'mysql',
+			),
+			'mysql'		=> array(
+				'SCHEMA'		=> 'mysql',
+				'DELIM'			=> ';',
+				'PDO'			=> 'mysql',
+			),
+			'mssql'		=> array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'odbc',
+			),
+			'mssql_odbc'=>	array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'odbc',
+			),
+			'mssqlnative'		=> array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'sqlsrv',
+			),
+			'oracle'	=>	array(
+				'SCHEMA'		=> 'oracle',
+				'DELIM'			=> '/',
+				'PDO'			=> 'oci',
+			),
+			'postgres' => array(
+				'SCHEMA'		=> 'postgres',
+				'DELIM'			=> ';',
+				'PDO'			=> 'pgsql',
+			),
+			'sqlite'		=> array(
+				'SCHEMA'		=> 'sqlite',
+				'DELIM'			=> ';',
+				'PDO'			=> 'sqlite2',
+			),
+		);
+
+		if (isset($available_dbms[$dbms]))
+		{
+			return $available_dbms[$dbms];
+		}
+		else
+		{
+			trigger_error('Database unsupported', E_USER_ERROR);
+		}
+	}
+}
-- 
cgit v1.2.1


From 17b17bc9399c0e72bebb74979f42aae5a683ae8b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 14 Feb 2011 09:15:51 +0100
Subject: [task/refactor-db-testcase] Improve error message of db tests

If database tests cannot be run the error message is ambigous. This
commit makes it clearer:

- whether the supplied dbms is supported by us
- which dbms are supported by us
- whether the required PDO extension is loaded

PHPBB3-10043
---
 .../phpbb_database_test_connection_manager.php              | 13 +++++++++++--
 1 file changed, 11 insertions(+), 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 e4b306f13f..3389081c4e 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -76,7 +76,14 @@ class phpbb_database_test_connection_manager
 			break;
 		}
 
-		$this->pdo = new PDO($dsn, $this->config['dbuser'], $this->config['dbpasswd']);;
+		try
+		{
+			$this->pdo = new PDO($dsn, $this->config['dbuser'], $this->config['dbpasswd']);
+		}
+		catch (PDOException $e)
+		{
+			throw new Exception("Unable do connect to $dsn with error: {$e->getMessage()}");
+		}
 
 		// good for debug
 		// $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -330,7 +337,9 @@ class phpbb_database_test_connection_manager
 		}
 		else
 		{
-			trigger_error('Database unsupported', E_USER_ERROR);
+			$message = 'Supplied dbms is unsupported, must be one of: ';
+			$message .= implode(', ', array_keys($available_dbms));
+			throw new Exception($message);
 		}
 	}
 }
-- 
cgit v1.2.1


From d3718bf5d43282cb2136d25b8fd1ba5c8ccf0b17 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 14 Feb 2011 15:25:05 +0100
Subject: [task/refactor-db-testcase] Do not show db password on connect error

PHPBB3-10043
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 3 ++-
 1 file changed, 2 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 3389081c4e..707ce70fd0 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -82,7 +82,8 @@ class phpbb_database_test_connection_manager
 		}
 		catch (PDOException $e)
 		{
-			throw new Exception("Unable do connect to $dsn with error: {$e->getMessage()}");
+			$cleaned_dsn = str_replace($this->config['dbpasswd'], '*password*', $dsn);
+			throw new Exception("Unable do connect to $cleaned_dsn with error: {$e->getMessage()}");
 		}
 
 		// good for debug
-- 
cgit v1.2.1


From bcbbeacaf87e217a72f704229e9e43cc36b9f8e3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 14 Feb 2011 16:40:12 +0100
Subject: [ticket/9944] Add empty line before the while() so you can better
 read the code

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index fb1024be99..4d3d51923b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1868,6 +1868,7 @@ function change_database_data(&$no_updates, $version)
 				FROM ' . EXTENSION_GROUPS_TABLE . '
 				WHERE group_name ' . $db->sql_like_expression('EXT_GROUP_' . $db->any_char);
 			$result = $db->sql_query($sql);
+
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$sql_ary = array(
-- 
cgit v1.2.1


From 0f3378ca28308eec4cc61d8e5170c4f40ad41699 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Feb 2011 04:45:54 -0500
Subject: [ticket/10044] Made setup_github_network.php runnable as a script

PHPBB3-10044
---
 git-tools/setup_github_network.php | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 git-tools/setup_github_network.php

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
old mode 100644
new mode 100755
index 08e99e2f32..80cc62df8a
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /**
 *
-- 
cgit v1.2.1


From 30c46a6e0ca76f99bede700d8e77b37dc1a62f99 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Feb 2011 04:49:48 -0500
Subject: [ticket/10044] Error handling for remote requests in
 setup_github_network.php

PHPBB3-10044
---
 git-tools/setup_github_network.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index 80cc62df8a..ae3d34f5fe 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -134,12 +134,21 @@ function get_repository_url($username, $repository, $ssh = false)
 
 function api_request($query)
 {
-	return json_decode(file_get_contents("http://github.com/api/v2/json/$query"));
+	$contents = file_get_contents("http://github.com/api/v2/json/$query");
+	if ($contents === false)
+	{
+		return false;
+	}
+	return json_decode($contents);
 }
 
 function get_contributors($username, $repository)
 {
 	$request = api_request("repos/show/$username/$repository/contributors");
+	if ($request === false)
+	{
+		return false;
+	}
 
 	$usernames = array();
 	foreach ($request->contributors as $contributor)
@@ -153,6 +162,10 @@ function get_contributors($username, $repository)
 function get_organisation_members($username)
 {
 	$request = api_request("organizations/$username/public_members");
+	if ($request === false)
+	{
+		return false;
+	}
 
 	$usernames = array();
 	foreach ($request->users as $member)
@@ -166,6 +179,10 @@ function get_organisation_members($username)
 function get_collaborators($username, $repository)
 {
 	$request = api_request("repos/show/$username/$repository/collaborators");
+	if ($request === false)
+	{
+		return false;
+	}
 
 	$usernames = array();
 	foreach ($request->collaborators as $collaborator)
@@ -179,6 +196,10 @@ function get_collaborators($username, $repository)
 function get_network($username, $repository)
 {
 	$request = api_request("repos/show/$username/$repository/network");
+	if ($request === false)
+	{
+		return false;
+	}
 
 	$usernames = array();
 	foreach ($request->network as $network)
-- 
cgit v1.2.1


From bf137b70051d00f6b0e6636ae08e5579c6f3739e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Feb 2011 05:11:21 -0500
Subject: [ticket/10044] Added -h to setup_github_network.php.

PHPBB3-10044
---
 git-tools/setup_github_network.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index ae3d34f5fe..9ada9e437a 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -31,14 +31,15 @@ function show_usage()
 	echo " -r repository_name             Overwrites the repository name (optional)\n";
 	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
 	echo " -d                             Outputs the commands instead of running them (optional)\n";
+	echo " -h                             This help text\n";
 
 	exit(1);
 }
 
 // Handle arguments
-$opts = getopt('s:u:r:m:d');
+$opts = getopt('s:u:r:m:dh');
 
-if (empty($opts))
+if (empty($opts) || isset($opts['h']))
 {
 	show_usage();
 }
-- 
cgit v1.2.1


From ed53cef0aaa2a23d4688c2429cc7961ad79ca496 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Feb 2011 05:13:48 -0500
Subject: [ticket/10044] Stop when failed to retrieve network/collaborators.

PHPBB3-10044
---
 git-tools/setup_github_network.php | 90 +++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index 9ada9e437a..a3606575b2 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -50,57 +50,67 @@ $repository 	= get_arg($opts, 'r', 'phpbb3');
 $developer		= get_arg($opts, 'm', '');
 $dry_run		= !get_arg($opts, 'd', true);
 run(null, $dry_run);
+exit(work($scope, $username, $repository, $developer));
 
-// Get some basic data
-$network		= get_network($username, $repository);
-$collaborators	= get_collaborators($username, $repository);
-
-switch ($scope)
+function work($scope, $username, $repository, $developer)
 {
-	case 'collaborators':
-		$remotes = array_intersect_key($network, $collaborators);
-	break;
+	// Get some basic data
+	$network		= get_network($username, $repository);
+	$collaborators	= get_collaborators($username, $repository);
 
-	case 'organisation':
-		$remotes = array_intersect_key($network, get_organisation_members($username));
-	break;
+	if ($network === false || $collaborators === false)
+	{
+		echo "Error: failed to retrieve network or collaborators\n";
+		return 1;
+	}
 
-	case 'contributors':
-		$remotes = array_intersect_key($network, get_contributors($username, $repository));
-	break;
+	switch ($scope)
+	{
+		case 'collaborators':
+			$remotes = array_intersect_key($network, $collaborators);
+		break;
 
-	case 'network':
-		$remotes = $network;
-	break;
+		case 'organisation':
+			$remotes = array_intersect_key($network, get_organisation_members($username));
+		break;
 
-	default:
-		show_usage();
-}
+		case 'contributors':
+			$remotes = array_intersect_key($network, get_contributors($username, $repository));
+		break;
 
-if (file_exists('.git'))
-{
-	add_remote($username, $repository, isset($collaborators[$developer]));
-}
-else
-{
-	clone_repository($username, $repository, isset($collaborators[$developer]));
-}
+		case 'network':
+			$remotes = $network;
+		break;
 
-// Add private security repository for developers
-if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
-{
-	run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
-}
+		default:
+			show_usage();
+	}
+
+	if (file_exists('.git'))
+	{
+		add_remote($username, $repository, isset($collaborators[$developer]));
+	}
+	else
+	{
+		clone_repository($username, $repository, isset($collaborators[$developer]));
+	}
 
-// Skip blessed repository.
-unset($remotes[$username]);
+	// Add private security repository for developers
+	if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
+	{
+		run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
+	}
 
-foreach ($remotes as $remote)
-{
-	add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
-}
+	// Skip blessed repository.
+	unset($remotes[$username]);
+
+	foreach ($remotes as $remote)
+	{
+		add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
+	}
 
-run('git remote update');
+	run('git remote update');
+}
 
 function clone_repository($username, $repository, $pushable = false)
 {
-- 
cgit v1.2.1


From bd8e5ff79e68e5a270762917af47917f504acbde Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Feb 2011 21:08:33 -0500
Subject: [task/refactor-db-testcase] Further improve error messages.

PHPBB3-10043
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 4 ++--
 1 file changed, 2 insertions(+), 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 707ce70fd0..6c06857fbc 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -83,7 +83,7 @@ class phpbb_database_test_connection_manager
 		catch (PDOException $e)
 		{
 			$cleaned_dsn = str_replace($this->config['dbpasswd'], '*password*', $dsn);
-			throw new Exception("Unable do connect to $cleaned_dsn with error: {$e->getMessage()}");
+			throw new Exception("Unable do connect to $cleaned_dsn using PDO with error: {$e->getMessage()}");
 		}
 
 		// good for debug
@@ -338,7 +338,7 @@ class phpbb_database_test_connection_manager
 		}
 		else
 		{
-			$message = 'Supplied dbms is unsupported, must be one of: ';
+			$message = "Supplied dbms \"$dbms\" is not a valid phpBB dbms, must be one of: ";
 			$message .= implode(', ', array_keys($available_dbms));
 			throw new Exception($message);
 		}
-- 
cgit v1.2.1


From 5af3cfe9cae4a59478bff2581f8484657a0d5bc9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 16 Feb 2011 21:13:35 -0500
Subject: [ticket/10044] Updated invocation documentation.

PHPBB3-10044
---
 git-tools/setup_github_network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-tools/setup_github_network.php b/git-tools/setup_github_network.php
index a3606575b2..e4e212eef6 100755
--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -15,7 +15,7 @@ function show_usage()
 	echo "$filename adds repositories of a github network as remotes to a local git repository.\n";
 	echo "\n";
 
-	echo "Usage: php $filename -s collaborators|organisation|contributors|network [OPTIONS]\n";
+	echo "Usage: [php] $filename -s collaborators|organisation|contributors|network [OPTIONS]\n";
 	echo "\n";
 
 	echo "Scopes:\n";
-- 
cgit v1.2.1


From aba31aeff9a00ffda1dc29d580ccd96894985d79 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 19 Feb 2011 14:29:21 +0100
Subject: [ticket/10047] Do not put session id in URL on posting.php when
 cookies are on.

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

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 7368026136..d05abc6a0e 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1360,8 +1360,8 @@ $lock_post_checked	= (isset($post_lock)) ? $post_lock : $post_data['post_edit_lo
 $notify_set			= ($mode != 'edit' && $config['allow_topic_notify'] && $user->data['is_registered'] && !$post_data['notify_set']) ? $user->data['user_notify'] : $post_data['notify_set'];
 $notify_checked		= (isset($notify)) ? $notify : (($mode == 'post') ? $user->data['user_notify'] : $notify_set);
 
-// Page title & action URL, include session_id for security purpose
-$s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode&amp;f=$forum_id", true, $user->session_id);
+// Page title & action URL
+$s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode&amp;f=$forum_id");
 $s_action .= ($topic_id) ? "&amp;t=$topic_id" : '';
 $s_action .= ($post_id) ? "&amp;p=$post_id" : '';
 
-- 
cgit v1.2.1


From 1abf7ad80932cdb2651dbefff51406c9d234f3bd Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 19 Feb 2011 20:30:46 -0500
Subject: [ticket/10049] Renamed session test files to proper file names.

phpunit.xml.dist specifies that only files ending in _test.php
are test files; with the old names session tests were not run
as a result.

PHPBB3-10049
---
 tests/session/continue_test.php    | 117 +++++++++++++++++++++++++++++++++++++
 tests/session/init_test.php        |  76 ++++++++++++++++++++++++
 tests/session/session_continue.php | 117 -------------------------------------
 tests/session/session_init.php     |  76 ------------------------
 4 files changed, 193 insertions(+), 193 deletions(-)
 create mode 100644 tests/session/continue_test.php
 create mode 100644 tests/session/init_test.php
 delete mode 100644 tests/session/session_continue.php
 delete mode 100644 tests/session/session_init.php

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
new file mode 100644
index 0000000000..58956c18a9
--- /dev/null
+++ b/tests/session/continue_test.php
@@ -0,0 +1,117 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once 'mock/cache.php';
+require_once 'mock/session_testable.php';
+
+class phpbb_session_continue_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+	}
+
+	static public function session_begin_attempts()
+	{
+		return array(
+			array(
+				'bar_session', '4', 'user agent',
+				array(
+					array('session_id' => 'anon_session', 'session_user_id' => 1),
+					array('session_id' => 'bar_session', 'session_user_id' => 4)
+				),
+				array(),
+				'Check if no new session was created',
+			),
+			array(
+				'anon_session', '4', 'user agent',
+				array(
+					array('session_id' => 'bar_session', 'session_user_id' => 4),
+					array('session_id' => null, 'session_user_id' => 1) // use generated SID
+				),
+				array(
+					'u' => array('1', null),
+					'k' => array(null, null),
+					'sid' => array($_SID, null),
+				),
+				'Check if an anonymous new session was created',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider session_begin_attempts
+	*/
+	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message)
+	{
+		$session = new phpbb_mock_session_testable;
+		$session->page = array('page' => 'page', 'forum' => 0);
+
+		// set up all the global variables used in session_create
+		global $SID, $_SID, $db, $config, $cache;
+
+		$config = $this->get_config();
+		$db = $this->new_dbal();
+		$cache_data = array(
+			'_bots' => array(),
+		);
+		$cache = new phpbb_mock_cache;
+		$SID = $_SID = null;
+
+		$_COOKIE['_sid'] = $session_id;
+		$_COOKIE['_u'] = $user_id;
+		$_SERVER['HTTP_USER_AGENT'] = $user_agent;
+
+		$config['session_length'] = time(); // need to do this to allow sessions started at time 0
+		$session->session_begin();
+
+		$sql = 'SELECT session_id, session_user_id
+			FROM phpbb_sessions';
+
+		// little tickery to allow using a dataProvider with dynamic expected result
+		foreach ($expected_sessions as $i => $s)
+		{
+			if (is_null($s['session_id']))
+			{
+				$expected_sessions[$i]['session_id'] = $session->session_id;
+			}
+		}
+
+		$this->assertResultEquals(
+			$sql,
+			$expected_sessions,
+			'Check if no new session was created'
+		);
+
+		$session->check_cookies($this, $expected_cookies);
+
+		$cache->check($this, $cache_data);
+	}
+	static public function get_config()
+	{
+		return array(
+			'allow_autologin' => false,
+			'auth_method' => 'db',
+			'forwarded_for_check' => true,
+			'active_sessions' => 0, // disable
+			'rand_seed' => 'foo',
+			'rand_seed_last_update' => 0,
+			'max_autologin_time' => 0,
+			'session_length' => 100,
+			'form_token_lifetime' => 100,
+			'cookie_name' => '',
+			'limit_load' => 0,
+			'limit_search_load' => 0,
+			'ip_check' => 3,
+			'browser_check' => 1,
+		);
+	}
+}
+
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
new file mode 100644
index 0000000000..f6fa564880
--- /dev/null
+++ b/tests/session/init_test.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once 'test_framework/framework.php';
+require_once 'mock/cache.php';
+require_once 'mock/session_testable.php';
+
+class phpbb_session_init_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	// also see security/extract_current_page.php
+
+	public function test_login_session_create()
+	{
+		$session = new phpbb_mock_session_testable;
+		$session->page = array('page' => 'page', 'forum' => 0);
+
+		// set up all the global variables used in session_create
+		global $SID, $_SID, $db, $config, $cache;
+
+		$config = $this->get_config();
+		$db = $this->new_dbal();
+		$cache_data = array(
+			'_bots' => array(),
+		);
+		$cache = new phpbb_mock_cache;
+		$SID = $_SID = null;
+
+		$session->session_create(3);
+
+		$sql = 'SELECT session_user_id
+			FROM phpbb_sessions';
+
+		$this->assertResultEquals(
+			$sql,
+			array(array('session_user_id' => 3)),
+			'Check if exacly one session for user id 3 was created'
+		);
+
+		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
+
+		$session->check_cookies($this, array(
+			'u' => array(null, $cookie_expire),
+			'k' => array(null, $cookie_expire),
+			'sid' => array($_SID, $cookie_expire),
+		));
+
+		$cache->check($this, $cache_data);
+	}
+
+	static public function get_config()
+	{
+		return array(
+			'allow_autologin' => false,
+			'auth_method' => 'db',
+			'forwarded_for_check' => true,
+			'active_sessions' => 0, // disable
+			'rand_seed' => 'foo',
+			'rand_seed_last_update' => 0,
+			'max_autologin_time' => 0,
+			'session_length' => 100,
+			'form_token_lifetime' => 100,
+		);
+	}
+}
+
diff --git a/tests/session/session_continue.php b/tests/session/session_continue.php
deleted file mode 100644
index 58956c18a9..0000000000
--- a/tests/session/session_continue.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once 'test_framework/framework.php';
-require_once 'mock/cache.php';
-require_once 'mock/session_testable.php';
-
-class phpbb_session_continue_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
-	}
-
-	static public function session_begin_attempts()
-	{
-		return array(
-			array(
-				'bar_session', '4', 'user agent',
-				array(
-					array('session_id' => 'anon_session', 'session_user_id' => 1),
-					array('session_id' => 'bar_session', 'session_user_id' => 4)
-				),
-				array(),
-				'Check if no new session was created',
-			),
-			array(
-				'anon_session', '4', 'user agent',
-				array(
-					array('session_id' => 'bar_session', 'session_user_id' => 4),
-					array('session_id' => null, 'session_user_id' => 1) // use generated SID
-				),
-				array(
-					'u' => array('1', null),
-					'k' => array(null, null),
-					'sid' => array($_SID, null),
-				),
-				'Check if an anonymous new session was created',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider session_begin_attempts
-	*/
-	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message)
-	{
-		$session = new phpbb_mock_session_testable;
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		// set up all the global variables used in session_create
-		global $SID, $_SID, $db, $config, $cache;
-
-		$config = $this->get_config();
-		$db = $this->new_dbal();
-		$cache_data = array(
-			'_bots' => array(),
-		);
-		$cache = new phpbb_mock_cache;
-		$SID = $_SID = null;
-
-		$_COOKIE['_sid'] = $session_id;
-		$_COOKIE['_u'] = $user_id;
-		$_SERVER['HTTP_USER_AGENT'] = $user_agent;
-
-		$config['session_length'] = time(); // need to do this to allow sessions started at time 0
-		$session->session_begin();
-
-		$sql = 'SELECT session_id, session_user_id
-			FROM phpbb_sessions';
-
-		// little tickery to allow using a dataProvider with dynamic expected result
-		foreach ($expected_sessions as $i => $s)
-		{
-			if (is_null($s['session_id']))
-			{
-				$expected_sessions[$i]['session_id'] = $session->session_id;
-			}
-		}
-
-		$this->assertResultEquals(
-			$sql,
-			$expected_sessions,
-			'Check if no new session was created'
-		);
-
-		$session->check_cookies($this, $expected_cookies);
-
-		$cache->check($this, $cache_data);
-	}
-	static public function get_config()
-	{
-		return array(
-			'allow_autologin' => false,
-			'auth_method' => 'db',
-			'forwarded_for_check' => true,
-			'active_sessions' => 0, // disable
-			'rand_seed' => 'foo',
-			'rand_seed_last_update' => 0,
-			'max_autologin_time' => 0,
-			'session_length' => 100,
-			'form_token_lifetime' => 100,
-			'cookie_name' => '',
-			'limit_load' => 0,
-			'limit_search_load' => 0,
-			'ip_check' => 3,
-			'browser_check' => 1,
-		);
-	}
-}
-
diff --git a/tests/session/session_init.php b/tests/session/session_init.php
deleted file mode 100644
index f6fa564880..0000000000
--- a/tests/session/session_init.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once 'test_framework/framework.php';
-require_once 'mock/cache.php';
-require_once 'mock/session_testable.php';
-
-class phpbb_session_init_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
-	}
-
-	// also see security/extract_current_page.php
-
-	public function test_login_session_create()
-	{
-		$session = new phpbb_mock_session_testable;
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		// set up all the global variables used in session_create
-		global $SID, $_SID, $db, $config, $cache;
-
-		$config = $this->get_config();
-		$db = $this->new_dbal();
-		$cache_data = array(
-			'_bots' => array(),
-		);
-		$cache = new phpbb_mock_cache;
-		$SID = $_SID = null;
-
-		$session->session_create(3);
-
-		$sql = 'SELECT session_user_id
-			FROM phpbb_sessions';
-
-		$this->assertResultEquals(
-			$sql,
-			array(array('session_user_id' => 3)),
-			'Check if exacly one session for user id 3 was created'
-		);
-
-		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
-
-		$session->check_cookies($this, array(
-			'u' => array(null, $cookie_expire),
-			'k' => array(null, $cookie_expire),
-			'sid' => array($_SID, $cookie_expire),
-		));
-
-		$cache->check($this, $cache_data);
-	}
-
-	static public function get_config()
-	{
-		return array(
-			'allow_autologin' => false,
-			'auth_method' => 'db',
-			'forwarded_for_check' => true,
-			'active_sessions' => 0, // disable
-			'rand_seed' => 'foo',
-			'rand_seed_last_update' => 0,
-			'max_autologin_time' => 0,
-			'session_length' => 100,
-			'form_token_lifetime' => 100,
-		);
-	}
-}
-
-- 
cgit v1.2.1


From 0cf741f3434ed5ad6550e3e8384d3f5665a23fe8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 19 Feb 2011 20:40:32 -0500
Subject: [ticket/10049] Fixed requires in session tests and mock.

PHPBB3-10049
---
 tests/mock/session_testable.php | 4 ++--
 tests/session/continue_test.php | 5 ++---
 tests/session/init_test.php     | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 2d7d42f82a..0d4642d372 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once '../phpBB/includes/functions.php';
-require_once '../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_mock_session_testable extends session
 {
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 58956c18a9..f909737f86 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -7,9 +7,8 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once 'mock/cache.php';
-require_once 'mock/session_testable.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+require_once dirname(__FILE__) . '/../mock/session_testable.php';
 
 class phpbb_session_continue_test extends phpbb_database_test_case
 {
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index f6fa564880..6cda7a0c2c 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -7,9 +7,8 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once 'mock/cache.php';
-require_once 'mock/session_testable.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+require_once dirname(__FILE__) . '/../mock/session_testable.php';
 
 class phpbb_session_init_test extends phpbb_database_test_case
 {
-- 
cgit v1.2.1


From 26b922ac3f220902bb527426039c552a0bcb8f5c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 19 Feb 2011 20:44:59 -0500
Subject: [ticket/10049] Chase assertResultEquals rename.

cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.

Parameter order also changed; chase that too.

PHPBB3-10049
---
 tests/session/continue_test.php | 4 ++--
 tests/session/init_test.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index f909737f86..8debb10175 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -83,9 +83,9 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 			}
 		}
 
-		$this->assertResultEquals(
-			$sql,
+		$this->assertSqlResultEquals(
 			$expected_sessions,
+			$sql,
 			'Check if no new session was created'
 		);
 
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index 6cda7a0c2c..c810bd6c3c 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -40,9 +40,9 @@ class phpbb_session_init_test extends phpbb_database_test_case
 		$sql = 'SELECT session_user_id
 			FROM phpbb_sessions';
 
-		$this->assertResultEquals(
-			$sql,
+		$this->assertSqlResultEquals(
 			array(array('session_user_id' => 3)),
+			$sql,
 			'Check if exacly one session for user id 3 was created'
 		);
 
-- 
cgit v1.2.1


From f3ab9da0e9a79948f4ae87f1f960792daa90853f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 19 Feb 2011 20:50:15 -0500
Subject: [ticket/10049] Globalize $_SID.

PHPBB3-10049
---
 tests/session/continue_test.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 8debb10175..e5b2b7258e 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -19,6 +19,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 
 	static public function session_begin_attempts()
 	{
+		global $_SID;
 		return array(
 			array(
 				'bar_session', '4', 'user agent',
-- 
cgit v1.2.1


From c1e198e7213d42025f9184aacb10fc58776cdbf3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 20 Feb 2011 08:45:59 -0500
Subject: [ticket/10049] Mark session continue test incomplete for now.

I am unable to find any code revision in which this test worked.
Thus to not break the entire suite I mark it incomplete.

PHPBB3-10049
---
 tests/session/continue_test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index e5b2b7258e..ac682e06ac 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -51,6 +51,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 	*/
 	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message)
 	{
+		$this->markTestIncomplete('Test needs to be fixed');
+		
 		$session = new phpbb_mock_session_testable;
 		$session->page = array('page' => 'page', 'forum' => 0);
 
-- 
cgit v1.2.1


From 6902ecf6a97df44b6874c0bf4c9fa28275b7c9f7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 20 Feb 2011 08:53:15 -0500
Subject: [ticket/10049] Mark session init test incomplete for now.

This test passes by itself but fails when run as part of the
compete suite. Mark it incomplete to avoid breaking the suite.

PHPBB3-10049
---
 tests/session/init_test.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index c810bd6c3c..ccb0554409 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -21,6 +21,8 @@ class phpbb_session_init_test extends phpbb_database_test_case
 
 	public function test_login_session_create()
 	{
+		$this->markTestIncomplete('Test fails when run as part of the test suite');
+		
 		$session = new phpbb_mock_session_testable;
 		$session->page = array('page' => 'page', 'forum' => 0);
 
-- 
cgit v1.2.1


From 24520f26ad5aaf812cfffbedc4ccafd5d47e14f7 Mon Sep 17 00:00:00 2001
From: Kevin Locke <kevin@kevinlocke.name>
Date: Fri, 21 Jan 2011 15:45:10 -0700
Subject: [ticket/10009] Differentiate published from updated in Atom feed

Change the handling of dates to differentiate between the date when an
entry was published and the date on which it was last updated.
Incorporate this information into the Atom feed by using <published> and
<updated> appropriately according to sections 4.2.9 and 4.2.15 of the
spec.

PHPBB3-10009
---
 phpBB/feed.php | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index c4b71f3a26..36655d694f 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -95,11 +95,13 @@ while ($row = $feed->get_item())
 
 	$title = (isset($row[$feed->get('title')]) && $row[$feed->get('title')] !== '') ? $row[$feed->get('title')] : ((isset($row[$feed->get('title2')])) ? $row[$feed->get('title2')] : '');
 
-	$item_time = (int) $row[$feed->get('date')];
+	$published = ($feed->get('published') !== NULL) ? (int) $row[$feed->get('published')] : 0;
+	$updated = ($feed->get('updated') !== NULL) ? (int) $row[$feed->get('updated')] : 0;
 
 	$item_row = array(
 		'author'		=> ($feed->get('creator') !== NULL) ? $row[$feed->get('creator')] : '',
-		'pubdate'		=> feed_format_date($item_time),
+		'published'		=> ($published > 0) ? feed_format_date($published) : '',
+		'updated'		=> ($updated > 0) ? feed_format_date($updated) : '',
 		'link'			=> '',
 		'title'			=> censor_text($title),
 		'category'		=> ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '',
@@ -113,7 +115,7 @@ while ($row = $feed->get_item())
 
 	$item_vars[] = $item_row;
 
-	$feed_updated_time = max($feed_updated_time, $item_time);
+	$feed_updated_time = max($feed_updated_time, $published, $updated);
 }
 
 // If we do not have any items at all, sending the current time is better than sending no time.
@@ -192,7 +194,16 @@ foreach ($item_vars as $row)
 		echo '<author><name><![CDATA[' . $row['author'] . ']]></name></author>' . "\n";
 	}
 
-	echo '<updated>' . $row['pubdate'] . '</updated>' . "\n";
+	if (!empty($row['published']))
+	{
+		echo '<published>' . $row['published'] . '</published>' . "\n";
+	}
+
+	if (!empty($row['updated']))
+	{
+		echo '<updated>' . $row['updated'] . '</updated>' . "\n";
+	}
+
 	echo '<id>' . $row['link'] . '</id>' . "\n";
 	echo '<link href="' . $row['link'] . '"/>' . "\n";
 	echo '<title type="html"><![CDATA[' . $row['title'] . ']]></title>' . "\n\n";
@@ -675,7 +686,8 @@ class phpbb_feed_post_base extends phpbb_feed_base
 
 		$this->set('author_id',	'user_id');
 		$this->set('creator',	'username');
-		$this->set('date',		'post_time');
+		$this->set('published',	'post_time');
+		$this->set('updated',	'post_edit_time');
 		$this->set('text',		'post_text');
 
 		$this->set('bitfield',	'bbcode_bitfield');
@@ -717,7 +729,8 @@ class phpbb_feed_topic_base extends phpbb_feed_base
 
 		$this->set('author_id',	'topic_poster');
 		$this->set('creator',	'topic_first_poster_name');
-		$this->set('date',		'topic_time');
+		$this->set('published',	'topic_time');
+		$this->set('updated',	'topic_last_post_time');
 		$this->set('text',		'post_text');
 
 		$this->set('bitfield',	'bbcode_bitfield');
@@ -737,7 +750,7 @@ class phpbb_feed_topic_base extends phpbb_feed_base
 		if ($config['feed_item_statistics'])
 		{
 			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('date')])
+				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('updated')])
 				. ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . (($this->is_moderator_approve_forum($row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'])
 				. ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views']
 				. (($this->is_moderator_approve_forum($row['forum_id']) && ($row['topic_replies_real'] != $row['topic_replies'])) ? ' ' . $this->separator_stats . ' ' . $user->lang['POSTS_UNAPPROVED'] : '');
@@ -800,7 +813,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 		// Get the actual data
 		$this->sql = array(
 			'SELECT'	=>	'f.forum_id, f.forum_name, ' .
-							'p.post_id, p.topic_id, p.post_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+							'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
 			'FROM'		=> array(
 				USERS_TABLE		=> 'u',
@@ -932,7 +945,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 		}
 
 		$this->sql = array(
-			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
 			'FROM'		=> array(
 				POSTS_TABLE		=> 'p',
@@ -1097,7 +1110,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 		global $auth, $db;
 
 		$this->sql = array(
-			'SELECT'	=>	'p.post_id, p.post_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
 			'FROM'		=> array(
 				POSTS_TABLE		=> 'p',
@@ -1136,7 +1149,7 @@ class phpbb_feed_forums extends phpbb_feed_base
 		$this->set('text',		'forum_desc');
 		$this->set('bitfield',	'forum_desc_bitfield');
 		$this->set('bbcode_uid','forum_desc_uid');
-		$this->set('date',		'forum_last_post_time');
+		$this->set('updated',	'forum_last_post_time');
 		$this->set('options',	'forum_desc_options');
 	}
 
@@ -1261,7 +1274,7 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 
 		$this->sql = array(
 			'SELECT'	=> 'f.forum_id, f.forum_name,
-							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time,
+							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
 							p.post_id, p.post_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
 			'FROM'		=> array(
 				TOPICS_TABLE	=> 't',
@@ -1334,7 +1347,7 @@ class phpbb_feed_topics extends phpbb_feed_topic_base
 
 		$this->sql = array(
 			'SELECT'	=> 'f.forum_id, f.forum_name,
-							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time,
+							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
 							p.post_id, p.post_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
 			'FROM'		=> array(
 				TOPICS_TABLE	=> 't',
@@ -1381,7 +1394,7 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 
 		$this->set('author_id',	'topic_last_poster_id');
 		$this->set('creator',	'topic_last_poster_name');
-		$this->set('date',		'topic_last_post_time');
+		$this->set('updated',	'topic_last_post_time');
 		$this->set('text',		'post_text');
 	}
 
-- 
cgit v1.2.1


From df93856ac45690fa1c84bc383d7a70a1225be8cc Mon Sep 17 00:00:00 2001
From: Kevin Locke <kevin@kevinlocke.name>
Date: Fri, 28 Jan 2011 21:11:55 -0700
Subject: [ticket/10009] Send atom:updated whenever possible

For posts/topics which have not been edited/updated, use the creation
date to populate atom:updated, as suggested by bantu.  This should
increase compatibility with user agents which expect an atom:updated
element.

PHPBB3-10009
---
 phpBB/feed.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 36655d694f..a95b3abf9a 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -203,6 +203,10 @@ foreach ($item_vars as $row)
 	{
 		echo '<updated>' . $row['updated'] . '</updated>' . "\n";
 	}
+	else if (!empty($row['published']))
+	{
+		echo '<updated>' . $row['published'] . '</updated>' . "\n";
+	}
 
 	echo '<id>' . $row['link'] . '</id>' . "\n";
 	echo '<link href="' . $row['link'] . '"/>' . "\n";
-- 
cgit v1.2.1


From 361f6fc16c98f8e083337481277e81c0cb060f38 Mon Sep 17 00:00:00 2001
From: Kevin Locke <kevin@kevinlocke.name>
Date: Mon, 31 Jan 2011 06:52:41 -0700
Subject: [ticket/10009] Make atom:update output unconditional and before
 atom:published

PHPBB3-10009
---
 phpBB/feed.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index a95b3abf9a..a69a24d062 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -194,20 +194,13 @@ foreach ($item_vars as $row)
 		echo '<author><name><![CDATA[' . $row['author'] . ']]></name></author>' . "\n";
 	}
 
+	echo '<updated>' . ((!empty($row['updated'])) ? $row['updated'] : $row['published']) . '</updated>' . "\n";
+
 	if (!empty($row['published']))
 	{
 		echo '<published>' . $row['published'] . '</published>' . "\n";
 	}
 
-	if (!empty($row['updated']))
-	{
-		echo '<updated>' . $row['updated'] . '</updated>' . "\n";
-	}
-	else if (!empty($row['published']))
-	{
-		echo '<updated>' . $row['published'] . '</updated>' . "\n";
-	}
-
 	echo '<id>' . $row['link'] . '</id>' . "\n";
 	echo '<link href="' . $row['link'] . '"/>' . "\n";
 	echo '<title type="html"><![CDATA[' . $row['title'] . ']]></title>' . "\n\n";
-- 
cgit v1.2.1


From 366107a54ca38afbe5635a1bf8b8c54758a8df4a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 21 Feb 2011 19:50:11 +0100
Subject: [ticket/10009] Always show 'published' data in feed item statistics.

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

diff --git a/phpBB/feed.php b/phpBB/feed.php
index a69a24d062..75a47630ca 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -704,7 +704,7 @@ class phpbb_feed_post_base extends phpbb_feed_base
 		if ($config['feed_item_statistics'])
 		{
 			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $user->format_date($row['post_time'])
+				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
 				. (($this->is_moderator_approve_forum($row['forum_id']) && !$row['post_approved']) ? ' ' . $this->separator_stats . ' ' . $user->lang['POST_UNAPPROVED'] : '');
 		}
 	}
@@ -747,7 +747,7 @@ class phpbb_feed_topic_base extends phpbb_feed_base
 		if ($config['feed_item_statistics'])
 		{
 			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('updated')])
+				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
 				. ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . (($this->is_moderator_approve_forum($row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'])
 				. ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views']
 				. (($this->is_moderator_approve_forum($row['forum_id']) && ($row['topic_replies_real'] != $row['topic_replies'])) ? ' ' . $this->separator_stats . ' ' . $user->lang['POSTS_UNAPPROVED'] : '');
-- 
cgit v1.2.1


From d11a0097d0a0a7b69ee644bd9c9d5e35d124bed0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 21 Feb 2011 19:56:54 +0100
Subject: [ticket/10009] Entries are always posts, update fields accordingly.

PHPBB3-10009
---
 phpBB/feed.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 75a47630ca..d737b8e10c 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -726,8 +726,8 @@ class phpbb_feed_topic_base extends phpbb_feed_base
 
 		$this->set('author_id',	'topic_poster');
 		$this->set('creator',	'topic_first_poster_name');
-		$this->set('published',	'topic_time');
-		$this->set('updated',	'topic_last_post_time');
+		$this->set('published',	'post_time');
+		$this->set('updated',	'post_edit_time');
 		$this->set('text',		'post_text');
 
 		$this->set('bitfield',	'bbcode_bitfield');
@@ -1272,7 +1272,7 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 		$this->sql = array(
 			'SELECT'	=> 'f.forum_id, f.forum_name,
 							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
 			'FROM'		=> array(
 				TOPICS_TABLE	=> 't',
 				POSTS_TABLE		=> 'p',
@@ -1345,7 +1345,7 @@ class phpbb_feed_topics extends phpbb_feed_topic_base
 		$this->sql = array(
 			'SELECT'	=> 'f.forum_id, f.forum_name,
 							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
 			'FROM'		=> array(
 				TOPICS_TABLE	=> 't',
 				POSTS_TABLE		=> 'p',
@@ -1391,8 +1391,6 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 
 		$this->set('author_id',	'topic_last_poster_id');
 		$this->set('creator',	'topic_last_poster_name');
-		$this->set('updated',	'topic_last_post_time');
-		$this->set('text',		'post_text');
 	}
 
 	function get_sql()
@@ -1444,7 +1442,7 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 			'SELECT'	=> 'f.forum_id, f.forum_name,
 							t.topic_id, t.topic_title, t.topic_replies, t.topic_replies_real, t.topic_views,
 							t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
 			'FROM'		=> array(
 				TOPICS_TABLE	=> 't',
 				POSTS_TABLE		=> 'p',
-- 
cgit v1.2.1


From 11262afa93fc7e1eea31873e3d1a7139230c427e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 23 Feb 2011 17:21:51 +0100
Subject: [ticket/10052] Correct session tests, and separate session factory
 from tests

PHPBB3-10052
---
 tests/mock/session_testable.php           |   7 ++
 tests/session/continue_test.php           |  67 ++++++-----------
 tests/session/fixtures/sessions_empty.xml |   6 ++
 tests/session/init_test.php               |  45 +++---------
 tests/session/testable_factory.php        | 118 ++++++++++++++++++++++++++++++
 5 files changed, 165 insertions(+), 78 deletions(-)
 create mode 100644 tests/session/testable_factory.php

diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 0d4642d372..47089cb94b 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -10,6 +10,13 @@
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
+/**
+* Extends the session class to overwrite the setting of cookies.
+*
+* The session class directly writes cookie headers making it impossible to
+* test it without warnings about sent headers. This class only stores cookie
+* data for later verification.
+*/
 class phpbb_mock_session_testable extends session
 {
 	private $_cookies = array();
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index ac682e06ac..06b03f5780 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -2,13 +2,13 @@
 /**
 *
 * @package testing
-* @copyright (c) 2008 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
 
 require_once dirname(__FILE__) . '/../mock/cache.php';
-require_once dirname(__FILE__) . '/../mock/session_testable.php';
+require_once dirname(__FILE__) . '/testable_factory.php';
 
 class phpbb_session_continue_test extends phpbb_database_test_case
 {
@@ -22,16 +22,16 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		global $_SID;
 		return array(
 			array(
-				'bar_session', '4', 'user agent',
+				'bar_session', '4', 'user agent', '127.0.0.1',
 				array(
 					array('session_id' => 'anon_session', 'session_user_id' => 1),
 					array('session_id' => 'bar_session', 'session_user_id' => 4)
 				),
 				array(),
-				'Check if no new session was created',
+				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
 			),
 			array(
-				'anon_session', '4', 'user agent',
+				'anon_session', '4', 'user agent', '127.0.0.1',
 				array(
 					array('session_id' => 'bar_session', 'session_user_id' => 4),
 					array('session_id' => null, 'session_user_id' => 1) // use generated SID
@@ -41,7 +41,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 					'k' => array(null, null),
 					'sid' => array($_SID, null),
 				),
-				'Check if an anonymous new session was created',
+				'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.',
 			),
 		);
 	}
@@ -49,29 +49,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 	/**
 	* @dataProvider session_begin_attempts
 	*/
-	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message)
+	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)
 	{
-		$this->markTestIncomplete('Test needs to be fixed');
-		
-		$session = new phpbb_mock_session_testable;
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		// set up all the global variables used in session_create
-		global $SID, $_SID, $db, $config, $cache;
-
-		$config = $this->get_config();
 		$db = $this->new_dbal();
-		$cache_data = array(
-			'_bots' => array(),
-		);
-		$cache = new phpbb_mock_cache;
-		$SID = $_SID = null;
+		$session_factory = new phpbb_session_testable_factory;
+		$session_factory->set_cookies(array(
+			'_sid' => $session_id,
+			'_u' => $user_id,
+		));
+		$session_factory->merge_config_data(array(
+			'session_length' => time(), // need to do this to allow sessions started at time 0
+		));
+		$session_factory->merge_server_data(array(
+			'HTTP_USER_AGENT' => $user_agent,
+			'REMOTE_ADDR' => $ip,
+		));
 
-		$_COOKIE['_sid'] = $session_id;
-		$_COOKIE['_u'] = $user_id;
-		$_SERVER['HTTP_USER_AGENT'] = $user_agent;
+		$session = $session_factory->get_session($db);
+		$session->page = array('page' => 'page', 'forum' => 0);
 
-		$config['session_length'] = time(); // need to do this to allow sessions started at time 0
 		$session->session_begin();
 
 		$sql = 'SELECT session_id, session_user_id
@@ -94,26 +90,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 
 		$session->check_cookies($this, $expected_cookies);
 
-		$cache->check($this, $cache_data);
-	}
-	static public function get_config()
-	{
-		return array(
-			'allow_autologin' => false,
-			'auth_method' => 'db',
-			'forwarded_for_check' => true,
-			'active_sessions' => 0, // disable
-			'rand_seed' => 'foo',
-			'rand_seed_last_update' => 0,
-			'max_autologin_time' => 0,
-			'session_length' => 100,
-			'form_token_lifetime' => 100,
-			'cookie_name' => '',
-			'limit_load' => 0,
-			'limit_search_load' => 0,
-			'ip_check' => 3,
-			'browser_check' => 1,
-		);
+		$session_factory->check($this);
 	}
 }
 
diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml
index 66fa585b18..f94337314e 100644
--- a/tests/session/fixtures/sessions_empty.xml
+++ b/tests/session/fixtures/sessions_empty.xml
@@ -16,4 +16,10 @@
 			<value>bar</value>
 		</row>
 	</table>
+	<table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_ip</column>
+		<column>session_browser</column>
+	</table>
 </dataset>
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index ccb0554409..cad327a490 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -2,13 +2,13 @@
 /**
 *
 * @package testing
-* @copyright (c) 2008 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
 
 require_once dirname(__FILE__) . '/../mock/cache.php';
-require_once dirname(__FILE__) . '/../mock/session_testable.php';
+require_once dirname(__FILE__) . '/testable_factory.php';
 
 class phpbb_session_init_test extends phpbb_database_test_case
 {
@@ -21,21 +21,11 @@ class phpbb_session_init_test extends phpbb_database_test_case
 
 	public function test_login_session_create()
 	{
-		$this->markTestIncomplete('Test fails when run as part of the test suite');
-		
-		$session = new phpbb_mock_session_testable;
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		// set up all the global variables used in session_create
-		global $SID, $_SID, $db, $config, $cache;
-
-		$config = $this->get_config();
 		$db = $this->new_dbal();
-		$cache_data = array(
-			'_bots' => array(),
-		);
-		$cache = new phpbb_mock_cache;
-		$SID = $_SID = null;
+		$session_factory = new phpbb_session_testable_factory;
+
+		$session = $session_factory->get_session($db);
+		$session->page = array('page' => 'page', 'forum' => 0);
 
 		$session->session_create(3);
 
@@ -48,30 +38,19 @@ class phpbb_session_init_test extends phpbb_database_test_case
 			'Check if exacly one session for user id 3 was created'
 		);
 
-		$cookie_expire = $session->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
+		$cookie_expire = $session->time_now + 31536000;
 
 		$session->check_cookies($this, array(
 			'u' => array(null, $cookie_expire),
 			'k' => array(null, $cookie_expire),
-			'sid' => array($_SID, $cookie_expire),
+			'sid' => array($session->session_id, $cookie_expire),
 		));
 
-		$cache->check($this, $cache_data);
-	}
+		global $SID, $_SID;
+		$this->assertEquals($session->session_id, $_SID);
+		$this->assertEquals('?sid=' . $session->session_id, $SID);
 
-	static public function get_config()
-	{
-		return array(
-			'allow_autologin' => false,
-			'auth_method' => 'db',
-			'forwarded_for_check' => true,
-			'active_sessions' => 0, // disable
-			'rand_seed' => 'foo',
-			'rand_seed_last_update' => 0,
-			'max_autologin_time' => 0,
-			'session_length' => 100,
-			'form_token_lifetime' => 100,
-		);
+		$session_factory->check($this);
 	}
 }
 
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
new file mode 100644
index 0000000000..6c42120c62
--- /dev/null
+++ b/tests/session/testable_factory.php
@@ -0,0 +1,118 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../mock/session_testable.php';
+
+/**
+* This class exists to setup an instance of phpbb's session class for testing.
+*
+* The class has rather complex dependencies, so in order to make its tests more
+* understandable and to make its dependencies more visible this class sets up
+* all the necessary global state & variable contents.
+*/
+class phpbb_session_testable_factory
+{
+	protected $config_data;
+	protected $cache_data;
+	protected $cookies;
+
+	protected $config;
+	protected $cache;
+
+	/**
+	* Initialises the factory with a set of default config and cache values.
+	*/
+	public function __construct()
+	{
+		// default configuration values
+		$this->config_data = array(
+			'allow_autologin' => false,
+			'auth_method' => 'db',
+			'forwarded_for_check' => true,
+			'active_sessions' => 0, // disable
+			'rand_seed' => 'foo',
+			'rand_seed_last_update' => 0,
+			'max_autologin_time' => 0,
+			'session_length' => 100,
+			'form_token_lifetime' => 100,
+			'cookie_name' => '',
+			'limit_load' => 0,
+			'limit_search_load' => 0,
+			'ip_check' => 3,
+			'browser_check' => 1,
+		);
+
+		$this->cache_data = array(
+			'_bots' => array(),
+		);
+
+		$this->cookies = array();
+
+		$this->server_data = $_SERVER;
+	}
+
+	public function get_session(dbal $dbal)
+	{
+		// set up all the global variables used by session
+		global $SID, $_SID, $db, $config, $cache;
+
+		$config = $this->config = $this->get_config_data();
+		$db = $dbal;
+
+		$cache = $this->cache = new phpbb_mock_cache($this->get_cache_data());
+		$SID = $_SID = null;
+
+		$_COOKIE = $this->cookies;
+		$_SERVER = $this->server_data;
+
+		$session = new phpbb_mock_session_testable;
+		return $session;
+	}
+
+	public function set_cookies($cookies)
+	{
+		$this->cookies = $cookies;
+	}
+
+	public function check(PHPUnit_Framework_Assert $test)
+	{
+		$this->cache->check($test, $this->get_cache_data());
+	}
+
+	public function merge_config_data($config_data)
+	{
+		$this->config_data = array_merge($this->config_data, $config_data);
+	}
+
+	public function get_config_data()
+	{
+		return $this->config_data;
+	}
+
+	public function merge_cache_data($cache_data)
+	{
+		$this->cache_data = array_merge($this->cache_data, $cache_data);
+	}
+
+	public function get_cache_data()
+	{
+		return $this->cache_data;
+	}
+
+	public function merge_server_data($server_data)
+	{
+		return $this->server_data = array_merge($this->server_data, $server_data);
+	}
+
+	public function get_server_data()
+	{
+		return $this->server_data;
+	}
+}
+
-- 
cgit v1.2.1


From cb56ab2dbda6c2c33f6437069de35bd09aeadb82 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 23 Feb 2011 19:41:11 +0100
Subject: [ticket/10052] Add comments to the session testable factory.

PHPBB3-10052
---
 tests/session/init_test.php        |  2 +-
 tests/session/testable_factory.php | 65 ++++++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index cad327a490..1181fab636 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -38,7 +38,7 @@ class phpbb_session_init_test extends phpbb_database_test_case
 			'Check if exacly one session for user id 3 was created'
 		);
 
-		$cookie_expire = $session->time_now + 31536000;
+		$cookie_expire = $session->time_now + 31536000; // default is one year
 
 		$session->check_cookies($this, array(
 			'u' => array(null, $cookie_expire),
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 6c42120c62..f3ef19a257 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -12,9 +12,9 @@ require_once dirname(__FILE__) . '/../mock/session_testable.php';
 /**
 * This class exists to setup an instance of phpbb's session class for testing.
 *
-* The class has rather complex dependencies, so in order to make its tests more
-* understandable and to make its dependencies more visible this class sets up
-* all the necessary global state & variable contents.
+* The session class has rather complex dependencies, so in order to make its
+* tests more * understandable and to make its dependencies more visible this
+* factory class sets up all the necessary global state & variable contents.
 */
 class phpbb_session_testable_factory
 {
@@ -57,6 +57,12 @@ class phpbb_session_testable_factory
 		$this->server_data = $_SERVER;
 	}
 
+	/**
+	* Retrieve the configured session class instance
+	*
+	* @param dbal $dbal The database connection to use for session data
+	* @return phpbb_mock_session_testable A session instance
+	*/
 	public function get_session(dbal $dbal)
 	{
 		// set up all the global variables used by session
@@ -75,41 +81,88 @@ class phpbb_session_testable_factory
 		return $session;
 	}
 
-	public function set_cookies($cookies)
+	/**
+	* Set the cookies which should be present in the request data.
+	*
+	* @param array $cookies The cookie data, structured like $_COOKIE contents.
+	*/
+	public function set_cookies(array $cookies)
 	{
 		$this->cookies = $cookies;
 	}
 
+	/**
+	* Check if the cache used for the generated session contains correct data.
+	*
+	* @param PHPUnit_Framework_Assert $test The test case to call assert methods
+	*                                       on
+	*/
 	public function check(PHPUnit_Framework_Assert $test)
 	{
 		$this->cache->check($test, $this->get_cache_data());
 	}
 
-	public function merge_config_data($config_data)
+	/**
+	* Merge config data with the current config data to be supplied to session.
+	*
+	* New values overwrite new ones.
+	*
+	* @param array $config_data The config data to merge with previous data
+	*/
+	public function merge_config_data(array $config_data)
 	{
 		$this->config_data = array_merge($this->config_data, $config_data);
 	}
 
+	/**
+	* Retrieve the entire config data to be passed to the session.
+	*
+	* @return array Configuration
+	*/
 	public function get_config_data()
 	{
 		return $this->config_data;
 	}
 
-	public function merge_cache_data($cache_data)
+	/**
+	* Merge the cache contents with more data.
+	*
+	* New values overwrite old ones.
+	*
+	* @param array $cache_data The additional cache data
+	*/
+	public function merge_cache_data(array $cache_data)
 	{
 		$this->cache_data = array_merge($this->cache_data, $cache_data);
 	}
 
+	/**
+	* Retrieve the entire cache data to be passed to the session.
+	*
+	* @return array Cache contents
+	*/
 	public function get_cache_data()
 	{
 		return $this->cache_data;
 	}
 
+	/**
+	* Merge the current server info ($_SERVER) with more data.
+	*
+	* New values overwrite old ones.
+	*
+	* @param array $server_data The additional server variables
+	*/
 	public function merge_server_data($server_data)
 	{
 		return $this->server_data = array_merge($this->server_data, $server_data);
 	}
 
+	/**
+	* Retrieve all server variables to be passed to the session.
+	*
+	* @return array Server variables
+	*/
 	public function get_server_data()
 	{
 		return $this->server_data;
-- 
cgit v1.2.1


From 786078d4232b1ca3b79d692938519e7bd677f12a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Feb 2011 18:15:54 -0500
Subject: [ticket/10041] Use send_status_line more in download/file.php

PHPBB3-10041
---
 phpBB/download/file.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index f5a766dd57..e1ec835b9b 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -125,11 +125,13 @@ $user->setup('viewtopic');
 
 if (!$download_id)
 {
+	send_status_line(404, 'Not Found');
 	trigger_error('NO_ATTACHMENT_SELECTED');
 }
 
 if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
 {
+	send_status_line(404, 'Not Found');
 	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
 }
 
@@ -142,11 +144,13 @@ $db->sql_freeresult($result);
 
 if (!$attachment)
 {
+	send_status_line(404, 'Not Found');
 	trigger_error('ERROR_NO_ATTACHMENT');
 }
 
 if ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach']))
 {
+	send_status_line(404, 'Not Found');
 	trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
 }
 
@@ -159,6 +163,7 @@ if ($attachment['is_orphan'])
 
 	if (!$own_attachment || ($attachment['in_message'] && !$auth->acl_get('u_pm_download')) || (!$attachment['in_message'] && !$auth->acl_get('u_download')))
 	{
+		send_status_line(404, 'Not Found');
 		trigger_error('ERROR_NO_ATTACHMENT');
 	}
 
@@ -191,6 +196,7 @@ else
 		}
 		else
 		{
+			send_status_line(403, 'Forbidden');
 			trigger_error('SORRY_AUTH_VIEW_ATTACH');
 		}
 	}
@@ -231,6 +237,7 @@ else
 	$extensions = array();
 	if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
 	{
+		send_status_line(404, 'Forbidden');
 		trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
 	}
 }
@@ -253,6 +260,7 @@ $db->sql_freeresult($result);
 
 if (!$attachment)
 {
+	send_status_line(404, 'Not Found');
 	trigger_error('ERROR_NO_ATTACHMENT');
 }
 
@@ -295,6 +303,7 @@ else
 		// This presenting method should no longer be used
 		if (!@is_dir($phpbb_root_path . $config['upload_path']))
 		{
+			send_status_line(500, 'Internal Server Error');
 			trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
 		}
 
@@ -419,6 +428,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));
 	}
 
@@ -445,9 +455,11 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 		// PHP track_errors setting On?
 		if (!empty($php_errormsg))
 		{
+			send_status_line(500, 'Internal Server Error');
 			trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '<br />' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg));
 		}
 
+		send_status_line(500, 'Internal Server Error');
 		trigger_error('UNABLE_TO_DELIVER_FILE');
 	}
 
-- 
cgit v1.2.1


From a0f6e185ca79fcade2bbd7b9609c2383ed5a57c4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Feb 2011 18:21:03 -0500
Subject: [ticket/10056] Corrected a typo in Firebird name.

PHPBB3-10056
---
 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 4d3d51923b..3a5a4a47d3 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -227,7 +227,7 @@ if (empty($config['dbms_version']))
 	set_config('dbms_version', $db->sql_server_info(true));
 }
 
-// Firebird update from Firebord 2.0 to 2.1+ required?
+// Firebird update from Firebird 2.0 to 2.1+ required?
 if ($db->sql_layer == 'firebird')
 {
 	// We do not trust any PHP5 function enabled, we will simply test for a function new in 2.1
-- 
cgit v1.2.1


From a7bc76d24622ce89f35023738e459ce38aa169a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 11 Jan 2011 13:48:13 +0100
Subject: [ticket/7778] BBCode single limit

There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
---
 phpBB/develop/create_schema_files.php |  2 +-
 phpBB/includes/acp/acp_bbcodes.php    |  2 +-
 phpBB/includes/constants.php          |  3 +++
 phpBB/install/database_update.php     | 11 +++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 0515d801f2..87670722aa 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -926,7 +926,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_bbcodes'] = array(
 		'COLUMNS'		=> array(
-			'bbcode_id'				=> array('TINT:3', 0),
+			'bbcode_id'				=> array('USINT', 0),
 			'bbcode_tag'			=> array('VCHAR:16', ''),
 			'bbcode_helpline'		=> array('VCHAR_UNI', ''),
 			'display_on_posting'	=> array('BOOL', 0),
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 2b706394c4..0644b38eb1 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -213,7 +213,7 @@ class acp_bbcodes
 							$bbcode_id = NUM_CORE_BBCODES + 1;
 						}
 
-						if ($bbcode_id > 1511)
+						if ($bbcode_id > BBCODE_LIMIT)
 						{
 							trigger_error($user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING);
 						}
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 90440f74b8..ea34eb8e81 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -173,6 +173,9 @@ define('BBCODE_UID_LEN', 8);
 // Number of core BBCodes
 define('NUM_CORE_BBCODES', 12);
 
+// BBCode hard limit
+define('BBCODE_LIMIT', 1511);
+
 // Smiley hard limit
 define('SMILEY_LIMIT', 1000);
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4d3d51923b..d74d1dab68 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -916,8 +916,15 @@ function database_update_info()
 		'3.0.7-PL1'		=> array(),
 		// No changes from 3.0.8-RC1 to 3.0.8
 		'3.0.8-RC1'		=> array(),
-		// No changes from 3.0.8 to 3.0.9-RC1
-		'3.0.8'		=> array(),
+
+		// Changes from 3.0.8 to 3.0.9-RC1
+		'3.0.8'			=> array(
+			'change_columns'	=> array(
+				BBCODES_TABLE	=> array(
+					'bbcode_id'	=> array('USINT', 0),
+				),
+			),
+		),
 	);
 }
 
-- 
cgit v1.2.1


From 1b88f5a316b64640807ddb14519a3d93d2238cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 11 Jan 2011 18:01:40 +0100
Subject: [ticket/7778] Add the column change to `mysql_upgrader.php`

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

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 57230339e8..5a7034b45c 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -414,7 +414,7 @@ function get_schema_struct()
 
 	$schema_data['phpbb_bbcodes'] = array(
 		'COLUMNS'		=> array(
-			'bbcode_id'				=> array('TINT:3', 0),
+			'bbcode_id'				=> array('USINT', 0),
 			'bbcode_tag'			=> array('VCHAR:16', ''),
 			'bbcode_helpline'		=> array('VCHAR_UNI', ''),
 			'display_on_posting'	=> array('BOOL', 0),
-- 
cgit v1.2.1


From 5dee60e54e99913e1804d2c74f94b6e9ada390a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 11 Jan 2011 18:12:25 +0100
Subject: [ticket/7778] Update all the schema files

Correct all the schema files to contain the new field type

PHPBB3-7778
---
 phpBB/install/schemas/mysql_40_schema.sql | 2 +-
 phpBB/install/schemas/mysql_41_schema.sql | 2 +-
 phpBB/install/schemas/oracle_schema.sql   | 2 +-
 phpBB/install/schemas/postgres_schema.sql | 2 +-
 phpBB/install/schemas/sqlite_schema.sql   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 19b1b4f0f7..eeaec4ccf6 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -110,7 +110,7 @@ CREATE TABLE phpbb_banlist (
 
 # Table: 'phpbb_bbcodes'
 CREATE TABLE phpbb_bbcodes (
-	bbcode_id tinyint(3) DEFAULT '0' NOT NULL,
+	bbcode_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_tag varbinary(16) DEFAULT '' NOT NULL,
 	bbcode_helpline blob NOT NULL,
 	display_on_posting 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 3b70630a9e..3a3b4ab2fd 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -110,7 +110,7 @@ CREATE TABLE phpbb_banlist (
 
 # Table: 'phpbb_bbcodes'
 CREATE TABLE phpbb_bbcodes (
-	bbcode_id tinyint(3) DEFAULT '0' NOT NULL,
+	bbcode_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_tag varchar(16) DEFAULT '' NOT NULL,
 	bbcode_helpline varchar(255) DEFAULT '' NOT NULL,
 	display_on_posting tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index d577fce46c..9c25af2512 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -254,7 +254,7 @@ END;
 	Table: 'phpbb_bbcodes'
 */
 CREATE TABLE phpbb_bbcodes (
-	bbcode_id number(3) DEFAULT '0' NOT NULL,
+	bbcode_id number(4) DEFAULT '0' NOT NULL,
 	bbcode_tag varchar2(16) DEFAULT '' ,
 	bbcode_helpline varchar2(765) DEFAULT '' ,
 	display_on_posting number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 50b3979adb..a2d4dc3e0b 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -213,7 +213,7 @@ CREATE INDEX phpbb_banlist_ban_ip ON phpbb_banlist (ban_ip, ban_exclude);
 	Table: 'phpbb_bbcodes'
 */
 CREATE TABLE phpbb_bbcodes (
-	bbcode_id INT2 DEFAULT '0' NOT NULL,
+	bbcode_id INT2 DEFAULT '0' NOT NULL CHECK (bbcode_id >= 0),
 	bbcode_tag varchar(16) DEFAULT '' NOT NULL,
 	bbcode_helpline varchar(255) DEFAULT '' NOT NULL,
 	display_on_posting INT2 DEFAULT '0' NOT NULL CHECK (display_on_posting >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 7ee821d395..8661bb7578 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -108,7 +108,7 @@ CREATE INDEX phpbb_banlist_ban_ip ON phpbb_banlist (ban_ip, ban_exclude);
 
 # Table: 'phpbb_bbcodes'
 CREATE TABLE phpbb_bbcodes (
-	bbcode_id tinyint(3) NOT NULL DEFAULT '0',
+	bbcode_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_tag varchar(16) NOT NULL DEFAULT '',
 	bbcode_helpline varchar(255) NOT NULL DEFAULT '',
 	display_on_posting INTEGER UNSIGNED NOT NULL DEFAULT '0',
-- 
cgit v1.2.1


From a875075cc866c52877b6ac67930ec621fd22e562 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 24 Feb 2011 12:57:28 +0100
Subject: [ticket/10036] Use image from configuration file for displaying
 online-status.

PHPBB3-10036
---
 phpBB/styles/prosilver/theme/colours.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 3f215def72..f7747ba73c 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -652,7 +652,7 @@ fieldset.polls dd div {
 }
 
 .online {
-	background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online.gif");
+	background-image: url("{IMG_ICON_USER_ONLINE_SRC}");
 }
 
 /*  	
-- 
cgit v1.2.1


From e6219c83c7302424f670d4160798db4952a48f0c Mon Sep 17 00:00:00 2001
From: Callum Macrae <callumacrae95@gmail.com>
Date: Thu, 24 Feb 2011 14:13:45 +0000
Subject: [ticket/9872] Removed some useless code that broke delete_posts

When in the ACP, there is the option to delete a user and all their
posts. This would then call the user_delete function and define $mode as
'remove'.

On lines 485-521 was some code that would delete their topics, then
after that there would be a call to delete_posts - which would also
delete their topics. It would not update the board statistics, and the
thread count would remain the same, even though several had been
deleted. It stopped delete_topics functioning correctly, so
delete_topics would not update the board statistics either.

My solution to this is to delete lines 485-521 and allow delete_posts
to call delete_topics, thus updating the thread count in the statistics.

PHPBB3-9872
---
 phpBB/includes/functions_user.php | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 90341cd926..0420aa70ab 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -482,44 +482,6 @@ function user_delete($mode, $user_id, $post_username = false)
 				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 			}
 
-			$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
-				FROM ' . POSTS_TABLE . "
-				WHERE poster_id = $user_id
-				GROUP BY topic_id";
-			$result = $db->sql_query($sql);
-
-			$topic_id_ary = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$topic_id_ary[$row['topic_id']] = $row['total_posts'];
-			}
-			$db->sql_freeresult($result);
-
-			if (sizeof($topic_id_ary))
-			{
-				$sql = 'SELECT topic_id, topic_replies, topic_replies_real
-					FROM ' . TOPICS_TABLE . '
-					WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
-				$result = $db->sql_query($sql);
-
-				$del_topic_ary = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
-					{
-						$del_topic_ary[] = $row['topic_id'];
-					}
-				}
-				$db->sql_freeresult($result);
-
-				if (sizeof($del_topic_ary))
-				{
-					$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-						WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary);
-					$db->sql_query($sql);
-				}
-			}
-
 			// Delete posts, attachments, etc.
 			delete_posts('poster_id', $user_id);
 
-- 
cgit v1.2.1


From e4497f4a1506c98ea94d3f1382b7d4d472ff9e80 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callumacrae95@gmail.com>
Date: Thu, 24 Feb 2011 19:54:47 +0000
Subject: [ticket/9997] Fixed an inconsistency in the Moderator Control Panel

The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.

This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.

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

diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 04e24cd1f9..9d4997e576 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -72,8 +72,8 @@
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
 			<p class="rules">
-				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> &nbsp;
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
+				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
+				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 				{S_FORM_TOKEN}
 			</p>
-- 
cgit v1.2.1


From c4b3d3a0896129a6dc2b6f97e3d97c098aa38667 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 24 Feb 2011 17:31:44 -0500
Subject: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.

Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.

PHPBB3-10058
---
 phpBB/develop/mysql_upgrader.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 5a7034b45c..70c8173a32 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -21,6 +21,7 @@
 die("Please read the first lines of this script for instructions on how to enable it");
 
 define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
-- 
cgit v1.2.1


From 9399c7c46bd4e895a06127c19b27155008946726 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callumacrae95@gmail.com>
Date: Thu, 24 Feb 2011 22:12:36 +0000
Subject: [ticket/7834] Topic time didn't update when first post was deleted

When the first post of a topic was deleted, the topic time didn't
update - it should have changed to the time of the next post.

This commit simply applies lefty74's patch posted in the ticket. It gets
the post time of the next post from the database, and updates the thread
accordingly.

This patch is not my work at all and all credits go to lefty74, I just
transferred it onto GitHub

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

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 72331a73c6..271039f415 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1479,7 +1479,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 		break;
 
 		case 'delete_first_post':
-			$sql = 'SELECT p.post_id, p.poster_id, p.post_username, u.username, u.user_colour
+			$sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username, u.user_colour
 				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
 				WHERE p.topic_id = $topic_id
 					AND p.poster_id = u.user_id
@@ -1493,7 +1493,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 				$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
 			}
 
-			$sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "'";
+			$sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "', topic_time = " . (int) $row['post_time'];
 
 			// Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply"
 			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
-- 
cgit v1.2.1


From a25238e0c16ba238136475bb1dcc17472fedfffa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 24 Feb 2011 23:51:42 +0100
Subject: [ticket/9874] view_log() performs unneeded count query over all log
 entries.

PHPBB3-9874
---
 phpBB/includes/acp/acp_main.php    |  2 +-
 phpBB/includes/functions_admin.php | 24 ++++++++++++++----------
 phpBB/includes/mcp/mcp_front.php   |  2 +-
 phpBB/includes/mcp/mcp_post.php    |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index b8712b2a3d..60cebe3c08 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -529,7 +529,7 @@ class acp_main
 		);
 
 		$log_data = array();
-		$log_count = 0;
+		$log_count = false;
 
 		if ($auth->acl_get('a_viewlogs'))
 		{
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 2aa12adb2e..cb0cf34e69 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2506,6 +2506,7 @@ function cache_moderators()
 
 /**
 * View log
+* If $log_count is set to false, we will skip counting all entries in the database.
 */
 function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 {
@@ -2761,16 +2762,19 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		}
 	}
 
-	$sql = 'SELECT COUNT(l.log_id) AS total_entries
-		FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
-		WHERE l.log_type = $log_type
-			AND l.user_id = u.user_id
-			AND l.log_time >= $limit_days
-			$sql_keywords
-			$sql_forum";
-	$result = $db->sql_query($sql);
-	$log_count = (int) $db->sql_fetchfield('total_entries');
-	$db->sql_freeresult($result);
+	if ($log_count !== false)
+	{
+		$sql = 'SELECT COUNT(l.log_id) AS total_entries
+			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
+			WHERE l.log_type = $log_type
+				AND l.user_id = u.user_id
+				AND l.log_time >= $limit_days
+				$sql_keywords
+				$sql_forum";
+		$result = $db->sql_query($sql);
+		$log_count = (int) $db->sql_fetchfield('total_entries');
+		$db->sql_freeresult($result);
+	}
 
 	return;
 }
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 50e14b9336..af262baa29 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -350,7 +350,7 @@ function mcp_front_view($id, $mode, $action)
 			// Add forum_id 0 for global announcements
 			$forum_list[] = 0;
 
-			$log_count = 0;
+			$log_count = false;
 			$log = array();
 			view_log('mod', $log, $log_count, 5, 0, $forum_list);
 
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 7098b4bbce..de7f3e63ee 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -227,10 +227,10 @@ function mcp_post_details($id, $mode, $action)
 
 	// Get User Notes
 	$log_data = array();
-	$log_count = 0;
+	$log_count = false;
 	view_log('user', $log_data, $log_count, $config['posts_per_page'], 0, 0, 0, $post_info['user_id']);
 
-	if ($log_count)
+	if (!empty($log_data))
 	{
 		$template->assign_var('S_USER_NOTES', true);
 
-- 
cgit v1.2.1


From c8ad006b71f0807b96be81fcd537fffee76551b3 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 25 Feb 2011 16:27:51 +0100
Subject: [ticket/10060] Fix test suite under MySQL

Regression from PHPBB3-10043, a typo caused the database tests to fail
under MySQL.

PHPBB3-10060
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 2 +-
 1 file changed, 1 insertion(+), 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 6c06857fbc..a7559e2183 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -123,7 +123,7 @@ class phpbb_database_test_connection_manager
 
 				try
 				{
-					$this->pdo->exec('DROP DATABASE ' . $config['dbname']);
+					$this->pdo->exec('DROP DATABASE ' . $this->config['dbname']);
 				}
 				catch (PDOException $e)
 				{
-- 
cgit v1.2.1


From 3b15fe0a5bc2c5bf5fcd5a08921ad3026791d4da Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 19 Jan 2011 03:08:27 +0100
Subject: [ticket/9912] Fix error in logic. Do not strip SID when user is not a
 bot.

This also moves the code up to the point where we know that the user is a bot.

Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314

PHPBB3-9912
---
 phpBB/includes/session.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 1dc854caf2..d803f8d799 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -583,6 +583,13 @@ class session
 			$bot = false;
 		}
 
+		// Bot user, if they have a SID in the Request URI we need to get rid of it
+		// otherwise they'll index this page with the SID, duplicate content oh my!
+		if ($bot && isset($_GET['sid']))
+		{
+			redirect(build_url(array('sid')));
+		}
+
 		// If no data was returned one or more of the following occurred:
 		// Key didn't match one in the DB
 		// User does not exist
@@ -619,12 +626,6 @@ class session
 		}
 		else
 		{
-			// Bot user, if they have a SID in the Request URI we need to get rid of it
-			// otherwise they'll index this page with the SID, duplicate content oh my!
-			if (isset($_GET['sid']))
-			{
-				redirect(build_url(array('sid')));
-			}
 			$this->data['session_last_visit'] = $this->time_now;
 		}
 
-- 
cgit v1.2.1


From 3d65c3c10484bc524160ebb4f4a483ba6c0dd8ed Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 27 Feb 2011 22:06:01 +0100
Subject: [task/session-tests] Make the session id replacement of dataset
 values clearer

PHPBB3-9732
---
 tests/session/continue_test.php | 44 ++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 06b03f5780..4e5df300f2 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -19,7 +19,6 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 
 	static public function session_begin_attempts()
 	{
-		global $_SID;
 		return array(
 			array(
 				'bar_session', '4', 'user agent', '127.0.0.1',
@@ -34,12 +33,12 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 				'anon_session', '4', 'user agent', '127.0.0.1',
 				array(
 					array('session_id' => 'bar_session', 'session_user_id' => 4),
-					array('session_id' => null, 'session_user_id' => 1) // use generated SID
+					array('session_id' => '__new_session_id__', 'session_user_id' => 1) // use generated SID
 				),
 				array(
 					'u' => array('1', null),
 					'k' => array(null, null),
-					'sid' => array($_SID, null),
+					'sid' => array('__new_session_id__', null),
 				),
 				'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.',
 			),
@@ -73,14 +72,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		$sql = 'SELECT session_id, session_user_id
 			FROM phpbb_sessions';
 
-		// little tickery to allow using a dataProvider with dynamic expected result
-		foreach ($expected_sessions as $i => $s)
-		{
-			if (is_null($s['session_id']))
-			{
-				$expected_sessions[$i]['session_id'] = $session->session_id;
-			}
-		}
+		$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
+		$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);
 
 		$this->assertSqlResultEquals(
 			$expected_sessions,
@@ -92,5 +85,32 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 
 		$session_factory->check($this);
 	}
-}
 
+	/**
+	* Replaces recursively the value __new_session_id__ with the given session
+	* id.
+	*
+	* @param array $array An array of data
+	* @param string $session_id The new session id to use instead of the
+	*                           placeholder.
+	* @return array The input array with all occurances of __new_session_id__
+	*               replaced.
+	*/
+	public function replace_session($array, $session_id)
+	{
+		foreach ($array as $key => &$value)
+		{
+			if ($value === '__new_session_id__')
+			{
+				$value = $session_id;
+			}
+
+			if (is_array($value))
+			{
+				$value = $this->replace_session($value, $session_id);
+			}
+		}
+
+		return $array;
+	}
+}
-- 
cgit v1.2.1


From bbf3864cb4cd3762a64b9489cfd38b7ac93df423 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 27 Feb 2011 22:16:39 +0100
Subject: [task/session-tests] Correctly display message on session continue
 test failure

PHPBB3-9732
---
 tests/session/continue_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 4e5df300f2..27ac457c2d 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -78,7 +78,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		$this->assertSqlResultEquals(
 			$expected_sessions,
 			$sql,
-			'Check if no new session was created'
+			$message
 		);
 
 		$session->check_cookies($this, $expected_cookies);
-- 
cgit v1.2.1


From 7255ef4f6d9ea8c63036ad32fa376cd03b1b8e9b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 27 Feb 2011 22:17:03 +0100
Subject: [task/session-tests] By default the cache check now skips over db
 server info

PHPBB3-9732
---
 tests/mock/cache.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 2ac46f7090..738d1eaaba 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -53,9 +53,16 @@ class phpbb_mock_cache
 		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
-	public function check(PHPUnit_Framework_Assert $test, $data)
+	public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)
 	{
-		$test->assertEquals($data, $this->data);
+		$cache_data = $this->data;
+
+		if ($ignore_db_info)
+		{
+			unset($cache_data['mysqli_version']);
+		}
+
+		$test->assertEquals($data, $cache_data);
 	}
 }
 
-- 
cgit v1.2.1


From 921603b09e1e34059f783c502d5dfc9ae0189057 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 27 Feb 2011 22:20:36 +0100
Subject: [task/session-tests] Make result check independent of returned row
 order.

PHPBB3-9732
---
 tests/session/continue_test.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 27ac457c2d..3080121978 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -24,7 +24,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 				'bar_session', '4', 'user agent', '127.0.0.1',
 				array(
 					array('session_id' => 'anon_session', 'session_user_id' => 1),
-					array('session_id' => 'bar_session', 'session_user_id' => 4)
+					array('session_id' => 'bar_session', 'session_user_id' => 4),
 				),
 				array(),
 				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
@@ -32,8 +32,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 			array(
 				'anon_session', '4', 'user agent', '127.0.0.1',
 				array(
+					array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
 					array('session_id' => 'bar_session', 'session_user_id' => 4),
-					array('session_id' => '__new_session_id__', 'session_user_id' => 1) // use generated SID
 				),
 				array(
 					'u' => array('1', null),
@@ -70,7 +70,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 		$session->session_begin();
 
 		$sql = 'SELECT session_id, session_user_id
-			FROM phpbb_sessions';
+			FROM phpbb_sessions
+			ORDER BY session_user_id';
 
 		$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
 		$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);
-- 
cgit v1.2.1


From dd1c12c758a7953ae2c0f8389e9423390d65ee42 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 27 Feb 2011 23:01:14 +0100
Subject: [ticket/9984] Add a phing target that does not create packages.

PHPBB3-9984
---
 build/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build.xml b/build/build.xml
index 724f201eb3..268f09d674 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -13,6 +13,7 @@
 	<!-- These are the main targets which you will probably want to use -->
 	<target name="package" depends="clean,prepare,create-package" />
 	<target name="all" depends="clean,prepare,test,docs,create-package" />
+	<target name="build" depends="clean,prepare,test,docs" />
 
 	<target name="prepare">
 		<mkdir dir="build/logs" />
-- 
cgit v1.2.1


From ffe691db1098c9bf9cd6c84d07bcdbc9a6cfb789 Mon Sep 17 00:00:00 2001
From: Philippe Chevrier <giles314@users.sourceforge.net>
Date: Sun, 27 Feb 2011 23:58:02 +0100
Subject: [ticket/10024] Populate unread information to template for styling
 issues.

PHPBB3-10024
---
 phpBB/includes/ucp/ucp_pm_viewfolder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 6b7172ca2b..bd7bf89854 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -169,6 +169,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 					'PM_IMG'			=> ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
 					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
 
+					'S_PM_UNREAD'		=> ($row['pm_unread']) ? true : false,
 					'S_PM_DELETED'		=> ($row['pm_deleted']) ? true : false,
 					'S_PM_REPORTED'		=> (isset($row['report_id'])) ? true : false,
 					'S_AUTHOR_DELETED'	=> ($row['author_id'] == ANONYMOUS) ? true : false,
-- 
cgit v1.2.1


From 25c738ccdb5d387e6773aaab14657bf539b2f155 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 1 Mar 2011 16:48:04 +0100
Subject: [ticket/9915] "Length of ban:" is not displayed in ACP

Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we
need to go back to "value", which we had before.

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

diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index cf44f4aaa7..0e2e71822e 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -33,7 +33,7 @@
 	{
 		document.getElementById('acp_unban').unbangivereason.innerHTML = ban_give_reason[option];
 		document.getElementById('acp_unban').unbanreason.innerHTML = ban_reason[option];
-		document.getElementById('acp_unban').unbanlength.innerHTML = ban_length[option];
+		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
 	}
 
 // ]]>
-- 
cgit v1.2.1


From 51b985399da2ec7287d7ca594abfc6f180c721fc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 1 Mar 2011 17:03:06 +0100
Subject: [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.

IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works.

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

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 9306e30269..2ad8b3e8aa 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -35,8 +35,8 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><label><input onchange="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
-			<label><input onchange="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
-- 
cgit v1.2.1


From 16a46e6a2451b39310cc4352ab8fae603a07effd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 2 Mar 2011 00:04:45 +0100
Subject: [ticket/9824] Remove space after PHPBB3-12345 in prepared commit
 message.

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

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index 2bf25e58a4..2c6426ad6f 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -38,5 +38,5 @@ then
 		tail="\n\nPHPBB3-${branch##ticket/}";
 	fi
 
-	echo "[$branch]$tail $(cat "$1")" > "$1"
+	echo "[$branch]$tail$(cat "$1")" > "$1"
 fi
-- 
cgit v1.2.1


From 9bed2b119c9d3214b7869cecb416a231878aad66 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 2 Mar 2011 00:07:45 +0100
Subject: [ticket/9824] Add space after [ticket/12345] in prepared commit
 message.

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

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index 2c6426ad6f..c3e5dfa90c 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -38,5 +38,5 @@ then
 		tail="\n\nPHPBB3-${branch##ticket/}";
 	fi
 
-	echo "[$branch]$tail$(cat "$1")" > "$1"
+	echo "[$branch] $tail$(cat "$1")" > "$1"
 fi
-- 
cgit v1.2.1


From 36e96bbc6a540e0910e2881c4ba3a629b0e00d9b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 19:53:12 -0500
Subject: [ticket/10059] Fix two misspellings of consistent.

PHPBB3-10059
---
 phpBB/docs/coding-guidelines.html | 2 +-
 phpBB/install/install_install.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 7434fa4870..bce65335d6 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -1018,7 +1018,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 
 	<h4>General function usage: </h4>
 
-	<p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistant over the code.</p>
+	<p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistent over the code.</p>
 
 	<ul>
 		<li>
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 2dd58584f4..9fe0c8aed5 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1882,7 +1882,7 @@ class install_install extends module
 
 			if (!$user_id)
 			{
-				// If we can't insert this user then continue to the next one to avoid inconsistant data
+				// If we can't insert this user then continue to the next one to avoid inconsistent data
 				$this->p_master->db_error('Unable to insert bot into users table', $db->sql_error_sql, __LINE__, __FILE__, true);
 				continue;
 			}
-- 
cgit v1.2.1


From c489b189df39c75195f85ab26afe08cd44ad7f2e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 20:17:59 -0500
Subject: [ticket/9824] Handle empty commit messages in commit-msg hook.

Git already handles the case of commit message being empty by
aborting the commit and displaying a reasonably helpful message.
If there is no commit message, the hook will exit with success
exit code to let git do its thing.

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

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index a6777ff9c9..1d33995162 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -55,6 +55,17 @@ quit()
 	fi
 }
 
+# Check for empty commit message
+if ! grep -qv '^#' "$1"
+then
+	# Commit message is empty (or contains only comments).
+	# Let git handle this.
+	# It will abort with a message like so:
+	#
+	# Aborting commit due to empty commit message.
+	exit 0
+fi
+
 msg=$(grep -nE '.{81,}' "$1");
 
 if [ $? -eq 0 ]
-- 
cgit v1.2.1


From b90e01392c1b88f5403d39e044cf80353923ca54 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 20:20:29 -0500
Subject: [ticket/9824] Use printf instead of echo to render \n.

On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead.

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

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index c3e5dfa90c..11d2b6b2f2 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -35,7 +35,7 @@ then
 	# Branch is prefixed with 'ticket/', append ticket ID to message
 	if [ "$branch" != "${branch##ticket/}" ];
 	then
-		tail="\n\nPHPBB3-${branch##ticket/}";
+		tail="$(printf "\n\nPHPBB3-${branch##ticket/}")";
 	fi
 
 	echo "[$branch] $tail$(cat "$1")" > "$1"
-- 
cgit v1.2.1


From d7a38fd7ef2bea57107968014cf63652372b45c1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 20:40:35 -0500
Subject: [ticket/9824] Allow empty lines after ticket reference.

PHPBB3-9824
---
 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 1d33995162..319e27b811 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -139,6 +139,10 @@ do
 				# Should not end up here
 				false
 			;;
+			"possibly-eof")
+				# Allow empty and/or comment lines at the end
+				! tail -n +"$i" "$1" |grep -qvE '^($|#)'
+			;;
 			"comment")
 				echo "$line" | grep -Eq "^#";
 			;;
@@ -199,7 +203,7 @@ do
 				in_description=1;
 			;;
 			"footer")
-				expecting="footer eof";
+				expecting="footer possibly-eof";
 				if [ "$tickets" = "" ]
 				then
 					tickets="$line";
@@ -210,6 +214,9 @@ do
 			"comment")
 				# Comments should expect the same thing again
 			;;
+			"possibly-eof")
+				expecting="eof";
+			;;
 			*)
 				echo "Unrecognised token $expect" >&2;
 				quit 254;
-- 
cgit v1.2.1


From e55228712831a2422cc1c171a6a1160c20d25f1e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 20:56:57 -0500
Subject: [ticket/9824] Accept commit messages with less than perfect headings.

Some commit messages exist only temporarily, because they are given
on commits that are intended to be squashed. Accept such commit
messages with a warning.

PHPBB3-9824
---
 git-tools/hooks/commit-msg | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 319e27b811..ad4d69a9da 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -118,7 +118,19 @@ do
 		case $expect in
 			"header")
 				err=$ERR_HEADER;
-				echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+				echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] .+$"
+				result=$?
+				if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"
+				then
+					# 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
+				fi
+				# restore exit code
+				(exit $result)
 			;;
 			"empty")
 				err=$ERR_EMPTY;
-- 
cgit v1.2.1


From 4c565774bfdd442bbf4298dcbf46d33b11697042 Mon Sep 17 00:00:00 2001
From: Sam Thompson <sam@websyntax.net>
Date: Wed, 2 Mar 2011 13:13:06 -0800
Subject: [ticket/10072] Added the POST_NUMBER template var

PHPBB3-10072
---
 phpBB/viewtopic.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 498088c5c8..bc839066a5 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1547,6 +1547,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		'U_WARN'			=> ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_post&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
 
 		'POST_ID'			=> $row['post_id'],
+		'POST_NUMBER'		=> $i + $start + 1,
 		'POSTER_ID'			=> $poster_id,
 
 		'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
-- 
cgit v1.2.1


From 1b606133198eb1c37402bafea2e3c2c36b25d197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 3 Feb 2011 14:36:37 +0100
Subject: [ticket/9581] Mass e-mail to banned users

Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.

PHPBB3-9581
---
 phpBB/adm/style/acp_email.html   |  4 ++++
 phpBB/includes/acp/acp_email.php | 20 ++++++++++++--------
 phpBB/language/en/acp/email.php  |  6 ++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html
index 885809ffe2..ff52500dca 100644
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -38,6 +38,10 @@
 	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
 	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
 </dl>
+<dl>
+	<dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
+	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>
+</dl>
 <dl>
 	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
 	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 350693a630..d65cce7899 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -69,6 +69,8 @@ class acp_email
 
 			if (!sizeof($error))
 			{
+				$sql_ban_where = (!isset($_REQUEST['mail_banned_flag'])) ? 'AND b.ban_userid != u.user_id' : '';
+
 				if ($usernames)
 				{
 					// If giving usernames the admin is able to email inactive users too...
@@ -83,21 +85,23 @@ class acp_email
 					if ($group_id)
 					{
 						$sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
-							FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
+							FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
 							WHERE ug.group_id = ' . $group_id . '
 								AND ug.user_pending = 0
 								AND u.user_id = ug.user_id
 								AND u.user_allow_massemail = 1
-								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-							ORDER BY u.user_lang, u.user_notify_type';
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
+								{$sql_ban_where}
+							ORDER BY u.user_lang, u.user_notify_type";
 					}
 					else
 					{
-						$sql = 'SELECT username, username_clean, user_email, user_jabber, user_notify_type, user_lang
-							FROM ' . USERS_TABLE . '
-							WHERE user_allow_massemail = 1
-								AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-							ORDER BY user_lang, user_notify_type';
+						$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_jabber, u.user_notify_type, u.user_lang
+							FROM (' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u)
+							WHERE u.user_allow_massemail = 1
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
+								{$sql_ban_where}
+							ORDER BY u.user_lang, u.user_notify_type";
 					}
 				}
 				$result = $db->sql_query($sql);
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 4427bfff01..38c9f19c27 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -52,14 +52,16 @@ $lang = array_merge($lang, array(
 	'SEND_TO_GROUP'			=> 'Send to group',
 	'SEND_TO_USERS'			=> 'Send to users',
 	'SEND_TO_USERS_EXPLAIN'	=> 'Entering names here will override any group selected above. Enter each username on a new line.',
-	
+
+	'MAIL_BANNED'			=> 'Mail banned users',
+	'MAIL_BANNED_EXPLAIN'	=> 'When sending a mass e-mail to a group you can select here whether banned users will also receive the e-mail.',
 	'MAIL_HIGH_PRIORITY'	=> 'High',
 	'MAIL_LOW_PRIORITY'		=> 'Low',
 	'MAIL_NORMAL_PRIORITY'	=> 'Normal',
 	'MAIL_PRIORITY'			=> 'Mail priority',
 	'MASS_MESSAGE'			=> 'Your message',
 	'MASS_MESSAGE_EXPLAIN'	=> 'Please note that you may enter only plain text. All markup will be removed before sending.',
-	
+
 	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
 	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
 ));
-- 
cgit v1.2.1


From 1dd25ce62df7650a295cdf017148a89962a538c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 3 Feb 2011 14:56:31 +0100
Subject: [ticket/9581] Make banlist table select optional

Per Nick, only set the `BANLIST_TABLE` in the select statement
if the `$sql_ban_where` variable is set.

PHPBB3-9581
---
 phpBB/includes/acp/acp_email.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index d65cce7899..c81a64d2a0 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -85,7 +85,7 @@ class acp_email
 					if ($group_id)
 					{
 						$sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
-							FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
+							FROM ' . ((!empty($sql_ban_where)) ? BANLIST_TABLE . ' b, ' : '') . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
 							WHERE ug.group_id = ' . $group_id . '
 								AND ug.user_pending = 0
 								AND u.user_id = ug.user_id
@@ -97,7 +97,7 @@ class acp_email
 					else
 					{
 						$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_jabber, u.user_notify_type, u.user_lang
-							FROM (' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u)
+							FROM (' . ((!empty($sql_ban_where)) ? BANLIST_TABLE . ' b, ' : '') . USERS_TABLE . ' u)
 							WHERE u.user_allow_massemail = 1
 								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
 								{$sql_ban_where}
-- 
cgit v1.2.1


From df76799d4b3b4a7e400ee1d026311ddea9305aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Fri, 4 Mar 2011 12:05:33 +0100
Subject: [ticket/9581] Slightly tweaked queries

Changed the queries based upon comments by Oleg and Nick, this
should return the expected result in every case.

PHPBB3-9581
---
 phpBB/includes/acp/acp_email.php | 49 ++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index c81a64d2a0..a8cc93c2e7 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -69,8 +69,6 @@ class acp_email
 
 			if (!sizeof($error))
 			{
-				$sql_ban_where = (!isset($_REQUEST['mail_banned_flag'])) ? 'AND b.ban_userid != u.user_id' : '';
-
 				if ($usernames)
 				{
 					// If giving usernames the admin is able to email inactive users too...
@@ -84,25 +82,48 @@ class acp_email
 				{
 					if ($group_id)
 					{
-						$sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type
-							FROM ' . ((!empty($sql_ban_where)) ? BANLIST_TABLE . ' b, ' : '') . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
-							WHERE ug.group_id = ' . $group_id . '
+						$sql_ary = array(
+							'SELECT'	=> 'u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type',
+							'FROM'		=> array(
+								USERS_TABLE			=> 'u',
+								USER_GROUP_TABLE	=> 'ug',
+							),
+							'WHERE'		=> 'ug.group_id = ' . $group_id . '
 								AND ug.user_pending = 0
 								AND u.user_id = ug.user_id
 								AND u.user_allow_massemail = 1
-								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
-								{$sql_ban_where}
-							ORDER BY u.user_lang, u.user_notify_type";
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
+							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+						);
 					}
 					else
 					{
-						$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_jabber, u.user_notify_type, u.user_lang
-							FROM (' . ((!empty($sql_ban_where)) ? BANLIST_TABLE . ' b, ' : '') . USERS_TABLE . ' u)
-							WHERE u.user_allow_massemail = 1
-								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
-								{$sql_ban_where}
-							ORDER BY u.user_lang, u.user_notify_type";
+						$sql_ary = array(
+							'SELECT'	=> 'u.username, u.username_clean, u.user_email, u.user_jabber, u.user_notify_type',
+							'FROM'		=> array(
+								USERS_TABLE	=> 'u',
+							),
+							'WHERE'		=> 'u.user_allow_massemail = 1
+								AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')',
+							'ORDER_BY'	=> 'u.user_lang, u.user_notify_type',
+						);
+					}
+
+					// Mail banned or not
+					if (!isset($_REQUEST['mail_banned_flag']))
+					{
+						$sql_ary['WHERE'] .= ' AND (b.ban_id IS NULL
+						        OR b.ban_exclude = 1)';
+						$sql_ary['LEFT_JOIN'] = array(
+							array(
+								'FROM'	=> array(
+									BANLIST_TABLE	=> 'b',
+								),
+								'ON'	=> 'u.user_id = b.ban_userid',
+							),
+						);
 					}
+					$sql = $db->sql_build_query('SELECT', $sql_ary);
 				}
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
-- 
cgit v1.2.1


From 32af9e8865d2d59d9116fb38b94b268ed1213675 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 4 Mar 2011 16:54:24 +0100
Subject: [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.

Remove:
 - A_Jelly_Doughnut
 - dhn
 - TerraFrost

Add:
 - nn-

Move:
 - Brainy

Rename:
 - Brainy -> ckwalsh

PHPBB3-10075
---
 phpBB/docs/AUTHORS | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 1dfb80141c..83feca009b 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -22,20 +22,18 @@ involved in phpBB.
 
 phpBB Lead Developer:  naderman (Nils Adermann)
 
-phpBB Developers:      A_Jelly_Doughnut (Josh Woody)
-                       Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
+phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        APTX (Marek A. R.)
                        bantu (Andreas Fischer)
-                       dhn (Dominik Dröscher)
+                       ckwalsh (Cullen Walsh)
                        igorw (Igor Wiedler)
                        kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)
+                       nn- (Oleg Pudeyev)
                        rxu (Ruslan Uzdenov)
-                       Terrafrost (Jim Wigginton)
                        ToonArmy (Chris Smith)
 
-Contributions by:      Brainy (Cullen Walsh)
-                       leviatan21 (Gabriel Vazquez)
+Contributions by:      leviatan21 (Gabriel Vazquez)
                        Raimon (Raimon Meuldijk)
                        Xore (Robert Hetzler)
 
@@ -47,11 +45,14 @@ phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
 
 phpBB Lead Developer:  psoTFX (Paul S. Owen) [2001 - 09/2005]
 
-phpBB Developers:      Ashe (Ludovic Arnaud)       [10/2002 - 11/2003, 06/2006 - 10/2006]
-                       BartVB (Bart van Bragt)     [11/2000 - 03/2006]
-                       DavidMJ (David M.)          [12/2005 - 08/2009]
-                       GrahamJE (Graham Eames)     [09/2005 - 11/2006]
-                       Vic D'Elfant (Vic D'Elfant) [04/2007 - 04/2009]
+phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
+                       Ashe (Ludovic Arnaud)         [10/2002 - 11/2003, 06/2006 - 10/2006]
+                       BartVB (Bart van Bragt)       [11/2000 - 03/2006]
+                       DavidMJ (David M.)            [12/2005 - 08/2009]
+                       dhn (Dominik Dröscher)        [05/2007 - 01/2011]
+                       GrahamJE (Graham Eames)       [09/2005 - 11/2006]
+                       TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
+                       Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
 
 -- Copyrights --
 
-- 
cgit v1.2.1


From 5ab4dc298327d3a8d51387959d6905c6bb24fd99 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:16:50 +0100
Subject: [ticket/10042] Add mt_rand() wrapper which allows swapping $min and
 $max.

PHPBB3-10042
---
 phpBB/includes/functions.php | 16 +++++++++++++++
 tests/random/mt_rand.php     | 46 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 tests/random/mt_rand.php

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 398a02380b..259b3b0481 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -244,6 +244,22 @@ function unique_id($extra = 'c')
 	return substr($val, 4, 16);
 }
 
+/**
+* Wrapper for mt_rand() which allows swapping $min and $max parameters.
+*
+* PHP does not allow us to swap the order of the arguments for mt_rand() anymore.
+* (since PHP 5.3.4, see http://bugs.php.net/46587)
+*
+* @param int $min		Lowest value to be returned
+* @param int $max		Highest value to be returned
+*
+* @return int			Random integer between $min and $max (or $max and $min)
+*/
+function phpbb_mt_rand($min, $max)
+{
+	return ($min > $max) ? mt_rand($max, $min) : mt_rand($min, $max);
+}
+
 /**
 * Return formatted string for filesizes
 *
diff --git a/tests/random/mt_rand.php b/tests/random/mt_rand.php
new file mode 100644
index 0000000000..d6502c4e80
--- /dev/null
+++ b/tests/random/mt_rand.php
@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_random_mt_rand_test extends phpbb_test_case
+{
+	public function test_max_equals_min()
+	{
+		$result = phpbb_mt_rand(42, 42);
+		$this->assertEquals(42, $result);
+	}
+
+	public function test_max_equals_min_negative()
+	{
+		$result = phpbb_mt_rand(-42, -42);
+		$this->assertEquals(-42, $result);
+	}
+
+	public function test_max_greater_min()
+	{
+		$result = phpbb_mt_rand(3, 4);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max()
+	{
+		$result = phpbb_mt_rand(4, 3);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max_negative()
+	{
+		$result = phpbb_mt_rand(-3, -4);
+		$this->assertGreaterThanOrEqual(-4, $result);
+		$this->assertLessThanOrEqual(-3, $result);
+	}
+}
-- 
cgit v1.2.1


From 841061426ded7100624496a915e8669d81d197c9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:48:24 +0100
Subject: [ticket/10016] Leave Firebird unchanged.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7632d8790d..ef71a4e7fd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -175,6 +175,9 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
 	switch ($db->sql_layer)
 	{
 		case 'firebird':
+			$sql_update = 'CAST(CAST(config_value as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
+		break;
+
 		case 'postgres':
 			$sql_update = 'CAST(CAST(config_value::text as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
 		break;
-- 
cgit v1.2.1


From 9cdeb51a5287844be1cd8671284d625d41e9b2fa Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:55:58 +0100
Subject: [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ef71a4e7fd..fb90ee5f50 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -179,6 +179,7 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
 		break;
 
 		case 'postgres':
+			// Need to cast to text first for PostgreSQL 7.x
 			$sql_update = 'CAST(CAST(config_value::text as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
 		break;
 
-- 
cgit v1.2.1


From c6c2a23ecb10b4b54e7e9b703d14e8c7cda6ad55 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:20:23 +0100
Subject: [ticket/10042] GD CAPTCHA: Round offset to the next pixel.

PHPBB3-10042
---
 phpBB/includes/captcha/captcha_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 96e39af85b..7a3f4f46ab 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -77,7 +77,7 @@ class captcha
 		{
 			$denom = ($code_len - $i);
 			$denom = max(1.3, $denom);
-			$offset[$i] = mt_rand(0, (1.5 * $width_avail) / $denom);
+			$offset[$i] = mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
 			$width_avail -= $offset[$i];
 		}
 
-- 
cgit v1.2.1


From 18daf6345f64e59f651c43a3150d9e139ac2a4cc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:21:45 +0100
Subject: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.

PHPBB3-10042
---
 phpBB/includes/captcha/captcha_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 7a3f4f46ab..6d859a4ecc 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -77,7 +77,7 @@ class captcha
 		{
 			$denom = ($code_len - $i);
 			$denom = max(1.3, $denom);
-			$offset[$i] = mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
+			$offset[$i] = phpbb_mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
 			$width_avail -= $offset[$i];
 		}
 
-- 
cgit v1.2.1


From b343920071cdef03ae421c67ea5b72ca1863cdcf Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 24 Feb 2011 15:26:06 -0500
Subject: [ticket/10069] Improvements to sample nginx configuration.

Most of these were contributed by burningbunny:

https://github.com/burningbunny

PHPBB3-10069
---
 phpBB/docs/nginx.sample.conf | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index 2a11e057c5..40b6ee76da 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -10,14 +10,23 @@ http {
     gzip_vary on;
     gzip_http_version 1.1;
     gzip_min_length 700;
+    
+    # Compression levels over 6 do not give an appreciable improvement
+    # in compression ratio, but take more resources.
     gzip_comp_level 6;
-    gzip_disable "MSIE [1-6]\.";
+    
+    # IE 6 and lower do not support gzip with Vary correctly.
+    gzip_disable "msie6";
+    # Before nginx 0.7.63:
+    #gzip_disable "MSIE [1-6]\.";
 
     # Catch-all server for requests to invalid hosts.
     # Also catches vulnerability scanners probing IP addresses.
-    # Should be first.
     server {
-        listen 80;
+        # default specifies that this block is to be used when
+        # no other block matches.
+        listen 80 default;
+
         server_name bogus;
         return 444;
         root /var/empty;
@@ -26,14 +35,20 @@ http {
     # If you have domains with and without www prefix,
     # redirect one to the other.
     server {
-        listen 80;
+        # Default port is 80.
+        #listen 80;
+
         server_name myforums.com;
-        rewrite ^(.*)$ http://www.myforums.com$1 permanent;
+
+        # A trick from http://wiki.nginx.org/Pitfalls#Taxing_Rewrites:
+        rewrite ^ http://www.myforums.com$request_uri permanent;
+        # Equivalent to:
+        #rewrite ^(.*)$ http://www.myforums.com$1 permanent;
     }
 
     # The actual board domain.
     server {
-        listen 80;
+        #listen 80;
         server_name www.myforums.com;
 
         root /path/to/phpbb;
@@ -45,8 +60,10 @@ http {
 
         # Deny access to internal phpbb files.
         location ~ /(config\.php|common\.php|includes|cache|files|store|images/avatars/upload) {
-            internal;
             deny all;
+            # deny was ignored before 0.8.40 for connections over IPv6.
+            # Use internal directive to prohibit access on older versions.
+            internal;
         }
 
         # Pass the php scripts to fastcgi server specified in upstream declaration.
@@ -60,8 +77,8 @@ http {
 
         # Deny access to version control system directories.
         location ~ /\.svn|/\.git {
-            internal;
             deny all;
+            internal;
         }
     }
 
-- 
cgit v1.2.1


From f7723b3e959b0cfd5ae738f9745f367aef1f0d47 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Wed, 5 Jan 2011 18:48:57 -0600
Subject: [ticket/9970] User language input is checked for existance

Users could select a language which did not exist in the database by altering
form fields because there was no back-end verification.

PHPBB3-9970
---
 phpBB/includes/functions_user.php   | 30 ++++++++++++++++++++++++++++++
 phpBB/includes/ucp/ucp_prefs.php    |  2 +-
 phpBB/includes/ucp/ucp_register.php |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 0420aa70ab..7bab51323b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1421,6 +1421,36 @@ function validate_match($string, $optional = false, $match = '')
 	return false;
 }
 
+/**
+* Validate Language string
+*
+* Tests whether a language string is valid and exists on the disk
+* This is the same criteria used to determine whether to include it or not.
+*
+* @param $lang - The language string to test
+*
+* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
+*/
+function validate_language($lang)
+{
+	global $phpbb_root_path;
+
+	// Note: Two language strings are identical here because the English
+	// version "Language you specified is not valid" is correct for both
+	// cases
+	if (!preg_match('#^[a-z_\-]{2,}$#i', $lang))
+	{
+		return 'WRONG_DATA';
+	}
+
+	if (!file_exists($phpbb_root_path . 'language/' . $lang . '/'))
+	{
+		return 'WRONG_DATA';
+	}
+
+	return false;
+}
+
 /**
 * Check to see if the username has been taken, or if it is disallowed.
 * Also checks if it includes the " character, which we don't allow in usernames.
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index cc8565e69d..76393530b2 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -65,7 +65,7 @@ class ucp_prefs
 
 					$error = validate_data($data, array(
 						'dateformat'	=> array('string', false, 1, 30),
-						'lang'			=> array('match', false, '#^[a-z0-9_\-]{2,}$#i'),
+						'lang'			=> array('language'),
 						'tz'			=> array('num', false, -14, 14),
 					));
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 7fd99da55a..88f3343f6f 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -210,7 +210,7 @@ class ucp_register
 					array('email')),
 				'email_confirm'		=> array('string', false, 6, 60),
 				'tz'				=> array('num', false, -14, 14),
-				'lang'				=> array('match', false, '#^[a-z_\-]{2,}$#i'),
+				'lang'				=> array('language'),
 			));
 
 			if (!check_form_key('ucp_register'))
-- 
cgit v1.2.1


From 405ef3982891712b0d88a04502ee2ad0141d571f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 6 Mar 2011 23:47:47 +0100
Subject: [ticket/9970] Check whether language pack is installed.

PHPBB3-9970
---
 phpBB/includes/functions_user.php | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7bab51323b..9b0175694d 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1422,33 +1422,28 @@ function validate_match($string, $optional = false, $match = '')
 }
 
 /**
-* Validate Language string
+* Validate Language Pack ISO Name
 *
-* Tests whether a language string is valid and exists on the disk
-* This is the same criteria used to determine whether to include it or not.
+* Tests whether a language name is valid and installed
 *
-* @param $lang - The language string to test
+* @param string $lang	The language string to test
 *
-* @return	boolean|string	Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
+* @return bool|string	Either false if validation succeeded or
+*						a string which will be used as the error message
+*						(with the variable name appended)
 */
 function validate_language($lang)
 {
-	global $phpbb_root_path;
-
-	// Note: Two language strings are identical here because the English
-	// version "Language you specified is not valid" is correct for both
-	// cases
-	if (!preg_match('#^[a-z_\-]{2,}$#i', $lang))
-	{
-		return 'WRONG_DATA';
-	}
+	global $db;
 
-	if (!file_exists($phpbb_root_path . 'language/' . $lang . '/'))
-	{
-		return 'WRONG_DATA';
-	}
+	$sql = 'SELECT lang_id
+		FROM ' . LANG_TABLE . "
+		WHERE lang_iso = '" . $db->sql_escape($lang) . "'";
+	$result = $db->sql_query($sql);
+	$lang_id = (int) $db->sql_fetchfield('lang_id');
+	$db->sql_freeresult($result);
 
-	return false;
+	return ($lang_id) ? false : 'WRONG_DATA';
 }
 
 /**
-- 
cgit v1.2.1


From 0f16fd3519151cbd309cfa5f7aec0d45bd7346e9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 00:20:02 +0100
Subject: [ticket/9970] Do not allow switching to languages not installed on
 reg. page.

PHPBB3-9970
---
 phpBB/includes/ucp/ucp_register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 88f3343f6f..76e02fd45b 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -56,7 +56,7 @@ class ucp_register
 		{
 			$use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang);
 
-			if (file_exists($user->lang_path . $use_lang . '/'))
+			if (!validate_language($use_lang))
 			{
 				if ($change_lang)
 				{
-- 
cgit v1.2.1


From ac9019068202efde7c532462ca5fce8523956db7 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 00:23:49 +0100
Subject: [ticket/9970] Rename validate_language() to
 validate_language_iso_name().

PHPBB3-9970
---
 phpBB/includes/functions_user.php   | 12 ++++++------
 phpBB/includes/ucp/ucp_prefs.php    |  2 +-
 phpBB/includes/ucp/ucp_register.php |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 9b0175694d..8a204995aa 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1426,19 +1426,19 @@ function validate_match($string, $optional = false, $match = '')
 *
 * Tests whether a language name is valid and installed
 *
-* @param string $lang	The language string to test
+* @param string $lang_iso	The language string to test
 *
-* @return bool|string	Either false if validation succeeded or
-*						a string which will be used as the error message
-*						(with the variable name appended)
+* @return bool|string		Either false if validation succeeded or
+*							a string which will be used as the error message
+*							(with the variable name appended)
 */
-function validate_language($lang)
+function validate_language_iso_name($lang_iso)
 {
 	global $db;
 
 	$sql = 'SELECT lang_id
 		FROM ' . LANG_TABLE . "
-		WHERE lang_iso = '" . $db->sql_escape($lang) . "'";
+		WHERE lang_iso = '" . $db->sql_escape($lang_iso) . "'";
 	$result = $db->sql_query($sql);
 	$lang_id = (int) $db->sql_fetchfield('lang_id');
 	$db->sql_freeresult($result);
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 76393530b2..13167b2b3d 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -65,7 +65,7 @@ class ucp_prefs
 
 					$error = validate_data($data, array(
 						'dateformat'	=> array('string', false, 1, 30),
-						'lang'			=> array('language'),
+						'lang'			=> array('language_iso_name'),
 						'tz'			=> array('num', false, -14, 14),
 					));
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 76e02fd45b..13b9945851 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -56,7 +56,7 @@ class ucp_register
 		{
 			$use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang);
 
-			if (!validate_language($use_lang))
+			if (!validate_language_iso_name($use_lang))
 			{
 				if ($change_lang)
 				{
@@ -210,7 +210,7 @@ class ucp_register
 					array('email')),
 				'email_confirm'		=> array('string', false, 6, 60),
 				'tz'				=> array('num', false, -14, 14),
-				'lang'				=> array('language'),
+				'lang'				=> array('language_iso_name'),
 			));
 
 			if (!check_form_key('ucp_register'))
-- 
cgit v1.2.1


From d69a7c620a08d1866a24033ef43646a4bbfc9925 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Feb 2011 20:12:12 -0500
Subject: [ticket/10057] Report postgres db connection errors.

Addresses two issues:

1. When pgsql extension is missing, @pg_connect would silently
abort execution. Check for pg_connect existence before calling it,
same with pg_pconnect.

2. When connection fails, the error reported by php is discarded.
User is shown the failure message without the reason for failure,
making debugging difficult. Collect the error (if any) via a
temporarily installed error handler, and display it if connection
failed.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 15 +++++++++++++-
 phpBB/includes/functions.php   | 44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 4360c790a1..29e15143bc 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -81,13 +81,25 @@ class dbal_postgres extends dbal
 
 		if ($this->persistency)
 		{
+			if (!function_exists('pg_pconnect'))
+			{
+				return $this->sql_error('pg_pconnect does not exist');
+			}
+			phpbb_start_error_collection();
 			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
 		}
 		else
 		{
+			if (!function_exists('pg_pconnect'))
+			{
+				return $this->sql_error('pg_connect does not exist');
+			}
+			phpbb_start_error_collection();
 			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
 		}
 
+		$errors = phpbb_stop_error_collection();
+
 		if ($this->db_connect_id)
 		{
 			if (version_compare($this->sql_server_info(true), '8.2', '>='))
@@ -102,7 +114,8 @@ class dbal_postgres extends dbal
 			return $this->db_connect_id;
 		}
 
-		return $this->sql_error('');
+		$errors = phpbb_format_collected_errors($errors);
+		return $this->sql_error($errors);
 	}
 
 	/**
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 398a02380b..471d3476a0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3928,6 +3928,50 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	return false;
 }
 
+function phpbb_error_collection_handler($errno, $msg_text, $errfile, $errline)
+{
+	global $phpbb_collected_errors;
+	$phpbb_collected_errors[-1][] = array($errno, $msg_text, $errfile, $errline);
+}
+
+function phpbb_start_error_collection()
+{
+	global $phpbb_collected_errors;
+	if (!isset($phpbb_collected_errors))
+	{
+		$phpbb_collected_errors = array();
+	}
+	$phpbb_collected_errors[] = array();
+	set_error_handler('phpbb_error_collection_handler');
+}
+
+function phpbb_stop_error_collection()
+{
+	global $phpbb_collected_errors;
+	restore_error_handler();
+	$errors = array_pop($phpbb_collected_errors);
+	return $errors;
+}
+
+function phpbb_format_collected_errors($errors)
+{
+	$text = '';
+	foreach ($errors as $error)
+	{
+		if (!empty($text))
+		{
+			$text .= "<br />\n";
+		}
+		list($errno, $msg_text, $errfile, $errline) = $error;
+		$text .= "Errno $errno: $msg_text";
+		if (defined('DEBUG'))
+		{
+			$text .= " at $errfile line $errline";
+		}
+	}
+	return $text;
+}
+
 /**
 * Queries the session table to get information about online guests
 * @param int $item_id Limits the search to the item with this id
-- 
cgit v1.2.1


From fc5be6928fc2af13333569e766a289e5e3334233 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Feb 2011 22:52:41 -0500
Subject: [ticket/10057] No negative array indexing.

PHP manual does not say that negative array indices are allowed,
so it's best to assume they are not guaranteed to work the way
one would expect.

PHPBB3-10057
---
 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 471d3476a0..e0623c0869 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3931,7 +3931,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 function phpbb_error_collection_handler($errno, $msg_text, $errfile, $errline)
 {
 	global $phpbb_collected_errors;
-	$phpbb_collected_errors[-1][] = array($errno, $msg_text, $errfile, $errline);
+	$phpbb_collected_errors[count($phpbb_collected_errors)-1][] = array($errno, $msg_text, $errfile, $errline);
 }
 
 function phpbb_start_error_collection()
-- 
cgit v1.2.1


From a4100fe7094aaa5377065d2f25ca8d0fa2ff6bf8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Feb 2011 22:54:25 -0500
Subject: [ticket/10057] More informative error messages in postgres dbal.

When pg_connect/pg_pconnect do not exist, mention that they come
with pgsql extension.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 29e15143bc..c1dc7f7e2b 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -83,7 +83,7 @@ class dbal_postgres extends dbal
 		{
 			if (!function_exists('pg_pconnect'))
 			{
-				return $this->sql_error('pg_pconnect does not exist');
+				return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?');
 			}
 			phpbb_start_error_collection();
 			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
@@ -92,7 +92,7 @@ class dbal_postgres extends dbal
 		{
 			if (!function_exists('pg_pconnect'))
 			{
-				return $this->sql_error('pg_connect does not exist');
+				return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?');
 			}
 			phpbb_start_error_collection();
 			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
-- 
cgit v1.2.1


From 17693c2802c92297251f5cd94cc5452f5e54eb0b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Mar 2011 06:35:25 -0500
Subject: [ticket/10057] Use a class for error collection.

Replaced error collection functions with a class for a cleaner
implementation.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 10 ++++---
 phpBB/includes/functions.php   | 64 +++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index c1dc7f7e2b..a8dc3dd8ee 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -85,7 +85,8 @@ class dbal_postgres extends dbal
 			{
 				return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?');
 			}
-			phpbb_start_error_collection();
+			$collector = new phpbb_error_collector;
+			$collector->install();
 			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
 		}
 		else
@@ -94,11 +95,12 @@ class dbal_postgres extends dbal
 			{
 				return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?');
 			}
-			phpbb_start_error_collection();
+			$collector = new phpbb_error_collector;
+			$collector->install();
 			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
 		}
 
-		$errors = phpbb_stop_error_collection();
+		$collector->uninstall();
 
 		if ($this->db_connect_id)
 		{
@@ -114,7 +116,7 @@ class dbal_postgres extends dbal
 			return $this->db_connect_id;
 		}
 
-		$errors = phpbb_format_collected_errors($errors);
+		$errors = $collector->format_errors();
 		return $this->sql_error($errors);
 	}
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e0623c0869..39a02034c4 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3928,48 +3928,48 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	return false;
 }
 
-function phpbb_error_collection_handler($errno, $msg_text, $errfile, $errline)
+class phpbb_error_collector
 {
-	global $phpbb_collected_errors;
-	$phpbb_collected_errors[count($phpbb_collected_errors)-1][] = array($errno, $msg_text, $errfile, $errline);
-}
+	var $errors;
 
-function phpbb_start_error_collection()
-{
-	global $phpbb_collected_errors;
-	if (!isset($phpbb_collected_errors))
+	function phpbb_error_collector()
 	{
-		$phpbb_collected_errors = array();
+		$this->errors = array();
 	}
-	$phpbb_collected_errors[] = array();
-	set_error_handler('phpbb_error_collection_handler');
-}
 
-function phpbb_stop_error_collection()
-{
-	global $phpbb_collected_errors;
-	restore_error_handler();
-	$errors = array_pop($phpbb_collected_errors);
-	return $errors;
-}
+	function install()
+	{
+		set_error_handler(array(&$this, 'error_handler'));
+	}
 
-function phpbb_format_collected_errors($errors)
-{
-	$text = '';
-	foreach ($errors as $error)
+	function uninstall()
 	{
-		if (!empty($text))
-		{
-			$text .= "<br />\n";
-		}
-		list($errno, $msg_text, $errfile, $errline) = $error;
-		$text .= "Errno $errno: $msg_text";
-		if (defined('DEBUG'))
+		restore_error_handler();
+	}
+
+	function error_handler($errno, $msg_text, $errfile, $errline)
+	{
+		$this->errors[] = array($errno, $msg_text, $errfile, $errline);
+	}
+
+	function format_errors()
+	{
+		$text = '';
+		foreach ($this->errors as $error)
 		{
-			$text .= " at $errfile line $errline";
+			if (!empty($text))
+			{
+				$text .= "<br />\n";
+			}
+			list($errno, $msg_text, $errfile, $errline) = $error;
+			$text .= "Errno $errno: $msg_text";
+			if (defined('DEBUG'))
+			{
+				$text .= " at $errfile line $errline";
+			}
 		}
+		return $text;
 	}
-	return $text;
 }
 
 /**
-- 
cgit v1.2.1


From 24834543eef54650d198e1eb2b3a851e1ce08227 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 20:14:06 -0500
Subject: [ticket/10057] Moved error collector class into its own file.

This will make it autoloadable in 3.1. This commit breaks 3.0
since no code includes the error collector. Such include code
will be in its own commit since it will need to be reverted in 3.1.

PHPBB3-10057
---
 phpBB/includes/error_collector.php | 45 ++++++++++++++++++++++++++++++++++++++
 phpBB/includes/functions.php       | 44 -------------------------------------
 2 files changed, 45 insertions(+), 44 deletions(-)
 create mode 100644 phpBB/includes/error_collector.php

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
new file mode 100644
index 0000000000..8b4a7660e9
--- /dev/null
+++ b/phpBB/includes/error_collector.php
@@ -0,0 +1,45 @@
+<?php
+
+class phpbb_error_collector
+{
+	var $errors;
+
+	function phpbb_error_collector()
+	{
+		$this->errors = array();
+	}
+
+	function install()
+	{
+		set_error_handler(array(&$this, 'error_handler'));
+	}
+
+	function uninstall()
+	{
+		restore_error_handler();
+	}
+
+	function error_handler($errno, $msg_text, $errfile, $errline)
+	{
+		$this->errors[] = array($errno, $msg_text, $errfile, $errline);
+	}
+
+	function format_errors()
+	{
+		$text = '';
+		foreach ($this->errors as $error)
+		{
+			if (!empty($text))
+			{
+				$text .= "<br />\n";
+			}
+			list($errno, $msg_text, $errfile, $errline) = $error;
+			$text .= "Errno $errno: $msg_text";
+			if (defined('DEBUG'))
+			{
+				$text .= " at $errfile line $errline";
+			}
+		}
+		return $text;
+	}
+}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 39a02034c4..398a02380b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3928,50 +3928,6 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	return false;
 }
 
-class phpbb_error_collector
-{
-	var $errors;
-
-	function phpbb_error_collector()
-	{
-		$this->errors = array();
-	}
-
-	function install()
-	{
-		set_error_handler(array(&$this, 'error_handler'));
-	}
-
-	function uninstall()
-	{
-		restore_error_handler();
-	}
-
-	function error_handler($errno, $msg_text, $errfile, $errline)
-	{
-		$this->errors[] = array($errno, $msg_text, $errfile, $errline);
-	}
-
-	function format_errors()
-	{
-		$text = '';
-		foreach ($this->errors as $error)
-		{
-			if (!empty($text))
-			{
-				$text .= "<br />\n";
-			}
-			list($errno, $msg_text, $errfile, $errline) = $error;
-			$text .= "Errno $errno: $msg_text";
-			if (defined('DEBUG'))
-			{
-				$text .= " at $errfile line $errline";
-			}
-		}
-		return $text;
-	}
-}
-
 /**
 * Queries the session table to get information about online guests
 * @param int $item_id Limits the search to the item with this id
-- 
cgit v1.2.1


From 22004fa7d65b19e8bfe96a97042a614be1adf444 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 20:51:09 -0500
Subject: [ticket/10057] Include error collector class file in postgres dbal.

This change is in its own commit because it will be reverted for 3.1.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index a8dc3dd8ee..d703f5b567 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -18,6 +18,11 @@ if (!defined('IN_PHPBB'))
 
 include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 
+if (!class_exists('phpbb_error_collector'))
+{
+	include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
+}
+
 /**
 * PostgreSQL Database Abstraction Layer
 * Minimum Requirement is Version 7.3+
-- 
cgit v1.2.1


From af43ed655bf31ae4b9ef999e0a95eeae67724597 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 20:55:41 -0500
Subject: [ticket/10057] Split statements in firebird dbal for readability.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 6f60dd5dad..2f17b00b3f 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -53,9 +53,23 @@ class dbal_firebird extends dbal
 			$use_database = $this->server . ':' . $this->dbname;
 		}
 
-		$this->db_connect_id = ($this->persistency) ? @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
+		if ($this->persistency)
+		{
+			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
+		}
+		else
+		{
+			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
+		}
 
-		$this->service_handle = (function_exists('ibase_service_attach') && $this->server) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false;
+		if (function_exists('ibase_service_attach') && $this->server)
+		{
+			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
+		}
+		else
+		{
+			$thih->service_handle = false;
+		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
-- 
cgit v1.2.1


From 4d92f9bb2eea82a9af36401649c318623d39307f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 21:03:24 -0500
Subject: [ticket/10057] Check for interbase function existence.

Calling nonexistent functions with @ destroys the script with
no feedback as to the cause of the error. Check whether
interbase functions exist before calling them.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 2f17b00b3f..d1d88ffe42 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -55,10 +55,18 @@ class dbal_firebird extends dbal
 
 		if ($this->persistency)
 		{
+			if (!function_exists('ibase_pconnect'))
+			{
+				return $this->sql_error('ibase_pconnect function does not exist, is interbase extension installed?');
+			}
 			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
 		}
 		else
 		{
+			if (!function_exists('ibase_connect'))
+			{
+				return $this->sql_error('ibase_connect function does not exist, is interbase extension installed?');
+			}
 			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
 		}
 
-- 
cgit v1.2.1


From edc1deaa3afcadab82d404e705e162a9f3fa26c5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 23:07:48 -0500
Subject: [ticket/10057] Skip ibase_service_attach if firebird connection
 failed.

ibase_errmsg works for the most recent call. If the connection
fails, any error message is clobbered by ibase_service_attach call.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index d1d88ffe42..660acb35db 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -70,7 +70,9 @@ class dbal_firebird extends dbal
 			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
 		}
 
-		if (function_exists('ibase_service_attach') && $this->server)
+		// Do not call ibase_service_attach if connection failed,
+		// otherwise error message from ibase_(p)connect call will be clobbered.
+		if ($this->db_connect_id && function_exists('ibase_service_attach') && $this->server)
 		{
 			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
 		}
-- 
cgit v1.2.1


From 98388b29212cf94c443e0b4f626508efc937715f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 6 Mar 2011 23:17:01 -0500
Subject: [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.

pg_last_error does not work if no connection was ever established.
Therefore we must keep track of connection errors in postgres
dbal ourselves.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index d703f5b567..78b6a75750 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -31,6 +31,7 @@ if (!class_exists('phpbb_error_collector'))
 class dbal_postgres extends dbal
 {
 	var $last_query_text = '';
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -121,8 +122,8 @@ class dbal_postgres extends dbal
 			return $this->db_connect_id;
 		}
 
-		$errors = $collector->format_errors();
-		return $this->sql_error($errors);
+		$this->connect_error = $collector->format_errors();
+		return $this->sql_error('');
 	}
 
 	/**
@@ -391,8 +392,19 @@ class dbal_postgres extends dbal
 	*/
 	function _sql_error()
 	{
+		// pg_last_error only works when there is an established connection.
+		// Connection errors have to be tracked by us manually.
+		if ($this->db_connect_id)
+		{
+			$message = @pg_last_error($this->db_connect_id);
+		}
+		else
+		{
+			$message = $this->connect_error;
+		}
+
 		return array(
-			'message'	=> (!$this->db_connect_id) ? @pg_last_error() : @pg_last_error($this->db_connect_id),
+			'message'	=> $message,
 			'code'		=> ''
 		);
 	}
-- 
cgit v1.2.1


From 65580f790146b6932372d7aa85903b753f31510e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 03:55:29 +0100
Subject: [ticket/10021] Check whether gmmktime() returns false before putting
 it in SQL.

This prevents SQL errors when large dates are entered.

PHPBB3-10021
---
 phpBB/memberlist.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 2fa2d11ee1..b1b9e87422 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1069,8 +1069,27 @@ switch ($mode)
 			$sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : '';
 			$sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : '';
 			$sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : '';
-			$sql_where .= (sizeof($joined) > 1 && isset($find_key_match[$joined_select])) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : '';
-			$sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1 && isset($find_key_match[$active_select])) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : '';
+
+			if (isset($find_key_match[$joined_select]) && sizeof($joined) == 3)
+			{
+				$joined_time = gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]);
+
+				if ($joined_time !== false && $joined_time !== -1)
+				{
+					$sql_where .= " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . $joined_time;
+				}
+			}
+
+			if (isset($find_key_match[$active_select]) && sizeof($active) == 3 && $auth->acl_get('u_viewonline'))
+			{
+				$active_time = gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]);
+
+				if ($active_time !== false && $active_time !== -1)
+				{
+					$sql_where .= " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . $active_time;
+				}
+			}
+
 			$sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : '';
 
 			if ($search_group_id)
-- 
cgit v1.2.1


From 40468a5adcd11628c123b54911919e533d2dbd28 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 7 Mar 2011 08:46:49 -0500
Subject: [ticket/10057] Condition file/line display on DEBUG_EXTRA or
 IN_INSTALL.

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

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 8b4a7660e9..6327a38649 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -35,7 +35,7 @@ class phpbb_error_collector
 			}
 			list($errno, $msg_text, $errfile, $errline) = $error;
 			$text .= "Errno $errno: $msg_text";
-			if (defined('DEBUG'))
+			if (defined('DEBUG_EXTRA') || defined('IN_INSTALL'))
 			{
 				$text .= " at $errfile line $errline";
 			}
-- 
cgit v1.2.1


From e5aa2c9ac112156b56db9c4b1d8fc2b6f6f79265 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 7 Mar 2011 08:52:59 -0500
Subject: [ticket/10057] Fixed usage of sql_error again.

PHPBB3-10057
---
 phpBB/includes/db/postgres.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 78b6a75750..69f605fc47 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -89,7 +89,8 @@ class dbal_postgres extends dbal
 		{
 			if (!function_exists('pg_pconnect'))
 			{
-				return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?');
+				$this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?';
+				return $this->sql_error('');
 			}
 			$collector = new phpbb_error_collector;
 			$collector->install();
@@ -99,7 +100,8 @@ class dbal_postgres extends dbal
 		{
 			if (!function_exists('pg_pconnect'))
 			{
-				return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?');
+				$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
+				return $this->sql_error('');
 			}
 			$collector = new phpbb_error_collector;
 			$collector->install();
-- 
cgit v1.2.1


From 7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 7 Mar 2011 09:04:01 -0500
Subject: [ticket/10057] Fixed wrong usage of sql_error again, in firebird.

This necessitates adding connect_error property to firebird.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 660acb35db..fb820b4894 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -28,6 +28,7 @@ class dbal_firebird extends dbal
 	var $last_query_text = '';
 	var $service_handle = false;
 	var $affected_rows = 0;
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -57,7 +58,8 @@ class dbal_firebird extends dbal
 		{
 			if (!function_exists('ibase_pconnect'))
 			{
-				return $this->sql_error('ibase_pconnect function does not exist, is interbase extension installed?');
+				$this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?';
+				return $this->sql_error('');
 			}
 			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
 		}
@@ -65,7 +67,8 @@ class dbal_firebird extends dbal
 		{
 			if (!function_exists('ibase_connect'))
 			{
-				return $this->sql_error('ibase_connect function does not exist, is interbase extension installed?');
+				$this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?';
+				return $this->sql_error('');
 			}
 			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
 		}
-- 
cgit v1.2.1


From 020d06cdaac13372feef615b8689ad2526733243 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 7 Mar 2011 09:09:40 -0500
Subject: [ticket/10057] Handle the case of missing interbase extension better.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index fb820b4894..6786edb964 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -498,8 +498,24 @@ class dbal_firebird extends dbal
 	*/
 	function _sql_error()
 	{
+		// Need special handling here because ibase_errmsg returns
+		// connection errors, however if the interbase extension
+		// is not installed then ibase_errmsg does not exist and
+		// we cannot call it.
+		if (function_exists('ibase_errmsg'))
+		{
+			$msg = @ibase_errmsg();
+			if (!$msg)
+			{
+				$msg = $this->connect_error;
+			}
+		}
+		else
+		{
+			$msg = $this->connect_error;
+		}
 		return array(
-			'message'	=> @ibase_errmsg(),
+			'message'	=> $msg,
 			'code'		=> (@function_exists('ibase_errcode') ? @ibase_errcode() : '')
 		);
 	}
-- 
cgit v1.2.1


From 9a9b156a8ed5a8c0ad71d51c10ae7a32b24359f4 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 7 Mar 2011 21:22:33 +0700
Subject: [ticket/10035] ACP template edit feature allows to read any files on
 webserver.

... and to upload/execute any script on it. Use preg_replace to filter filename

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

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 0f157ceff3..37cf8d1f72 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -716,7 +716,7 @@ parse_css_file = {PARSE_CSS_FILE}
 		$save_changes	= (isset($_POST['save'])) ? true : false;
 
 		// make sure template_file path doesn't go upwards
-		$template_file = str_replace('..', '.', $template_file);
+		$template_file = preg_replace('#\.{2,}#', '.', $template_file);
 
 		// Retrieve some information about the template
 		$sql = 'SELECT template_storedb, template_path, template_name
-- 
cgit v1.2.1


From dec9d243929a08deb054cd836590c2e0d60d14c1 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 7 Mar 2011 16:25:52 +0100
Subject: [ticket/10040] Ensure the test suite runs on PHP 5.2 without
 E_DEPRECATED.

PHPBB3-10040
---
 tests/bootstrap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c729c6e2d8..6f3c93a374 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -12,6 +12,10 @@ $phpbb_root_path = 'phpBB/';
 $phpEx = '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
-- 
cgit v1.2.1


From a229dd98965457fe24eaf1b7b10d9d0c3997ce9a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 16:43:39 +0100
Subject: [ticket/10079] Add gallery avatars to .gitignore.

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

diff --git a/.gitignore b/.gitignore
index c417bf01c1..22a3124b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ phpunit.xml
 phpBB/cache/*.php
 phpBB/config.php
 phpBB/files/*
+phpBB/images/avatars/gallery/*
 phpBB/images/avatars/upload/*
 phpBB/store/*
 tests/phpbb_unit_tests.sqlite2
-- 
cgit v1.2.1


From f6c6de45395e18a8e3c6091e4b3fcd02f8355a28 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Mon, 7 Mar 2011 08:48:02 -0600
Subject: [ticket/9946] Allow storage of data >4kB on Oracle again

This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle.

PHPBB3-9946
---
 phpBB/includes/db/oracle.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index c8a9a5f604..62b36aa8bf 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -269,11 +269,12 @@ class dbal_oracle extends dbal
 						{
 							$cols = explode(', ', $regs[2]);
 
+							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
+
 /*						The code inside this comment block breaks clob handling, but does allow the
 						database restore script to work.  If you want to allow no posts longer than 4KB
 						and/or need the db restore script, uncomment this.
 
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
 
 							if (sizeof($cols) !== sizeof($vals))
 							{
-- 
cgit v1.2.1


From 7147382e9ef3174dfb1d060f313e4cf260fe7a77 Mon Sep 17 00:00:00 2001
From: "Marek A. Ruszczynski" <aptx@phpbb.com>
Date: Mon, 7 Mar 2011 18:26:46 +0100
Subject: [ticket/10081] Cleanup Template Tests.

There are no incomplete template tests anymore.

PHPBB3-10081
---
 tests/template/template_test.php          | 240 ++++++------------------------
 tests/template/templates/includephp.html  |   2 +-
 tests/template/templates/loop_nested.html |   4 +-
 3 files changed, 47 insertions(+), 199 deletions(-)

diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 1b2f35f210..7517d97223 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -409,21 +409,16 @@ class phpbb_template_template_test extends phpbb_test_case
 
 	public function test_includephp()
 	{
-		$this->markTestIncomplete('Include PHP test file paths are broken');
+		global $phpEx;
 
 		$GLOBALS['config']['tpl_allow_php'] = true;
 
-		$cache_file = $this->template->cachepath . 'includephp.html.' . PHP_EXT;
-
-		$cwd = getcwd();
-		chdir(dirname(__FILE__) . '/templates');
+		$cache_file = $this->template->cachepath . 'includephp.html.' . $phpEx;
 
 		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file);
 
 		$this->template->set_filenames(array('test' => 'includephp.html'));
-		$this->assertEquals('testing included php', $this->display('test'), "Testing $file");
-
-		chdir($cwd);
+		$this->assertEquals('testing included php', $this->display('test'), "Testing INCLUDEPHP");
 
 		$GLOBALS['config']['tpl_allow_php'] = false;
 	}
@@ -437,17 +432,16 @@ class phpbb_template_template_test extends phpbb_test_case
 				false,
 				'insert',
 				<<<EOT
-outer - 0/4 - before
-outer - 1/4
-middle - 0/2
-middle - 1/2
-outer - 2/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 3/4
-middle - 0/2
-middle - 1/2
+outer - 0 - before
+outer - 1
+middle - 0
+middle - 1
+outer - 2
+middle - 0
+middle - 1
+outer - 3
+middle - 0
+middle - 1
 EOT
 ,
 				'Test inserting before on top level block',
@@ -458,17 +452,16 @@ EOT
 				true,
 				'insert',
 				<<<EOT
-outer - 0/4
-middle - 0/2
-middle - 1/2
-outer - 1/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/4
-middle - 0/2
-middle - 1/2
-outer - 3/4 - after
+outer - 0
+middle - 0
+middle - 1
+outer - 1
+middle - 0
+middle - 1
+outer - 2
+middle - 0
+middle - 1
+outer - 3 - after
 EOT
 ,
 				'Test inserting after on top level block',
@@ -479,17 +472,16 @@ EOT
 				1,
 				'insert',
 				<<<EOT
-outer - 0/4
-middle - 0/2
-middle - 1/2
-outer - 1/4 - pos #1
-outer - 2/4
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 3/4
-middle - 0/2
-middle - 1/2
+outer - 0
+middle - 0
+middle - 1
+outer - 1 - pos #1
+outer - 2
+middle - 0
+middle - 1
+outer - 3
+middle - 0
+middle - 1
 EOT
 ,
 				'Test inserting at 1 on top level block',
@@ -500,171 +492,28 @@ EOT
 				0,
 				'change',
 				<<<EOT
-outer - 0/3 - pos #1
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
+outer - 0 - pos #1
+middle - 0
+middle - 1
+outer - 1
+middle - 0
+middle - 1
+outer - 2
+middle - 0
+middle - 1
 EOT
 ,
 				'Test inserting at 1 on top level block',
 			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting before on nested block',
-			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'after'),
-				true,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3
-middle - 1/3
-middle - 2/3 - after
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting after on nested block',
-			),
-			array(
-				'outer[0].middle',
-				array('VARIABLE' => 'pos #1'),
-				1,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/3
-middle - 1/3 - pos #1
-middle - 2/3
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting at pos 1 on nested block',
-			),
-			array(
-				'outer[1].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/4 - before
-middle - 1/4
-middle - 2/4
-middle - 3/4
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-				'Test inserting before on nested block (pos 1)',
-			),
-			array(
-				'outer[].middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-EOT
-,
-				'Test inserting before on nested block (end)',
-			),
-			array(
-				'outer.middle',
-				array('VARIABLE' => 'before'),
-				false,
-				'insert',
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/3 - before
-middle - 1/3
-middle - 2/3
-EOT
-,
-				'Test inserting before on nested block (end)',
-			),
 		);
 	}
 
-/*
-				<<<EOT
-outer - 0/3
-middle - 0/2
-middle - 1/2
-outer - 1/3
-middle - 0/3
-middle - 1/3
-middle - 2/3
-outer - 2/3
-middle - 0/2
-middle - 1/2
-EOT
-,
-*/
-
 	/**
 	* @dataProvider alter_block_array_data
 	*/
 	public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description)
 	{
-		$this->markTestIncomplete('Alter Block Test is broken');
+//		$this->markTestIncomplete('Alter Block Test is broken');
 
 		$this->template->set_filenames(array('test' => 'loop_nested.html'));
 
@@ -675,12 +524,11 @@ EOT
 		$this->template->assign_block_vars('outer', array());
 		$this->template->assign_block_vars('outer.middle', array());
 		$this->template->assign_block_vars('outer.middle', array());
-		$this->template->assign_block_vars('outer.middle', array());
 		$this->template->assign_block_vars('outer', array());
 		$this->template->assign_block_vars('outer.middle', array());
 		$this->template->assign_block_vars('outer.middle', array());
 
-		$this->assertEquals("outer - 0/3\nmiddle - 0/2\nmiddle - 1/2\nouter - 1/3\nmiddle - 0/3\nmiddle - 1/3\nmiddle - 2/3\nouter - 2/3\nmiddle - 0/2\nmiddle - 1/2", $this->display('test'), 'Ensuring template is built correctly before modification');
+		$this->assertEquals("outer - 0\nmiddle - 0\nmiddle - 1\nouter - 1\nmiddle - 0\nmiddle - 1\nouter - 2\nmiddle - 0\nmiddle - 1", $this->display('test'), 'Ensuring template is built correctly before modification');
 
 		$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
 		$this->assertEquals($expect, $this->display('test'), $description);
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp.html
index 117d4273f0..70ebdac0d0 100644
--- a/tests/template/templates/includephp.html
+++ b/tests/template/templates/includephp.html
@@ -1 +1 @@
-<!-- INCLUDEPHP ../templates/_dummy_include.php.inc -->
+<!-- INCLUDEPHP ../tests/template/templates/_dummy_include.php.inc -->
diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html
index 571df97b4c..9b251cd453 100644
--- a/tests/template/templates/loop_nested.html
+++ b/tests/template/templates/loop_nested.html
@@ -1,8 +1,8 @@
 <!-- BEGIN outer -->
-	{outer.S_BLOCK_NAME} - {outer.S_ROW_NUM}/{outer.S_NUM_ROWS}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
+	outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
 
 	<!-- BEGIN middle -->
-		{middle.S_BLOCK_NAME} - {middle.S_ROW_NUM}/{middle.S_NUM_ROWS}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF -->
+		middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF -->
 
 	<!-- END middle -->
 <!-- END outer -->
-- 
cgit v1.2.1


From b835f364f544b40f5a29df2c1f12ed62774c5ee7 Mon Sep 17 00:00:00 2001
From: "Marek A. Ruszczynski" <aptx@phpbb.com>
Date: Mon, 7 Mar 2011 18:50:18 +0100
Subject: [ticket/10081] remove $phpEx.

PHPBB3-10081
---
 tests/template/template_test.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 7517d97223..33c82d53ad 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -343,8 +343,7 @@ class phpbb_template_template_test extends phpbb_test_case
 	*/
 	public function test_template($file, array $vars, array $block_vars, array $destroy, $expected)
 	{
-		global $phpEx;
-		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.' . $phpEx;
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
 
 		$this->assertFileNotExists($cache_file);
 
@@ -394,11 +393,9 @@ class phpbb_template_template_test extends phpbb_test_case
 
 	public function test_php()
 	{
-		global $phpEx;
-
 		$GLOBALS['config']['tpl_allow_php'] = true;
 
-		$cache_file = $this->template->cachepath . 'php.html.' . $phpEx;
+		$cache_file = $this->template->cachepath . 'php.html.php';
 
 		$this->assertFileNotExists($cache_file);
 
@@ -409,11 +406,9 @@ class phpbb_template_template_test extends phpbb_test_case
 
 	public function test_includephp()
 	{
-		global $phpEx;
-
 		$GLOBALS['config']['tpl_allow_php'] = true;
 
-		$cache_file = $this->template->cachepath . 'includephp.html.' . $phpEx;
+		$cache_file = $this->template->cachepath . 'includephp.html.php';
 
 		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file);
 
@@ -513,8 +508,6 @@ EOT
 	*/
 	public function test_alter_block_array($alter_block, array $vararray, $key, $mode, $expect, $description)
 	{
-//		$this->markTestIncomplete('Alter Block Test is broken');
-
 		$this->template->set_filenames(array('test' => 'loop_nested.html'));
 
 		// @todo Change this
-- 
cgit v1.2.1


From 87e3560c30365d757280f6ef6f067c29c1f9c5f0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 8 Mar 2011 19:48:56 -0500
Subject: [ticket/10057] Fixes for a bunch of small problems.

PHPBB3-10057
---
 phpBB/includes/db/firebird.php     |  2 +-
 phpBB/includes/db/postgres.php     |  2 +-
 phpBB/includes/error_collector.php | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 6786edb964..7e3f15ed1d 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -81,7 +81,7 @@ class dbal_firebird extends dbal
 		}
 		else
 		{
-			$thih->service_handle = false;
+			$this->service_handle = false;
 		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 69f605fc47..bb116e0763 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -98,7 +98,7 @@ class dbal_postgres extends dbal
 		}
 		else
 		{
-			if (!function_exists('pg_pconnect'))
+			if (!function_exists('pg_connect'))
 			{
 				$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
 				return $this->sql_error('');
diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 6327a38649..55834f354c 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -1,4 +1,20 @@
 <?php
+/**
+*
+* @package phpBB
+* @version $Id$
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
 
 class phpbb_error_collector
 {
-- 
cgit v1.2.1


From dfbd8f7de90b3faa1a0b0162538dfe5530a274ff Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 10 Mar 2011 16:12:32 +0100
Subject: [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for
 subforums.

Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
---
 phpBB/language/en/common.php                        | 1 +
 phpBB/styles/prosilver/template/viewforum_body.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index db60cbf227..7065b8add3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -322,6 +322,7 @@ $lang = array_merge($lang, array(
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
+	'MARK_SUBFORUMS_READ'	=> 'Mark subforums read',
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 12073a39d2..f4e80fd625 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -28,7 +28,7 @@
 <!-- IF S_HAS_SUBFORUM -->
 <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
 <ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a></li>
+	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
 </ul>
 <!-- ENDIF -->
 	<!-- INCLUDE forumlist_body.html -->
-- 
cgit v1.2.1


From 67fa589ba28b64cf8fa2aace610f103a200fd336 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 10 Mar 2011 16:47:00 +0100
Subject: [ticket/8802] Make FORUMS_MARKED more generic as it is also used for
 subforums.

PHPBB3-8802
---
 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 7065b8add3..731f674120 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -190,7 +190,7 @@ $lang = array_merge($lang, array(
 	'FORM_INVALID'			=> 'The submitted form was invalid. Try submitting again.',
 	'FORUM'					=> 'Forum',
 	'FORUMS'				=> 'Forums',
-	'FORUMS_MARKED'			=> 'All forums have been marked read.',
+	'FORUMS_MARKED'			=> 'The selected forums have been marked read.',
 	'FORUM_CAT'				=> 'Forum category',
 	'FORUM_INDEX'			=> 'Board index',
 	'FORUM_LINK'			=> 'Forum link',
-- 
cgit v1.2.1


From 2fb9bfe3b3803feffdaa293fdd9ad23a0d428a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 10 Mar 2011 22:42:30 +0100
Subject: [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore

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

diff --git a/.gitignore b/.gitignore
index c417bf01c1..817b0fa979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *~
 phpunit.xml
 phpBB/cache/*.php
+phpBB/cache/queue.php.lock
 phpBB/config.php
 phpBB/files/*
 phpBB/images/avatars/upload/*
-- 
cgit v1.2.1


From 7cf134c73d043e1adc1ac6361b202afa0d0f4ca9 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 Mar 2011 19:26:07 -0500
Subject: [ticket/10092] Ignore overlength comment lines in commit-msg hook.

PHPBB3-10092
---
 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 ad4d69a9da..6d4f02a1d2 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -66,7 +66,7 @@ then
 	exit 0
 fi
 
-msg=$(grep -nE '.{81,}' "$1");
+msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
 
 if [ $? -eq 0 ]
 then
-- 
cgit v1.2.1


From 94e09ac041ac7bc9fd52c8bd1d13d1a91da1da6f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 Mar 2011 19:27:38 -0500
Subject: [ticket/10078] Avoid \n in strings given to echo for portability.

Also preserve whitespace (including newlines) when printing the
lines that exceed 80 character limit.

PHPBB3-10078
---
 git-tools/hooks/commit-msg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index ad4d69a9da..9114cd368a 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -70,8 +70,9 @@ msg=$(grep -nE '.{81,}' "$1");
 
 if [ $? -eq 0 ]
 then
-	echo "The following lines are greater than 80 characters long:\n" >&2;
-	echo $msg >&2;
+	echo "The following lines are greater than 80 characters long:" >&2;
+	echo >&2
+	echo "$msg" >&2;
 
 	quit $ERR_LENGTH;
 fi
-- 
cgit v1.2.1


From ec15ac92f3935e08bbdb42db57586fb12a67be55 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 12 Mar 2011 14:29:34 +0100
Subject: [ticket/10046] Remove calls to register_shutdown_function() in
 cron.php

After reading some PHP source as well as the PHP manual we have arrived at the
following two situations with one conclusion:

 * SAPI supports flush():
   o call to flush() is enough to stop the page from displaying as loading
   o and thus register_shutdown_function is unnecessary

 * SAPI does not support flush():
   o neither a call to flush() nor the beginning of shutdown phase, which calls
     registered shutdown functions can flush anything to the client
   o and thus register_shutdown_function is unnecessary

Thanks to lacton for reporting the initial issue.
Thanks to nn- and naderman for doing all the dirty works.

PHPBB3-10046
---
 phpBB/cron.php | 91 +++++++---------------------------------------------------
 1 file changed, 10 insertions(+), 81 deletions(-)

diff --git a/phpBB/cron.php b/phpBB/cron.php
index 3993a149b5..16880b8914 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -21,7 +21,6 @@ $user->session_begin(false);
 $auth->acl($user->data);
 
 $cron_type = request_var('cron_type', '');
-$use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false;
 
 // Output transparent gif
 header('Cache-Control: no-cache');
@@ -79,23 +78,10 @@ switch ($cron_type)
 			break;
 		}
 
-		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
-		if ($use_shutdown_function && !$config['smtp_delivery'])
-		{
-			$use_shutdown_function = false;
-		}
-
 		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 		$queue = new queue();
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$queue, 'process'));
-		}
-		else
-		{
-			$queue->process();
-		}
+		$queue->process();
 
 	break;
 
@@ -106,14 +92,7 @@ switch ($cron_type)
 			break;
 		}
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$cache, 'tidy'));
-		}
-		else
-		{
-			$cache->tidy();
-		}
+		$cache->tidy();
 
 	break;
 
@@ -138,14 +117,7 @@ switch ($cron_type)
 			break;
 		}
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$search, 'tidy'));
-		}
-		else
-		{
-			$search->tidy();
-		}
+		$search->tidy();
 
 	break;
 
@@ -158,14 +130,7 @@ switch ($cron_type)
 
 		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function('tidy_warnings');
-		}
-		else
-		{
-			tidy_warnings();
-		}
+		tidy_warnings();
 
 	break;
 
@@ -178,14 +143,7 @@ switch ($cron_type)
 
 		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function('tidy_database');
-		}
-		else
-		{
-			tidy_database();
-		}
+		tidy_database();
 
 	break;
 
@@ -196,14 +154,7 @@ switch ($cron_type)
 			break;
 		}
 
-		if ($use_shutdown_function)
-		{
-			register_shutdown_function(array(&$user, 'session_gc'));
-		}
-		else
-		{
-			$user->session_gc();
-		}
+		$user->session_gc();
 
 	break;
 
@@ -230,26 +181,12 @@ switch ($cron_type)
 
 			if ($row['prune_days'])
 			{
-				if ($use_shutdown_function)
-				{
-					register_shutdown_function('auto_prune', $row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
-				}
-				else
-				{
-					auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
-				}
+				auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
 			}
 
 			if ($row['prune_viewed'])
 			{
-				if ($use_shutdown_function)
-				{
-					register_shutdown_function('auto_prune', $row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
-				}
-				else
-				{
-					auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
-				}
+				auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
 			}
 		}
 
@@ -257,16 +194,8 @@ switch ($cron_type)
 }
 
 // Unloading cache and closing db after having done the dirty work.
-if ($use_shutdown_function)
-{
-	register_shutdown_function('unlock_cron');
-	register_shutdown_function('garbage_collection');
-}
-else
-{
-	unlock_cron();
-	garbage_collection();
-}
+unlock_cron();
+garbage_collection();
 
 exit;
 
-- 
cgit v1.2.1


From 79d209824f9d88fa8116ace1a14d25900ed9466f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 12 Mar 2011 14:40:20 +0100
Subject: [ticket/10046] Call flush() in cron.php

PHPBB3-10046
---
 phpBB/cron.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpBB/cron.php b/phpBB/cron.php
index 16880b8914..8000066c92 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -29,10 +29,9 @@ header('Content-length: 43');
 
 echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
 
-// test without flush ;)
-// flush();
+// Flush here to prevent browser from showing the page as loading while running cron.
+flush();
 
-//
 if (!isset($config['cron_lock']))
 {
 	set_config('cron_lock', '0', true);
-- 
cgit v1.2.1


From a8f2e79fbc485c0133e616068570ed369e23935c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 12 Mar 2011 14:40:42 +0100
Subject: [ticket/10046] No longer change $phpbb_root_path to an absolute path
 for cron.

This is no longer required because we no longer call
register_shutdown_function() which made this change necessary.

PHPBB3-10046
---
 phpBB/common.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpBB/common.php b/phpBB/common.php
index c8b2fb9609..ae174c8441 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -118,11 +118,6 @@ else
 	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
 }
 
-if (defined('IN_CRON'))
-{
-	$phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR;
-}
-
 if (file_exists($phpbb_root_path . 'config.' . $phpEx))
 {
 	require($phpbb_root_path . 'config.' . $phpEx);
-- 
cgit v1.2.1


From 9a4804525471b69b1ed0beb4ea7145faeb8855b8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Mar 2011 06:43:10 -0500
Subject: [ticket/10046] Do not link bots to cron.php.

Bots, generally speaking, will not request cron.php immediately,
thus telling them to request it is pointless.

PHPBB3-10046
---
 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 6a2d132175..80b51f80ae 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4611,7 +4611,7 @@ function page_footer($run_cron = true)
 
 	// Call cron-type script
 	$call_cron = false;
-	if (!defined('IN_CRON') && $run_cron && !$config['board_disable'])
+	if (!defined('IN_CRON') && $run_cron && !$config['board_disable'] && !$user->data['is_bot'])
 	{
 		$call_cron = true;
 		$time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time();
-- 
cgit v1.2.1


From 7a39bdef890a4c781eda8ad03a6e3821a9f339df Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 12 Mar 2011 15:26:09 +0100
Subject: [ticket/10088] Also ignore DBMS versions other than MySQLi in cache
 mock.

PHPBB3-10088
---
 tests/mock/cache.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 738d1eaaba..11e525ff79 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -59,7 +59,12 @@ class phpbb_mock_cache
 
 		if ($ignore_db_info)
 		{
+			unset($cache_data['mssqlodbc_version']);
+			unset($cache_data['mssql_version']);
+			unset($cache_data['mysql_version']);
 			unset($cache_data['mysqli_version']);
+			unset($cache_data['pgsql_version']);
+			unset($cache_data['sqlite_version']);
 		}
 
 		$test->assertEquals($data, $cache_data);
-- 
cgit v1.2.1


From 1d2634f0ee90a95b05a5ba52a36a05f2505400af Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 12 Mar 2011 22:55:38 +0100
Subject: [ticket/9806] Script for merging pull requests

PHPBB3-9806
---
 git-tools/merge.php | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100755 git-tools/merge.php

diff --git a/git-tools/merge.php b/git-tools/merge.php
new file mode 100755
index 0000000000..cbd84b896f
--- /dev/null
+++ b/git-tools/merge.php
@@ -0,0 +1,175 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+function show_usage()
+{
+	$filename = basename(__FILE__);
+
+	echo "$filename merges a github pull request.\n";
+	echo "\n";
+
+	echo "Usage: [php] $filename -p pull_request_id [OPTIONS]\n";
+	echo "\n";
+
+	echo "Options:\n";
+	echo " -p pull_request_id             The pull request id to be merged (mandatory)\n";
+	echo " -r remote                      Remote of upstream, defaults to 'upstream' (optional)\n";
+	echo " -d                             Outputs the commands instead of running them (optional)\n";
+	echo " -h                             This help text\n";
+
+	exit(2);
+}
+
+// Handle arguments
+$opts = getopt('p:r:dh');
+
+if (empty($opts) || isset($opts['h']))
+{
+	show_usage();
+}
+
+$pull_id	= get_arg($opts, 'p', '');
+$remote		= get_arg($opts, 'r', 'upstream');
+$dry_run	= !get_arg($opts, 'd', true);
+
+try
+{
+	exit(work($pull_id, $remote));
+}
+catch (RuntimeException $e)
+{
+	echo $e->getMessage();
+	exit($e->getCode());
+}
+
+function work($pull_id, $remote)
+{
+	// Get some basic data
+	$pull = get_pull('phpbb', 'phpbb3', $pull_id);
+
+	if (!$pull_id)
+	{
+		show_usage();
+	}
+
+	if ($pull['state'] != 'open')
+	{
+		throw new RuntimeException(sprintf("Error: pull request is closed\n",
+			$target_branch), 5);
+	}
+
+	$pull_user = $pull['head'][0];
+	$pull_branch = $pull['head'][1];
+	$target_branch = $pull['base'][1];
+
+	switch ($target_branch)
+	{
+		case 'develop-olympus':
+			run("git checkout develop-olympus");
+			run("git pull $remote develop-olympus");
+
+			add_remote($pull_user, 'phpbb3');
+			run("git fetch $pull_user");
+			run("git merge --no-ff $pull_user/$pull_branch");
+			run("phpunit");
+
+			run("git checkout develop");
+			run("git pull $remote develop");
+			run("git merge --no-ff develop-olympus");
+			run("phpunit");
+		break;
+
+		case 'develop':
+			run("git checkout develop");
+			run("git pull $remote develop");
+
+			add_remote($pull_user, 'phpbb3');
+			run("git fetch $pull_user");
+			run("git merge --no-ff $pull_user/$pull_branch");
+			run("phpunit");
+		break;
+
+		default:
+			throw new RuntimeException(sprintf("Error: pull request target branch '%s' is not a main branch\n",
+				$target_branch), 5);
+		break;
+	}
+}
+
+function add_remote($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git remote add $username $url", true);
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function get_repository_url($username, $repository, $ssh = false)
+{
+	$url_base = ($ssh) ? 'git@github.com:' : 'git://github.com/';
+
+	return $url_base . $username . '/' . $repository . '.git';
+}
+
+function api_request($query)
+{
+	$contents = file_get_contents("http://github.com/api/v2/json/$query");
+
+	if ($contents === false)
+	{
+		throw new RuntimeException("Error: failed to retrieve pull request data\n", 4);
+	}
+
+	return json_decode($contents);
+}
+
+function get_pull($username, $repository, $pull_id)
+{
+	$request = api_request("pulls/$username/$repository/$pull_id");
+
+	$pull = $request->pull;
+
+	$pull_data = array(
+		'base'  => array($pull->base->user->login, $pull->base->ref),
+		'head'  => array($pull->head->user->login, $pull->head->ref),
+		'state' => $pull->state,
+	);
+
+	return $pull_data;
+}
+
+function get_arg($array, $index, $default)
+{
+	return isset($array[$index]) ? $array[$index] : $default;
+}
+
+function run($cmd, $ignore_fail = false)
+{
+	global $dry_run;
+
+	if (!empty($dry_run))
+	{
+		echo "$cmd\n";
+	}
+	else
+	{
+		passthru(escapeshellcmd($cmd), $status);
+
+		if ($status != 0 && !$ignore_fail)
+		{
+			throw new RuntimeException(sprintf("Error: command '%s' failed with status %s'\n",
+				$cmd, $status), 6);
+		}
+	}
+}
-- 
cgit v1.2.1


From 64657ee366f3d7f7e78129cda0e6cfc1ae36d4c3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 13 Mar 2011 23:11:33 -0400
Subject: [ticket/10096] Fixed whitespace in functions.php.

PHPBB3-10096
---
 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 80b51f80ae..2fc7ca6903 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4261,7 +4261,7 @@ function phpbb_http_login($param)
 	if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0)
 	{
 		list($username, $password) = explode(':', base64_decode(substr($username, 6)), 2);
-    }
+	}
 
 	if (!is_null($username) && !is_null($password))
 	{
-- 
cgit v1.2.1


From 91b319525546ea696653dbb7f2c494058a85b00b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 12 Mar 2011 16:49:25 +0100
Subject: [ticket/9685] Buffer posts for search indexing when using
 mssqlnative.

To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.

PHPBB3-9685
---
 phpBB/includes/acp/acp_search.php | 18 ++++++++++++++++--
 phpBB/includes/db/dbal.php        | 10 ++++++++++
 phpBB/includes/db/mssqlnative.php | 10 +++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 930c8d2a26..0cd67b1c34 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -392,7 +392,18 @@ class acp_search
 									AND post_id <= ' . (int) ($post_counter + $this->batch_size);
 							$result = $db->sql_query($sql);
 
-							while ($row = $db->sql_fetchrow($result))
+							$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.
@@ -402,7 +413,10 @@ class acp_search
 								}
 								$row_count++;
 							}
-							$db->sql_freeresult($result);
+							if (!$buffer)
+							{
+								$db->sql_freeresult($result);
+							}
 
 							$post_counter += $this->batch_size;
 						}
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 5d8d5fbd47..d7860fc8bc 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -241,6 +241,16 @@ class dbal
 		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
 	}
 
+	/**
+	* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
+	*
+	* @return bool Whether buffering is required.
+	*/
+	function sql_buffer_nested_transaction()
+	{
+		return false;
+	}
+
 	/**
 	* SQL Transaction
 	* @access private
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 7ed4146f27..8912cda178 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -258,6 +258,14 @@ class dbal_mssqlnative extends dbal
 		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
 	}
 
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_buffer_nested_transaction()
+	{
+		return true;
+	}
+
 	/**
 	* SQL Transaction
 	* @access private
@@ -628,7 +636,7 @@ class dbal_mssqlnative extends dbal
 			return false;
 		}
 	}
-	
+
 	/**
 	* Allows setting mssqlnative specific query options passed to sqlsrv_query as 4th parameter.
 	*/
-- 
cgit v1.2.1


From 48ba841be0abf6b44211826101334d1dafb93dd2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 17 Mar 2011 23:01:07 +0100
Subject: [ticket/10100] Update rand_seed_last_update before rand_seed in
 unique_id().

Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in
unique_id() to mitigate a race condition and unnecessary updates on heavily
busy boards.

PHPBB3-10100
---
 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 2fc7ca6903..198e429afc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -240,8 +240,8 @@ function unique_id($extra = 'c')
 
 	if ($dss_seeded !== true && ($config['rand_seed_last_update'] < time() - rand(1,10)))
 	{
-		set_config('rand_seed', $config['rand_seed'], true);
 		set_config('rand_seed_last_update', time(), true);
+		set_config('rand_seed', $config['rand_seed'], true);
 		$dss_seeded = true;
 	}
 
-- 
cgit v1.2.1


From f8384b7302ca27aec0064f7d927a732e4e4552da Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 17 Mar 2011 23:59:38 +0100
Subject: [ticket/10101] Add support for native phpass hashes

phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.

This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.

PHPBB3-10101
---
 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 2fc7ca6903..d6330f6d85 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -516,7 +516,7 @@ function _hash_crypt_private($password, $setting, &$itoa64)
 	$output = '*';
 
 	// Check for correct hash
-	if (substr($setting, 0, 3) != '$H$')
+	if (substr($setting, 0, 3) != '$H$' && substr($setting, 0, 3) != '$P$')
 	{
 		return $output;
 	}
-- 
cgit v1.2.1


From c24408f6eda8347bba17c83e027f118091986488 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 18 Mar 2011 02:51:43 +0100
Subject: [ticket/10021] Add comment explaining why we can check -1 as an error
 value.

PHPBB3-10021
---
 phpBB/memberlist.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b1b9e87422..599cd0b3e7 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1072,6 +1072,11 @@ switch ($mode)
 
 			if (isset($find_key_match[$joined_select]) && sizeof($joined) == 3)
 			{
+				// Before PHP 5.1 an error value -1 can be returned instead of false.
+				// Theoretically gmmktime() can also legitimately return -1 as an actual timestamp.
+				// But since we do not pass the $second parameter to gmmktime(),
+				// an actual unix timestamp -1 cannot be returned in this case.
+				// Thus we can check whether it is -1 and treat -1 as an error.
 				$joined_time = gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]);
 
 				if ($joined_time !== false && $joined_time !== -1)
-- 
cgit v1.2.1


From 087e7642e795f5b2e63e7fe5d2190b33d523c221 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 19 Mar 2011 14:56:56 +0100
Subject: [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if
 statement.

There is no member.S_PENDING_SET variable.

This fixes an XHTML error when managing groups with both approved and pending
users from the UCP.

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

diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 2171250621..bce31431cb 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -118,7 +118,7 @@
 			</thead>
 			<tbody>
 		<!-- ELSEIF member.S_APPROVED -->
-			<!-- IF member.S_PENDING_SET -->
+			<!-- IF S_PENDING_SET -->
 				</tbody>
 				</table>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From d36f78b9f1c7fc0c52a36d95510be1d8e2361f5d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 18 Mar 2011 03:15:40 +0100
Subject: [ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a
 CHAR(32).

This fixes session unit tests on PostgreSQL in particular.

PHPBB3-10082
---
 tests/session/continue_test.php          | 14 +++++++++-----
 tests/session/fixtures/sessions_full.xml |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 3080121978..6737562a0a 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -19,21 +19,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case
 
 	static public function session_begin_attempts()
 	{
+		// The session_id field is defined as CHAR(32) in the database schema.
+		// Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes.
+		// Thus we fill those strings up with zeroes until they have a string length of 32.
+
 		return array(
 			array(
-				'bar_session', '4', 'user agent', '127.0.0.1',
+				'bar_session000000000000000000000', '4', 'user agent', '127.0.0.1',
 				array(
-					array('session_id' => 'anon_session', 'session_user_id' => 1),
-					array('session_id' => 'bar_session', 'session_user_id' => 4),
+					array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
+					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
 				),
 				array(),
 				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
 			),
 			array(
-				'anon_session', '4', 'user agent', '127.0.0.1',
+				'anon_session00000000000000000000', '4', 'user agent', '127.0.0.1',
 				array(
 					array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
-					array('session_id' => 'bar_session', 'session_user_id' => 4),
+					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
 				),
 				array(
 					'u' => array('1', null),
diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
index 4559a08c55..bf6fc65997 100644
--- a/tests/session/fixtures/sessions_full.xml
+++ b/tests/session/fixtures/sessions_full.xml
@@ -22,13 +22,13 @@
 		<column>session_ip</column>
 		<column>session_browser</column>
 		<row>
-			<value>anon_session</value>
+			<value>anon_session00000000000000000000</value>
 			<value>1</value>
 			<value>127.0.0.1</value>
 			<value>anonymous user agent</value>
 		</row>
 		<row>
-			<value>bar_session</value>
+			<value>bar_session000000000000000000000</value>
 			<value>4</value>
 			<value>127.0.0.1</value>
 			<value>user agent</value>
-- 
cgit v1.2.1


From 4c3cc152c81af57ec0a25bfee5da4964309a3aa5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 20 Mar 2011 22:52:31 +0100
Subject: [ticket/10101] Add test case for native phpass hashes

PHPBB3-10101
---
 tests/security/hash_test.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/security/hash_test.php

diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
new file mode 100644
index 0000000000..19a3822145
--- /dev/null
+++ b/tests/security/hash_test.php
@@ -0,0 +1,21 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_security_hash_test extends phpbb_test_case
+{
+	public function test_check_hash_with_phpass()
+	{
+		$this->assertTrue(phpbb_check_hash('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		$this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+		$this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1'));
+	}
+}
+
-- 
cgit v1.2.1


From 1564c01c38742037bf44f87c03c96384344fd17b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 23 Mar 2011 22:48:22 +0100
Subject: [ticket/10033] "Disallow usernames" does not check already disallowed
 names.

PHPBB3-10033
---
 phpBB/includes/acp/acp_disallow.php | 12 ++++++++++++
 phpBB/language/en/acp/posting.php   |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php
index 9549955cc8..e2176b7bcd 100644
--- a/phpBB/includes/acp/acp_disallow.php
+++ b/phpBB/includes/acp/acp_disallow.php
@@ -56,6 +56,18 @@ class acp_disallow
 				trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 
+			$sql = 'SELECT disallow_id
+				FROM ' . DISALLOW_TABLE . "
+				WHERE disallow_username = '" . $db->sql_escape($disallowed_user) . "'";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($row)
+			{
+				trigger_error($user->lang['DISALLOWED_ALREADY'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
 			$sql = 'INSERT INTO ' . DISALLOW_TABLE . ' ' . $db->sql_build_array('INSERT', array('disallow_username' => $disallowed_user));
 			$db->sql_query($sql);
 
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 443f4a3ea2..25152dd766 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -233,13 +233,13 @@ $lang = array_merge($lang, array(
 
 // Disallow Usernames
 $lang = array_merge($lang, array(
-	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
+	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *.',
 	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character.',
 	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
 
 	'DELETE_DISALLOW_EXPLAIN'	=> 'You can remove a disallowed username by selecting the username from this list and clicking submit.',
 	'DELETE_DISALLOW_TITLE'		=> 'Remove a disallowed username',
-	'DISALLOWED_ALREADY'		=> 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
+	'DISALLOWED_ALREADY'		=> 'The name you entered is already disallowed.',
 	'DISALLOWED_DELETED'		=> 'The disallowed username has been successfully removed.',
 	'DISALLOW_SUCCESSFUL'		=> 'The disallowed username has been successfully added.',
 
-- 
cgit v1.2.1


From ae8131077ef8a4c75c0582b47c871ca0c81ef2ef Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 23 Mar 2011 23:06:55 +0100
Subject: [ticket/10107] Add a webserver section to docs/INSTALL.html

Explain what to do with lighttpd and nginx after installing phpBB on
one of those webservers.

PHPBB3-10107
---
 phpBB/docs/INSTALL.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 4af185beb3..3cd0e215c3 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -79,6 +79,7 @@
 	<li><a href="#postinstall">Important (security related) post-Install tasks for all installation methods</a>
 	<ol style="list-style-type: lower-roman;">
 		<li><a href="#avatars">Uploadable avatars</a></li>
+		<li><a href="#webserver_configuration">Webserver configuration</a></li>
 	</ol>
 	</li>
 	<li><a href="#disclaimer">Disclaimer</a></li>
@@ -408,6 +409,12 @@
 
 	<p>Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there to cause trouble. Therefore you should monitor this directory and if possible make regular backups.</p>
 
+<a name="webserver_configuration"></a><h3>6.ii. Webserver configuration</h3>
+
+	<p>Depending on your web server you may have to configure your server to deny web access to the <code>files/</code> and <code>store/</code> directories. This is to prevent users from accessing private attachments and database backups.</p>
+
+	<p>For apache there are <code>.htaccess</code> files already in place to do this for you. For other webservers you will have to adjust the configuration yourself. There are sample configuration files for <em>lighttpd</em> and <em>nginx</em> in the <code>docs/</code> directory.</p>
+
 		</div>
 
 		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-- 
cgit v1.2.1


From 03017a8946b5c7dd7f5aa9c47367991071990f5e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 24 Mar 2011 00:34:09 +0100
Subject: [ticket/10107] Make it clear that provided httpd samples are not
 perfect

PHPBB3-10107
---
 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 3cd0e215c3..c960b49cc6 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -413,7 +413,7 @@
 
 	<p>Depending on your web server you may have to configure your server to deny web access to the <code>files/</code> and <code>store/</code> directories. This is to prevent users from accessing private attachments and database backups.</p>
 
-	<p>For apache there are <code>.htaccess</code> files already in place to do this for you. For other webservers you will have to adjust the configuration yourself. There are sample configuration files for <em>lighttpd</em> and <em>nginx</em> in the <code>docs/</code> directory.</p>
+	<p>For <strong>apache</strong> there are <code>.htaccess</code> files already in place to do this for you. For other webservers you will have to adjust the configuration yourself. Sample files for <strong>nginx</strong> and <strong>lighttpd</strong> to help you get started may be found in docs directory.</p>
 
 		</div>
 
-- 
cgit v1.2.1


From 0793b49212599b3536279d2bb5424c2b24cc1669 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 24 Mar 2011 00:40:56 +0100
Subject: [ticket/10107] Add cache to the enumeration, make statement more
 generic

PHPBB3-10107
---
 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 c960b49cc6..9f635fe50b 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -411,7 +411,7 @@
 
 <a name="webserver_configuration"></a><h3>6.ii. Webserver configuration</h3>
 
-	<p>Depending on your web server you may have to configure your server to deny web access to the <code>files/</code> and <code>store/</code> directories. This is to prevent users from accessing private attachments and database backups.</p>
+	<p>Depending on your web server you may have to configure your server to deny web access to the <code>cache/</code>, <code>files/</code>, <code>store/</code> and other directories. This is to prevent users from accessing sensitive files.</p>
 
 	<p>For <strong>apache</strong> there are <code>.htaccess</code> files already in place to do this for you. For other webservers you will have to adjust the configuration yourself. Sample files for <strong>nginx</strong> and <strong>lighttpd</strong> to help you get started may be found in docs directory.</p>
 
-- 
cgit v1.2.1


From 83ca7305444e09180f0cee0352c4426bb72b793f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 24 Mar 2011 10:44:36 +0100
Subject: [ticket/9581] Fix missing index

Add `u.user_lang` to the select statement to prevent "undefined
index" errors.

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

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index a8cc93c2e7..133fe47e09 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -99,7 +99,7 @@ class acp_email
 					else
 					{
 						$sql_ary = array(
-							'SELECT'	=> 'u.username, u.username_clean, u.user_email, u.user_jabber, u.user_notify_type',
+							'SELECT'	=> 'u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type',
 							'FROM'		=> array(
 								USERS_TABLE	=> 'u',
 							),
-- 
cgit v1.2.1


From 657971754bd72debb3086ac084af07a7c3d7831c Mon Sep 17 00:00:00 2001
From: Callum Macrae <callumacrae95@gmail.com>
Date: Tue, 29 Mar 2011 21:12:04 +0100
Subject: [ticket/10112] Replaced a couple occurrences of count() with sizeof()

As per the coding guidlines, sizeof() should be used instead of count().

PHPBB3-10112
---
 phpBB/includes/captcha/captcha_gd.php | 54 +++++++++++++++++------------------
 phpBB/includes/db/mssqlnative.php     |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 96e39af85b..5f24618aab 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -112,7 +112,7 @@ class captcha
 			$noise_bitmaps = $this->captcha_noise_bg_bitmaps();
 			for ($i = 0; $i < $code_len; ++$i)
 			{
-				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, count($noise_bitmaps['data'])));
+				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, sizeof($noise_bitmaps['data'])));
 
 				list($min, $max) = $noise[$i]->range();
 				//$box = $noise[$i]->dimensions($sizes[$i]);
@@ -1669,32 +1669,32 @@ class captcha
 			'height'	=> 15,
 			'data'		=> array(
 
-			'A' =>	$chars['A'][mt_rand(0, min(count($chars['A']), $config['captcha_gd_fonts']) -1)],
-			'B' =>	$chars['B'][mt_rand(0, min(count($chars['B']), $config['captcha_gd_fonts']) -1)],
-			'C' =>	$chars['C'][mt_rand(0, min(count($chars['C']), $config['captcha_gd_fonts']) -1)],
-			'D' =>	$chars['D'][mt_rand(0, min(count($chars['D']), $config['captcha_gd_fonts']) -1)],
-			'E' =>	$chars['E'][mt_rand(0, min(count($chars['E']), $config['captcha_gd_fonts']) -1)],
-			'F' =>	$chars['F'][mt_rand(0, min(count($chars['F']), $config['captcha_gd_fonts']) -1)],
-			'G' =>	$chars['G'][mt_rand(0, min(count($chars['G']), $config['captcha_gd_fonts']) -1)],
-			'H' =>	$chars['H'][mt_rand(0, min(count($chars['H']), $config['captcha_gd_fonts']) -1)],
-			'I' =>	$chars['I'][mt_rand(0, min(count($chars['I']), $config['captcha_gd_fonts']) -1)],
-			'J' =>	$chars['J'][mt_rand(0, min(count($chars['J']), $config['captcha_gd_fonts']) -1)],
-			'K' =>	$chars['K'][mt_rand(0, min(count($chars['K']), $config['captcha_gd_fonts']) -1)],
-			'L' =>	$chars['L'][mt_rand(0, min(count($chars['L']), $config['captcha_gd_fonts']) -1)],
-			'M' =>	$chars['M'][mt_rand(0, min(count($chars['M']), $config['captcha_gd_fonts']) -1)],  
-			'N' =>	$chars['N'][mt_rand(0, min(count($chars['N']), $config['captcha_gd_fonts']) -1)],
-			'O' =>	$chars['O'][mt_rand(0, min(count($chars['O']), $config['captcha_gd_fonts']) -1)],
-			'P' =>	$chars['P'][mt_rand(0, min(count($chars['P']), $config['captcha_gd_fonts']) -1)],
-			'Q' =>	$chars['Q'][mt_rand(0, min(count($chars['Q']), $config['captcha_gd_fonts']) -1)],
-			'R' =>	$chars['R'][mt_rand(0, min(count($chars['R']), $config['captcha_gd_fonts']) -1)],
-			'S' =>	$chars['S'][mt_rand(0, min(count($chars['S']), $config['captcha_gd_fonts']) -1)],
-			'T' =>	$chars['T'][mt_rand(0, min(count($chars['T']), $config['captcha_gd_fonts']) -1)],
-			'U' =>	$chars['U'][mt_rand(0, min(count($chars['U']), $config['captcha_gd_fonts']) -1)],
-			'V' =>	$chars['V'][mt_rand(0, min(count($chars['V']), $config['captcha_gd_fonts']) -1)],
-			'W' =>	$chars['W'][mt_rand(0, min(count($chars['W']), $config['captcha_gd_fonts']) -1)],
-			'X' =>	$chars['X'][mt_rand(0, min(count($chars['X']), $config['captcha_gd_fonts']) -1)],
-			'Y' =>	$chars['Y'][mt_rand(0, min(count($chars['Y']), $config['captcha_gd_fonts']) -1)],
-			'Z' =>	$chars['Z'][mt_rand(0, min(count($chars['Z']), $config['captcha_gd_fonts']) -1)],
+			'A' =>	$chars['A'][mt_rand(0, min(sizeof($chars['A']), $config['captcha_gd_fonts']) -1)],
+			'B' =>	$chars['B'][mt_rand(0, min(sizeof($chars['B']), $config['captcha_gd_fonts']) -1)],
+			'C' =>	$chars['C'][mt_rand(0, min(sizeof($chars['C']), $config['captcha_gd_fonts']) -1)],
+			'D' =>	$chars['D'][mt_rand(0, min(sizeof($chars['D']), $config['captcha_gd_fonts']) -1)],
+			'E' =>	$chars['E'][mt_rand(0, min(sizeof($chars['E']), $config['captcha_gd_fonts']) -1)],
+			'F' =>	$chars['F'][mt_rand(0, min(sizeof($chars['F']), $config['captcha_gd_fonts']) -1)],
+			'G' =>	$chars['G'][mt_rand(0, min(sizeof($chars['G']), $config['captcha_gd_fonts']) -1)],
+			'H' =>	$chars['H'][mt_rand(0, min(sizeof($chars['H']), $config['captcha_gd_fonts']) -1)],
+			'I' =>	$chars['I'][mt_rand(0, min(sizeof($chars['I']), $config['captcha_gd_fonts']) -1)],
+			'J' =>	$chars['J'][mt_rand(0, min(sizeof($chars['J']), $config['captcha_gd_fonts']) -1)],
+			'K' =>	$chars['K'][mt_rand(0, min(sizeof($chars['K']), $config['captcha_gd_fonts']) -1)],
+			'L' =>	$chars['L'][mt_rand(0, min(sizeof($chars['L']), $config['captcha_gd_fonts']) -1)],
+			'M' =>	$chars['M'][mt_rand(0, min(sizeof($chars['M']), $config['captcha_gd_fonts']) -1)],  
+			'N' =>	$chars['N'][mt_rand(0, min(sizeof($chars['N']), $config['captcha_gd_fonts']) -1)],
+			'O' =>	$chars['O'][mt_rand(0, min(sizeof($chars['O']), $config['captcha_gd_fonts']) -1)],
+			'P' =>	$chars['P'][mt_rand(0, min(sizeof($chars['P']), $config['captcha_gd_fonts']) -1)],
+			'Q' =>	$chars['Q'][mt_rand(0, min(sizeof($chars['Q']), $config['captcha_gd_fonts']) -1)],
+			'R' =>	$chars['R'][mt_rand(0, min(sizeof($chars['R']), $config['captcha_gd_fonts']) -1)],
+			'S' =>	$chars['S'][mt_rand(0, min(sizeof($chars['S']), $config['captcha_gd_fonts']) -1)],
+			'T' =>	$chars['T'][mt_rand(0, min(sizeof($chars['T']), $config['captcha_gd_fonts']) -1)],
+			'U' =>	$chars['U'][mt_rand(0, min(sizeof($chars['U']), $config['captcha_gd_fonts']) -1)],
+			'V' =>	$chars['V'][mt_rand(0, min(sizeof($chars['V']), $config['captcha_gd_fonts']) -1)],
+			'W' =>	$chars['W'][mt_rand(0, min(sizeof($chars['W']), $config['captcha_gd_fonts']) -1)],
+			'X' =>	$chars['X'][mt_rand(0, min(sizeof($chars['X']), $config['captcha_gd_fonts']) -1)],
+			'Y' =>	$chars['Y'][mt_rand(0, min(sizeof($chars['Y']), $config['captcha_gd_fonts']) -1)],
+			'Z' =>	$chars['Z'][mt_rand(0, min(sizeof($chars['Z']), $config['captcha_gd_fonts']) -1)],
 
 			'1' => array(
 				array(0,0,0,1,1,0,0,0,0),
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 7ed4146f27..783c331872 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -50,7 +50,7 @@ class result_mssqlnative
 			}
 		}
 
-		$this->m_row_count = count($this->m_rows);
+		$this->m_row_count = sizeof($this->m_rows);
 	}
 
 	private function array_to_obj($array, &$obj)
-- 
cgit v1.2.1


From fad7333e7266fe402e4a63f816b401c2f54b0c66 Mon Sep 17 00:00:00 2001
From: Eric <eric@maltoya.org>
Date: Mon, 28 Mar 2011 21:08:53 +0800
Subject: [ticket/10110] Add Redis ACM backend

PHPBB3-10110
---
 phpBB/docs/coding-guidelines.html |   4 ++
 phpBB/includes/acm/acm_redis.php  | 142 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 phpBB/includes/acm/acm_redis.php

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index bce65335d6..3f72ac406a 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -240,6 +240,10 @@ PHPBB_ACM_MEMCACHE_PORT     (overwrite memcached port, default is 11211)
 PHPBB_ACM_MEMCACHE_COMPRESS (overwrite memcached compress setting, default is disabled)
 PHPBB_ACM_MEMCACHE_HOST     (overwrite memcached host name, default is localhost)
 
+PHPBB_ACM_REDIS_HOST        (overwrite redis host name, default is localhost)
+PHPBB_ACM_REDIS_PORT        (overwrite redis port, default is 6379)
+PHPBB_ACM_REDIS_PASSWORD    (overwrite redis password, default is empty)
+
 PHPBB_QA                   (Set board to QA-Mode, which means the updater also checks for RC-releases)
 </pre></div>
 
diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
new file mode 100644
index 0000000000..3f0e590d0a
--- /dev/null
+++ b/phpBB/includes/acm/acm_redis.php
@@ -0,0 +1,142 @@
+<?php
+/**
+*
+* @package acm
+* @version $Id$
+* @copyright (c) 2005, 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Include the abstract base
+if (!class_exists('acm_memory'))
+{
+	require("{$phpbb_root_path}includes/acm/acm_memory.$phpEx");
+}
+
+if (!defined('PHPBB_ACM_REDIS_PORT'))
+{
+	define('PHPBB_ACM_REDIS_PORT', 6379);
+}
+
+if (!defined('PHPBB_ACM_REDIS_HOST'))
+{
+	define('PHPBB_ACM_REDIS_HOST', 'localhost');
+}
+
+if (!defined('PHPBB_ACM_REDIS'))
+{
+	//can define multiple servers with host1/port1,host2/port2 format
+	define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT);
+}
+
+/**
+* ACM for Redis
+* @package acm
+*/
+class acm extends acm_memory
+{
+	var $extension = 'redis';
+
+	var $redis;
+
+	function acm()
+	{
+		// Call the parent constructor
+		parent::acm_memory();
+
+		if (!extension_loaded('redis'))
+		{
+			trigger_error("Could not find required extension [{$this->extension}] for the ACM module $acm_type.", E_USER_ERROR);
+		}
+		
+		$this->redis = new Redis();
+		foreach (explode(',', PHPBB_ACM_REDIS) as $u)
+		{
+			$parts = explode('/', $u);
+			$this->redis->connect(trim($parts[0]), trim($parts[1]));
+		}
+		
+		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
+		{
+			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
+			{
+				trigger_error("Incorrect password for the ACM module $acm_type.", E_USER_ERROR);
+			}
+		}
+	}
+
+	/**
+	* Unload the cache resources
+	*
+	* @return void
+	*/
+	function unload()
+	{
+		parent::unload();
+
+		$this->redis->close();
+	}
+
+	/**
+	* Purge cache data
+	*
+	* @return void
+	*/
+	function purge()
+	{
+		$this->redis->flushDB();
+
+		parent::purge();
+	}
+
+	/**
+	* Fetch an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return mixed Cached data
+	*/
+	function _read($var)
+	{
+		return $this->redis->get($this->key_prefix . $var);
+	}
+
+	/**
+	* Store data in the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @param mixed $data Data to store
+	* @param int $ttl Time-to-live of cached data
+	* @return bool True if the operation succeeded
+	*/
+	function _write($var, $data, $ttl = 2592000)
+	{
+		return $this->redis->setex($this->key_prefix . $var, $ttl, $data);
+	}
+
+	/**
+	* Remove an item from the cache
+	*
+	* @access protected
+	* @param string $var Cache key
+	* @return bool True if the operation succeeded
+	*/
+	function _delete($var)
+	{
+		if ($this->redis->delete($this->key_prefix . $var) > 0)
+		{
+			return true;
+		}
+		return false;
+	}
+}
-- 
cgit v1.2.1


From f18d93756cad336db8299a2ab88ec3382efe171a Mon Sep 17 00:00:00 2001
From: Eric <eric@maltoya.org>
Date: Mon, 28 Mar 2011 23:09:32 +0800
Subject: [ticket/10110] Update comments with a link to the phpredis extension

PHPBB3-10110
---
 phpBB/includes/acm/acm_redis.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
index 3f0e590d0a..b1739c0479 100644
--- a/phpBB/includes/acm/acm_redis.php
+++ b/phpBB/includes/acm/acm_redis.php
@@ -2,8 +2,7 @@
 /**
 *
 * @package acm
-* @version $Id$
-* @copyright (c) 2005, 2011 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -40,6 +39,10 @@ if (!defined('PHPBB_ACM_REDIS'))
 
 /**
 * ACM for Redis
+*
+* Compatible with the php extension phpredis available
+* at https://github.com/nicolasff/phpredis
+*
 * @package acm
 */
 class acm extends acm_memory
-- 
cgit v1.2.1


From 9891f5a8d2025aeec19c6b33de0d1a48dd92d211 Mon Sep 17 00:00:00 2001
From: Eric <eric@maltoya.org>
Date: Tue, 29 Mar 2011 15:54:28 +0800
Subject: [ticket/10110] Enable the serialization and add a constant for
 defined the database

PHPBB3-10110
---
 phpBB/docs/coding-guidelines.html |  1 +
 phpBB/includes/acm/acm_redis.php  | 32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 3f72ac406a..cd3c09f6fb 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -243,6 +243,7 @@ PHPBB_ACM_MEMCACHE_HOST     (overwrite memcached host name, default is localhost
 PHPBB_ACM_REDIS_HOST        (overwrite redis host name, default is localhost)
 PHPBB_ACM_REDIS_PORT        (overwrite redis port, default is 6379)
 PHPBB_ACM_REDIS_PASSWORD    (overwrite redis password, default is empty)
+PHPBB_ACM_REDIS_DB          (overwrite redis default database)
 
 PHPBB_QA                   (Set board to QA-Mode, which means the updater also checks for RC-releases)
 </pre></div>
diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
index b1739c0479..1c2b9c0c2f 100644
--- a/phpBB/includes/acm/acm_redis.php
+++ b/phpBB/includes/acm/acm_redis.php
@@ -48,7 +48,7 @@ if (!defined('PHPBB_ACM_REDIS'))
 class acm extends acm_memory
 {
 	var $extension = 'redis';
-
+	
 	var $redis;
 
 	function acm()
@@ -56,15 +56,10 @@ class acm extends acm_memory
 		// Call the parent constructor
 		parent::acm_memory();
 
-		if (!extension_loaded('redis'))
-		{
-			trigger_error("Could not find required extension [{$this->extension}] for the ACM module $acm_type.", E_USER_ERROR);
-		}
-		
 		$this->redis = new Redis();
-		foreach (explode(',', PHPBB_ACM_REDIS) as $u)
+		foreach (explode(',', PHPBB_ACM_REDIS) as $server)
 		{
-			$parts = explode('/', $u);
+			$parts = explode('/', $server);
 			$this->redis->connect(trim($parts[0]), trim($parts[1]));
 		}
 		
@@ -72,9 +67,24 @@ class acm extends acm_memory
 		{
 			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
 			{
+				global $acm_type;
+				
 				trigger_error("Incorrect password for the ACM module $acm_type.", E_USER_ERROR);
 			}
 		}
+		
+		$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+		$this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix);
+		
+		if (defined('PHPBB_ACM_REDIS_DB'))
+		{
+			if (!$this->redis->select(PHPBB_ACM_REDIS_DB))
+			{
+				global $acm_type;
+				
+				trigger_error("Incorrect database for the ACM module $acm_type.", E_USER_ERROR);
+			}
+		}
 	}
 
 	/**
@@ -110,7 +120,7 @@ class acm extends acm_memory
 	*/
 	function _read($var)
 	{
-		return $this->redis->get($this->key_prefix . $var);
+		return $this->redis->get($var);
 	}
 
 	/**
@@ -124,7 +134,7 @@ class acm extends acm_memory
 	*/
 	function _write($var, $data, $ttl = 2592000)
 	{
-		return $this->redis->setex($this->key_prefix . $var, $ttl, $data);
+		return $this->redis->setex($var, $ttl, $data);
 	}
 
 	/**
@@ -136,7 +146,7 @@ class acm extends acm_memory
 	*/
 	function _delete($var)
 	{
-		if ($this->redis->delete($this->key_prefix . $var) > 0)
+		if ($this->redis->delete($var) > 0)
 		{
 			return true;
 		}
-- 
cgit v1.2.1


From ddda094d3abd2e5971c77cc38993eefa3d0bdf3a Mon Sep 17 00:00:00 2001
From: Eric <eric@maltoya.org>
Date: Wed, 30 Mar 2011 17:55:53 +0800
Subject: [ticket/10110] Remove tab from empty lines

PHPBB3-10110
---
 phpBB/includes/acm/acm_redis.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
index 1c2b9c0c2f..8954b9d0e7 100644
--- a/phpBB/includes/acm/acm_redis.php
+++ b/phpBB/includes/acm/acm_redis.php
@@ -48,7 +48,7 @@ if (!defined('PHPBB_ACM_REDIS'))
 class acm extends acm_memory
 {
 	var $extension = 'redis';
-	
+
 	var $redis;
 
 	function acm()
@@ -62,26 +62,26 @@ class acm extends acm_memory
 			$parts = explode('/', $server);
 			$this->redis->connect(trim($parts[0]), trim($parts[1]));
 		}
-		
+
 		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
 		{
 			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
 			{
 				global $acm_type;
-				
+
 				trigger_error("Incorrect password for the ACM module $acm_type.", E_USER_ERROR);
 			}
 		}
-		
+
 		$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
 		$this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix);
-		
+
 		if (defined('PHPBB_ACM_REDIS_DB'))
 		{
 			if (!$this->redis->select(PHPBB_ACM_REDIS_DB))
 			{
 				global $acm_type;
-				
+
 				trigger_error("Incorrect database for the ACM module $acm_type.", E_USER_ERROR);
 			}
 		}
-- 
cgit v1.2.1


From a83518982394f93e843e68f663fd39b2d6fd5150 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 15 Mar 2011 22:21:43 +0700
Subject: [ticket/9751] Password requirement "Must contain letters and numbers"
 fails

PHPBB3-9751
---
 phpBB/includes/functions_user.php        |  6 +--
 tests/regex/password_complexity_test.php | 81 ++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 tests/regex/password_complexity_test.php

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8a204995aa..88e07f729c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1617,7 +1617,6 @@ function validate_password($password)
 	{
 		$upp = '\p{Lu}';
 		$low = '\p{Ll}';
-		$let = '\p{L}';
 		$num = '\p{N}';
 		$sym = '[^\p{Lu}\p{Ll}\p{N}]';
 		$pcre = true;
@@ -1627,7 +1626,6 @@ function validate_password($password)
 		mb_regex_encoding('UTF-8');
 		$upp = '[[:upper:]]';
 		$low = '[[:lower:]]';
-		$let = '[[:lower:][:upper:]]';
 		$num = '[[:digit:]]';
 		$sym = '[^[:upper:][:lower:][:digit:]]';
 		$mbstring = true;
@@ -1636,7 +1634,6 @@ function validate_password($password)
 	{
 		$upp = '[A-Z]';
 		$low = '[a-z]';
-		$let = '[a-zA-Z]';
 		$num = '[0-9]';
 		$sym = '[^A-Za-z0-9]';
 		$pcre = true;
@@ -1652,7 +1649,8 @@ function validate_password($password)
 		break;
 
 		case 'PASS_TYPE_ALPHA':
-			$chars[] = $let;
+			$chars[] = $low;
+			$chars[] = $upp;
 			$chars[] = $num;
 		break;
 
diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php
new file mode 100644
index 0000000000..21e8d12a0a
--- /dev/null
+++ b/tests/regex/password_complexity_test.php
@@ -0,0 +1,81 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
+
+class phpbb_password_complexity_test extends phpbb_test_case
+{
+	public function password_complexity_test_data_positive()
+	{
+		return array(
+			array('12345', 'PASS_TYPE_ANY'),
+			array('qwerty', 'PASS_TYPE_ANY'),
+			array('QWERTY', 'PASS_TYPE_ANY'),
+			array('QwerTY', 'PASS_TYPE_ANY'),
+			array('q$erty', 'PASS_TYPE_ANY'),
+			array('qW$rty', 'PASS_TYPE_ANY'),
+
+			array('QwerTY', 'PASS_TYPE_CASE'),
+			array('QwerTY123', 'PASS_TYPE_ALPHA'),
+			array('QwerTY123$&', 'PASS_TYPE_SYMBOL'),
+
+			array('', 'PASS_TYPE_ANY'),
+		);
+	}
+
+	public function password_complexity_test_data_negative()
+	{
+		return array(
+			array('qwerty', 'PASS_TYPE_CASE'),
+			array('QWERTY', 'PASS_TYPE_CASE'),
+			array('123456', 'PASS_TYPE_CASE'),
+			array('#$&', 'PASS_TYPE_CASE'),
+			array('QTY123$', 'PASS_TYPE_CASE'),
+
+			array('qwerty', 'PASS_TYPE_ALPHA'),
+			array('QWERTY', 'PASS_TYPE_ALPHA'),
+			array('123456', 'PASS_TYPE_ALPHA'),
+			array('QwertY', 'PASS_TYPE_ALPHA'),
+			array('qwerty123', 'PASS_TYPE_ALPHA'),
+			array('QWERTY123', 'PASS_TYPE_ALPHA'),
+			array('#$&', 'PASS_TYPE_ALPHA'),
+			array('QTY123$', 'PASS_TYPE_ALPHA'),
+
+			array('qwerty', 'PASS_TYPE_SYMBOL'),
+			array('QWERTY', 'PASS_TYPE_SYMBOL'),
+			array('123456', 'PASS_TYPE_SYMBOL'),
+			array('QwertY', 'PASS_TYPE_SYMBOL'),
+			array('qwerty123', 'PASS_TYPE_SYMBOL'),
+			array('QWERTY123', 'PASS_TYPE_SYMBOL'),
+			array('#$&', 'PASS_TYPE_SYMBOL'),
+			array('qwerty123$', 'PASS_TYPE_SYMBOL'),
+			array('QWERTY123$', 'PASS_TYPE_SYMBOL'),
+		);
+	}
+
+	/**
+	* @dataProvider password_complexity_test_data_positive
+	*/
+	public function test_password_complexity_positive($password, $mode)
+	{
+		global $config;
+		$config['pass_complex'] = $mode;
+		$this->assertFalse(validate_password($password));
+	}
+
+	/**
+	* @dataProvider password_complexity_test_data_negative
+	*/
+	public function test_password_complexity_negative($password, $mode)
+	{
+		global $config;
+		$config['pass_complex'] = $mode;
+		$this->assertEquals('INVALID_CHARS', validate_password($password));
+	}
+}
-- 
cgit v1.2.1


From dba8cf12fd2573edc9722076770140c7b4024f6b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Mar 2011 22:48:44 +0100
Subject: [ticket/9751] Use a switch/case block without break for password
 complexity.

PHPBB3-9751
---
 phpBB/includes/functions_user.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 88e07f729c..c51e571e31 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1643,23 +1643,25 @@ function validate_password($password)
 
 	switch ($config['pass_complex'])
 	{
-		case 'PASS_TYPE_CASE':
-			$chars[] = $low;
-			$chars[] = $upp;
-		break;
+		// No break statements below ...
+		// We require strong passwords in case pass_complex is not set or is invalid
+		default:
 
+		// Require mixed case letters, numbers and symbols
+		case 'PASS_TYPE_SYMBOL':
+			$chars[] = $sym;
+
+		// Require mixed case letters and numbers
 		case 'PASS_TYPE_ALPHA':
-			$chars[] = $low;
-			$chars[] = $upp;
 			$chars[] = $num;
-		break;
 
-		case 'PASS_TYPE_SYMBOL':
+		// Require mixed case letters
+		case 'PASS_TYPE_CASE':
 			$chars[] = $low;
 			$chars[] = $upp;
-			$chars[] = $num;
-			$chars[] = $sym;
-		break;
+
+		// No requirements
+		case 'PASS_TYPE_ANY':
 	}
 
 	if ($pcre)
-- 
cgit v1.2.1


From 7cc32d3843afbb754b3de101bda2267012647c2f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Mar 2011 23:11:15 +0100
Subject: [ticket/9751] Compare $password with empty string instead of casting
 it to bool

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

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index c51e571e31..6ac6317dd2 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1605,7 +1605,7 @@ function validate_password($password)
 {
 	global $config, $db, $user;
 
-	if (!$password)
+	if ($password === '')
 	{
 		return false;
 	}
-- 
cgit v1.2.1


From 4dce53628c97062b1085eb714892f6d81ae07699 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Mar 2011 23:15:40 +0100
Subject: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.

Add shortcut logic for pass_complex because this is the default value phpBB
ships with and there is nothing to do in that function in that case.

PHPBB3-9751
---
 phpBB/includes/functions_user.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6ac6317dd2..89ce52dc39 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1605,8 +1605,9 @@ function validate_password($password)
 {
 	global $config, $db, $user;
 
-	if ($password === '')
+	if ($password === '' || $config['pass_complex'] === 'PASS_TYPE_ANY')
 	{
+		// Password empty or no password complexity required.
 		return false;
 	}
 
@@ -1659,9 +1660,6 @@ function validate_password($password)
 		case 'PASS_TYPE_CASE':
 			$chars[] = $low;
 			$chars[] = $upp;
-
-		// No requirements
-		case 'PASS_TYPE_ANY':
 	}
 
 	if ($pcre)
-- 
cgit v1.2.1


From 646d3e10d2fad2521d7239ed2a2a8fe90e6e7234 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 2 Apr 2011 19:07:13 +0800
Subject: [ticket/10115] Make some text oriented BBCodes to properly handle
 unicode.

[quote], [b], [i], [size], [color], [u], [list] are affected.

PHPBB3-10115
---
 phpBB/includes/message_parser.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index b2d0b6c566..cc687b6fec 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -111,16 +111,16 @@ class bbcode_firstpass extends bbcode
 		// [quote] in second position.
 		$this->bbcodes = array(
 			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#ise' => "\$this->bbcode_code('\$1', '\$2')")),
-			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#ise' => "\$this->bbcode_quote('\$0')")),
+			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
-			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
-			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
+			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
+			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
 			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
-			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
-			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
-			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")),
-			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#ise' => "\$this->bbcode_parse_list('\$0')")),
+			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uise' => "\$this->bbcode_size('\$1', '\$2')")),
+			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uise' => "\$this->bbcode_color('\$1', '\$2')")),
+			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uise' => "\$this->bbcode_underline('\$1')")),
+			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uise' => "\$this->bbcode_parse_list('\$0')")),
 			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")),
 			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')"))
 		);
-- 
cgit v1.2.1


From 25ae46b8df36f040f7f3adc1e4aebb4041d79964 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 3 Apr 2011 00:53:00 +0800
Subject: [ticket/10117] Make smilies to be correctly parsed within unicode
 text.

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

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index b2d0b6c566..7c12321d51 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1332,7 +1332,7 @@ class parse_message extends bbcode_firstpass
 		{
 			if ($max_smilies)
 			{
-				$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#', $this->message, $matches);
+				$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#u', $this->message, $matches);
 				unset($matches);
 
 				if ($num_matches !== false && $num_matches > $max_smilies)
@@ -1343,7 +1343,7 @@ class parse_message extends bbcode_firstpass
 			}
 
 			// Make sure the delimiter # is added in front and at the end of every element within $match
-			$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message));
+			$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#u' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message));
 		}
 	}
 
-- 
cgit v1.2.1


From d1bd5962c75fc87469694ae93829a5800c30c6cc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 3 Apr 2011 01:00:21 +0800
Subject: [ticket/6712] Pass $post_data by the value instead of by the
 reference.

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

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 041b549cd6..ab346afb38 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2614,7 +2614,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 /*
 * Handle topic bumping
 */
-function bump_topic($forum_id, $topic_id, &$post_data, $current_time = false)
+function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
 {
 	global $config, $db, $user, $phpEx, $phpbb_root_path;
 
-- 
cgit v1.2.1


From 6ddb92c41e63e21612efaa0d420f19374786dfc0 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 3 Apr 2011 08:33:33 +0800
Subject: [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes

PHPBB3-10115
---
 phpBB/includes/message_parser.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index cc687b6fec..26532e84c0 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -110,19 +110,19 @@ class bbcode_firstpass extends bbcode
 		// order, so it is important to keep [code] in first position and
 		// [quote] in second position.
 		$this->bbcodes = array(
-			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#ise' => "\$this->bbcode_code('\$1', '\$2')")),
+			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uise' => "\$this->bbcode_code('\$1', '\$2')")),
 			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
-			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
+			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
-			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#uiUe' => "\$this->validate_url('\$2', '\$3')")),
+			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uise' => "\$this->bbcode_size('\$1', '\$2')")),
 			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uise' => "\$this->bbcode_color('\$1', '\$2')")),
 			'u'				=> array('bbcode_id' => 7,	'regexp' => array('#\[u\](.*?)\[/u\]#uise' => "\$this->bbcode_underline('\$1')")),
 			'list'			=> array('bbcode_id' => 9,	'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#uise' => "\$this->bbcode_parse_list('\$0')")),
-			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")),
-			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')"))
+			'email'			=> array('bbcode_id' => 10,	'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#uise' => "\$this->validate_email('\$1', '\$2')")),
+			'flash'			=> array('bbcode_id' => 11,	'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#uie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')"))
 		);
 
 		// Zero the parsed items array
-- 
cgit v1.2.1


From b8adad0d48845540083519651bf9befb6cffaceb Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 3 Apr 2011 15:28:00 +0800
Subject: [ticket/10117] Add one more missed 'u' modifier, add code comment

PHPBB3-10117
---
 phpBB/includes/message_parser.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 7c12321d51..5a7dd9d11e 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1332,6 +1332,8 @@ class parse_message extends bbcode_firstpass
 		{
 			if ($max_smilies)
 			{
+				// 'u' modifier has been added to correctly parse smilies within unicode strings
+				// For details: http://tracker.phpbb.com/browse/PHPBB3-10117
 				$num_matches = preg_match_all('#(?<=^|[\n .])(?:' . implode('|', $match) . ')(?![^<>]*>)#u', $this->message, $matches);
 				unset($matches);
 
@@ -1343,7 +1345,10 @@ class parse_message extends bbcode_firstpass
 			}
 
 			// Make sure the delimiter # is added in front and at the end of every element within $match
-			$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#u' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#'), $replace, $this->message));
+			// 'u' modifier has been added to correctly parse smilies within unicode strings
+			// For details: http://tracker.phpbb.com/browse/PHPBB3-10117
+
+			$this->message = trim(preg_replace(explode(chr(0), '#(?<=^|[\n .])' . implode('(?![^<>]*>)#u' . chr(0) . '#(?<=^|[\n .])', $match) . '(?![^<>]*>)#u'), $replace, $this->message));
 		}
 	}
 
-- 
cgit v1.2.1


From 59d75c1ae6df1546da998a3748a82f14cde604b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Apr 2011 21:12:01 +0200
Subject: [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.

PHPBB3-10121
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 phpBB/memberlist.php                      | 2 +-
 phpBB/viewtopic.php                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index b91636a9c8..d0cfa1ffd2 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -208,7 +208,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
 		'U_WWW'			=> (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
-		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '',
+		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people' . urlencode($user_info['user_icq']) . '/' : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
 		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
 		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 599cd0b3e7..589877305f 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1716,7 +1716,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 		'U_EMAIL'		=> $email,
 		'U_WWW'			=> (!empty($data['user_website'])) ? $data['user_website'] : '',
 		'U_SHORT_WWW'			=> (!empty($data['user_website'])) ? ((strlen($data['user_website']) > 55) ? substr($data['user_website'], 0, 39) . ' ... ' . substr($data['user_website'], -10) : $data['user_website']) : '',
-		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '',
+		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/' . urlencode($data['user_icq']) . '/' : '',
 		'U_AIM'			=> ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
 		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
 		'U_MSN'			=> ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index bc839066a5..80ba4d8a54 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1157,7 +1157,7 @@ while ($row = $db->sql_fetchrow($result))
 
 			if (!empty($row['user_icq']))
 			{
-				$user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/webmsg.php?to=' . $row['user_icq'];
+				$user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/' . $row['user_icq'] . '/';
 				$user_cache[$poster_id]['icq_status_img'] = '<img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&amp;img=5" width="18" height="18" alt="" />';
 			}
 			else
-- 
cgit v1.2.1


From f96cb431a9b47e06f4104dfc3d6ebd613ef0d733 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Apr 2011 22:14:26 +0200
Subject: [ticket/10121] Fix missing urlencode() for ICQ-number in
 viewtopic.php

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

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 80ba4d8a54..53da7f539f 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1157,7 +1157,7 @@ while ($row = $db->sql_fetchrow($result))
 
 			if (!empty($row['user_icq']))
 			{
-				$user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/' . $row['user_icq'] . '/';
+				$user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/' . urlencode($row['user_icq']) . '/';
 				$user_cache[$poster_id]['icq_status_img'] = '<img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&amp;img=5" width="18" height="18" alt="" />';
 			}
 			else
-- 
cgit v1.2.1


From a72fe8acafa85b5a65a40c7661487d8cee7776f5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Apr 2011 14:53:47 +0200
Subject: [ticket/10109] Fix "Undefined Index" errors when copying a topic.

PHPBB3-10109
---
 phpBB/includes/mcp/mcp_main.php | 51 +++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index d5551f5114..ad10a52705 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1048,37 +1048,38 @@ function mcp_fork_topic($topic_ids)
 		$total_posts = 0;
 		$new_topic_id_list = array();
 
-		if ($topic_data['enable_indexing'])
-		{
-			// Select the search method and do some additional checks to ensure it can actually be utilised
-			$search_type = basename($config['search_type']);
 
-			if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+		foreach ($topic_data as $topic_id => $topic_row)
+		{
+			if (!isset($search_type) && $topic_row['enable_indexing'])
 			{
-				trigger_error('NO_SUCH_SEARCH_MODULE');
-			}
+				// Select the search method and do some additional checks to ensure it can actually be utilised
+				$search_type = basename($config['search_type']);
 
-			if (!class_exists($search_type))
-			{
-				include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
-			}
+				if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
+				{
+					trigger_error('NO_SUCH_SEARCH_MODULE');
+				}
+
+				if (!class_exists($search_type))
+				{
+					include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
+				}
 
-			$error = false;
-			$search = new $search_type($error);
-			$search_mode = 'post';
+				$error = false;
+				$search = new $search_type($error);
+				$search_mode = 'post';
 
-			if ($error)
+				if ($error)
+				{
+					trigger_error($error);
+				}
+			}
+			else if (!isset($search_type) && !$topic_row['enable_indexing'])
 			{
-				trigger_error($error);
+				$search_type = false;
 			}
-		}
-		else
-		{
-			$search_type = false;
-		}
 
-		foreach ($topic_data as $topic_id => $topic_row)
-		{
 			$sql_ary = array(
 				'forum_id'					=> (int) $to_forum_id,
 				'icon_id'					=> (int) $topic_row['icon_id'],
@@ -1187,9 +1188,9 @@ function mcp_fork_topic($topic_ids)
 				// Copy whether the topic is dotted
 				markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']);
 
-				if ($search_type)
+				if (!empty($search_type))
 				{
-					$search->index($search_mode, $sql_ary['post_id'], $sql_ary['post_text'], $sql_ary['post_subject'], $sql_ary['poster_id'], ($topic_row['topic_type'] == POST_GLOBAL) ? 0 : $to_forum_id);
+					$search->index($search_mode, $new_post_id, $sql_ary['post_text'], $sql_ary['post_subject'], $sql_ary['poster_id'], ($topic_row['topic_type'] == POST_GLOBAL) ? 0 : $to_forum_id);
 					$search_mode = 'reply'; // After one we index replies
 				}
 
-- 
cgit v1.2.1


From 851bb9fcd869b71140f75ed3a454ade2447c1328 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Apr 2011 20:36:11 +0200
Subject: [ticket/10084] Add smilie/icon errors out when file is missing

PHPBB3-10084
---
 phpBB/includes/acp/acp_icons.php  | 4 ++++
 phpBB/language/en/acp/posting.php | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index 3d64a2acda..24f6cbbcbf 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -394,6 +394,10 @@ class acp_icons
 					{
 						// skip images where add wasn't checked
 					}
+					else if (!file_exists($phpbb_root_path . $img_path . '/' . $image))
+					{
+						$errors[$image] = 'SMILIE_NO_FILE';
+					}
 					else
 					{
 						if ($image_width[$image] == 0 || $image_height[$image] == 0)
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 25152dd766..0fad400ea9 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -168,8 +168,9 @@ $lang = array_merge($lang, array(
 	'SMILIES_CONFIG'			=> 'Smiley configuration',
 	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
 	'SMILIES_EDIT'				=> 'Edit smiley',
-	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
+	'SMILIE_NO_CODE'			=> 'The smilie “%s” was ignored, as there was no code entered.',
 	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
+	'SMILIE_NO_FILE'			=> 'The smilie “%s” was ignored, as the file is missing.',
 	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
 	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
 	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
-- 
cgit v1.2.1


From 5798c8f02e7ac7dd73dbbd7953467926b369023e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 8 Apr 2011 12:30:43 +0200
Subject: [ticket/10123] Change "smilie" to "smiley" as per our coding
 guidelines.

PHPBB3-10123
---
 phpBB/language/en/acp/posting.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 0fad400ea9..9719287c2a 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -168,9 +168,9 @@ $lang = array_merge($lang, array(
 	'SMILIES_CONFIG'			=> 'Smiley configuration',
 	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
 	'SMILIES_EDIT'				=> 'Edit smiley',
-	'SMILIE_NO_CODE'			=> 'The smilie “%s” was ignored, as there was no code entered.',
-	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
-	'SMILIE_NO_FILE'			=> 'The smilie “%s” was ignored, as the file is missing.',
+	'SMILIE_NO_CODE'			=> 'The smiley “%s” was ignored, as there was no code entered.',
+	'SMILIE_NO_EMOTION'			=> 'The smiley “%s” was ignored, as there was no emotion entered.',
+	'SMILIE_NO_FILE'			=> 'The smiley “%s” was ignored, as the file is missing.',
 	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
 	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
 	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
-- 
cgit v1.2.1


From 259929ad4e7e0c527f652e3bff1db48e7533fd08 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 11 Apr 2011 00:29:48 +0200
Subject: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from
 user_ban().

The user_ban() function is shared by the MCP and the ACP.

Mark trigger_error() calls as errors by passing E_USER_WARNING to make the
error message appear on red background (instead of green background) in the
ACP.

PHPBB3-10128
---
 phpBB/includes/functions_user.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 89ce52dc39..6b5cca8abb 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -733,7 +733,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 			}
 			else
 			{
-				trigger_error('LENGTH_BAN_INVALID');
+				trigger_error('LENGTH_BAN_INVALID', E_USER_WARNING);
 			}
 		}
 	}
@@ -793,7 +793,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 			// Make sure we have been given someone to ban
 			if (!sizeof($sql_usernames))
 			{
-				trigger_error('NO_USER_SPECIFIED');
+				trigger_error('NO_USER_SPECIFIED', E_USER_WARNING);
 			}
 
 			$sql = 'SELECT user_id
@@ -824,7 +824,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 			else
 			{
 				$db->sql_freeresult($result);
-				trigger_error('NO_USERS');
+				trigger_error('NO_USERS', E_USER_WARNING);
 			}
 			$db->sql_freeresult($result);
 		break;
@@ -926,7 +926,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 
 				if (empty($banlist_ary))
 				{
-					trigger_error('NO_IPS_DEFINED');
+					trigger_error('NO_IPS_DEFINED', E_USER_WARNING);
 				}
 			}
 		break;
@@ -954,12 +954,12 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 
 			if (sizeof($ban_list) == 0)
 			{
-				trigger_error('NO_EMAILS_DEFINED');
+				trigger_error('NO_EMAILS_DEFINED', E_USER_WARNING);
 			}
 		break;
 
 		default:
-			trigger_error('NO_MODE');
+			trigger_error('NO_MODE', E_USER_WARNING);
 		break;
 	}
 
-- 
cgit v1.2.1


From 682814180c647c363c83ef09c66b2b97bda1eac4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 17 Apr 2011 18:46:03 -0400
Subject: [ticket/7941] Added @return to generate_board_url docstring.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 585e23b2ee..b8ea80ad4a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2253,7 +2253,10 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 
 /**
 * Generate board url (example: http://www.example.com/phpBB)
+*
 * @param bool $without_script_path if set to true the script path gets not appended (example: http://www.example.com)
+*
+* @return string the generated board url
 */
 function generate_board_url($without_script_path = false)
 {
-- 
cgit v1.2.1


From 1d2201902f0f3789daf02ca054f33f4b4bfa3eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 30 Dec 2010 16:03:11 +0100
Subject: [ticket/9961] Create log entries when users are activated.

 * Create log entries when a user activates own account without
   also changing their password.

 * Additionally create admin log entries when an administrator activates
   user accounts.

PHPBB3-9961
---
 phpBB/includes/ucp/ucp_activate.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 8debaabf31..b00c1b9f52 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -98,6 +98,13 @@ class ucp_activate
 				SET user_actkey = ''
 				WHERE user_id = {$user_row['user_id']}";
 			$db->sql_query($sql);
+
+			// Create the correct logs
+			add_log('user', $user_row['user_id'], 'LOG_USER_ACTIVE_USER');
+			if ($auth->acl_get('a_user'))
+			{
+				add_log('admin', 'LOG_USER_ACTIVE', $user_row['username']);
+			}
 		}
 
 		if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
-- 
cgit v1.2.1


From ee6167879ecba11dea945f129c026ce0f3cf7514 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 17 Mar 2011 01:20:44 +0100
Subject: [ticket/9802] Fix redundant str_replace call. No need to replace ' '
 with ' '.

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d803f8d799..9ab53d38ab 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -221,7 +221,7 @@ class session
 		// if the forwarded for header shall be checked we have to validate its contents
 		if ($config['forwarded_for_check'])
 		{
-			$this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->forwarded_for));
+			$this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
 
 			// split the list of IPs
 			$ips = explode(' ', $this->forwarded_for);
@@ -268,7 +268,7 @@ class session
 		// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
 		// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
 		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
-		$this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->ip));
+		$this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->ip));
 
 		// split the list of IPs
 		$ips = explode(' ', $this->ip);
-- 
cgit v1.2.1


From fd805358592162cf05c8808caca0bdf788fb7088 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 17 Mar 2011 01:29:10 +0100
Subject: [ticket/9802] Remove redundant character class definition from
 preg_replace.

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 9ab53d38ab..e1e315035b 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -221,7 +221,7 @@ class session
 		// if the forwarded for header shall be checked we have to validate its contents
 		if ($config['forwarded_for_check'])
 		{
-			$this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
+			$this->forwarded_for = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
 
 			// split the list of IPs
 			$ips = explode(' ', $this->forwarded_for);
@@ -268,7 +268,7 @@ class session
 		// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
 		// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
 		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
-		$this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->ip));
+		$this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));
 
 		// split the list of IPs
 		$ips = explode(' ', $this->ip);
-- 
cgit v1.2.1


From bef2540d9ce3b429837c7e67c5f3f7f254aa1920 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 19 Apr 2011 13:46:00 +0200
Subject: [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.

When $ip is empty() it was assigned to $this->ip.

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index e1e315035b..f2aa47d84e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -271,7 +271,7 @@ class session
 		$this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));
 
 		// split the list of IPs
-		$ips = explode(' ', $this->ip);
+		$ips = explode(' ', trim($this->ip));
 
 		// Default IP if REMOTE_ADDR is invalid
 		$this->ip = '127.0.0.1';
@@ -279,7 +279,7 @@ class session
 		foreach ($ips as $ip)
 		{
 			// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
-			if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
+			if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
 			{
 				// Just break
 				break;
-- 
cgit v1.2.1


From 5ca7121ed2f698963387f5f9fb7ffe16d3781447 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 19 Apr 2011 13:53:09 +0200
Subject: [ticket/9802] Only check for IPv4-mapped address when address is
 IPv6.

PHPBB3-9802
---
 phpBB/includes/session.php | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f2aa47d84e..b2772696f1 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -278,26 +278,31 @@ class session
 
 		foreach ($ips as $ip)
 		{
-			// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
-			if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
+			if (preg_match(get_preg_expression('ipv4'), $ip))
 			{
-				// Just break
-				break;
+				$this->ip = $ip;
 			}
-
-			// Quick check for IPv4-mapped address in IPv6
-			if (stripos($ip, '::ffff:') === 0)
+			else if (preg_match(get_preg_expression('ipv6'), $ip))
 			{
-				$ipv4 = substr($ip, 7);
-
-				if (preg_match(get_preg_expression('ipv4'), $ipv4))
+				// Quick check for IPv4-mapped address in IPv6
+				if (stripos($ip, '::ffff:') === 0)
 				{
-					$ip = $ipv4;
+					$ipv4 = substr($ip, 7);
+
+					if (preg_match(get_preg_expression('ipv4'), $ipv4))
+					{
+						$ip = $ipv4;
+					}
 				}
-			}
 
-			// Use the last in chain
-			$this->ip = $ip;
+				$this->ip = $ip;
+			}
+			else
+			{
+				// We want to use the last valid address in the chain
+				// Leave foreach loop when address is invalid
+				break;
+			}
 		}
 
 		$this->load = false;
-- 
cgit v1.2.1


From d1f1d8ade7ab98bde70451874c94bb35584f9192 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 19 Apr 2011 14:10:23 +0200
Subject: [ticket/9802] Remove unnecessary htmlspecialchars() call on
 REMOTE_ADDR.

The value in $_SERVER['REMOTE_ADDR'] is either validated to be a valid IP
address or is replaced by our default value. Valid IP addresses do not contain
HTML special characters, thus the htmlspecialchars() call is unnecessary.

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index b2772696f1..79d94e7780 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -267,7 +267,7 @@ class session
 
 		// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
 		// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
-		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
+		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? (string) $_SERVER['REMOTE_ADDR'] : '';
 		$this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));
 
 		// split the list of IPs
-- 
cgit v1.2.1


From 11dd4b54fa1f3a15448271061e51907e3ba5c79d Mon Sep 17 00:00:00 2001
From: Bart van Bragt <phpbb@vanbragt.com>
Date: Thu, 21 Apr 2011 04:21:09 -0400
Subject: [ticket/10141] Use a cache in $auth->_fill_acl() for better
 performance.

Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.

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

diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 02819f9e78..22fafd7b7f 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -109,6 +109,7 @@ class auth
 	*/
 	function _fill_acl($user_permissions)
 	{
+		$seq_cache = array();
 		$this->acl = array();
 		$user_permissions = explode("\n", $user_permissions);
 
@@ -125,8 +126,15 @@ class auth
 
 				while ($subseq = substr($seq, $i, 6))
 				{
-					// We put the original bitstring into the acl array
-					$this->acl[$f] .= str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
+					if (isset($seq_cache[$subseq]))
+					{
+						$this->acl[$f] .= $seq_cache[$subseq];
+					}
+					else
+					{
+						// We put the original bitstring into the acl array
+						$this->acl[$f] .= ($seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT));
+					}
 					$i += 6;
 				}
 			}
-- 
cgit v1.2.1


From b1367bce488d0acea00a5ebf8725d0cde5515655 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 22 Apr 2011 00:15:05 +0200
Subject: [ticket/10141] Split double-assignment into conditional and
 unconditional part.

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

diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 22fafd7b7f..4b13c6be7f 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -126,15 +126,13 @@ class auth
 
 				while ($subseq = substr($seq, $i, 6))
 				{
-					if (isset($seq_cache[$subseq]))
+					if (!isset($seq_cache[$subseq]))
 					{
-						$this->acl[$f] .= $seq_cache[$subseq];
-					}
-					else
-					{
-						// We put the original bitstring into the acl array
-						$this->acl[$f] .= ($seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT));
+						$seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
 					}
+
+					// We put the original bitstring into the acl array
+					$this->acl[$f] .= $seq_cache[$subseq];
 					$i += 6;
 				}
 			}
-- 
cgit v1.2.1


From 6ee6245e5b283a0868ed219b145af94a5be090a7 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 22 Apr 2011 00:30:13 +0200
Subject: [ticket/10137] Remove unintended space at end of
 PHP_URL_FOPEN_SUPPORT_EXPLAIN.

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 11c5d78359..37147cc6a0 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -302,7 +302,7 @@ $lang = array_merge($lang, array(
 	'PHP_SETTINGS'					=> 'PHP version and settings',
 	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
-	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
+	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
 	'PHP_VERSION_REQD'				=> 'PHP version >= 4.3.3',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
-- 
cgit v1.2.1


From 78fa3a3b03df4739c80c7bcabab5b64c1b0476ce Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 22 Apr 2011 00:41:55 +0200
Subject: [ticket/10105] Update AIM application download link.

PHPBB3-10105
---
 phpBB/styles/prosilver/template/memberlist_im.html  | 2 +-
 phpBB/styles/subsilver2/template/memberlist_im.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index acc7ec359b..bda235d477 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -39,7 +39,7 @@
 			<dt>&nbsp;</dt>
 			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
 			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
+			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
 		</dl>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index e8d86128c7..f720a1ff86 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -19,7 +19,7 @@
 
 	<!-- IF S_SEND_AIM -->
 		<tr>
-			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com/download.adp">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
+			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">&nbsp;</td>
-- 
cgit v1.2.1


From 8c3cfbb40ea267f02eceef000a324116707530a3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 22 Apr 2011 00:42:49 +0200
Subject: [ticket/10105] Update AIM express link.

PHPBB3-10105
---
 phpBB/styles/prosilver/template/memberlist_im.html  | 2 +-
 phpBB/styles/subsilver2/template/memberlist_im.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index bda235d477..49de3b2596 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -39,7 +39,7 @@
 			<dt>&nbsp;</dt>
 			<dd><a href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a></dd>
 			<dd><a href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a></dd>
-			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a></dd>
+			<dd><a href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a></dd>
 		</dl>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index f720a1ff86..0a92fd2ba0 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -19,7 +19,7 @@
 
 	<!-- IF S_SEND_AIM -->
 		<tr>
-			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://aimexpress.oscar.aol.com/aimexpress/launch.adp?Brand=AIM">{L_IM_AIM_EXPRESS}</a> </td>
+			<td class="row1" colspan="2" align="center"><br /><a class="gen" href="{U_AIM_CONTACT}">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="{U_AIM_MESSAGE}">{L_IM_SEND_MESSAGE}</a><br /><br /><a class="gensmall" href="http://www.aim.com">{L_IM_DOWNLOAD_APP}</a> | <a class="gensmall" href="http://www.aim.com/products/express">{L_IM_AIM_EXPRESS}</a> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">&nbsp;</td>
-- 
cgit v1.2.1


From f49656986cc1898e85d6d7e4cd859ec8e980dc4a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 21 Apr 2011 23:15:51 -0400
Subject: [ticket/10141] Save a hash lookup when value is not in cache.

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

diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 4b13c6be7f..8324cb4977 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -126,13 +126,17 @@ class auth
 
 				while ($subseq = substr($seq, $i, 6))
 				{
-					if (!isset($seq_cache[$subseq]))
+					if (isset($seq_cache[$subseq]))
 					{
-						$seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
+						$converted = $seq_cache[$subseq];
+					}
+					else
+					{
+						$converted = $seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
 					}
 
 					// We put the original bitstring into the acl array
-					$this->acl[$f] .= $seq_cache[$subseq];
+					$this->acl[$f] .= $converted;
 					$i += 6;
 				}
 			}
-- 
cgit v1.2.1


From 9cb6a69861b2ef1ca9a23ffe773ca3be4f9e4461 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 22 Apr 2011 11:01:07 +0200
Subject: [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18,
 0).

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 585e23b2ee..ca5a483536 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -175,7 +175,8 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
 	switch ($db->sql_layer)
 	{
 		case 'firebird':
-			$sql_update = 'CAST(CAST(config_value as DECIMAL(255, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
+			// Precision must be from 1 to 18
+			$sql_update = 'CAST(CAST(config_value as DECIMAL(18, 0)) + ' . (int) $increment . ' as VARCHAR(255))';
 		break;
 
 		case 'postgres':
-- 
cgit v1.2.1


From a8ecd30fe1fbee46a7605c60c95b813fdf26719b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 21 Apr 2011 12:00:04 -0400
Subject: [ticket/10147] Corrected a typo in includes/functions_template.php.

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

diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index 1d3a4d74f8..8636dfe010 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -322,7 +322,7 @@ class template_compile
 		// Is the designer wanting to call another loop in a loop?
 		if (strpos($tag_args, '!') === 0)
 		{
-			// Count the number if ! occurrences (not allowed in vars)
+			// Count the number of ! occurrences (not allowed in vars)
 			$no_nesting = substr_count($tag_args, '!');
 			$tag_args = substr($tag_args, $no_nesting);
 		}
-- 
cgit v1.2.1


From a3a70e13b5a9e8eaef2bbf7dabe64398b5d10455 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 26 Apr 2011 12:33:15 +0200
Subject: [ticket/10145] Always recompile all templates when DEBUG_EXTRA is
 defined.

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

diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 6347633b14..9ac395344f 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -276,7 +276,7 @@ class template
 		$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
 
 		$recompile = false;
-		if (!file_exists($filename) || @filesize($filename) === 0)
+		if (!file_exists($filename) || @filesize($filename) === 0 || defined('DEBUG_EXTRA'))
 		{
 			$recompile = true;
 		}
-- 
cgit v1.2.1


From e6eb11bb1168236cbaba0263d322170dc2c7bdcd Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 00:03:49 -0400
Subject: [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to
 db_tools.

PHPBB3-10003
---
 phpBB/includes/db/db_tools.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f4b181c6ad..f22ddc2ee8 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1371,24 +1371,29 @@ class phpbb_db_tools
 		switch ($this->sql_layer)
 		{
 			case 'firebird':
+				// Does not support AFTER statement, only POSITION (and there you need the column position)
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
 			break;
 
 			case 'mssql':
 			case 'mssqlnative':
+				// Does not support AFTER, only through temporary table
 				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
 			break;
 
 			case 'mysql_40':
 			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
+				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
+				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
 			break;
 
 			case 'oracle':
+				// Does not support AFTER, only through temporary table
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
 			break;
 
 			case 'postgres':
+				// Does not support AFTER, only through temporary table
 				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
 				{
 					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
@@ -2120,4 +2125,4 @@ class phpbb_db_tools
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From 3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 00:34:24 -0400
Subject: [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to
 db_tools.

This change is somewhat questionable, maybe it should be reviewed.

PHPBB3-10003
---
 phpBB/includes/db/db_tools.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f22ddc2ee8..d9ff811e34 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -681,10 +681,12 @@ class phpbb_db_tools
 			{
 				foreach ($columns as $column_name => $column_data)
 				{
-					// Only add the column if it does not exist yet, else change it (to be consistent)
+					// Only add the column if it does not exist yet
 					if ($column_exists = $this->sql_column_exists($table, $column_name))
 					{
-						$result = $this->sql_column_change($table, $column_name, $column_data, true);
+						continue;
+						// This is commented out here because it can take tremendous time on updates
+//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
 					}
 					else
 					{
-- 
cgit v1.2.1


From 9f34aa0b79456f5d2d60f62361f483c76a3f89dd Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 00:39:36 -0400
Subject: [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to
 db_tools.

This diff applied cleanly.

PHPBB3-10003
---
 phpBB/includes/db/db_tools.php | 110 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index d9ff811e34..a793a2f313 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -697,7 +697,8 @@ class phpbb_db_tools
 					{
 						if ($column_exists)
 						{
-							$sqlite_data[$table]['change_columns'][] = $result;
+							continue;
+//							$sqlite_data[$table]['change_columns'][] = $result;
 						}
 						else
 						{
@@ -719,6 +720,11 @@ class phpbb_db_tools
 			{
 				foreach ($indexes as $index_name)
 				{
+					if (!$this->sql_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
 					$result = $this->sql_index_drop($table, $index_name);
 
 					if ($this->return_statements)
@@ -779,6 +785,11 @@ class phpbb_db_tools
 			{
 				foreach ($index_array as $index_name => $column)
 				{
+					if ($this->sql_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
 					$result = $this->sql_create_unique_index($table, $index_name, $column);
 
 					if ($this->return_statements)
@@ -796,6 +807,11 @@ class phpbb_db_tools
 			{
 				foreach ($index_array as $index_name => $column)
 				{
+					if ($this->sql_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
 					$result = $this->sql_create_index($table, $index_name, $column);
 
 					if ($this->return_statements)
@@ -1104,6 +1120,98 @@ class phpbb_db_tools
 		}
 	}
 
+	/**
+	* Check if a specified index exists in table
+	*
+	* @param string	$table_name		Table to check the index at
+	* @param string	$index_name		The index name to check
+	*
+	* @return bool True if index exists, else false
+	*/
+	function sql_index_exists($table_name, $index_name)
+	{
+		if ($this->sql_layer == 'mssql')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if ($row['TYPE'] == 3)
+				{
+					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			return false;
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+					FROM RDB\$INDICES
+					WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . "
+						AND RDB\$UNIQUE_FLAG IS NULL
+						AND RDB\$FOREIGN_KEY IS NULL";
+				$col = 'index_name';
+			break;
+
+			case 'postgres':
+				$sql = "SELECT ic.relname as index_name
+					FROM pg_class bc, pg_class ic, pg_index i
+					WHERE (bc.oid = i.indrelid)
+						AND (ic.oid = i.indexrelid)
+						AND (bc.relname = '" . $table_name . "')
+						AND (i.indisunique != 't')
+						AND (i.indisprimary != 't')";
+				$col = 'index_name';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql = 'SHOW KEYS
+					FROM ' . $table_name;
+				$col = 'Key_name';
+			break;
+
+			case 'oracle':
+				$sql = "SELECT index_name
+					FROM user_indexes
+					WHERE table_name = '" . $table_name . "'
+						AND generated = 'N'";
+			break;
+
+			case 'sqlite':
+				$sql = "PRAGMA index_info('" . $table_name . "');";
+				$col = 'name';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+			{
+				continue;
+			}
+
+			if (strtolower($row[$col]) == strtolower($index_name))
+			{
+				$this->db->sql_freeresult($result);
+				return true;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return false;
+	}
+
 	/**
 	* Private method for performing sql statements (either execute them or return them)
 	* @access private
-- 
cgit v1.2.1


From 761e3dd36f3b42fdaac99ba76f8d214b47983c05 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 01:07:46 -0400
Subject: [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to
 db_tools.

This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.

PHPBB3-10003
---
 phpBB/includes/db/db_tools.php | 143 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 137 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index a793a2f313..f72498af9b 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -785,7 +785,7 @@ class phpbb_db_tools
 			{
 				foreach ($index_array as $index_name => $column)
 				{
-					if ($this->sql_index_exists($table, $index_name))
+					if ($this->sql_unique_index_exists($table, $index_name))
 					{
 						continue;
 					}
@@ -1121,7 +1121,7 @@ class phpbb_db_tools
 	}
 
 	/**
-	* Check if a specified index exists in table
+	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
 	*
 	* @param string	$table_name		Table to check the index at
 	* @param string	$index_name		The index name to check
@@ -1156,7 +1156,7 @@ class phpbb_db_tools
 			case 'firebird':
 				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
 					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . "
+					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
 						AND RDB\$UNIQUE_FLAG IS NULL
 						AND RDB\$FOREIGN_KEY IS NULL";
 				$col = 'index_name';
@@ -1183,12 +1183,14 @@ class phpbb_db_tools
 			case 'oracle':
 				$sql = "SELECT index_name
 					FROM user_indexes
-					WHERE table_name = '" . $table_name . "'
-						AND generated = 'N'";
+					WHERE table_name = '" . strtoupper($table_name) . "'
+						AND generated = 'N'
+						AND uniqueness = 'NONUNIQUE'";
+				$col = 'index_name';
 			break;
 
 			case 'sqlite':
-				$sql = "PRAGMA index_info('" . $table_name . "');";
+				$sql = "PRAGMA index_list('" . $table_name . "');";
 				$col = 'name';
 			break;
 		}
@@ -1201,6 +1203,135 @@ class phpbb_db_tools
 				continue;
 			}
 
+			// These DBMS prefix index name with the table name
+			switch ($this->sql_layer)
+			{
+				case 'firebird':
+				case 'oracle':
+				case 'postgres':
+				case 'sqlite':
+					$row[$col] = substr($row[$col], strlen($table_name) + 1);
+				break;
+			}
+
+			if (strtolower($row[$col]) == strtolower($index_name))
+			{
+				$this->db->sql_freeresult($result);
+				return true;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return false;
+	}
+
+	/**
+	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
+	*
+	* @param string	$table_name		Table to check the index at
+	* @param string	$index_name		The index name to check
+	*
+	* @return bool True if index exists, else false
+	*/
+	function sql_unique_index_exists($table_name, $index_name)
+	{
+		if ($this->sql_layer == 'mssql')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				// Usually NON_UNIQUE is the column we want to check, but we allow for both
+				if ($row['TYPE'] == 3)
+				{
+					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+			}
+			$this->db->sql_freeresult($result);
+			return false;
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+					FROM RDB\$INDICES
+					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
+						AND RDB\$UNIQUE_FLAG IS NOT NULL
+						AND RDB\$FOREIGN_KEY IS NULL";
+				$col = 'index_name';
+			break;
+
+			case 'postgres':
+				$sql = "SELECT ic.relname as index_name, i.indisunique
+					FROM pg_class bc, pg_class ic, pg_index i
+					WHERE (bc.oid = i.indrelid)
+						AND (ic.oid = i.indexrelid)
+						AND (bc.relname = '" . $table_name . "')
+						AND (i.indisprimary != 't')";
+				$col = 'index_name';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql = 'SHOW KEYS
+					FROM ' . $table_name;
+				$col = 'Key_name';
+			break;
+
+			case 'oracle':
+				$sql = "SELECT index_name, table_owner
+					FROM user_indexes
+					WHERE table_name = '" . strtoupper($table_name) . "'
+						AND generated = 'N'
+						AND uniqueness = 'UNIQUE'
+						AND index_name LIKE 'U_%'";
+				$col = 'index_name';
+			break;
+
+			case 'sqlite':
+				$sql = "PRAGMA index_list('" . $table_name . "') WHERE unique = 1;";
+				$col = 'name';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
+			{
+				continue;
+			}
+
+			if ($this->sql_layer == 'sqlite' && !$row['unique'])
+			{
+				continue;
+			}
+
+			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
+			{
+				continue;
+			}
+
+			// These DBMS prefix index name with the table name
+			switch ($this->sql_layer)
+			{
+				case 'oracle':
+					$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
+				break;
+
+				case 'firebird':
+				case 'postgres':
+				case 'sqlite':
+					$row[$col] = substr($row[$col], strlen($table_name) + 1);
+				break;
+			}
+
 			if (strtolower($row[$col]) == strtolower($index_name))
 			{
 				$this->db->sql_freeresult($result);
-- 
cgit v1.2.1


From 55ff5da70b6598218b032725f73de7c4f94a7c89 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 01:25:46 -0400
Subject: [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to
 db_tools.

The diff in database_update was only partially relevant.

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

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f72498af9b..01061c77b1 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1289,13 +1289,12 @@ class phpbb_db_tools
 					FROM user_indexes
 					WHERE table_name = '" . strtoupper($table_name) . "'
 						AND generated = 'N'
-						AND uniqueness = 'UNIQUE'
-						AND index_name LIKE 'U_%'";
+						AND uniqueness = 'UNIQUE'";
 				$col = 'index_name';
 			break;
 
 			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "') WHERE unique = 1;";
+				$sql = "PRAGMA index_list('" . $table_name . "');";
 				$col = 'name';
 			break;
 		}
@@ -1322,7 +1321,15 @@ class phpbb_db_tools
 			switch ($this->sql_layer)
 			{
 				case 'oracle':
-					$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
+					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
+					if (strpos($row[$col], 'U_') === 0)
+					{
+						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
+					}
+					else if (strpos($row[$col], strtoupper($table_name)) === 0)
+					{
+						$row[$col] = substr($row[$col], strlen($table_name) + 1);
+					}
 				break;
 
 				case 'firebird':
@@ -2203,6 +2210,7 @@ class phpbb_db_tools
 				}
 				else
 				{
+					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
 					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
 				}
 			break;
-- 
cgit v1.2.1


From 85549fad8324afc6e9358e98d75b8fdcc5faa416 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 01:46:01 -0400
Subject: [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to
 db_tools.

Most of it was already in db_tools, these changes could have applied to
code that did not exist in db_tools at the time of the commit.

PHPBB3-10003
---
 phpBB/includes/db/db_tools.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 01061c77b1..fd09ccde3f 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1130,7 +1130,7 @@ class phpbb_db_tools
 	*/
 	function sql_index_exists($table_name, $index_name)
 	{
-		if ($this->sql_layer == 'mssql')
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
 		{
 			$sql = "EXEC sp_statistics '$table_name'";
 			$result = $this->db->sql_query($sql);
@@ -1235,7 +1235,7 @@ class phpbb_db_tools
 	*/
 	function sql_unique_index_exists($table_name, $index_name)
 	{
-		if ($this->sql_layer == 'mssql')
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
 		{
 			$sql = "EXEC sp_statistics '$table_name'";
 			$result = $this->db->sql_query($sql);
-- 
cgit v1.2.1


From 1e2c19f4b443692b18a3a167dc464f63b19da47f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 29 Apr 2011 02:16:02 -0400
Subject: [ticket/10003] Delete EOL at EOF for the benefit of 3.0
 modifications.

PHPBB3-10003
---
 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 fd09ccde3f..483ceee043 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2374,4 +2374,4 @@ class phpbb_db_tools
 	}
 }
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From 8155bc5a9dbbe5ad6a9ceb722baf4587db8f3689 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 30 Apr 2011 15:39:19 -0400
Subject: [ticket/10067] Clarify language for user activation options in ACP.

PHPBB3-10067
---
 phpBB/includes/acp/acp_board.php | 10 ++++++++--
 phpBB/language/en/acp/board.php  | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index a5e80e1f6d..8f7d08cc8f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -770,12 +770,18 @@ class acp_board
 		global $user, $config;
 
 		$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
+		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, $key);
 		if ($config['email_enable'])
 		{
-			$radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
+			$radio_ary = array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
+			// With longer labels the four options no longer fit
+			// onto a single line. Separate them onto two lines.
+			// This also requires two h_radio calls to generate HTML.
+			$radio_text .= '<br /><br />';
+			$radio_text .= h_radio('config[require_activation]', $radio_ary, $value, $key);
 		}
 
-		return h_radio('config[require_activation]', $radio_ary, $value, $key);
+		return $radio_text;
 	}
 
 	/**
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5293b835d6..c770497655 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -208,16 +208,16 @@ $lang = array_merge($lang, array(
 	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
 
 	'ACC_ACTIVATION'				=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. "Board-wide e-mail" must be enabled in order to use user or admin activation.',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
 	'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN'	=> 'If set to yes, and a new member post limit is specified, newly registered users will not only be put into the <em>Newly Registered Users</em> group, but this group will also be their default one. This may come in handy if you want to assign a group default rank and/or avatar the user then inherits.',
 
-	'ACC_ADMIN'					=> 'By Admin',
-	'ACC_DISABLE'				=> 'Disable',
-	'ACC_NONE'					=> 'None',
-	'ACC_USER'					=> 'By User',
+	'ACC_ADMIN'					=> 'By admin',
+	'ACC_DISABLE'				=> 'Disable registration',
+	'ACC_NONE'					=> 'No activation (immediate access)',
+	'ACC_USER'					=> 'By user (email verification)',
 //	'ACC_USER_ADMIN'			=> 'User + Admin',
 	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
 	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
-- 
cgit v1.2.1


From 5254ec27959d8a4b2e6af61d0d28080a81ff86b5 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 1 May 2011 13:38:39 +0800
Subject: [ticket/6712] Add phpbb_ function name prefix, more docs, rename
 current_time

PHPBB3-6712
---
 phpBB/includes/functions_posting.php | 31 +++++++++++++++++++++----------
 phpBB/posting.php                    |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ab346afb38..7713c07bc0 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2611,16 +2611,27 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	return $url;
 }
 
-/*
+/**
 * Handle topic bumping
+* @param int $forum_id The ID of the forum the topic is being bumped belongs to
+* @param int $topic_id The ID of the topic is being bumping
+* @param array $post_data Passes some topic parameters:
+*				- 'topic_title'
+*				- 'topic_last_post_id'
+*				- 'topic_last_poster_id'
+*				- 'topic_last_post_subject'
+*				- 'topic_last_poster_name'
+*				- 'topic_last_poster_colour'
+* @param int $bump_time The time at which topic was bumped, usually it is a current time as obtained via time(). 
+* @return string An URL to the bumped topic, example: ./viewtopic.php?forum_id=1&amptopic_id=2&ampp=3#p3
 */
-function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
+function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false)
 {
 	global $config, $db, $user, $phpEx, $phpbb_root_path;
 
-	if ($current_time === false)
+	if ($bump_time === false)
 	{
-		$current_time = time();
+		$bump_time = time();
 	}
 
 	// Begin bumping
@@ -2628,14 +2639,14 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
 
 	// Update the topic's last post post_time
 	$sql = 'UPDATE ' . POSTS_TABLE . "
-		SET post_time = $current_time
+		SET post_time = $bump_time
 		WHERE post_id = {$post_data['topic_last_post_id']}
 			AND topic_id = $topic_id";
 	$db->sql_query($sql);
 
 	// Sync the topic's last post time, the rest of the topic's last post data isn't changed
 	$sql = 'UPDATE ' . TOPICS_TABLE . "
-		SET topic_last_post_time = $current_time,
+		SET topic_last_post_time = $bump_time,
 			topic_bumped = 1,
 			topic_bumper = " . $user->data['user_id'] . "
 		WHERE topic_id = $topic_id";
@@ -2646,7 +2657,7 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
 		SET forum_last_post_id = " . $post_data['topic_last_post_id'] . ",
 			forum_last_poster_id = " . $post_data['topic_last_poster_id'] . ",
 			forum_last_post_subject = '" . $db->sql_escape($post_data['topic_last_post_subject']) . "',
-			forum_last_post_time = $current_time,
+			forum_last_post_time = $bump_time,
 			forum_last_poster_name = '" . $db->sql_escape($post_data['topic_last_poster_name']) . "',
 			forum_last_poster_colour = '" . $db->sql_escape($post_data['topic_last_poster_colour']) . "'
 		WHERE forum_id = $forum_id";
@@ -2654,17 +2665,17 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
 
 	// Update bumper's time of the last posting to prevent flood
 	$sql = 'UPDATE ' . USERS_TABLE . "
-		SET user_lastpost_time = $current_time
+		SET user_lastpost_time = $bump_time
 		WHERE user_id = " . $user->data['user_id'];
 	$db->sql_query($sql);
 
 	$db->sql_transaction('commit');
 
 	// Mark this topic as posted to
-	markread('post', $forum_id, $topic_id, $current_time);
+	markread('post', $forum_id, $topic_id, $bump_time);
 
 	// Mark this topic as read
-	markread('topic', $forum_id, $topic_id, $current_time);
+	markread('topic', $forum_id, $topic_id, $bump_time);
 
 	// Update forum tracking info
 	if ($config['load_db_lastread'] && $user->data['is_registered'])
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 89f2dfa2a6..5860219c45 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -321,7 +321,7 @@ if ($mode == 'bump')
 	if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
 	   && check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
 	{
-		$meta_url = bump_topic($forum_id, $topic_id, $post_data, $current_time);
+		$meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time);
 		meta_refresh(3, $meta_url);
 
 		$message = $user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
-- 
cgit v1.2.1


From c651948cb3effbd2960062114f4b93d6507a2fe8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 2 May 2011 23:54:35 -0400
Subject: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.

PHPBB3-9630
---
 phpBB/language/en/common.php                    | 2 +-
 phpBB/language/en/mcp.php                       | 5 ++---
 phpBB/styles/prosilver/template/mcp_topic.html  | 2 +-
 phpBB/styles/subsilver2/template/mcp_topic.html | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 731f674120..da0088a2ec 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -329,7 +329,7 @@ $lang = array_merge($lang, array(
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE'					=> 'Merge',
-	'MERGE_POSTS'			=> 'Merge posts',
+	'MERGE_POSTS'			=> 'Move posts',
 	'MERGE_TOPIC'			=> 'Merge topic',
 	'MESSAGE'				=> 'Message',
 	'MESSAGES'				=> 'Messages',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index fc1b8c8f62..d0bcec0d9c 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -209,9 +209,8 @@ $lang = array_merge($lang, array(
 	'MCP_WARN_POST'			=> 'Warn for specific post',
 	'MCP_WARN_USER'			=> 'Warn user',
 
-	'MERGE_POSTS'			=> 'Merge posts',
-	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
-	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
+	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to move the selected posts?',
+	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can move selected posts into another topic. The posts will be split from this topic and merged into the other topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
 	'MERGE_TOPIC_ID'		=> 'Destination topic identification number',
 	'MERGE_TOPICS'			=> 'Merge topics',
 	'MERGE_TOPICS_CONFIRM'	=> 'Are you sure you want to merge the selected topics?',
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index db36ebf5ac..a4d2a0f600 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -31,7 +31,7 @@ onload_functions.push('subPanels()');
 		</li>
 		<li id="merge-panel-tab"<!-- IF S_MERGE_VIEW --> class="activetab"<!-- ENDIF -->>
 			<span class="corners-top"><span></span></span>
-			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_TOPIC}</span></a>
+			<a href="#minitabs" onclick="subPanels('merge-panel'); return false;"><span>{L_MERGE_POSTS}</span></a>
 		</li>
 	</ul>
 </div>
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 12c0f73b97..13865d26ee 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -35,7 +35,7 @@
 
 <!-- IF S_CAN_MERGE -->
 	<tr>
-		<th colspan="3" nowrap="nowrap">{L_MERGE_TOPIC}</th>
+		<th colspan="3" nowrap="nowrap">{L_MERGE_POSTS}</th>
 	</tr>
 	<tr>
 		<td class="row2" colspan="3" align="center"><span class="gensmall">{L_MERGE_TOPIC_EXPLAIN}</span></td>
-- 
cgit v1.2.1


From 65d956bd81fad62d7bc2f489ea8d3d930e666049 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 5 May 2011 10:49:54 +0200
Subject: [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.

PHPBB3-10158
---
 phpBB/includes/ucp/ucp_pm_compose.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index b596e72c41..d7fe0af361 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -741,10 +741,13 @@ function compose_pm($id, $mode, $action)
 			$msg_id = submit_pm($action, $subject, $pm_data);
 
 			$return_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=view&amp;p=' . $msg_id);
-			$return_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=outbox');
+			$return_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox');
+			$outbox_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=outbox');
 			meta_refresh(3, $return_message_url);
 
-			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>');
+			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
+			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
 			trigger_error($message);
 		}
 
-- 
cgit v1.2.1


From 0d234cabf4193a93dff3a19eda45879608e24f89 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 5 May 2011 11:24:39 +0200
Subject: [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.

PHPBB3-10171
---
 phpBB/styles/prosilver/theme/cp.css | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 1e0edc616f..b574b0ae1f 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -393,13 +393,11 @@ ol.def-rules li {
 
 /* PM marking colours */
 .pmlist li.bg1 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
+	padding: 0 3px;
 }
 
 .pmlist li.bg2 {
-	border: solid 3px transparent;
-	border-width: 0 3px;
+	padding: 0 3px;
 }
 
 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour {
@@ -408,21 +406,25 @@ ol.def-rules li {
 }
 
 .pmlist li.pm_marked_colour, .pm_marked_colour {
+	padding: 0;
 	border: solid 3px #ffffff;
 	border-width: 0 3px;
 }
 
 .pmlist li.pm_replied_colour, .pm_replied_colour {
+	padding: 0;
 	border: solid 3px #c2c2c2;
-	border-width: 0 3px;	
+	border-width: 0 3px;
 }
 
 .pmlist li.pm_friend_colour, .pm_friend_colour {
+	padding: 0;
 	border: solid 3px #bdbdbd;
 	border-width: 0 3px;
 }
 
 .pmlist li.pm_foe_colour, .pm_foe_colour {
+	padding: 0;
 	border: solid 3px #000000;
 	border-width: 0 3px;
 }
-- 
cgit v1.2.1


From 963a67332af12af31d231baf315fdd29d30149cb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 7 Mar 2011 02:05:37 +0100
Subject: [ticket/9922] Link post subject to the post's anchor in subsilver2.

Link post subject to the post's anchor in subsilver2 to expose full URL to post
which is otherwise only hidden behind the small post icon.

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

diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index bba00ce685..630871af61 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -150,7 +150,7 @@
 				<!-- IF postrow.POST_ICON_IMG -->
 					<td><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" title="" /></td>
 				<!-- ENDIF -->
-					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> {postrow.POST_SUBJECT}</div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
+					<td class="gensmall" width="100%"><div style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<b>{L_POST_SUBJECT}:</b> <a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></div><div style="float: {S_CONTENT_FLOW_END};"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><b>{L_POSTED}:</b> {postrow.POST_DATE}&nbsp;</div></td>
 				</tr>
 				</table>
 			</td>
-- 
cgit v1.2.1


From 129f70bf9519a609d37d1e1ef797fd7d7e6bba82 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 7 May 2011 22:30:23 -0400
Subject: [ticket/10177] Add `-f -` to tar command to build packages with
 bsdtar.

PHPBB3-10177
---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index 268f09d674..8fb34377a9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -133,7 +133,7 @@
 	-->
 	<target name="export">
 		<exec dir="phpBB"
-			command="git archive ${revision} | tar -x -C ../${dir}"
+			command="git archive ${revision} | tar -xf - -C ../${dir}"
 			checkreturn="true" />
 		<delete file="${dir}/config.php" />
 		<delete dir="${dir}/develop" />
-- 
cgit v1.2.1


From d987c0a118940c2fb1cffbf54155596ec4f41c9c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 7 May 2011 22:30:53 -0400
Subject: [ticket/10178] Add path to find command to build packages on FreeBSD.

PHPBB3-10178
---
 build/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 268f09d674..25935106d7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -141,8 +141,8 @@
 
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
-		<exec dir="${dir}" command="find -type f|xargs chmod 644" escape="false" />
-		<exec dir="${dir}" command="find -type d|xargs chmod 755" escape="false" />
+		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
+		<exec dir="${dir}" command="find . -type d|xargs chmod 755" escape="false" />
 		<!-- set permissions of some directories to 777 -->
 		<chmod mode="0777" file="${dir}/cache" />
 		<chmod mode="0777" file="${dir}/store" />
-- 
cgit v1.2.1


From 437013194a516932b6f85ba4ee355dcf5836ef19 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 9 May 2011 12:46:34 +0200
Subject: [ticket/10158] Add return-link to folder, when the user replied from
 a folder.

PHPBB3-10158
---
 phpBB/includes/ucp/ucp_pm.php         |  4 ++--
 phpBB/includes/ucp/ucp_pm_compose.php | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index e1c51170db..c675928a5b 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -115,7 +115,7 @@ class ucp_pm
 			case 'compose':
 				$action = request_var('action', 'post');
 
-				get_folder($user->data['user_id']);
+				$user_folders = get_folder($user->data['user_id']);
 
 				if (!$auth->acl_get('u_sendpm'))
 				{
@@ -130,7 +130,7 @@ class ucp_pm
 				}
 
 				include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx);
-				compose_pm($id, $mode, $action);
+				compose_pm($id, $mode, $action, $user_folders);
 
 				$tpl_file = 'posting_body';
 			break;
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d7fe0af361..6ea702570e 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * Compose private message
 * Called from ucp_pm with mode == 'compose'
 */
-function compose_pm($id, $mode, $action)
+function compose_pm($id, $mode, $action, $user_folders = array())
 {
 	global $template, $db, $auth, $user;
 	global $phpbb_root_path, $phpEx, $config;
@@ -398,7 +398,7 @@ function compose_pm($id, $mode, $action)
 	unset($message_text);
 
 	$s_action = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=$mode&amp;action=$action", true, $user->session_id);
-	$s_action .= ($msg_id) ? "&amp;p=$msg_id" : '';
+	$s_action .= (($folder_id) ? "&amp;f=$folder_id" : '') . (($msg_id) ? "&amp;p=$msg_id" : '');
 
 	// Delete triggered ?
 	if ($action == 'delete')
@@ -741,13 +741,23 @@ function compose_pm($id, $mode, $action)
 			$msg_id = submit_pm($action, $subject, $pm_data);
 
 			$return_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=view&amp;p=' . $msg_id);
-			$return_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox');
+			$inbox_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox');
 			$outbox_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=outbox');
-			meta_refresh(3, $return_message_url);
+
+			$folder_return_message = '';
+			$return_message_url = $inbox_folder_url;
+			if ($folder_id && isset($user_folders[$folder_id]))
+			{
+				$return_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $folder_id);
+				$folder_return_message = '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_message_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+			}
 
 			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>');
-			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
+			$message .= $folder_return_message;
+			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
 			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+
+			meta_refresh(3, $return_message_url);
 			trigger_error($message);
 		}
 
-- 
cgit v1.2.1


From 2d35e6044300293916f26df4495af542b24c63a8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 9 May 2011 22:53:08 +0200
Subject: [ticket/10154] Move "copy permissions from" to below "parent" on
 forum creation

Move "copy permissions from" to below "parent forum" in forum creation form.

PHPBB3-10154
---
 phpBB/adm/style/acp_forums.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d27cea28f7..9201736085 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -140,6 +140,12 @@
 		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
 		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
 	</dl>
+	<!-- IF S_CAN_COPY_PERMISSIONS -->
+		<dl>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
 		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
@@ -176,12 +182,6 @@
 		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
-	<!-- IF S_CAN_COPY_PERMISSIONS -->
-		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
-			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
-		</dl>
-	<!-- ENDIF -->
 	</fieldset>
 
 	<div id="forum_cat_options">
-- 
cgit v1.2.1


From 4038091382fb9d5e429c1eaee79413f077a54d2d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 9 May 2011 23:11:56 +0200
Subject: [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.

L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.

Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.

PHPBB3-9999
---
 phpBB/includes/functions_display.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index acaef49fe8..d7422aa2c9 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -477,7 +477,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'SUBFORUMS'				=> $s_subforums_list,
 
 			'L_SUBFORUM_STR'		=> $l_subforums,
-			'L_FORUM_FOLDER_ALT'	=> $folder_alt,
 			'L_MODERATOR_STR'		=> $l_moderator,
 
 			'U_UNAPPROVED_TOPICS'	=> ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=unapproved_topics&amp;f=' . $row['forum_id_unapproved_topics']) : '',
-- 
cgit v1.2.1


From ccb78f74a4e3e86cefa2e36b64ca0e55451b7416 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 9 May 2011 23:20:17 +0200
Subject: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to
 common.

PHPBB3-9999
---
 phpBB/language/en/common.php     | 1 +
 phpBB/language/en/memberlist.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 731f674120..e74c9ea0e4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -530,6 +530,7 @@ $lang = array_merge($lang, array(
 	'SEARCH_TOPIC'				=> 'Search this topic…',
 	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
 	'SEARCH_UNREAD'				=> 'View unread posts',
+	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
 	'SELECT'					=> 'Select',
 	'SELECT_ALL_CODE'			=> 'Select all',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 213f766610..e71f9d6565 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -116,7 +116,6 @@ $lang = array_merge($lang, array(
 	'REMOVE_FOE'			=> 'Remove foe',
 	'REMOVE_FRIEND'			=> 'Remove friend',
 
-	'SEARCH_USER_POSTS'		=> 'Search user’s posts',
 	'SELECT_MARKED'			=> 'Select marked',
 	'SELECT_SORT_METHOD'	=> 'Select sort method',
 	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
-- 
cgit v1.2.1


From ca981b6d1819560f7722773796ac33407f18cde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 10 May 2011 23:31:41 +0200
Subject: [ticket/10170] reCaptcha API has been moved.

The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.

PHPBB3-10170
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index ea171dbe2c..f3bc1a859f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -27,9 +27,9 @@ if (!class_exists('phpbb_default_captcha'))
 */
 class phpbb_recaptcha extends phpbb_default_captcha
 {
-	var $recaptcha_server = 'http://api.recaptcha.net';
-	var $recaptcha_server_secure = 'https://api-secure.recaptcha.net'; // class constants :(
-	var $recaptcha_verify_server = 'api-verify.recaptcha.net';
+	var $recaptcha_server = 'http://www.google.com/recaptcha/api';
+	var $recaptcha_server_secure = 'https://www.google.com/recaptcha/api'; // class constants :(
+	var $recaptcha_verify_server = 'http://www.google.com/recaptcha/api/verify';
 	var $challenge;
 	var $response;
 
-- 
cgit v1.2.1


From 46fcf9c8e4d1c3c867b7013a25f915af2b531d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 10 May 2011 23:34:38 +0200
Subject: [ticket/10170] Update language entries

Update the language entries to reflect the reCaptcha
API change.

PHPBB3-10170
---
 phpBB/language/en/captcha_recaptcha.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index 463bfffe0d..fd7e3853b7 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -37,14 +37,14 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'RECAPTCHA_LANG'				=> 'en',
-	'RECAPTCHA_NOT_AVAILABLE'		=> 'In order to use reCaptcha, you must create an account on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'RECAPTCHA_NOT_AVAILABLE'		=> 'In order to use reCaptcha, you must create an account on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
 	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
 	'RECAPTCHA_INCORRECT'			=> 'The visual confirmation code you submitted was incorrect',
 
 	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
-	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
 	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
-	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
 
 	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
 ));
-- 
cgit v1.2.1


From 2c0c8a580f23225d6757ba49c70c01b29447fb0a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:14:14 +0200
Subject: [ticket/10170] Include www in hostname in language strings.

PHPBB3-10170
---
 phpBB/language/en/captcha_recaptcha.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index fd7e3853b7..9b2fb2049d 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -37,14 +37,14 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'RECAPTCHA_LANG'				=> 'en',
-	'RECAPTCHA_NOT_AVAILABLE'		=> 'In order to use reCaptcha, you must create an account on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
+	'RECAPTCHA_NOT_AVAILABLE'		=> 'In order to use reCaptcha, you must create an account on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
 	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
 	'RECAPTCHA_INCORRECT'			=> 'The visual confirmation code you submitted was incorrect',
 
 	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
-	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
+	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
 	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
-	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">google.com/recaptcha</a>.',
+	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
 
 	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
 ));
-- 
cgit v1.2.1


From eded608a53b3882a7a42bddf6b1c9f479c2b0304 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:23:31 +0200
Subject: [ticket/10170] Fix broken recaptcha verification host.

PHPBB3-10170
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index f3bc1a859f..0b0270f568 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -29,7 +29,12 @@ class phpbb_recaptcha extends phpbb_default_captcha
 {
 	var $recaptcha_server = 'http://www.google.com/recaptcha/api';
 	var $recaptcha_server_secure = 'https://www.google.com/recaptcha/api'; // class constants :(
-	var $recaptcha_verify_server = 'http://www.google.com/recaptcha/api/verify';
+
+	// We are opening a socket to port 80 of this host and send
+	// the POST request asking for verification to the path specified here.
+	var $recaptcha_verify_server = 'www.google.com';
+	var $recaptcha_verify_path = '/recaptcha/api/verify';
+
 	var $challenge;
 	var $response;
 
@@ -296,7 +301,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			return $user->lang['RECAPTCHA_INCORRECT'];
 		}
 
-		$response = $this->_recaptcha_http_post($this->recaptcha_verify_server, '/verify',
+		$response = $this->_recaptcha_http_post($this->recaptcha_verify_server, $this->recaptcha_verify_path,
 			array(
 				'privatekey'	=> $config['recaptcha_privkey'],
 				'remoteip'		=> $user->ip,
-- 
cgit v1.2.1


From 5a4a1e3c25b0e10a3ce008dc2eded29decb0f469 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:51:34 +0200
Subject: [ticket/10126] Use binary "and not" instead of binary "xor" in
 error_reporting.

Make what we want to achieve clear by using "and not" instead of "xor".

PHPBB3-10126
---
 phpBB/common.php                  | 2 +-
 phpBB/download/file.php           | 2 +-
 phpBB/install/database_update.php | 2 +-
 phpBB/install/index.php           | 2 +-
 phpBB/style.php                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/common.php b/phpBB/common.php
index ae174c8441..ceafdbd3bd 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -24,7 +24,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 /*
 * Remove variables created by register_globals from the global scope
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index e1ec835b9b..ed5c4f55b8 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -35,7 +35,7 @@ if (isset($_GET['avatar']))
 	{
 		define('E_DEPRECATED', 8192);
 	}
-	error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+	error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 	require($phpbb_root_path . 'config.' . $phpEx);
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 01048520d2..3d32a82cc6 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -35,7 +35,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-//error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+//error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 error_reporting(E_ALL);
 
 @set_time_limit(0);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 49c99da0d7..bace22f177 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -23,7 +23,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 // @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it
 if (version_compare(PHP_VERSION, '4.3.3') < 0)
diff --git a/phpBB/style.php b/phpBB/style.php
index 8ca1751391..f3e1b4c89e 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -20,7 +20,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 require($phpbb_root_path . 'config.' . $phpEx);
 
-- 
cgit v1.2.1


From f6fa52540c0fb20d79b4d59cb08c49484d9f3116 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Thu, 12 May 2011 09:45:09 -0400
Subject: [ticket/10186] UCP signature panel displays when not authed for
 signatures

The signature panel link was displayed even when a user did not have the
auths to create/edit their signature. Clicking on the link gave a
trigger_error of "Not authorised to have a signature". Hide the link
when user does not have permissions to edit their signature.

PHPBB3-10186
---
 phpBB/ucp.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index f5a2ec9648..8fa022668b 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -314,6 +314,12 @@ if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
 	$module->set_display('main', 'subscribed', false);
 }
 
+// Do not display signature panel if not authed to do so
+if (!$auth->acl_get('u_sig'))
+{
+	$module->set_display('profile', 'signature', false);
+}
+
 // Select the active module
 $module->set_active($id, $mode);
 
-- 
cgit v1.2.1


From 94c28efe079c0c06cdc6ebacb49cfa4dd98d09c0 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 1 Mar 2011 21:19:38 -0500
Subject: [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.

PHPBB3-10039
---
 phpBB/install/convertors/functions_phpbb20.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 78224dd5da..466f57a572 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -94,6 +94,7 @@ function phpbb_insert_forums()
 	{
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON');
 		break;
 	}
@@ -291,6 +292,7 @@ function phpbb_insert_forums()
 
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF');
 		break;
 
@@ -1727,6 +1729,7 @@ function phpbb_create_userconv_table()
 
 		case 'mssql':
 		case 'mssql_odbc':
+		case 'mssqlnative':
 			$map_dbms = 'mssql';
 		break;
 
-- 
cgit v1.2.1


From 9b62500a1068fd9c17409e435b53a33bb1cf6838 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 22 May 2011 06:48:59 -0400
Subject: [ticket/10188] Use ob_get_level in msg_handler for output buffering
 check.

Output buffering may be enabled via various approaches, among them:

 * output_buffering in php.ini;
 * output_handler in php.ini enables output_buffering;
 * ob_start call.

ob_get_level allows us to query php runtime for the actual output buffering
status.

PHPBB3-10188
---
 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 ceaf426850..9f1d39118a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3743,7 +3743,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 			{
 				// flush the content, else we get a white page if output buffering is on
-				if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on')
+				if (ob_get_level() > 0)
 				{
 					@ob_flush();
 				}
-- 
cgit v1.2.1


From 44cc8153cdfedda1d0733655bc13e5e9beac3431 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 22 May 2011 07:16:40 -0400
Subject: [ticket/10191] Use ob_get_level in exit_handler for output buffering
 check.

Calling flush() when output buffering is enabled causes output to be
duplicated. Besides phpBB enabling output buffering for gzip compression,
output buffering may be enabled externally to phpBB via output_handler
or output_buffering directives in php.ini.

Use ob_get_level to determine whether output buffering is active and
call ob_flush in that case.

PHPBB3-10191
---
 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 ceaf426850..22373f6d63 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4719,7 +4719,7 @@ function exit_handler()
 	}
 
 	// As a pre-caution... some setups display a blank page if the flush() is not there.
-	(empty($config['gzip_compress'])) ? @flush() : @ob_flush();
+	(ob_get_level() > 0) ? @ob_flush() : @flush();
 
 	exit;
 }
-- 
cgit v1.2.1


From b5e5ed003346b50ac60b40827498bf974e255f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Mon, 23 May 2011 11:00:58 +0200
Subject: [ticket/10192] Add missing semicolon

if the index has to be recreated it will run into the private message
table query.

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

diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 70c8173a32..dec8f8c210 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -253,7 +253,7 @@ foreach ($schema_data as $table_name => $table_data)
 	// Do we now need to re-add the fulltext index? ;)
 	if ($table_name == ($prefix . 'posts') && $drop_index)
 	{
-		echo "ALTER TABLE $table_name ADD FULLTEXT (post_subject), ADD FULLTEXT (post_text), ADD FULLTEXT post_content (post_subject, post_text){$newline}";
+		echo "ALTER TABLE $table_name ADD FULLTEXT (post_subject), ADD FULLTEXT (post_text), ADD FULLTEXT post_content (post_subject, post_text);{$newline}";
 	}
 }
 
-- 
cgit v1.2.1


From 67449f8f1b1b9eff8430a77d16d6ee2dac1210d9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 23 May 2011 12:01:11 +0200
Subject: [ticket/10158] Only view "Return to" links if they are useful.

PHPBB3-10158
---
 phpBB/includes/ucp/ucp_pm_compose.php | 42 ++++++++++++++++++++++++++++-------
 phpBB/language/en/ucp.php             |  1 +
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 6ea702570e..78b2e7a348 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -135,6 +135,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	}
 
 	$sql = '';
+	$folder_id = 0;
 
 	// What is all this following SQL for? Well, we need to know
 	// some basic information in all cases before we do anything.
@@ -744,18 +745,43 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 			$inbox_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox');
 			$outbox_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=outbox');
 
-			$folder_return_message = '';
-			$return_message_url = $inbox_folder_url;
-			if ($folder_id && isset($user_folders[$folder_id]))
+			$folder_url = '';
+			if (($folder_id > 0) && isset($user_folders[$folder_id]))
 			{
-				$return_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $folder_id);
-				$folder_return_message = '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_message_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+				$folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $folder_id);
 			}
 
 			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>');
-			$message .= $folder_return_message;
-			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
-			$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+			switch ($action)
+			{
+				case 'post':
+				case 'edit':
+					if ($folder_url)
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_GOTO_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+					}
+					else
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+					}
+				break;
+
+				case 'quote':
+				case 'quotepost':
+				case 'reply':
+				case 'forward':
+					if ($folder_url)
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_GOTO_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
+					}
+					else
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
+					}
+				break;
+			}
 
 			meta_refresh(3, $return_message_url);
 			trigger_error($message);
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 02b8a282d9..ad7c1ccbff 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -119,6 +119,7 @@ $lang = array_merge($lang, array(
 	'CANNOT_REMOVE_FOLDER'		=> 'This folder cannot be removed.',
 	'CHANGE_DEFAULT_GROUP'		=> 'Change default group',
 	'CHANGE_PASSWORD'			=> 'Change password',
+	'CLICK_GOTO_FOLDER'			=> '%1$sGo to your “%3$s” folder%2$s',
 	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
 	'CONFIRMATION'				=> 'Confirmation of registration',
 	'CONFIRM_CHANGES'			=> 'Confirm changes',
-- 
cgit v1.2.1


From 83dfe0d22c71df8e5701c812d304ef8918c3190f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 26 May 2011 10:43:14 +0200
Subject: [ticket/10195] Return false in session::check_dnsbl() when IPv6 is
 passed.

There is no support for IPv6 addresses in the blacklists we check right now.

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d803f8d799..2181375dc1 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1238,6 +1238,12 @@ class session
 			$ip = $this->ip;
 		}
 
+		// Neither Spamhaus nor Spamcop supports IPv6 addresses.
+		if (strpos($ip, ':') !== false)
+		{
+			return false;
+		}
+
 		$dnsbl_check = array(
 			'sbl.spamhaus.org'	=> 'http://www.spamhaus.org/query/bl?ip=',
 		);
-- 
cgit v1.2.1


From ebe83769e6efff249f94e5337dcd8fd16593a290 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 01:45:12 +0200
Subject: [ticket/9685] Consistently name the new
 sql_buffer_nested_transactions function

PHPBB3-9685
---
 phpBB/includes/db/dbal.php        | 2 +-
 phpBB/includes/db/mssqlnative.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index d7860fc8bc..2f9619c8ea 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -246,7 +246,7 @@ class dbal
 	*
 	* @return bool Whether buffering is required.
 	*/
-	function sql_buffer_nested_transaction()
+	function sql_buffer_nested_transactions()
 	{
 		return false;
 	}
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index e057e7fe74..6810562d17 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -261,7 +261,7 @@ class dbal_mssqlnative extends dbal
 	/**
 	* {@inheritDoc}
 	*/
-	function sql_buffer_nested_transaction()
+	function sql_buffer_nested_transactions()
 	{
 		return true;
 	}
-- 
cgit v1.2.1


From f0287f7e57919619e7b8085a7e7071975e18da93 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 06:09:21 +0200
Subject: [ticket/9685] Test for databases that are able to nest transactions

If a database is unable to nest transactions the dbal should implement
sql_buffer_nested_transactions to signal that buffering of the outer
results and closing of the outer transaction is required to open the
inner transaction.

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

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 533416f14b..e0d08d9306 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -8,6 +8,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
@@ -317,4 +318,27 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		$db->sql_freeresult($result);
 	}
+
+	function test_nested_transactions()
+	{
+		$db = $this->new_dbal();
+
+		// nested transactions should work on systems that do not require
+		// buffering of nested transactions, so ignore the ones that need
+		// buffering
+		if ($db->sql_buffer_nested_transactions())
+		{
+			return;
+		}
+
+		$sql = 'SELECT user_id FROM phpbb_users ORDER BY user_id ASC';
+		$result1 = $db->sql_query($sql);
+
+		$db->sql_transaction('begin');
+		$result2 = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result2);
+		$db->sql_transaction('commit');
+
+		$this->assertEquals('1', $row['user_id']);
+	}
 }
-- 
cgit v1.2.1


From 324c913ac9eb3ce158d1c735ee49b62a06d8327b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 06:24:28 +0200
Subject: [ticket/9950] Use actual language instead of user's language in
 overall header

PHPBB3-9950
---
 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 791aa09010..2d9d2c225f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4529,7 +4529,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'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->data['user_lang'],
+		'T_IMAGESET_LANG_PATH'	=> "{$web_path}styles/" . $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']}/",
@@ -4537,7 +4537,7 @@ 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->data['user_lang']),
+		'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_NAME'		=> $user->theme['theme_name'],
 
 		'T_THEME_NAME'			=> $user->theme['theme_path'],
-- 
cgit v1.2.1


From 7b10f859decdb5d97ffe97e647db52f29f4661f8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 08:45:48 +0200
Subject: [ticket/10005] Add validation of dropdown custom profile field values

PHPBB3-10005
---
 phpBB/includes/functions_profile_fields.php | 14 +++++++-
 phpBB/language/en/ucp.php                   |  1 +
 tests/profile/custom_test.php               | 52 +++++++++++++++++++++++++++++
 tests/profile/fixtures/profile_fields.xml   | 31 +++++++++++++++++
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 tests/profile/custom_test.php
 create mode 100644 tests/profile/fixtures/profile_fields.xml

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 78fe049f40..1eae2a9ad6 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -149,7 +149,18 @@ class custom_profile
 
 			case FIELD_DROPDOWN:
 				$field_value = (int) $field_value;
-			
+
+				// retrieve option lang data if necessary
+				if (!isset($this->options_lang[$field_data['field_id']]) || !isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']]) || !sizeof($this->options_lang[$file_data['field_id']][$field_data['lang_id']]))
+				{
+					$this->get_option_lang($field_data['field_id'], $field_data['lang_id'], FIELD_DROPDOWN, false);
+				}
+
+				if (!isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']][$field_value]))
+				{
+					return 'FIELD_INVALID_VALUE';
+				}
+
 				if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])
 				{
 					return 'FIELD_REQUIRED';
@@ -302,6 +313,7 @@ class custom_profile
 				switch ($cp_result)
 				{
 					case 'FIELD_INVALID_DATE':
+					case 'FIELD_INVALID_VALUE':
 					case 'FIELD_REQUIRED':
 						$error = sprintf($user->lang[$cp_result], $row['lang_name']);
 					break;
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 02b8a282d9..6de6e4856a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -194,6 +194,7 @@ $lang = array_merge($lang, array(
 	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
 	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
 	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
+	'FIELD_INVALID_VALUE'				=> 'The field “%s” has an invalid value.',
 
 	'FOE_MESSAGE'				=> 'Message from foe',
 	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.',
diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
new file mode 100644
index 0000000000..06926d4af6
--- /dev/null
+++ b/tests/profile/custom_test.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
+
+class phpbb_profile_custom_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml');
+	}
+
+	static public function dropdownFields()
+	{
+		return array(
+			//    novalue, required, value, expected
+			array(1,       1,        '0',   'FIELD_INVALID_VALUE'),
+			array(1,       1,        '1',   'FIELD_REQUIRED'),
+			array(1,       1,        '2',   false),
+			array(1,       0,        '0',   'FIELD_INVALID_VALUE'),
+			array(1,       0,        '1',   false),
+			array(1,       0,        '2',   false),
+		);
+	}
+
+	/**
+	* @dataProvider dropdownFields
+	*/
+	public function test_dropdown_validate($field_novalue, $field_required, $field_value, $expected)
+	{
+		global $db;
+		$db = $this->new_dbal();
+
+		$field_data = array(
+			'field_id'			=> 1,
+			'lang_id'			=> 1,
+			'field_novalue'		=> $field_novalue,
+			'field_required'	=> $field_required,
+		);
+
+		$cp = new custom_profile;
+		$result = $cp->validate_profile_field(FIELD_DROPDOWN, &$field_value, $field_data);
+
+		$this->assertEquals($expected, $result);
+	}
+}
diff --git a/tests/profile/fixtures/profile_fields.xml b/tests/profile/fixtures/profile_fields.xml
new file mode 100644
index 0000000000..0b2929f625
--- /dev/null
+++ b/tests/profile/fixtures/profile_fields.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_profile_fields_lang">
+		<column>field_id</column>
+		<column>lang_id</column>
+		<column>option_id</column>
+		<column>field_type</column>
+		<column>lang_value</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value>5</value>
+			<value>Default Option</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value>5</value>
+			<value>First Alternative</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>2</value>
+			<value>5</value>
+			<value>Third Alternative</value>
+		</row>
+	</table>
+</dataset>
-- 
cgit v1.2.1


From d270f736e3a553042879b9a7918d2e9bd513c659 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 09:48:49 +0200
Subject: [ticket/7057] Remove trailing whitespace in functions.php

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9a8cc5d6b3..7cbf314309 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3434,7 +3434,7 @@ function get_preg_expression($mode)
 * Depends on whether installed PHP version supports unicode properties
 *
 * @param string	$word			word template to be replaced
-* @param bool	$use_unicode	whether or not to take advantage of PCRE supporting unicode 
+* @param bool	$use_unicode	whether or not to take advantage of PCRE supporting unicode
 *
 * @return string $preg_expr		regex to use with word censor
 */
@@ -3544,7 +3544,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 	// but until 5.3.3 it only works for MX records
 	// See: http://bugs.php.net/bug.php?id=51844
 
-	// Call checkdnsrr() if 
+	// Call checkdnsrr() if
 	// we're looking for an MX record or
 	// we're not on Windows or
 	// we're running a PHP version where #51844 has been fixed
@@ -3564,7 +3564,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 	// dns_get_record() is available since PHP 5; since PHP 5.3 also on Windows,
 	// but on Windows it does not work reliable for AAAA records before PHP 5.3.1
 
-	// Call dns_get_record() if 
+	// Call dns_get_record() if
 	// we're not looking for an AAAA record or
 	// we're not on Windows or
 	// we're running a PHP version where AAAA lookups work reliable
@@ -3594,7 +3594,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 		foreach ($resultset as $result)
 		{
 			if (
-				isset($result['host']) && $result['host'] == $host && 
+				isset($result['host']) && $result['host'] == $host &&
 				isset($result['type']) && $result['type'] == $type
 			)
 			{
-- 
cgit v1.2.1


From 6e8b59dce32032cafeb39c3dc1dfe16e20194683 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 2 Jun 2011 09:44:02 +0200
Subject: [ticket/7057] Use GET for quicksearch and add session id to hidden
 fields

Without sid a GET form logs a user out if they have cookies disabled.

PHPBB3-7057
---
 phpBB/includes/functions.php                        | 8 ++++++++
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7cbf314309..ded69d7150 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4422,6 +4422,12 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		$user_lang = substr($user_lang, 0, strpos($user_lang, '-x-'));
 	}
 
+	$s_search_hidden_fields = array();
+	if ($_SID)
+	{
+		$s_search_hidden_fields['sid'] = $_SID;
+	}
+
 	// The following assigns all _common_ variables that may be used at any point in a template.
 	$template->assign_vars(array(
 		'SITENAME'						=> $config['sitename'],
@@ -4511,6 +4517,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 		'S_LOAD_UNREADS'			=> ($config['load_unreads_search'] && ($config['load_anon_lastread'] || $user->data['is_registered'])) ? true : false,
 
+		'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',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e537aabf56..ca9ba8ef34 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -117,7 +117,7 @@
 
 		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
 			<div id="search-box">
-				<form action="{U_SEARCH}" method="post" id="search">
+				<form action="{U_SEARCH}" method="get" id="search">
 				<fieldset>
 					<input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
 					<input class="button2" value="{L_SEARCH}" type="submit" /><br />
-- 
cgit v1.2.1


From 57eb02bf2c62c665e8b0050515aa78684c8dd452 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 02:30:36 +0200
Subject: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is
 scalar

PHPBB3-10149
---
 phpBB/common.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/common.php b/phpBB/common.php
index ceafdbd3bd..a176a45c38 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -69,7 +69,7 @@ function deregister_globals()
 	{
 		if (isset($not_unset[$varname]))
 		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE
+			// Hacking attempt. No point in continuing unless it's a COOKIE (so a cookie called GLOBALS doesn't lock users out completely)
 			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
 			{
 				exit;
@@ -79,6 +79,11 @@ function deregister_globals()
 				$cookie = &$_COOKIE;
 				while (isset($cookie['GLOBALS']))
 				{
+					if (!is_array($cookie['GLOBALS']))
+					{
+						break;
+					}
+
 					foreach ($cookie['GLOBALS'] as $registered_var => $value)
 					{
 						if (!isset($not_unset[$registered_var]))
-- 
cgit v1.2.1


From a2b6605ce8d5d4c156fda44c5fc44b11aae22b02 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 03:12:13 +0200
Subject: [ticket/10005] Add description to test cases

PHPBB3-10005
---
 tests/profile/custom_test.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
index 06926d4af6..0e0a851243 100644
--- a/tests/profile/custom_test.php
+++ b/tests/profile/custom_test.php
@@ -19,20 +19,23 @@ class phpbb_profile_custom_test extends phpbb_database_test_case
 	static public function dropdownFields()
 	{
 		return array(
-			//    novalue, required, value, expected
-			array(1,       1,        '0',   'FIELD_INVALID_VALUE'),
-			array(1,       1,        '1',   'FIELD_REQUIRED'),
-			array(1,       1,        '2',   false),
-			array(1,       0,        '0',   'FIELD_INVALID_VALUE'),
-			array(1,       0,        '1',   false),
-			array(1,       0,        '2',   false),
+			// note, there is an offset of 1 between option_id (0-indexed)
+			// in the database and values (1-indexed) to avoid problems with
+			// transmitting 0 in an HTML form
+			//    required, value, expected
+			array(1,        '0',   'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'),
+			array(1,        '1',   'FIELD_REQUIRED',      'Required field should throw error for default value'),
+			array(1,        '2',   false,                 'Required field should accept non-default value'),
+			array(0,        '0',   'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'),
+			array(0,        '1',   false,                 'Optional field should accept default value'),
+			array(0,        '2',   false,                 'Optional field should accept non-default value'),
 		);
 	}
 
 	/**
 	* @dataProvider dropdownFields
 	*/
-	public function test_dropdown_validate($field_novalue, $field_required, $field_value, $expected)
+	public function test_dropdown_validate($field_required, $field_value, $expected, $description)
 	{
 		global $db;
 		$db = $this->new_dbal();
@@ -40,13 +43,13 @@ class phpbb_profile_custom_test extends phpbb_database_test_case
 		$field_data = array(
 			'field_id'			=> 1,
 			'lang_id'			=> 1,
-			'field_novalue'		=> $field_novalue,
+			'field_novalue'		=> 1,
 			'field_required'	=> $field_required,
 		);
 
 		$cp = new custom_profile;
 		$result = $cp->validate_profile_field(FIELD_DROPDOWN, &$field_value, $field_data);
 
-		$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, $result, $description);
 	}
 }
-- 
cgit v1.2.1


From 4ddd116cd436f273fea04bd9f81d0a77b58e9d0e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 18:54:13 +0200
Subject: [ticket/8138] Add autocomplete="off" to a user and forum ACP.

PHPBB3-8138
---
 phpBB/adm/style/acp_forums.html         | 4 ++--
 phpBB/adm/style/acp_users_overview.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9201736085..8577c08860 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -166,11 +166,11 @@
 	</dl>
 	<dl>
 		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
-		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" /></dd>
+		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<!-- IF S_FORUM_PASSWORD_SET -->
 	<dl>
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 911dcad293..9237e45daf 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -43,19 +43,19 @@
 </dl>
 <dl>
 	<dt><label for="user_email">{L_EMAIL}:</label></dt>
-	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" /></dd>
+	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
 </dl>
 <dl>
 	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
-	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd>
+	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd>
 </dl>
 <dl>
 	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="new_password" name="new_password" value="" /></dd>
+	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>
 </dl>
 <dl>
 	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
-	<dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd>
+	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
 
 <p class="quick">
-- 
cgit v1.2.1


From f11ef89c657b0386ea5686dd8cc35dff79690adb Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 19:06:12 +0200
Subject: [ticket/8138] Add autocomplete="off" to acp_board and ldap settings

PHPBB3-8138
---
 phpBB/adm/index.php               | 2 +-
 phpBB/includes/auth/auth_ldap.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index dd8f4c279d..f673e2af05 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -276,7 +276,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
+			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
 		break;
 
 		case 'dimension':
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index e8c957aaa3..5dfa74ddab 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -335,7 +335,7 @@ function acp_ldap(&$new)
 	</dl>
 	<dl>
 		<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . ':</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
-		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" /></dd>
+		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
 	</dl>
 	';
 
-- 
cgit v1.2.1


From 6b6705b852bcd2a86735fa99d00a77426bf12813 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 5 Jun 2011 01:57:43 +0200
Subject: [ticket/10158] Remove some code duplication from generating the
 message.

PHPBB3-10158
---
 phpBB/includes/ucp/ucp_pm_compose.php | 38 +++++++++--------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 78b2e7a348..05243e3d7a 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -751,37 +751,19 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 				$folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=' . $folder_id);
 			}
 
+			$return_box_url = ($action === 'post' || $action === 'edit') ? $outbox_folder_url : $inbox_folder_url;
+			$return_box_lang = ($action === 'post' || $action === 'edit') ? 'PM_OUTBOX' : 'PM_INBOX';
+
+
 			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>');
-			switch ($action)
-			{
-				case 'post':
-				case 'edit':
-					if ($folder_url)
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_GOTO_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
-					}
-					else
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $outbox_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
-					}
-				break;
 
-				case 'quote':
-				case 'quotepost':
-				case 'reply':
-				case 'forward':
-					if ($folder_url)
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_GOTO_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
-					}
-					else
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $inbox_folder_url . '">', '</a>', $user->lang['PM_INBOX']);
-					}
-				break;
+			$last_click_type = 'CLICK_RETURN_FOLDER';
+			if ($folder_url)
+			{
+				$message .= '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $folder_url . '">', '</a>', $user_folders[$folder_id]['folder_name']);
+				$last_click_type = 'CLICK_GOTO_FOLDER';
 			}
+			$message .= '<br /><br />' . sprintf($user->lang[$last_click_type], '<a href="' . $return_box_url . '">', '</a>', $user->lang[$return_box_lang]);
 
 			meta_refresh(3, $return_message_url);
 			trigger_error($message);
-- 
cgit v1.2.1


From 26e052bb26a683bff17d86ae2beecc66ffcd93cf Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 5 Jun 2011 09:52:17 +0200
Subject: [ticket/10067] Add separator to h_radio to place options on
 individual lines

The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
---
 phpBB/adm/index.php              |  4 ++--
 phpBB/includes/acp/acp_board.php | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index dd8f4c279d..74e51a8696 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -237,7 +237,7 @@ function build_select($option_ary, $option_default = false)
 /**
 * Build radio fields in acp pages
 */
-function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false)
+function h_radio($name, $input_ary, $input_default = false, $id = false, $key = false, $separator = '')
 {
 	global $user;
 
@@ -246,7 +246,7 @@ function h_radio($name, &$input_ary, $input_default = false, $id = false, $key =
 	foreach ($input_ary as $value => $title)
 	{
 		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
-		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>';
+		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator;
 		$id_assigned = true;
 	}
 
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 8f7d08cc8f..d38c4d58ba 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -769,18 +769,19 @@ class acp_board
 	{
 		global $user, $config;
 
-		$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
-		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, $key);
+		$radio_ary = array(
+			USER_ACTIVATION_DISABLE => 'ACC_DISABLE',
+			USER_ACTIVATION_NONE => 'ACC_NONE',
+		);
+
 		if ($config['email_enable'])
 		{
-			$radio_ary = array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
-			// With longer labels the four options no longer fit
-			// onto a single line. Separate them onto two lines.
-			// This also requires two h_radio calls to generate HTML.
-			$radio_text .= '<br /><br />';
-			$radio_text .= h_radio('config[require_activation]', $radio_ary, $value, $key);
+			$radio_ary[USER_ACTIVATION_SELF] = 'ACC_USER';
+			$radio_ary[USER_ACTIVATION_ADMIN] = 'ACC_ADMIN';
 		}
 
+		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, 'require_activation', $key, '<br />');
+
 		return $radio_text;
 	}
 
-- 
cgit v1.2.1


From 16ab0d8c264d88db5e3e961e66e6820b365f45ac Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 17 Apr 2011 17:58:11 +0800
Subject: [ticket/217] Multiline [url] not converted

This is the second attempt parse multiline URL text, see the ticket comments.

PHPBB3-217
---
 phpBB/includes/message_parser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 6951dcf820..8f5e72cbf7 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -109,13 +109,15 @@ class bbcode_firstpass extends bbcode
 		// This array holds all bbcode data. BBCodes will be processed in this
 		// order, so it is important to keep [code] in first position and
 		// [quote] in second position.
+		// To parse multiline URL we enable dotall option setting only for URL text
+		// but not for link itself, thus [url][/url] is not affected.
 		$this->bbcodes = array(
 			'code'			=> array('bbcode_id' => 8,	'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#uise' => "\$this->bbcode_code('\$1', '\$2')")),
 			'quote'			=> array('bbcode_id' => 0,	'regexp' => array('#\[quote(?:=&quot;(.*?)&quot;)?\](.+)\[/quote\]#uise' => "\$this->bbcode_quote('\$0')")),
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#uiUe' => "\$this->validate_url('\$2', '\$3')")),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', '\$3')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uise' => "\$this->bbcode_size('\$1', '\$2')")),
 			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uise' => "\$this->bbcode_color('\$1', '\$2')")),
-- 
cgit v1.2.1


From 6585d938d2c441900d8af6d25da2433d3beec856 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 5 Jun 2011 21:55:28 +0800
Subject: [ticket/217] Adjust patch, add tests

PHPBB3-217
---
 phpBB/includes/message_parser.php | 11 ++++++++---
 tests/bbcode/url_bbcode_test.php  | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 tests/bbcode/url_bbcode_test.php

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 8f5e72cbf7..a6a4e530f0 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -102,7 +102,7 @@ class bbcode_firstpass extends bbcode
 	/**
 	* Init bbcode data for later parsing
 	*/
-	function bbcode_init()
+	function bbcode_init($no_custom_bbcode = false)
 	{
 		static $rowset;
 
@@ -117,7 +117,7 @@ class bbcode_firstpass extends bbcode
 			'attachment'	=> array('bbcode_id' => 12,	'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#uise' => "\$this->bbcode_attachment('\$1', '\$2')")),
 			'b'				=> array('bbcode_id' => 1,	'regexp' => array('#\[b\](.*?)\[/b\]#uise' => "\$this->bbcode_strong('\$1')")),
 			'i'				=> array('bbcode_id' => 2,	'regexp' => array('#\[i\](.*?)\[/i\]#uise' => "\$this->bbcode_italic('\$1')")),
-			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', '\$3')")),
+			'url'			=> array('bbcode_id' => 3,	'regexp' => array('#\[url(=(.*))?\](?(1)((?s).*(?-s))|(.*))\[/url\]#uiUe' => "\$this->validate_url('\$2', ('\$3') ? '\$3' : '\$4')")),
 			'img'			=> array('bbcode_id' => 4,	'regexp' => array('#\[img\](.*)\[/img\]#uiUe' => "\$this->bbcode_img('\$1')")),
 			'size'			=> array('bbcode_id' => 5,	'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#uise' => "\$this->bbcode_size('\$1', '\$2')")),
 			'color'			=> array('bbcode_id' => 6,	'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!uise' => "\$this->bbcode_color('\$1', '\$2')")),
@@ -135,6 +135,11 @@ class bbcode_firstpass extends bbcode
 			$this->parsed_items[$tag] = 0;
 		}
 
+		if ($no_custom_bbcode)
+		{
+			return;
+		}
+
 		if (!is_array($rowset))
 		{
 			global $db;
@@ -970,7 +975,7 @@ class bbcode_firstpass extends bbcode
 			}
 
 			// Is this a link to somewhere inside this board? If so then remove the session id from the url
-			if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)
+			if (strpos($url, @generate_board_url()) !== false && strpos($url, 'sid=') !== false)
 			{
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}&amp;/', '\1', $url);
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}$/', '', $url);
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
new file mode 100644
index 0000000000..6d9e51664d
--- /dev/null
+++ b/tests/bbcode/url_bbcode_test.php
@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
+
+class phpbb_url_bbcode_test extends phpbb_test_case
+{
+	public function url_bbcode_test_data()
+	{
+		return array(
+			array('[url]http://www.phpbb.com/community/[/url]'),
+			array('[url=http://www.phpbb.com/community/]One line URL text[/url]'),
+			array("[url=http://www.phpbb.com/community/]Multiline\x0AURL\x0Atext[/url]"),
+			array("test [url] test \x0A test [url=http://www.phpbb.com/]test[/url] test"),
+			array("test [url=http://www.phpbb.com/]test \x0A [url]http://phpbb.com[/url] test"),
+		);
+	}
+
+	/**
+	* @dataProvider url_bbcode_test_data
+	*/
+	public function test_url($message)
+	{
+		$bbcode = new bbcode_firstpass();
+		$bbcode->message = $message;
+		$bbcode->bbcode_init(true);
+		$bbcode->parse_bbcode();
+		$this->assertNotEquals($bbcode->message, '[url][/url]');
+		$this->assertNotEquals($bbcode->message, $message);
+		$this->assertNotEquals($bbcode->message, NULL);
+	}
+}
-- 
cgit v1.2.1


From d44b6ba5caeafe220b4959a6de99d035fe10b4f1 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 6 Jun 2011 00:50:53 +0800
Subject: [ticket/217] Use positive parameter statement for bbcode_init()

PHPBB3-217
---
 phpBB/includes/message_parser.php | 4 ++--
 tests/bbcode/url_bbcode_test.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index a6a4e530f0..9e0e61d0ba 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -102,7 +102,7 @@ class bbcode_firstpass extends bbcode
 	/**
 	* Init bbcode data for later parsing
 	*/
-	function bbcode_init($no_custom_bbcode = false)
+	function bbcode_init($allow_custom_bbcode = true)
 	{
 		static $rowset;
 
@@ -135,7 +135,7 @@ class bbcode_firstpass extends bbcode
 			$this->parsed_items[$tag] = 0;
 		}
 
-		if ($no_custom_bbcode)
+		if (!$allow_custom_bbcode)
 		{
 			return;
 		}
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 6d9e51664d..597933c6f8 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -32,7 +32,7 @@ class phpbb_url_bbcode_test extends phpbb_test_case
 	{
 		$bbcode = new bbcode_firstpass();
 		$bbcode->message = $message;
-		$bbcode->bbcode_init(true);
+		$bbcode->bbcode_init(false);
 		$bbcode->parse_bbcode();
 		$this->assertNotEquals($bbcode->message, '[url][/url]');
 		$this->assertNotEquals($bbcode->message, $message);
-- 
cgit v1.2.1


From 2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 5 Jun 2011 13:23:55 -0400
Subject: [ticket/217] Silence errors in tests, not code.

Use a mock user object for testing bbcode.

PHPBB3-217
---
 phpBB/includes/message_parser.php |  2 +-
 tests/bbcode/url_bbcode_test.php  |  4 ++++
 tests/mock_user.php               | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tests/mock_user.php

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9e0e61d0ba..a134fab5d3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -975,7 +975,7 @@ class bbcode_firstpass extends bbcode
 			}
 
 			// Is this a link to somewhere inside this board? If so then remove the session id from the url
-			if (strpos($url, @generate_board_url()) !== false && strpos($url, 'sid=') !== false)
+			if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)
 			{
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}&amp;/', '\1', $url);
 				$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}$/', '', $url);
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 597933c6f8..7bbf731c74 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -11,6 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
+require_once dirname(__FILE__) . '/../mock_user.php';
 
 class phpbb_url_bbcode_test extends phpbb_test_case
 {
@@ -30,6 +31,9 @@ class phpbb_url_bbcode_test extends phpbb_test_case
 	*/
 	public function test_url($message)
 	{
+		global $user;
+		$user = new phpbb_mock_user;
+
 		$bbcode = new bbcode_firstpass();
 		$bbcode->message = $message;
 		$bbcode->bbcode_init(false);
diff --git a/tests/mock_user.php b/tests/mock_user.php
new file mode 100644
index 0000000000..74d31c4c4a
--- /dev/null
+++ b/tests/mock_user.php
@@ -0,0 +1,20 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* Mock user class.
+* This class is used when tests invoke phpBB code expecting to have a global
+* user object, to avoid instantiating the actual user object.
+* It has a minimum amount of functionality, just to make tests work.
+*/
+class phpbb_mock_user
+{
+	public $host = "testhost";
+	public $page = array('root_script_path' => '/');
+}
-- 
cgit v1.2.1


From c93164db587391aaff7dd810d07cd0671c8bce3c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 5 Jun 2011 13:48:37 -0400
Subject: [ticket/217] Use positive assertions in tests.

PHPBB3-217
---
 tests/bbcode/url_bbcode_test.php | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 7bbf731c74..cd85dbd0d9 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -18,18 +18,38 @@ class phpbb_url_bbcode_test extends phpbb_test_case
 	public function url_bbcode_test_data()
 	{
 		return array(
-			array('[url]http://www.phpbb.com/community/[/url]'),
-			array('[url=http://www.phpbb.com/community/]One line URL text[/url]'),
-			array("[url=http://www.phpbb.com/community/]Multiline\x0AURL\x0Atext[/url]"),
-			array("test [url] test \x0A test [url=http://www.phpbb.com/]test[/url] test"),
-			array("test [url=http://www.phpbb.com/]test \x0A [url]http://phpbb.com[/url] test"),
+			array(
+				'url only',
+				'[url]http://www.phpbb.com/community/[/url]',
+				'[url:]http&#58;//www&#46;phpbb&#46;com/community/[/url:]'
+			),
+			array(
+				'url with title',
+				'[url=http://www.phpbb.com/community/]One line URL text[/url]',
+				'[url=http&#58;//www&#46;phpbb&#46;com/community/:]One line URL text[/url:]'
+			),
+			array(
+				'url with multiline title',
+				"[url=http://www.phpbb.com/community/]Multiline\x0AURL\x0Atext[/url]",
+				"[url=http&#58;//www&#46;phpbb&#46;com/community/:]Multiline\x0AURL\x0Atext[/url:]"
+			),
+			array(
+				'unclosed url with multiline',
+				"test [url] test \x0A test [url=http://www.phpbb.com/]test[/url] test",
+				"test [url] test \x0A test [url=http&#58;//www&#46;phpbb&#46;com/:]test[/url:] test"
+			),
+			array(
+				'unclosed url with multiline and title',
+				"test [url=http://www.phpbb.com/]test \x0A [url]http://phpbb.com[/url] test",
+				"test [url=http&#58;//www&#46;phpbb&#46;com/:]test \x0A [url]http://phpbb.com[/url:] test"
+			),
 		);
 	}
 
 	/**
 	* @dataProvider url_bbcode_test_data
 	*/
-	public function test_url($message)
+	public function test_url($description, $message, $expected)
 	{
 		global $user;
 		$user = new phpbb_mock_user;
@@ -38,8 +58,6 @@ class phpbb_url_bbcode_test extends phpbb_test_case
 		$bbcode->message = $message;
 		$bbcode->bbcode_init(false);
 		$bbcode->parse_bbcode();
-		$this->assertNotEquals($bbcode->message, '[url][/url]');
-		$this->assertNotEquals($bbcode->message, $message);
-		$this->assertNotEquals($bbcode->message, NULL);
+		$this->assertEquals($expected, $bbcode->message);
 	}
 }
-- 
cgit v1.2.1


From c07540163c2bf674e384d6df294c83e79e510ce9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 Mar 2011 12:49:59 +0100
Subject: [ticket/10068] Style links posted in posts the same way as in
 signatures.

Firefox4 is going to have some restrictions to :visited for security purpose
(see http://hacks.mozilla.org/2010/03/privacy-related-changes-coming-to-css-vistited/ for more information)
In phpBB links inside posts therefor can not be displayed with the dotted line
anymore. So when we change this anyway we can just make links in signature and
posts look the same.

PHPBB3-10068
---
 phpBB/styles/prosilver/theme/colours.css | 2 +-
 phpBB/styles/prosilver/theme/links.css   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index f7747ba73c..e98ce237bc 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -298,7 +298,7 @@ a.topictitle:active {
 
 .postlink:visited {
 	color: #5D8FBD;
-	border-bottom-color: #666666;
+	border-bottom-color: #5D8FBD;
 }
 
 .postlink:active {
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index a406114054..1f6c2af550 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -87,11 +87,7 @@ a.topictitle:active {
 	padding-bottom: 0;
 }
 
-.postlink:visited {
-	color: #bdbdbd;
-	border-bottom-style: dotted;
-	border-bottom-color: #666666;
-}
+/* .postlink:visited { color: #bdbdbd; } */
 
 .postlink:active {
 	color: #d2d2d2;
-- 
cgit v1.2.1


From d2b5d77b2c45b595ca49bc48d51d180404b132c4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 9 Jun 2011 00:33:27 +0200
Subject: [ticket/10203] Fix quotations and hyphen in language strings for
 PHPBB3-10067

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c770497655..10e4aa7b6b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -208,7 +208,7 @@ $lang = array_merge($lang, array(
 	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
 
 	'ACC_ACTIVATION'				=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. "Board-wide e-mail" must be enabled in order to use user or admin activation.',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide e-mail” must be enabled in order to use user or admin activation.',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
@@ -217,7 +217,7 @@ $lang = array_merge($lang, array(
 	'ACC_ADMIN'					=> 'By admin',
 	'ACC_DISABLE'				=> 'Disable registration',
 	'ACC_NONE'					=> 'No activation (immediate access)',
-	'ACC_USER'					=> 'By user (email verification)',
+	'ACC_USER'					=> 'By user (e-mail verification)',
 //	'ACC_USER_ADMIN'			=> 'User + Admin',
 	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
 	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
-- 
cgit v1.2.1


From 3c60cfd86385bf2b88ffb7b27f255e8c32c59613 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 9 Jun 2011 05:58:38 +0200
Subject: [ticket/10204] Detect binary file changes in dirs with names
 containing dots

PHPBB3-10204
---
 build/build_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build_helper.php b/build/build_helper.php
index 94fc0ff3b5..2d9b86b3c3 100644
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -177,7 +177,7 @@ class build_package
 			}
 
 			// Is binary?
-			if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9_-]+\/\1 differ/i', $line, $match))
+			if (preg_match('/^Binary files ' . $package_name . '\/(.*) and [a-z0-9._-]+\/\1 differ/i', $line, $match))
 			{
 				$binary[] = trim($match[1]);
 			}
-- 
cgit v1.2.1


From fe425dedff388e5eb1477874e0419114db996dc2 Mon Sep 17 00:00:00 2001
From: Adam Reyher <adamr@phpbb.com>
Date: Thu, 9 Jun 2011 06:52:11 -0400
Subject: [ticket/9878] Remove IE7 emulation from prosilver/subSilver2

With these changes, prosilver and subSilver2 no longer need to force IE7
emulation when browsing with IE8 due to the well-known textarea scrolling
bug.

PHPBB3-9878
---
 phpBB/styles/prosilver/template/overall_header.html     | 1 -
 phpBB/styles/prosilver/theme/forms.css                  | 5 ++++-
 phpBB/styles/subsilver2/template/overall_header.html    | 1 -
 phpBB/styles/subsilver2/template/posting_body.html      | 2 +-
 phpBB/styles/subsilver2/template/quickreply_editor.html | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 51fff0735a..71634c9094 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -10,7 +10,6 @@
 <meta name="distribution" content="global" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 4e48a93a55..3f85aa3099 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -262,7 +262,10 @@ fieldset.submit-buttons input {
 
 #message-box textarea {
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	width: 100%;
+	width: 700px;
+	height: 270px;
+	min-width: 100%;
+	max-width: 100%;
 	font-size: 1.2em;
 	color: #333333;
 }
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index be4c7b5b4c..62ed79ed39 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -10,7 +10,6 @@
 <meta name="distribution" content="global" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 0021cd2eb3..fec6d7ff6c 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -210,7 +210,7 @@
 		<table width="100%" cellspacing="0" cellpadding="0" border="0">
 		<!-- INCLUDE posting_buttons.html -->
 		<tr>
-			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 98%;">{MESSAGE}</textarea></td>
+			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
 			<td width="80" align="center" valign="top">
 				<script type="text/javascript">
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index 704c6e1306..91a8c9a702 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -10,7 +10,7 @@
 		</tr>
 		<tr>
 			<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}:</b></td>
-			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 98%;"></textarea> </td>
+			<td class="row2" valign="top" align="left" width="78%"><textarea name="message" rows="7" cols="76" tabindex="3"  style="width: 700px; height: 130px; min-width: 98%; max-width: 98%;"></textarea> </td>
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">
-- 
cgit v1.2.1


From 5b5ed96bc5097bebf3d1ec0c6af87588a53f4e05 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 9 Jun 2011 09:41:29 +0200
Subject: [ticket/7888] Swap in-forum/topic search to GET forms.

This will allow sending URLs to search results to other users. The advanced
search page has always worked like this, but these special pages used to
cause problems.

PHPBB3-7888
---
 phpBB/styles/prosilver/template/viewforum_body.html |  4 ++--
 phpBB/styles/prosilver/template/viewtopic_body.html |  5 ++---
 phpBB/styles/subsilver2/template/searchbox.html     |  2 +-
 phpBB/viewforum.php                                 |  9 ++++++++-
 phpBB/viewtopic.php                                 | 12 +++++++++++-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index f4e80fd625..6a789074b1 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -45,11 +45,11 @@
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
-			<form method="post" id="forum-search" action="{S_SEARCHBOX_ACTION}">
+			<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{FORUM_ID}" name="fid[]" />
+				{S_SEARCH_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 24c57b9a7e..98e1988d10 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -38,12 +38,11 @@
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
-			<form method="post" id="topic-search" action="{S_SEARCHBOX_ACTION}">
+			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />
-				<input type="hidden" value="{TOPIC_ID}" name="t" />
-				<input type="hidden" value="msgonly" name="sf" />
+				{S_SEARCH_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html
index cb0bb5ba73..09b87a15d8 100644
--- a/phpBB/styles/subsilver2/template/searchbox.html
+++ b/phpBB/styles/subsilver2/template/searchbox.html
@@ -1 +1 @@
-<form method="post" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" /></form>
+<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_HIDDEN_FIELDS}</form>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 9cfa93f880..fff5be69d3 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -267,6 +267,12 @@ $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LO
 // Display active topics?
 $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
 
+$s_search_hidden_fields = array('fid' => $forum_id);
+if ($_SID)
+{
+	$s_search_hidden_fields['sid'] = $_SID;
+}
+
 $template->assign_vars(array(
 	'MODERATORS'	=> (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',
 
@@ -304,7 +310,8 @@ $template->assign_vars(array(
 	'S_WATCHING_FORUM'		=> $s_watching_forum['is_watching'],
 	'S_FORUM_ACTION'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . (($start == 0) ? '' : "&amp;start=$start")),
 	'S_DISPLAY_SEARCHBOX'	=> ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,
-	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id),
+	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
+	'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 	'S_SINGLE_MODERATOR'	=> (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
 	'S_IS_LOCKED'			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
 	'S_VIEWFORUM'			=> true,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 53da7f539f..e4c02a88fb 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -585,6 +585,15 @@ $server_path = (!$view) ? $phpbb_root_path : generate_board_url() . '/';
 // Replace naughty words in title
 $topic_data['topic_title'] = censor_text($topic_data['topic_title']);
 
+$s_search_hidden_fields = array(
+	't' => $topic_id,
+	'sf' => 'msgonly',
+);
+if ($_SID)
+{
+	$s_search_hidden_fields['sid'] = $_SID;
+}
+
 // Send vars to template
 $template->assign_vars(array(
 	'FORUM_ID' 		=> $forum_id,
@@ -636,7 +645,8 @@ $template->assign_vars(array(
 
 	'S_VIEWTOPIC'			=> true,
 	'S_DISPLAY_SEARCHBOX'	=> ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,
-	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx", 't=' . $topic_id),
+	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
+	'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 
 	'S_DISPLAY_POST_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
 	'S_DISPLAY_REPLY_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
-- 
cgit v1.2.1


From 7f3d6150fc636289a4739a90403201076a5085e4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 00:11:11 +0200
Subject: [ticket/6712] Properly explain result of setting the bump interval to
 0.

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 77deba6e19..2b39e257d7 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -151,7 +151,7 @@ $lang = array_merge($lang, array(
 	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
 
 	'BUMP_INTERVAL'					=> 'Bump interval',
-	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic. Setting the value to 0 disables this feature.',
+	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump that topic. Setting the value to 0 disables bumping entirely.',
 	'CHAR_LIMIT'					=> 'Maximum characters per post/message',
 	'CHAR_LIMIT_EXPLAIN'			=> 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.',
 	'DELETE_TIME'					=> 'Limit deleting time',
-- 
cgit v1.2.1


From eb0ffd350386b7706f414e793da047c225822828 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 5 Jun 2011 23:02:56 +0800
Subject: [ticket/10198] validate_config_vars() improperly validates multibyte
 strings

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

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index dd8f4c279d..3b93c9ea72 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -402,7 +402,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 		switch ($validator[$type])
 		{
 			case 'string':
-				$length = strlen($cfg_array[$config_name]);
+				$length = utf8_strlen($cfg_array[$config_name]);
 
 				// the column is a VARCHAR
 				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
-- 
cgit v1.2.1


From 72479e13ab41444db532f8d8e238796e419e07c3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 01:07:41 +0200
Subject: [ticket/10198] range validation for strings should limit characters
 not bytes

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

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 3b93c9ea72..5498e6bff7 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -600,7 +600,7 @@ function validate_range($value_ary, &$error)
 		{
 			case 'string' :
 				$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max'];
-				if (strlen($value['value']) > $max)
+				if (utf8_strlen($value['value']) > $max)
 				{
 					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max);
 				}
-- 
cgit v1.2.1


From 28801d01985dcee7c94ad5c54ca5f9ee34592026 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 02:16:19 +0200
Subject: [ticket/10206] Failed unicode.org downloads no longer terminate tests

Instead a warning is triggered and an explanation echo'd.

PHPBB3-10206
---
 tests/utf/normalizer_test.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 38b4ec1b6b..f78dba8004 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -298,12 +298,14 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		if (!$fpr = fopen($url, 'rb'))
 		{
-			throw new RuntimeException("Failed to download $url");
+			echo "Failed to download $url\n";
+			return;
 		}
 
 		if (!$fpw = fopen($target, 'wb'))
 		{
-			throw new RuntimeException("Failed to open $target for writing");
+			echo "Failed to open $target for writing\n";
+			return;
 		}
 
 		$chunk = 32768;
-- 
cgit v1.2.1


From fc9b12669145f72414eb45bbb73860099c6cecef Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 11:06:29 +0200
Subject: [ticket/9992] Make sql_create_table and sql_table_exists available in
 updater

These are defined the same way in db_tools. This duplicated code should be
removed together with the rest of the db_tools duplication at some point.

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 3d32a82cc6..77b5f44502 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2225,6 +2225,260 @@ class updater_db_tools
 		}
 	}
 
+	/**
+	* Check if table exists
+	*
+	*
+	* @param string	$table_name	The table name to check for
+	* @return bool true if table exists, else false
+	*/
+	function sql_table_exists($table_name)
+	{
+		$this->db->sql_return_on_error(true);
+		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
+		$this->db->sql_return_on_error(false);
+
+		if ($result)
+		{
+			$this->db->sql_freeresult($result);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Create SQL Table
+	*
+	* @param string	$table_name	The table name to create
+	* @param array	$table_data	Array containing table data.
+	* @return array	Statements if $return_statements is true.
+	*/
+	function sql_create_table($table_name, $table_data)
+	{
+		// holds the DDL for a column
+		$columns = $statements = array();
+
+		if ($this->sql_table_exists($table_name))
+		{
+			return $this->_sql_run_sql($statements);
+		}
+
+		// Begin transaction
+		$statements[] = 'begin';
+
+		// Determine if we have created a PRIMARY KEY in the earliest
+		$primary_key_gen = false;
+
+		// Determine if the table must be created with TEXTIMAGE
+		$create_textimage = false;
+
+		// Determine if the table requires a sequence
+		$create_sequence = false;
+
+		// Begin table sql statement
+		switch ($this->sql_layer)
+		{
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
+			break;
+
+			default:
+				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
+			break;
+		}
+
+		// Iterate through the columns to create a table
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// here lies an array, filled with information compiled on the column's data
+			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+
+			// here we add the definition of the new column to the list of columns
+			switch ($this->sql_layer)
+			{
+				case 'mssql':
+				case 'mssqlnative':
+					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
+				break;
+
+				default:
+					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
+				break;
+			}
+
+			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
+			if (!$primary_key_gen)
+			{
+				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
+			}
+
+			// create textimage DDL based off of the existance of certain column types
+			if (!$create_textimage)
+			{
+				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
+			}
+
+			// create sequence DDL based off of the existance of auto incrementing columns
+			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
+			{
+				$create_sequence = $column_name;
+			}
+		}
+
+		// this makes up all the columns in the create table statement
+		$table_sql .= implode(",\n", $columns);
+
+		// Close the table for two DBMS and add to the statements
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
+				$statements[] = $table_sql;
+			break;
+		}
+
+		// we have yet to create a primary key for this table,
+		// this means that we can add the one we really wanted instead
+		if (!$primary_key_gen)
+		{
+			// Write primary key
+			if (isset($table_data['PRIMARY_KEY']))
+			{
+				if (!is_array($table_data['PRIMARY_KEY']))
+				{
+					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+				}
+
+				switch ($this->sql_layer)
+				{
+					case 'mysql_40':
+					case 'mysql_41':
+					case 'postgres':
+					case 'sqlite':
+						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+
+					case 'firebird':
+					case 'mssql':
+					case 'mssqlnative':
+						// We need the data here
+						$old_return_statements = $this->return_statements;
+						$this->return_statements = true;
+
+						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
+						foreach ($primary_key_stmts as $pk_stmt)
+						{
+							$statements[] = $pk_stmt;
+						}
+
+						$this->return_statements = $old_return_statements;
+					break;
+
+					case 'oracle':
+						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+				}
+			}
+		}
+
+		// close the table
+		switch ($this->sql_layer)
+		{
+			case 'mysql_41':
+				// make sure the table is in UTF-8 mode
+				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mysql_40':
+			case 'sqlite':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'postgres':
+				// do we need to add a sequence for auto incrementing columns?
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+				}
+
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'oracle':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+
+				// do we need to add a sequence and a tigger for auto incrementing columns?
+				if ($create_sequence)
+				{
+					// create the actual sequence
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
+
+					// the trigger is the mechanism by which we increment the counter
+					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$trigger .= "BEFORE INSERT ON {$table_name}\n";
+					$trigger .= "FOR EACH ROW WHEN (\n";
+					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
+					$trigger .= ")\n";
+					$trigger .= "BEGIN\n";
+					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
+					$trigger .= "\tINTO :new.{$create_sequence}\n";
+					$trigger .= "\tFROM dual\n";
+					$trigger .= "END;";
+
+					$statements[] = $trigger;
+				}
+			break;
+
+			case 'firebird':
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+				}
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				$old_return_statements = $this->return_statements;
+				$this->return_statements = true;
+
+				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
+
+				foreach ($key_stmts as $key_stmt)
+				{
+					$statements[] = $key_stmt;
+				}
+
+				$this->return_statements = $old_return_statements;
+			}
+		}
+
+		// Commit Transaction
+		$statements[] = 'commit';
+
+		return $this->_sql_run_sql($statements);
+	}
+
 	/**
 	* Handle passed database update array.
 	* Expected structure...
-- 
cgit v1.2.1


From 2dee57fd43ebe1cf1f43fb0161cdd5f072eeaa63 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 12:02:59 +0200
Subject: [ticket/9992] Adding a limit on login attempts per IP.

A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
---
 phpBB/develop/create_schema_files.php     | 20 ++++++++++
 phpBB/includes/acp/acp_board.php          |  3 ++
 phpBB/includes/auth.php                   |  2 +-
 phpBB/includes/auth/auth_db.php           | 66 +++++++++++++++++++++++++++++--
 phpBB/includes/constants.php              |  1 +
 phpBB/includes/db/db_tools.php            | 13 ++++++
 phpBB/includes/session.php                |  4 ++
 phpBB/install/database_update.php         | 39 +++++++++++++++++-
 phpBB/install/schemas/firebird_schema.sql | 32 ++++++++++++++-
 phpBB/install/schemas/mssql_schema.sql    | 38 +++++++++++++++++-
 phpBB/install/schemas/mysql_40_schema.sql | 20 +++++++++-
 phpBB/install/schemas/mysql_41_schema.sql | 20 +++++++++-
 phpBB/install/schemas/oracle_schema.sql   | 43 +++++++++++++++++++-
 phpBB/install/schemas/postgres_schema.sql | 24 ++++++++++-
 phpBB/install/schemas/schema_data.sql     |  3 ++
 phpBB/install/schemas/sqlite_schema.sql   | 19 ++++++++-
 phpBB/language/en/acp/board.php           | 12 ++++--
 17 files changed, 343 insertions(+), 16 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 87670722aa..f1e2858848 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1207,6 +1207,26 @@ function get_schema_struct()
 		),
 	);
 
+	$schema_data['phpbb_login_attempts'] = array(
+		'COLUMNS'		=> array(
+			'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+			'attempt_ip'			=> array('VCHAR:40', ''),
+			'attempt_browser'		=> array('VCHAR:150', ''),
+			'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+			'attempt_time'			=> array('TIMESTAMP', 0),
+			'user_id'				=> array('UINT', 0),
+			'username'				=> array('VCHAR_UNI:255', 0),
+			'username_clean'		=> array('VCHAR_CI', 0),
+		),
+		'PRIMARY_KEY'	=> 'attempt_id',
+		'KEYS'			=> array(
+			'attempt_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
+			'attempt_forwarded_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+			'attempt_time'				=> array('INDEX', array('attempt_time')),
+			'user_id'					=> array('INDEX', 'user_id'),
+		),
+	);
+
 	$schema_data['phpbb_moderator_cache'] = array(
 		'COLUMNS'		=> array(
 			'forum_id'				=> array('UINT', 0),
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index d38c4d58ba..9f00145f3b 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -386,6 +386,9 @@ class acp_board
 						'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),
+						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
+						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
+						'ip_login_limit_use_forwarded'	=> array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'form_token_sid_guests'	=> array('lang' => 'FORM_SID_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 8324cb4977..5564de2943 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -908,7 +908,7 @@ class auth
 		$method = 'login_' . $method;
 		if (function_exists($method))
 		{
-			$login = $method($username, $password);
+			$login = $method($username, $password, $user->ip, $user->browser, $user->forwarded_for);
 
 			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
 			if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index e04a6307e9..e155130e04 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -23,8 +23,21 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Login function
+*
+* @param string $username
+* @param string $password
+* @param string $ip			IP address the login is taking place from. Used to
+*							limit the number of login attempts per IP address.
+* @param string $browser	The user agent used to login
+* @param string $forwarded_for X_FORWARDED_FOR header sent with login request
+* @return array				A associative array of the format
+*							array(
+*								'status' => status constant
+*								'error_msg' => string
+*								'user_row' => array
+*							)
 */
-function login_db(&$username, &$password)
+function login_db($username, $password, $ip = '', $browser = '', $forwarded_for = '')
 {
 	global $db, $config;
 
@@ -47,13 +60,52 @@ function login_db(&$username, &$password)
 		);
 	}
 
+	$username_clean = utf8_clean_string($username);
+
 	$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
 		FROM ' . USERS_TABLE . "
-		WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
+		WHERE username_clean = '" . $db->sql_escape($username_clean) . "'";
 	$result = $db->sql_query($sql);
 	$row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
 
+	if (($ip && !$config['ip_login_limit_use_forwarded']) ||
+		($forwarded_for && $config['ip_login_limit_use_forwarded']))
+	{
+		$sql = 'SELECT COUNT(attempt_id) AS count
+			FROM ' . LOGIN_ATTEMPT_TABLE . '
+			WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
+		if ($config['ip_login_limit_use_forwarded'])
+		{
+			$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($forwarded_for) . "'";
+		}
+		else
+		{
+			$sql .= " AND attempt_ip = '" . $db->sql_escape($ip) . "' ";
+		}
+
+		$result = $db->sql_query($sql);
+		$attempts_row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		$attempts = $attempts_row['count'];
+
+		$attempt_data = array(
+			'attempt_ip'			=> $ip,
+			'attempt_browser'		=> $browser,
+			'attempt_forwarded_for'	=> $forwarded_for,
+			'attempt_time'			=> time(),
+			'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
+			'username'				=> $username,
+			'username_clean'		=> $username_clean,
+		);
+		$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $db->sql_build_array('INSERT', $attempt_data);
+		$result = $db->sql_query($sql);
+	}
+	else
+	{
+		$attempts = 0;
+	}
+
 	if (!$row)
 	{
 		return array(
@@ -62,7 +114,9 @@ function login_db(&$username, &$password)
 			'user_row'	=> array('user_id' => ANONYMOUS),
 		);
 	}
-	$show_captcha = $config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'];
+
+	$show_captcha = ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) ||
+		($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']);
 
 	// If there are too much login attempts, we need to check for an confirm image
 	// Every auth module is able to define what to do by itself...
@@ -90,7 +144,7 @@ function login_db(&$username, &$password)
 		{
 			$captcha->reset();
 		}
-		
+
 	}
 
 	// If the password convert flag is set we need to convert it
@@ -165,6 +219,10 @@ function login_db(&$username, &$password)
 			$row['user_password'] = $hash;
 		}
 
+		$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
+			WHERE user_id = ' . $row['user_id'];
+		$db->sql_query($sql);
+
 		if ($row['user_login_attempts'] != 0)
 		{
 			// Successful, reset login attempts (the user passed all stages)
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index ea34eb8e81..b5a0aa893a 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -236,6 +236,7 @@ define('GROUPS_TABLE',				$table_prefix . 'groups');
 define('ICONS_TABLE',				$table_prefix . 'icons');
 define('LANG_TABLE',				$table_prefix . 'lang');
 define('LOG_TABLE',					$table_prefix . 'log');
+define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 483ceee043..fdefda9e26 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -638,6 +638,19 @@ class phpbb_db_tools
 			$sqlite = true;
 		}
 
+		// Add tables?
+		if (!empty($schema_changes['add_tables']))
+		{
+			foreach ($schema_changes['add_tables'] as $table => $table_data)
+			{
+				$result = $this->sql_create_table($table, $table_data);
+				if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
 		// Change columns?
 		if (!empty($schema_changes['change_columns']))
 		{
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index ceb22c197c..69369ff72d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1005,6 +1005,10 @@ class session
 				include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
 			}
 			phpbb_captcha_factory::garbage_collect($config['captcha_plugin']);
+
+			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
+				WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
+			$db->sql_query($sql);
 		}
 
 		return;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 77b5f44502..24a69ab99b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -916,9 +916,29 @@ function database_update_info()
 		'3.0.7-PL1'		=> array(),
 		// No changes from 3.0.8-RC1 to 3.0.8
 		'3.0.8-RC1'		=> array(),
-
 		// Changes from 3.0.8 to 3.0.9-RC1
 		'3.0.8'			=> array(
+			'add_tables'		=> array(
+				LOGIN_ATTEMPT_TABLE	=> array(
+					'COLUMNS'			=> array(
+						'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					'PRIMARY_KEY'		=> 'attempt_id',
+					'KEYS'				=> array(
+						'attempt_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
+						'attempt_forwarded_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'attempt_time'			=> array('INDEX', array('attempt_time')),
+						'user_id'				=> array('INDEX', 'user_id'),
+					),
+				),
+			),
 			'change_columns'	=> array(
 				BBCODES_TABLE	=> array(
 					'bbcode_id'	=> array('USINT', 0),
@@ -1870,6 +1890,10 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.0.8 to 3.0.9-RC1
 		case '3.0.8':
+			set_config('ip_login_limit_max', '50');
+			set_config('ip_login_limit_time', '21600');
+			set_config('ip_login_limit_use_forwarded', '0');
+
 			// Update file extension group names to use language strings, again.
 			$sql = 'SELECT group_id, group_name
 				FROM ' . EXTENSION_GROUPS_TABLE . '
@@ -2516,6 +2540,19 @@ class updater_db_tools
 			$sqlite = true;
 		}
 
+		// Add tables?
+		if (!empty($schema_changes['add_tables']))
+		{
+			foreach ($schema_changes['add_tables'] as $table => $table_data)
+			{
+				$result = $this->sql_create_table($table, $table_data);
+				if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
 		// Change columns?
 		if (!empty($schema_changes['change_columns']))
 		{
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 85f86781de..24ebd0f1af 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 
@@ -545,6 +545,36 @@ BEGIN
 END;;
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INTEGER NOT NULL,
+	attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	attempt_time INTEGER DEFAULT 0 NOT NULL,
+	user_id INTEGER DEFAULT 0 NOT NULL,
+	username VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE,
+	username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
+);;
+
+ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);;
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
+
+CREATE GENERATOR phpbb_login_attempts_gen;;
+SET GENERATOR phpbb_login_attempts_gen TO 0;;
+
+CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
+BEFORE INSERT
+AS
+BEGIN
+	NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
+END;;
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0827b14cc2..dbbd144aa0 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -649,6 +649,41 @@ CREATE  INDEX [user_id] ON [phpbb_log]([user_id]) ON [PRIMARY]
 GO
 
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE TABLE [phpbb_login_attempts] (
+	[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
+	[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
+	[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
+	[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
+	[attempt_time] [int] DEFAULT (0) NOT NULL ,
+	[user_id] [int] DEFAULT (0) NOT NULL ,
+	[username] [varchar] (255) DEFAULT (0) NOT NULL ,
+	[username_clean] [varchar] (255) DEFAULT (0) NOT NULL 
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD 
+	CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY  CLUSTERED 
+	(
+		[attempt_id]
+	)  ON [PRIMARY] 
+GO
+
+CREATE  INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
+GO
+
+CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
+GO
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
@@ -1730,3 +1765,4 @@ ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
+
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index eeaec4ccf6..bce04eedfb 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 # Table: 'phpbb_attachments'
@@ -369,6 +369,24 @@ CREATE TABLE phpbb_log (
 );
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	attempt_ip varbinary(40) DEFAULT '' NOT NULL,
+	attempt_browser varbinary(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
+	attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	username blob NOT NULL,
+	username_clean blob NOT NULL,
+	PRIMARY KEY (attempt_id),
+	KEY attempt_ip (attempt_ip, attempt_time),
+	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
+	KEY attempt_time (attempt_time),
+	KEY user_id (user_id)
+);
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 3a3b4ab2fd..e77ad44dd8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 # Table: 'phpbb_attachments'
@@ -369,6 +369,24 @@ CREATE TABLE phpbb_log (
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+	attempt_ip varchar(40) DEFAULT '' NOT NULL,
+	attempt_browser varchar(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
+	attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	username varchar(255) DEFAULT '0' NOT NULL,
+	username_clean varchar(255) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (attempt_id),
+	KEY attempt_ip (attempt_ip, attempt_time),
+	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
+	KEY attempt_time (attempt_time),
+	KEY user_id (user_id)
+) CHARACTER SET `utf8` COLLATE `utf8_bin`;
+
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 9c25af2512..5a1e4930b2 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -740,6 +740,47 @@ END;
 /
 
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE TABLE phpbb_login_attempts (
+	attempt_id number(8) NOT NULL,
+	attempt_ip varchar2(40) DEFAULT '' ,
+	attempt_browser varchar2(150) DEFAULT '' ,
+	attempt_forwarded_for varchar2(255) DEFAULT '' ,
+	attempt_time number(11) DEFAULT '0' NOT NULL,
+	user_id number(8) DEFAULT '0' NOT NULL,
+	username varchar2(765) DEFAULT '0' NOT NULL,
+	username_clean varchar2(255) DEFAULT '0' NOT NULL,
+	CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
+)
+/
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time)
+/
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
+/
+
+CREATE SEQUENCE phpbb_login_attempts_seq
+/
+
+CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
+BEFORE INSERT ON phpbb_login_attempts
+FOR EACH ROW WHEN (
+	new.attempt_id IS NULL OR new.attempt_id = 0
+)
+BEGIN
+	SELECT phpbb_login_attempts_seq.nextval
+	INTO :new.attempt_id
+	FROM dual;
+END;
+/
+
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index a2d4dc3e0b..c4c2307c3a 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1,6 +1,6 @@
 /*
 
- $Id$
+ $Id: $
 
 */
 
@@ -524,6 +524,28 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
 CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
 CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
+/*
+	Table: 'phpbb_login_attempts'
+*/
+CREATE SEQUENCE phpbb_login_attempts_seq;
+
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
+	attempt_ip varchar(40) DEFAULT '' NOT NULL,
+	attempt_browser varchar(150) DEFAULT '' NOT NULL,
+	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
+	attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
+	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
+	username varchar(255) DEFAULT '0' NOT NULL,
+	username_clean varchar_ci DEFAULT '0' NOT NULL,
+	PRIMARY KEY (attempt_id)
+);
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
+
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ea4157d6a3..08d6c18ee8 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -136,6 +136,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_widt
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_use_forwarded', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', '');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 8661bb7578..9668c8d5f1 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: $
 #
 
 BEGIN TRANSACTION;
@@ -357,6 +357,23 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
 CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
 CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
+# Table: 'phpbb_login_attempts'
+CREATE TABLE phpbb_login_attempts (
+	attempt_id INTEGER PRIMARY KEY NOT NULL ,
+	attempt_ip varchar(40) NOT NULL DEFAULT '',
+	attempt_browser varchar(150) NOT NULL DEFAULT '',
+	attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
+	attempt_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	username varchar(255) NOT NULL DEFAULT '0',
+	username_clean varchar(255) NOT NULL DEFAULT '0'
+);
+
+CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
+
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 3a63e72b8f..5d6930ce98 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -458,12 +458,18 @@ $lang = array_merge($lang, array(
 	'FORM_TIME_MAX_EXPLAIN'			=> 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
 	'FORM_SID_GUESTS'				=> 'Tie forms to guest sessions',
 	'FORM_SID_GUESTS_EXPLAIN'		=> 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.',
-	'FORWARDED_FOR_VALID'			=> 'Validated <var>X_FORWARDED_FOR</var> header',
+	'FORWARDED_FOR_VALID'			=> 'Validate <var>X_FORWARDED_FOR</var> header',
 	'FORWARDED_FOR_VALID_EXPLAIN'	=> 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.',
 	'IP_VALID'						=> 'Session IP validation',
 	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
-	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts',
-	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'After this number of failed logins the user needs to additionally solve the anti-spambot task.',
+	'IP_LOGIN_LIMIT_MAX'			=> 'Maximum number of login attempts per IP address',
+	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'Once the count of failed logins from an IP address exceeds this limit any login from the IP address requires solving an anti-spambot task. Select 0 to disable the limit, so that no tasks need to be solved.',
+	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
+	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period, in seconds.',
+	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
+	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
+	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts per username',
+	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'Logging into a user account requires solving an anti-spambot task after the count of failed logins for the account exceeds this limit ',
 	'NO_IP_VALIDATION'				=> 'None',
 	'NO_REF_VALIDATION'				=> 'None',
 	'PASSWORD_TYPE'					=> 'Password complexity',
-- 
cgit v1.2.1


From c8828473a85a061889f58e900036ddb90f38652c Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 10 Jun 2011 18:37:29 +0200
Subject: [ticket/9992] Use sql_fetchfield for single row and single column
 result

PHPBB3-9992
---
 phpBB/includes/auth/auth_db.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index e155130e04..02c9386f33 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -85,9 +85,8 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 		}
 
 		$result = $db->sql_query($sql);
-		$attempts_row = $db->sql_fetchrow($result);
+		$attempts = (int) $db->sql_fetchfield('count');
 		$db->sql_freeresult($result);
-		$attempts = $attempts_row['count'];
 
 		$attempt_data = array(
 			'attempt_ip'			=> $ip,
-- 
cgit v1.2.1


From b5cefc400e6a8c3500b8ed5126548e3cbb727858 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 19 Jan 2011 03:47:51 +0100
Subject: [ticket/9908] Send 301 before stripping SID so bots do (hopefully)
 not revisit.

PHPBB3-9908
---
 phpBB/includes/session.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index ceb22c197c..7db319493b 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -592,6 +592,7 @@ class session
 		// otherwise they'll index this page with the SID, duplicate content oh my!
 		if ($bot && isset($_GET['sid']))
 		{
+			send_status_line(301, 'Moved Permanently');
 			redirect(build_url(array('sid')));
 		}
 
-- 
cgit v1.2.1


From cbcc48b8e3e18b036fa8813b36ae7f01e5f4ae38 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 11 Jun 2011 01:36:28 +0200
Subject: [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5d6930ce98..c0c730c45e 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -463,7 +463,7 @@ $lang = array_merge($lang, array(
 	'IP_VALID'						=> 'Session IP validation',
 	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
 	'IP_LOGIN_LIMIT_MAX'			=> 'Maximum number of login attempts per IP address',
-	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'Once the count of failed logins from an IP address exceeds this limit any login from the IP address requires solving an anti-spambot task. Select 0 to disable the limit, so that no tasks need to be solved.',
+	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'Once the count of failed logins from an IP address exceeds this limit, any login from the IP address requires solving an anti-spambot task. Select 0 to disable the limit, so that no tasks need to be solved.',
 	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
 	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period, in seconds.',
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
-- 
cgit v1.2.1


From b9f4240c103734b33aeab809312fcef8e32c396e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 01:47:50 +0200
Subject: [ticket/10110] Remove multi-server syntax from Redis ACM.

PHPBB3-10110
---
 phpBB/includes/acm/acm_redis.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php
index 8954b9d0e7..41533eaacb 100644
--- a/phpBB/includes/acm/acm_redis.php
+++ b/phpBB/includes/acm/acm_redis.php
@@ -31,12 +31,6 @@ if (!defined('PHPBB_ACM_REDIS_HOST'))
 	define('PHPBB_ACM_REDIS_HOST', 'localhost');
 }
 
-if (!defined('PHPBB_ACM_REDIS'))
-{
-	//can define multiple servers with host1/port1,host2/port2 format
-	define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT);
-}
-
 /**
 * ACM for Redis
 *
@@ -57,11 +51,7 @@ class acm extends acm_memory
 		parent::acm_memory();
 
 		$this->redis = new Redis();
-		foreach (explode(',', PHPBB_ACM_REDIS) as $server)
-		{
-			$parts = explode('/', $server);
-			$this->redis->connect(trim($parts[0]), trim($parts[1]));
-		}
+		$this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT);
 
 		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
 		{
-- 
cgit v1.2.1


From f1998ddbc712015562b8e16fdc0f42a4c85ae82e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 11 Jun 2011 01:56:25 +0200
Subject: [ticket/9992] Clarify explanations of ip and account limits on login

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c0c730c45e..5b8af7ab61 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -463,13 +463,13 @@ $lang = array_merge($lang, array(
 	'IP_VALID'						=> 'Session IP validation',
 	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
 	'IP_LOGIN_LIMIT_MAX'			=> 'Maximum number of login attempts per IP address',
-	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'Once the count of failed logins from an IP address exceeds this limit, any login from the IP address requires solving an anti-spambot task. Select 0 to disable the limit, so that no tasks need to be solved.',
+	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered.Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.',
 	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
 	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period, in seconds.',
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
 	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
 	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts per username',
-	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'Logging into a user account requires solving an anti-spambot task after the count of failed logins for the account exceeds this limit ',
+	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being trigger for distinct user accounts.',
 	'NO_IP_VALIDATION'				=> 'None',
 	'NO_REF_VALIDATION'				=> 'None',
 	'PASSWORD_TYPE'					=> 'Password complexity',
-- 
cgit v1.2.1


From eaf5ba7f50a47d8d8fc5de37881f6115f4cc6184 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:57:07 +0200
Subject: [ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.

PHPBB3-10075
---
 phpBB/docs/AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 83feca009b..688b8147a8 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -23,7 +23,6 @@ involved in phpBB.
 phpBB Lead Developer:  naderman (Nils Adermann)
 
 phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
-                       APTX (Marek A. R.)
                        bantu (Andreas Fischer)
                        ckwalsh (Cullen Walsh)
                        igorw (Igor Wiedler)
@@ -46,6 +45,7 @@ phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007]
 phpBB Lead Developer:  psoTFX (Paul S. Owen) [2001 - 09/2005]
 
 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]
                        DavidMJ (David M.)            [12/2005 - 08/2009]
-- 
cgit v1.2.1


From 41250044f8b25dcfe84712218151822a39b7d76d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:57:31 +0200
Subject: [ticket/10075] Rename nn- to Oleg in docs/AUTHORS.

PHPBB3-10075
---
 phpBB/docs/AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 688b8147a8..81bc9f52e6 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -28,7 +28,7 @@ phpBB Developers:      Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010]
                        igorw (Igor Wiedler)
                        kellanved (Henry Sudhof)
                        nickvergessen (Joas Schilling)
-                       nn- (Oleg Pudeyev)
+                       Oleg (Oleg Pudeyev)
                        rxu (Ruslan Uzdenov)
                        ToonArmy (Chris Smith)
 
-- 
cgit v1.2.1


From 418c3d546a5ea29b5ce338e4710e0d3636009733 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 01:21:55 +0200
Subject: [ticket/9892] column & index name limits, firebird auto increment in
 db_tools

- Column names are limited to 30 characters
- Index names are limited to 31 characters.
  On some dbms the index name contains both table name and actual index name
  so the limit applies to the sum of the lenghts of table name and index name.
- Auto incremented column names are limited to 26 characters to provide an
  additional 4 characters for sequence names

The code for firebird auto increment support using generators/sequences with
triggers was copied from create_schema_files.php

PHPBB3-9892
---
 phpBB/develop/create_schema_files.php | 16 +++++++++++++++-
 phpBB/includes/db/db_tools.php        | 28 +++++++++++++++++++++++++++-
 phpBB/install/database_update.php     | 28 +++++++++++++++++++++++++++-
 3 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index f1e2858848..e59552f370 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -329,6 +329,15 @@ foreach ($supported_dbms as $dbms)
 		// Write columns one by one...
 		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
 		{
+			if (strlen($column_name) > 30)
+			{
+				trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			}
+			if (isset($column_data[2]) && $column_data[2] == 'auto_increment' && strlen($column_name) > 26) // "${column_name}_gen"
+			{
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			}
+
 			// Get type
 			if (strpos($column_data[0], ':') !== false)
 			{
@@ -632,6 +641,11 @@ foreach ($supported_dbms as $dbms)
 					$key_data[1] = array($key_data[1]);
 				}
 
+				if (strlen($table_name . $key_name) > 30)
+				{
+					trigger_error("Index name '$key_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+				}
+
 				switch ($dbms)
 				{
 					case 'mysql_40':
@@ -2067,4 +2081,4 @@ EOF;
 
 echo 'done';
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index fdefda9e26..0e3173c23e 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -417,6 +417,11 @@ class phpbb_db_tools
 			// here lies an array, filled with information compiled on the column's data
 			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
 
+			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
+			{
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			}
+
 			// here we add the definition of the new column to the list of columns
 			switch ($this->sql_layer)
 			{
@@ -566,7 +571,13 @@ class phpbb_db_tools
 			case 'firebird':
 				if ($create_sequence)
 				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
+					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
+
+					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
+					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
+					$statements[] = $trigger;
 				}
 			break;
 		}
@@ -1400,6 +1411,11 @@ class phpbb_db_tools
 	*/
 	function sql_prepare_column_data($table_name, $column_name, $column_data)
 	{
+		if (strlen($column_name) > 30)
+		{
+			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// Get type
 		if (strpos($column_data[0], ':') !== false)
 		{
@@ -2040,6 +2056,11 @@ class phpbb_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		switch ($this->sql_layer)
 		{
 			case 'firebird':
@@ -2070,6 +2091,11 @@ class phpbb_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// remove index length unless MySQL4
 		if ('mysql_40' != $this->sql_layer)
 		{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 24a69ab99b..1abd91e27f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2319,6 +2319,11 @@ class updater_db_tools
 			// here lies an array, filled with information compiled on the column's data
 			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
 
+			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
+			{
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			}
+
 			// here we add the definition of the new column to the list of columns
 			switch ($this->sql_layer)
 			{
@@ -2468,7 +2473,13 @@ class updater_db_tools
 			case 'firebird':
 				if ($create_sequence)
 				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
+					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
+
+					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
+					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
+					$statements[] = $trigger;
 				}
 			break;
 		}
@@ -3302,6 +3313,11 @@ class updater_db_tools
 	*/
 	function sql_prepare_column_data($table_name, $column_name, $column_data)
 	{
+		if (strlen($column_name) > 30)
+		{
+			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// Get type
 		if (strpos($column_data[0], ':') !== false)
 		{
@@ -3875,6 +3891,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		switch ($this->sql_layer)
 		{
 			case 'firebird':
@@ -3905,6 +3926,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
+		if (strlen($table_name . $index_name) > 30)
+		{
+			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
 		// remove index length unless MySQL4
 		if ('mysql_40' != $this->sql_layer)
 		{
-- 
cgit v1.2.1


From 8a5e3781d53e3df379c55166136abd6e71990af4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 01:25:15 +0200
Subject: [ticket/9892] Shorten the index names on the q&a captcha

PHPBB3-9892
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 49a64b9339..45f76bd676 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -319,7 +319,7 @@ class phpbb_captcha_qa
 					),
 					'PRIMARY_KEY'		=> 'question_id',
 					'KEYS'				=> array(
-						'lang_iso'			=> array('INDEX', 'lang_iso'),
+						'lang'			=> array('INDEX', 'lang_iso'),
 					),
 				),
 				CAPTCHA_ANSWERS_TABLE		=> array (
@@ -328,7 +328,7 @@ class phpbb_captcha_qa
 						'answer_text'	=> array('STEXT_UNI', ''),
 					),
 					'KEYS'				=> array(
-						'question_id'			=> array('INDEX', 'question_id'),
+						'qid'			=> array('INDEX', 'question_id'),
 					),
 				),
 				CAPTCHA_QA_CONFIRM_TABLE		=> array (
-- 
cgit v1.2.1


From ef544ee095f2decde39cc537d3d675642b7c80f2 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 04:10:51 +0200
Subject: [ticket/9892] Table prefix lengths influence index lengths in
 db_tools

PHPBB3-9892
---
 phpBB/includes/db/db_tools.php    | 14 +++++++++-----
 phpBB/install/database_update.php | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 0e3173c23e..c1af2782f8 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -419,7 +419,7 @@ class phpbb_db_tools
 
 			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
 			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
 			}
 
 			// here we add the definition of the new column to the list of columns
@@ -2056,9 +2056,11 @@ class phpbb_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		switch ($this->sql_layer)
@@ -2091,9 +2093,11 @@ class phpbb_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		// remove index length unless MySQL4
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 1abd91e27f..7bf41c8450 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2321,7 +2321,7 @@ class updater_db_tools
 
 			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
 			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
 			}
 
 			// here we add the definition of the new column to the list of columns
@@ -3891,9 +3891,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		switch ($this->sql_layer)
@@ -3926,9 +3928,11 @@ class updater_db_tools
 	{
 		$statements = array();
 
-		if (strlen($table_name . $index_name) > 30)
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			trigger_error("Index name '${table_name}_$index_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+			$max_length = $table_prefix + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
 		// remove index length unless MySQL4
-- 
cgit v1.2.1


From 025649e14cf4a4678f26790fa4328b25a3f040cf Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 10:34:43 +0200
Subject: [ticket/9892] Adding a number of tests for db_tools

The test creates a table and runs a number of queries on it to judge whether
the selected column types can hold the data they are expected to contain.
Additional test methods check the auto increment feature and a few of the
basic commands of db_tools. This is only a starting point. Plenty more
tests need to be added.

PHPBB3-9892
---
 tests/dbal/db_tools_test.php | 268 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 268 insertions(+)
 create mode 100644 tests/dbal/db_tools_test.php

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
new file mode 100644
index 0000000000..b9206b622e
--- /dev/null
+++ b/tests/dbal/db_tools_test.php
@@ -0,0 +1,268 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_dbal_db_tools_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_int_size'			=> array('INT:4', 4),
+				'c_bint'				=> array('BINT', 4),
+				'c_uint'				=> array('UINT', 4),
+				'c_uint_size'			=> array('UINT:4', 4),
+				'c_tint_size'			=> array('TINT:2', 4),
+				'c_usint'				=> array('USINT', 4),
+				'c_bool'				=> array('BOOL', 1),
+				'c_vchar'				=> array('VCHAR', 'foo'),
+				'c_vchar_size'		=> array('VCHAR:4', 'foo'),
+				'c_char_size'			=> array('CHAR:4', 'foo'),
+				'c_xstext'			=> array('XSTEXT', 'foo'),
+				'c_stext'				=> array('STEXT', 'foo'),
+				'c_text'				=> array('TEXT', 'foo'),
+				'c_mtext'				=> array('MTEXT', 'foo'),
+				'c_xstext_uni'		=> array('XSTEXT_UNI', 'foo'),
+				'c_stext_uni'			=> array('STEXT_UNI', 'foo'),
+				'c_text_uni'			=> array('TEXT_UNI', 'foo'),
+				'c_mtext_uni'			=> array('MTEXT_UNI', 'foo'),
+				'c_timestamp'			=> array('TIMESTAMP', 4),
+				'c_decimal'			=> array('DECIMAL', 4.2),
+				'c_decimal_size'		=> array('DECIMAL:6', 4.2),
+				'c_pdecimal'			=> array('PDECIMAL', 4.2),
+				'c_pdecimal_size'		=> array('PDECIMAL:7', 4.2),
+				'c_vchar_uni'			=> array('VCHAR_UNI', 'foo'),
+				'c_vchar_uni_size'	=> array('VCHAR_UNI:4', 'foo'),
+				'c_vchar_ci'			=> array('VCHAR_CI', 'foo'),
+				'c_varbinary'			=> array('VARBINARY', 'foo'),
+			),
+			'PRIMARY_KEY'	=> 'c_id',
+			'KEYS'			=> array(
+				'i_simple'	=> array('INDEX', 'c_uint'),
+				'i_uniq'	=> array('UNIQUE', 'c_vchar'),
+				'i_comp'	=> array('INDEX', array('c_vchar_uni', 'c_bool')),
+				'i_comp_uniq'	=> array('UNIQUE', array('c_vchar_size', 'c_usint')),
+			),
+		);
+		$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();
+	}
+
+	public function test_created_and_drop_table()
+	{
+		// table is empty after creation and queryable
+		$sql = 'SELECT * FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+		$this->assertTrue(! $this->db->sql_fetchrow($result));
+		$this->db->sql_freeresult($result);
+
+		$this->table_exists = false;
+		$this->tools->sql_table_drop('prefix_table_name');
+	}
+
+	static protected function get_default_values()
+	{
+		return array(
+			'c_int_size' => 0,
+			'c_bint' => 0,
+			'c_uint' => 0,
+			'c_uint_size' => 0,
+			'c_tint_size' => 0,
+			'c_usint' => 0,
+			'c_bool' => 0,
+			'c_vchar' => '',
+			'c_vchar_size' => '',
+			'c_char_size' => '',
+			'c_xstext' => '',
+			'c_stext' => '',
+			'c_text' => '',
+			'c_mtext' => '',
+			'c_xstext_uni' => '',
+			'c_stext_uni' => '',
+			'c_text_uni' => '',
+			'c_mtext_uni' => '',
+			'c_timestamp' => 0,
+			'c_decimal' => 0,
+			'c_decimal_size' => 0,
+			'c_pdecimal' => 0,
+			'c_pdecimal_size' => 0,
+			'c_vchar_uni' => '',
+			'c_vchar_uni_size' => '',
+			'c_vchar_ci' => '',
+			'c_varbinary' => '',
+		);
+	}
+
+	static public function columnValues()
+	{
+		return array(
+			array('c_int_size', -9999),
+			array('c_bint', '99999999999999999'),
+			array('c_uint', 16777215),
+			array('c_uint_size', 9999),
+			array('c_tint_size', -99),
+			array('c_usint', 99),
+			array('c_bool', 0),
+			array('c_vchar', str_repeat('a', 255)),
+			array('c_vchar_size', str_repeat('a', 4)),
+			array('c_char_size', str_repeat('a', 4)),
+			array('c_xstext', str_repeat('a', 1000)),
+			array('c_stext', str_repeat('a', 3000)),
+			array('c_text', str_repeat('a', 8000)),
+			array('c_mtext', str_repeat('a', 10000)),
+			array('c_xstext_uni', str_repeat("\xC3\x84", 100)),
+			array('c_stext_uni', str_repeat("\xC3\x84", 255)),
+			array('c_text_uni', str_repeat("\xC3\x84", 4000)),
+			array('c_mtext_uni', str_repeat("\xC3\x84", 10000)),
+			array('c_timestamp', 2147483647),
+			array('c_decimal', 999.99),
+			array('c_decimal_size', 9999.99),
+			array('c_pdecimal', 999.999),
+			array('c_pdecimal_size', 9999.999),
+			array('c_vchar_uni', str_repeat("\xC3\x84", 255)),
+			array('c_vchar_uni_size', str_repeat("\xC3\x84", 4)),
+			array('c_vchar_ci', str_repeat("\xC3\x84", 255)),
+			array('c_varbinary', str_repeat("\x00\xFF", 127)),
+		);
+	}
+
+	/**
+	* @dataProvider columnValues
+	*/
+	public function test_created_column($column_name, $column_value)
+	{
+		$row_insert = self::get_default_values();
+		$row_insert[$column_name] = $column_value;
+
+		// empty table
+		$sql = 'DELETE FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row_insert);
+		$result = $this->db->sql_query($sql);
+
+		$sql = "SELECT *
+			FROM prefix_table_name";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row_expect = $row_insert;
+
+		unset($row_actual['id']); // auto increment id changes, so ignore
+
+		$type = $this->table_data['COLUMNS'][$column_name][0];
+		$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_column_exists()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'column_does_not_exist'));
+	}
+
+	public function test_column_remove()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+
+		$this->assertTrue($this->tools->sql_column_remove('prefix_table_name', 'c_id'));
+
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+	}
+
+	public function test_table_exists()
+	{
+		$this->assertTrue($this->tools->sql_table_exists('prefix_table_name'));
+		$this->assertFalse($this->tools->sql_table_exists('prefix_does_not_exist'));
+	}
+
+	public function test_table_drop()
+	{
+		$this->tools->sql_create_table('prefix_test_table',
+			array('COLUMNS' => array(
+				'foo' => array('UINT', 42)))
+		);
+
+		$this->tools->sql_table_drop('prefix_test_table');
+	}
+
+}
-- 
cgit v1.2.1


From 32f37bf938efe7a85b72ad2429e715269abc6fee Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 10:49:48 +0200
Subject: [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7bf41c8450..dce77a67d7 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,6 +1913,30 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
+			global $db_tools;
+
+			// Recover from potentially broken Q&A CAPTCHA table on firebird
+			if ($db_tools->sql_layer == 'firebird')
+			{
+				if ($config['captcha_plugin'] == 'phpbb_captcha_qa')
+				{
+					setconfig('captcha_plugin', 'phpbb_captcha_nogd');
+				}
+
+				$tables = array(
+					$table_prefix . 'captcha_questions',
+					$table_prefix . 'captcha_answers',
+					$table_prefix . 'qa_confirm',
+				);
+				foreach ($tables as $table)
+				{
+					if ($db_tools->sql_table_exists($table))
+					{
+						$db_tools->sql_table_drop($table);
+					}
+				}
+			}
+
 			$no_updates = false;
 		break;
 	}
-- 
cgit v1.2.1


From 6cab45b28e5c30571ce6f2961e26d268fb6542e7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:02:30 +0200
Subject: [ticket/9892] Shorten login_attempt key names to avoid firebird
 length problems

PHPBB3-9892
---
 phpBB/install/database_update.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index dce77a67d7..7cf3b02e9f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -932,9 +932,9 @@ function database_update_info()
 					),
 					'PRIMARY_KEY'		=> 'attempt_id',
 					'KEYS'				=> array(
-						'attempt_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
-						'attempt_forwarded_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'attempt_time'			=> array('INDEX', array('attempt_time')),
+						'att_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time'			=> array('INDEX', array('attempt_time')),
 						'user_id'				=> array('INDEX', 'user_id'),
 					),
 				),
-- 
cgit v1.2.1


From cd3d23810f844b529f304cb7062ffe65cc17e4e3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:06:52 +0200
Subject: [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to
 change config

PHPBB3-9892
---
 phpBB/install/database_update.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7cf3b02e9f..7d7572b204 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1913,16 +1913,13 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
-			global $db_tools;
+			global $db_tools, $table_prefix;
 
 			// Recover from potentially broken Q&A CAPTCHA table on firebird
+			// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+			// without data loss
 			if ($db_tools->sql_layer == 'firebird')
 			{
-				if ($config['captcha_plugin'] == 'phpbb_captcha_qa')
-				{
-					setconfig('captcha_plugin', 'phpbb_captcha_nogd');
-				}
-
 				$tables = array(
 					$table_prefix . 'captcha_questions',
 					$table_prefix . 'captcha_answers',
-- 
cgit v1.2.1


From ef977abe596fdc926e84e10fd994278665d38417 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:33:55 +0200
Subject: [ticket/9892] count is a keyword in firebird, so renaming this alias

PHPBB3-9892
---
 phpBB/includes/auth/auth_db.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index 02c9386f33..fe3ea30b2a 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -72,7 +72,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 	if (($ip && !$config['ip_login_limit_use_forwarded']) ||
 		($forwarded_for && $config['ip_login_limit_use_forwarded']))
 	{
-		$sql = 'SELECT COUNT(attempt_id) AS count
+		$sql = 'SELECT COUNT(attempt_id) AS attempts
 			FROM ' . LOGIN_ATTEMPT_TABLE . '
 			WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
 		if ($config['ip_login_limit_use_forwarded'])
@@ -85,7 +85,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 		}
 
 		$result = $db->sql_query($sql);
-		$attempts = (int) $db->sql_fetchfield('count');
+		$attempts = (int) $db->sql_fetchfield('attempts');
 		$db->sql_freeresult($result);
 
 		$attempt_data = array(
-- 
cgit v1.2.1


From 2569d7460ae8ba771b840f437c3846fc1f2c3e07 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:40:57 +0200
Subject: [ticket/9892] Transaction support for database update sql execution
 function

Updates would fail before because 'begin' as generated by
db_tools::sql_create_table would be executed literally.

PHPBB3-9892
---
 phpBB/install/database_update.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7d7572b204..5bc856250b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -534,12 +534,23 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
 
 	$db->sql_return_on_error(true);
 
-	$result = $db->sql_query($sql);
-	if ($db->sql_error_triggered)
+	if ($sql === 'begin')
+	{
+		$db->sql_transaction('begin');
+	}
+	else if ($sql === 'commit')
 	{
-		$errored = true;
-		$error_ary['sql'][] = $db->sql_error_sql;
-		$error_ary['error_code'][] = $db->sql_error_returned;
+		$db->sql_transaction('commit');
+	}
+	else
+	{
+		$result = $db->sql_query($sql);
+		if ($db->sql_error_triggered)
+		{
+			$errored = true;
+			$error_ary['sql'][] = $db->sql_error_sql;
+			$error_ary['error_code'][] = $db->sql_error_returned;
+		}
 	}
 
 	$db->sql_return_on_error(false);
-- 
cgit v1.2.1


From 76cc7be4d2e388cc59ea297a33fda532ffe853fe Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 11:46:55 +0200
Subject: [ticket/9892] Removing closing php tag from create_schema_files

PHPBB3-9892
---
 phpBB/develop/create_schema_files.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index e59552f370..c153f3e1e8 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -2081,4 +2081,3 @@ EOF;
 
 echo 'done';
 
-?>
-- 
cgit v1.2.1


From 11750bdccc168568148de68df2ceca258e5a7da5 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 12:24:57 +0200
Subject: [ticket/9892] Remove incorrect use of camel case

PHPBB3-9892
---
 tests/dbal/db_tools_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index b9206b622e..48406d40a3 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -127,7 +127,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		);
 	}
 
-	static public function columnValues()
+	static public function column_values()
 	{
 		return array(
 			array('c_int_size', -9999),
@@ -161,7 +161,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 	}
 
 	/**
-	* @dataProvider columnValues
+	* @dataProvider column_values
 	*/
 	public function test_created_column($column_name, $column_value)
 	{
-- 
cgit v1.2.1


From 4e0717b4d7da58469c795191236ad4256a20c72a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 12:26:49 +0200
Subject: [ticket/9892] Correct copyright year

PHPBB3-9892
---
 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 48406d40a3..eb2af4c4cc 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package testing
-* @copyright (c) 2008 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
-- 
cgit v1.2.1


From 8475a8bec5e82cbdd3d37b881cfc71fb6a6d8228 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 19:36:22 +0200
Subject: [ticket/10211] Add spce after dot in new language string

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5b8af7ab61..556ad212c0 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -463,7 +463,7 @@ $lang = array_merge($lang, array(
 	'IP_VALID'						=> 'Session IP validation',
 	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
 	'IP_LOGIN_LIMIT_MAX'			=> 'Maximum number of login attempts per IP address',
-	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered.Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.',
+	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.',
 	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
 	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period, in seconds.',
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
-- 
cgit v1.2.1


From b774520621e5508365984a890e1b9c2375c201c3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:20:48 +0200
Subject: [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9
 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 9f635fe50b..3c3ccf9f28 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.7-PL1</samp> you should select the phpBB-3.0.7-PL1_to_3.0.8.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.8</samp> you should select the phpBB-3.0.8_to_3.0.9.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 3.0.5 you need the phpBB-3.0.7-PL1_to_3.0.8.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.8</samp> you need the phpBB-3.0.8_to_3.0.9.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 b6eee8d621..7f6e3c0250 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.8',
+	'phpbb_version'	=> '3.0.9',
 	'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 bbafe5e26d..72252079d6 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.8
+version = 3.0.9
 
 # Images
 img_site_logo = site_logo.gif*52*139
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 7f7e677993..83e762f65b 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.8
\ No newline at end of file
+version = 3.0.9
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index 0dd4150266..42383a022f 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.8
+version = 3.0.9
 
 # 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 83f3120829..4270094eab 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.8
+version = 3.0.9
 
 # Some configuration options
 
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index ce0c859193..d8cfabcb02 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.8
+version = 3.0.9
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index b8ddd6deec..0cdb7204bb 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.8
+version = 3.0.9
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index edfc2d43f2..92ccfef35a 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,5 +19,5 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.8
+version = 3.0.9
 
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index a6ac5f337c..94e2f6d53d 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.8
+version = 3.0.9
 
 # Some configuration options
 
-- 
cgit v1.2.1


From 7232ca4102f7af992abe80037c3414f4d6b7768d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 02:29:11 +0200
Subject: [develop-olympus] Bumping version number for 3.0.9-RC1.

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

diff --git a/build/build.xml b/build/build.xml
index bc9240f37c..dd2d82249d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,8 +2,8 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.8" />
-	<property name="prevversion" value="3.0.8-RC1" />
+	<property name="newversion" value="3.0.9-RC1" />
+	<property name="prevversion" value="3.0.8" />
 	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7-PL1" />
 	<!-- no configuration should be needed beyond this point -->
 
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index b5a0aa893a..9cde068773 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.9-dev');
+define('PHPBB_VERSION', '3.0.9-RC1');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 5bc856250b..92fadd0853 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.9-dev';
+$updates_to_version = '3.0.9-RC1';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 08d6c18ee8..52f9a94746 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-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');
 
-- 
cgit v1.2.1


From 939bb65b1708bd43c55ffc2d11ec36b938763f23 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 11 Jun 2011 16:17:30 +0200
Subject: [develop-olympus] Changelog: Changes since 3.0.8

---
 phpBB/docs/CHANGELOG.html | 367 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 350 insertions(+), 17 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 253df4ac56..915f7e6a71 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="#v308">Changes since 3.0.8</a></li>
 		<li><a href="#v307-PL1">Changes since 3.0.7-PL1</a></li>
 		<li><a href="#v307">Changes since 3.0.7</a></li>
 		<li><a href="#v306">Changes since 3.0.6</a></li>
@@ -89,7 +90,339 @@
 
 		<div class="content">
 
-	<a name="v307-PL1"></a><h3>1.i. Changes since 3.0.7-PL1</h3>
+	<a name="v308"></a><h3>1.i. Changes since 3.0.8</h3>
+
+<h4>        Bug
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-217'>PHPBB3-217</a>] -         Multiline [url] not Converted
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-6712'>PHPBB3-6712</a>] -         Topic bumping does not create new topic icon on index
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7057'>PHPBB3-7057</a>] -         Quicksearch uses POST, thus the page expires!
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7778'>PHPBB3-7778</a>] -         Increase limit of custom BBcodes
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7834'>PHPBB3-7834</a>] -         Correctly update topic_time when deleting first post in topic
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7888'>PHPBB3-7888</a>] -         URL of search results page does not always contain all keywords of the search query
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7941'>PHPBB3-7941</a>] -         mistake in description of function generate_board_url
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-8138'>PHPBB3-8138</a>] -         Browser autocompleton fills wrong fields in ACP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-8736'>PHPBB3-8736</a>] -         Honour ACP settings for min/max username length when posting as a guest.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-8802'>PHPBB3-8802</a>] -         Wrong confirmation text when clicking &quot;mark forums read&quot; in a category
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-8904'>PHPBB3-8904</a>] -         Show numeric CPF default value when editing
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9166'>PHPBB3-9166</a>] -         Subsilver and prosilver CSS elements out of order.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9348'>PHPBB3-9348</a>] -         Correctly encode default_dateformat when converting from phpBB2
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9575'>PHPBB3-9575</a>] -         The word &quot;administrate&quot; is not correct.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9630'>PHPBB3-9630</a>] -         Naming inconsistency of Merging Posts / Topics in MCP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9675'>PHPBB3-9675</a>] -         Add option to delete template/theme/imageset when deleting style.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9685'>PHPBB3-9685</a>] -         Unable to create &quot;Fulltext native&quot; search index using the mssqlnative DBAL
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9751'>PHPBB3-9751</a>] -         Password requirement &quot;Must contain letters and numbers&quot; is not working properly
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9764'>PHPBB3-9764</a>] -         Empty value for CONFIG_TABLE config_name= &#39;mime_triggers&#39; causes functions_fileupload.php-&gt;fileupload-&gt;check_content() to be too restrictive
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9851'>PHPBB3-9851</a>] -         &quot;Search new posts&quot; should require login
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9872'>PHPBB3-9872</a>] -         Total topics isn&#39;t correct after I deleted a user
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9874'>PHPBB3-9874</a>] -         view_log() performs unneeded count query over all log entries.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9892'>PHPBB3-9892</a>] -         Firebird index name length limit is not taken into account
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9905'>PHPBB3-9905</a>] -         DSN field should include SQLite
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9908'>PHPBB3-9908</a>] -         Send &quot;Moved Permanently&quot; before stripping off session ids for Bots.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9910'>PHPBB3-9910</a>] -         Javascript bug in Subsilver2 PMs
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9911'>PHPBB3-9911</a>] -         Incorrect open/close field in Manage ranks ACP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9913'>PHPBB3-9913</a>] -         currunt should be current
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9915'>PHPBB3-9915</a>] -         &quot;Length of ban:&quot; is not displayed in ACP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9924'>PHPBB3-9924</a>] -         $template-&gt;display hook does not pass $template instance
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9925'>PHPBB3-9925</a>] -         prosilver logo margin bug in IE 6-7-8 
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9928'>PHPBB3-9928</a>] -         Do not link &quot;login to your board&quot; to the &quot;send statistics&quot; page after completed update.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9930'>PHPBB3-9930</a>] -         Redirect fails with open_basedir enabled
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9932'>PHPBB3-9932</a>] -         The Bing bot is not added when converting.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9933'>PHPBB3-9933</a>] -         Wrong handling of consecutive multiple asterisks in word censor 
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9934'>PHPBB3-9934</a>] -         Mass Mail missing under the system tab on a fresh install
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9939'>PHPBB3-9939</a>] -         JavaScript error in recaptcha ACP template
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9944'>PHPBB3-9944</a>] -         Extension groups naming don&#39;t use users&#39; language in ACP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9946'>PHPBB3-9946</a>] -         $inserts empty in sql_query() for oracle
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9948'>PHPBB3-9948</a>] -         Inline quicktime files won&#39;t display
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9949'>PHPBB3-9949</a>] -         $user-&gt;lang() is not handling arguments as per documentation 
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9950'>PHPBB3-9950</a>] -         Problem with localized button images after uprading from 3.0.7-PL1 to 3.0.8
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9953'>PHPBB3-9953</a>] -         Set focus to password on re-authentication
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9954'>PHPBB3-9954</a>] -         u_masspm* permissions are forced to never for certain groups
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9961'>PHPBB3-9961</a>] -         Inconsistent activation logs
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9966'>PHPBB3-9966</a>] -         Language download in ACP creates index.html and misses captcha_*
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9970'>PHPBB3-9970</a>] -         user_lang input not checked during registration
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9981'>PHPBB3-9981</a>] -         Fix unit test dependencies on phpBB files
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9985'>PHPBB3-9985</a>] -         3D Wave CAPTCHA mt_rand() does not check order of min/max values
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9997'>PHPBB3-9997</a>] -         Inconsistent approve/disapprove button order in modcp
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9999'>PHPBB3-9999</a>] -         {forumrow.L_FORUM_FOLDER_ALT} and {SEARCH_IMG} only return a language key.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10005'>PHPBB3-10005</a>] -         users can register without custom profile field correctly entered
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10011'>PHPBB3-10011</a>] -         __DIR__ in test suite renders it unusable on php &lt; 5.3
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10016'>PHPBB3-10016</a>] -         set_config_count() fails on PostreSQL 7
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10020'>PHPBB3-10020</a>] -         ACP function validate_range() fails partially on non-32-bit systems
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10021'>PHPBB3-10021</a>] -         &quot;Find a member&quot; generates SQL error when large dates are entered
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10033'>PHPBB3-10033</a>] -         &quot;Disallow usernames&quot; does not check already disallowed names
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10035'>PHPBB3-10035</a>] -         ACP template edit feature allows to read any files on webserver and to upload/execute any script on it
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10036'>PHPBB3-10036</a>] -         Use image from configuration file for displaying online-status.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10038'>PHPBB3-10038</a>] -         download/file.php uses $_GET value instead of function request_var()
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10039'>PHPBB3-10039</a>] -         2.x to 3.x conversion fails when using mssqlnative to connect to destination database
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10042'>PHPBB3-10042</a>] -         GD captcha has invalid mt_rand calls
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10047'>PHPBB3-10047</a>] -         Session ID always included in URL on posting.php
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10049'>PHPBB3-10049</a>] -         Session test files are misnamed, session tests are not run
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10052'>PHPBB3-10052</a>] -         Session tests are broken
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10056'>PHPBB3-10056</a>] -         Firebird misspelled in database updater
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10058'>PHPBB3-10058</a>] -         Root path is undefined in MySQL upgrader
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10059'>PHPBB3-10059</a>] -         Consistent is misspelled twice
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10060'>PHPBB3-10060</a>] -         Typo in tests database connection manager
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10068'>PHPBB3-10068</a>] -         Firefox4 restrictions to :visited
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10078'>PHPBB3-10078</a>] -         commit-msg hook prints \n on freebsd
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10081'>PHPBB3-10081</a>] -         Cleanup Template Tests
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10084'>PHPBB3-10084</a>] -         Add smilie errors out when image is missing
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10088'>PHPBB3-10088</a>] -         Cache mock does not unset database versions other than mysqli
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10090'>PHPBB3-10090</a>] -         cache/queue.php.lock isn&#39;t covered by .gitignore
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10092'>PHPBB3-10092</a>] -         commit-msg hook aborts on overlength comment lines
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10096'>PHPBB3-10096</a>] -         Wrong whitespace in functions.php
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10100'>PHPBB3-10100</a>] -         Race condition in unique_id() on heavily busy database.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10102'>PHPBB3-10102</a>] -         member.S_PENDING_SET in styles/prosilver/template/ucp_groups_manage.html
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10104'>PHPBB3-10104</a>] -         missing one intval() along with others already being there
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10109'>PHPBB3-10109</a>] -         Errors while copying a topic
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10112'>PHPBB3-10112</a>] -         Use of count() in captcha_gd.php and mssqlnative.php
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10115'>PHPBB3-10115</a>] -         BBcodes not working if post contains about or more 55000 non-english symbols
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10117'>PHPBB3-10117</a>] -         Big posts becomes empty if they have smilies on specified places.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10121'>PHPBB3-10121</a>] -         ICQ profile link leads to a webservice that is no longer active
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10123'>PHPBB3-10123</a>] -         Inconsistent use of smilie/smiley
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10128'>PHPBB3-10128</a>] -         Error message is on green background when trying to ban a nonexistent user
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10137'>PHPBB3-10137</a>] -         Deleting an unintended space at the end of PHP_URL_FOPEN_SUPPORT_EXPLAIN
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10146'>PHPBB3-10146</a>] -         Firebird cannot handle DECIMAL(255, 0)
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10147'>PHPBB3-10147</a>] -         Typo in code comment in functions_template.php
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10149'>PHPBB3-10149</a>] -         deregister_globals causes error when cookie called GLOBALS is set to scalar value
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10170'>PHPBB3-10170</a>] -         reCAPTCHA address has changed
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10171'>PHPBB3-10171</a>] -         Firefox4 displays grey pixels at PM message rows when message is neither marked nor replied
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10177'>PHPBB3-10177</a>] -         phpBB package cannot be built with bsdtar
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10178'>PHPBB3-10178</a>] -         build.xml does not specify path to find - breaks on FreeBSD
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10188'>PHPBB3-10188</a>] -         Wrong handling of output_buffering value in message handler
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10192'>PHPBB3-10192</a>] -         Missing semicolon in MySQL Upgrader
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10195'>PHPBB3-10195</a>] -         Do not check DNS Blacklists if IPv6 address is passed to session::check_dnsbl().
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10198'>PHPBB3-10198</a>] -         Function validate_config_vars() improperly validates multibyte strings
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10203'>PHPBB3-10203</a>] -         Fix quotations and hyphen in language strings for PHPBB3-10067
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10204'>PHPBB3-10204</a>] -         Package build tool does not detect binary file changes
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10206'>PHPBB3-10206</a>] -         Normalization tests fail when unicode.org is not reachable
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10211'>PHPBB3-10211</a>] -         Missing space on the recent PHPBB3-9992 changes
+</li>
+</ul>
+    
+<h4>        Improvement
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9581'>PHPBB3-9581</a>] -         Banned users get mass emails.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9802'>PHPBB3-9802</a>] -         Optimize session_begin REMOTE_ADDR validation
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9878'>PHPBB3-9878</a>] -         Get rid of Internet Explorer 7 emulation
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9897'>PHPBB3-9897</a>] -         Language typos in language/en/acp/board.php
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9922'>PHPBB3-9922</a>] -         Posting URL in subsilver 2
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9937'>PHPBB3-9937</a>] -         Feed Icon displays on Forum links
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9980'>PHPBB3-9980</a>] -         URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9989'>PHPBB3-9989</a>] -         Skip PM popup in overall_header.html, if there are no new PMs.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10007'>PHPBB3-10007</a>] -         Add directive &#39;internal&#39; to blocked folders in nginx example configuration.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10009'>PHPBB3-10009</a>] -         Differentiate published/updated dates in Atom feed
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10014'>PHPBB3-10014</a>] -         Make the error message when cache is not writable clearer
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10024'>PHPBB3-10024</a>] -         Allow a Style to present Unread PM in different way than read PM
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10040'>PHPBB3-10040</a>] -         Continuous integration on PHP 5.2
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10041'>PHPBB3-10041</a>] -         download/file.php needs more use of send_status_line
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10044'>PHPBB3-10044</a>] -         Setup github network improvements
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10057'>PHPBB3-10057</a>] -         More informative reporting of errors when database connection fails for Firebird and PostgreSQL.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10067'>PHPBB3-10067</a>] -         ACP options for account activation are confusing when emails are turned off board-wide
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10069'>PHPBB3-10069</a>] -         Improvements in sample nginx config file
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10072'>PHPBB3-10072</a>] -         Send the post number to the template as it relates to it&#39;s position in the topic
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10101'>PHPBB3-10101</a>] -         Compatibility with native phpass hashes
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10126'>PHPBB3-10126</a>] -         Replace ^ with &amp;~ in error_reporting calls
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10141'>PHPBB3-10141</a>] -         Performance improvement for $auth-&gt;_fill_acl()
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10145'>PHPBB3-10145</a>] -         Ability to force recompilation of all templates on every page load
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10154'>PHPBB3-10154</a>] -         Move &quot;copy permissions from&quot; to below &quot;parent&quot; in forum creation form
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10158'>PHPBB3-10158</a>] -         Return link not really useful after sending a Private Message
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10186'>PHPBB3-10186</a>] -         UCP signature panel displays when not authed for signatures
+</li>
+</ul>
+    
+<h4>        New Feature
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9942'>PHPBB3-9942</a>] -         WinCache Caching Module
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9992'>PHPBB3-9992</a>] -         Limit amount of failed login attempts per IP
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10110'>PHPBB3-10110</a>] -         Redis caching module
+</li>
+</ul>
+    
+<h4>        Task
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9788'>PHPBB3-9788</a>] -         Add README for GitHub
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9805'>PHPBB3-9805</a>] -         Add a script for setting up git remotes for a github network
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9806'>PHPBB3-9806</a>] -         Script for easy merging
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9824'>PHPBB3-9824</a>] -         Git hook quirks
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9859'>PHPBB3-9859</a>] -         Remove the years from visible copyright in the footer.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9921'>PHPBB3-9921</a>] -         Add sample configuration for lighttpd webserver
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9943'>PHPBB3-9943</a>] -         Setup phpDocumentor API documentation generation
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9967'>PHPBB3-9967</a>] -         Use phpunit.xml for test suite
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9987'>PHPBB3-9987</a>] -         Enforce _test.php suffix for test files
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9990'>PHPBB3-9990</a>] -         Integrate utf normalizer tests into test suite
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10043'>PHPBB3-10043</a>] -         Refactor phpbb_database_test_case
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10046'>PHPBB3-10046</a>] -         Getting rid of register_shutdown_function() in cron.php to prevent path disclosure (reported by lacton)
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10075'>PHPBB3-10075</a>] -         Update docs/AUTHORS for 3.0.9-RC1 release
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10079'>PHPBB3-10079</a>] -         Add gallery avatars to .gitignore.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10082'>PHPBB3-10082</a>] -         Fix Session Test Issues with CHAR vs. VARCHAR.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10105'>PHPBB3-10105</a>] -         Update AIM express link and &quot;Download Application&quot; links
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10107'>PHPBB3-10107</a>] -         Improve docs for non-apache webserver configuration
+</li>
+</ul>
+    
+<h4>        Sub-task
+</h4>
+<ul>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9732'>PHPBB3-9732</a>] -         Cover session code extensively in tests
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9968'>PHPBB3-9968</a>] -         Create unit test for word censor regular expression
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9969'>PHPBB3-9969</a>] -         Move word censor regular expression creation into separate function definition in functions.php
+</li>
+</ul>
+
+
+	<a name="v307-PL1"></a><h3>1.ii. Changes since 3.0.7-PL1</h3>
 <h4>        Security
 </h4>
 <ul>
@@ -547,13 +880,13 @@
 </ul>
 
 
-	<a name="v307"></a><h3>1.ii. Changes since 3.0.7</h3>
+	<a name="v307"></a><h3>1.iii. 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.iii. Changes since 3.0.6</h3>
+	<a name="v306"></a><h3>1.iv. 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>
@@ -657,7 +990,7 @@
 
 	</ul>
 
-	<a name="v305"></a><h3>1.iv. Changes since 3.0.5</h3>
+	<a name="v305"></a><h3>1.v. Changes since 3.0.5</h3>
 
 	<ul>
 		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -879,7 +1212,7 @@
 		<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
 	</ul>
 
-	<a name="v304"></a><h3>1.v. Changes since 3.0.4</h3>
+	<a name="v304"></a><h3>1.vi. 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>
@@ -968,7 +1301,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.vi. Changes since 3.0.3</h3>
+	<a name="v303"></a><h3>1.vii. Changes since 3.0.3</h3>
 
 	<ul>
 		<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -1000,7 +1333,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.vii. Changes since 3.0.2</h3>
+	<a name="v302"></a><h3>1.viii. 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>
@@ -1099,7 +1432,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.viii. Changes since 3.0.1</h3>
+	<a name="v301"></a><h3>1.ix. Changes since 3.0.1</h3>
 
 	<ul>
 		<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -1147,7 +1480,7 @@
 		<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
 	</ul>
 
-	<a name="v300"></a><h3>1.ix Changes since 3.0.0</h3>
+	<a name="v300"></a><h3>1.x Changes since 3.0.0</h3>
 
 	<ul>
 		<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -1218,7 +1551,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.x. Changes since 3.0.RC8</h3>
+	<a name="v30rc8"></a><h3>1.xi. 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>
@@ -1227,7 +1560,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.xi. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>1.xii. Changes since 3.0.RC7</h3>
 
 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -1262,7 +1595,7 @@
 		<li>[Fix] No duplication of active topics (Bug #15474)</li>
 	</ul>
 
-	<a name="v30rc6"></a><h3>1.xii. Changes since 3.0.RC6</h3>
+	<a name="v30rc6"></a><h3>1.xiii. Changes since 3.0.RC6</h3>
 
 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -1272,7 +1605,7 @@
 		<li>[Fix] Able to request new password (Bug #14743)</li>
 	</ul>
 
-	<a name="v30rc5"></a><h3>1.xiii. Changes since 3.0.RC5</h3>
+	<a name="v30rc5"></a><h3>1.xiv. 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>
@@ -1335,7 +1668,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
-	<a name="v30rc4"></a><h3>1.xiv. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>1.xv. Changes since 3.0.RC4</h3>
 
 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -1386,7 +1719,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>
 
-	<a name="v30rc3"></a><h3>1.xv. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>1.xvi. Changes since 3.0.RC3</h3>
 
 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -1495,7 +1828,7 @@
 
 	</ul>
 
-	<a name="v30rc2"></a><h3>1.xvi. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>1.xvii. Changes since 3.0.RC2</h3>
 
 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -1541,7 +1874,7 @@
 
 	</ul>
 
-	<a name="v30rc1"></a><h3>1.xvii. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>1.xviii. Changes since 3.0.RC1</h3>
 
 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
-- 
cgit v1.2.1


From cab3b1bf7b7b37a80658ceb0bd62f1d1d7b64f01 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 12 Jun 2011 23:07:48 +0200
Subject: [develop-olympus] Also build packages for 3.0.7.

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index dd2d82249d..c22f41691b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,7 +4,7 @@
 	<!-- a few settings for the build -->
 	<property name="newversion" value="3.0.9-RC1" />
 	<property name="prevversion" value="3.0.8" />
-	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7-PL1" />
+	<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" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
-- 
cgit v1.2.1


From b65cf4c8d6f4d97f9db6dbb612072b3a999158da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 23:09:52 +0200
Subject: [ticket/9992] The table name constant needs to be defined in the
 updater

When the database update is run before updating the files the constant
is not yet defined.

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 24a69ab99b..935fe70b9c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -78,6 +78,13 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+// new table constants are separately defined here in case the updater is run
+// before the files are updated
+if (!defined('LOGIN_ATTEMPT_TABLE'))
+{
+	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
+}
+
 // If we are on PHP >= 6.0.0 we do not need some code
 if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
 {
-- 
cgit v1.2.1


From c9e22ac5098d0ff6c66256965f16daa7511e3e58 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 23:45:23 +0200
Subject: [ticket/9892] _sql in the updater needs to return the transaction
 results

PHPBB3-9892
---
 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 5bc856250b..c3f22df530 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -536,11 +536,11 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
 
 	if ($sql === 'begin')
 	{
-		$db->sql_transaction('begin');
+		$result = $db->sql_transaction('begin');
 	}
 	else if ($sql === 'commit')
 	{
-		$db->sql_transaction('commit');
+		$result = $db->sql_transaction('commit');
 	}
 	else
 	{
-- 
cgit v1.2.1


From 47edadfc9e1b4788975910ad474cc2b806024ce3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Jun 2011 01:52:18 +0200
Subject: [ticket/10213] Update install schema with shorter index names.

PHPBB3-10213
---
 phpBB/develop/create_schema_files.php     | 8 ++++----
 phpBB/install/schemas/firebird_schema.sql | 6 +++---
 phpBB/install/schemas/mssql_schema.sql    | 6 +++---
 phpBB/install/schemas/mysql_40_schema.sql | 6 +++---
 phpBB/install/schemas/mysql_41_schema.sql | 6 +++---
 phpBB/install/schemas/oracle_schema.sql   | 6 +++---
 phpBB/install/schemas/postgres_schema.sql | 6 +++---
 phpBB/install/schemas/sqlite_schema.sql   | 6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index c153f3e1e8..f4d89e5562 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -643,7 +643,7 @@ foreach ($supported_dbms as $dbms)
 
 				if (strlen($table_name . $key_name) > 30)
 				{
-					trigger_error("Index name '$key_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+					trigger_error("Index name '${table_name}_$key_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
 				}
 
 				switch ($dbms)
@@ -1234,9 +1234,9 @@ function get_schema_struct()
 		),
 		'PRIMARY_KEY'	=> 'attempt_id',
 		'KEYS'			=> array(
-			'attempt_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
-			'attempt_forwarded_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-			'attempt_time'				=> array('INDEX', array('attempt_time')),
+			'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
+			'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+			'att_time'				=> array('INDEX', array('attempt_time')),
 			'user_id'					=> array('INDEX', 'user_id'),
 		),
 	);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 24ebd0f1af..5df7dfe9a5 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -559,9 +559,9 @@ CREATE TABLE phpbb_login_attempts (
 
 ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
 CREATE GENERATOR phpbb_login_attempts_gen;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index dbbd144aa0..0bc76c05e6 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -671,13 +671,13 @@ ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD
 	)  ON [PRIMARY] 
 GO
 
-CREATE  INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
+CREATE  INDEX [att_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
 GO
 
 CREATE  INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index bce04eedfb..6b13485a3d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -380,9 +380,9 @@ CREATE TABLE phpbb_login_attempts (
 	username blob NOT NULL,
 	username_clean blob NOT NULL,
 	PRIMARY KEY (attempt_id),
-	KEY attempt_ip (attempt_ip, attempt_time),
-	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
-	KEY attempt_time (attempt_time),
+	KEY att_ip (attempt_ip, attempt_time),
+	KEY att_for (attempt_forwarded_for, attempt_time),
+	KEY att_time (attempt_time),
 	KEY user_id (user_id)
 );
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index e77ad44dd8..b400e8fcff 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -380,9 +380,9 @@ CREATE TABLE phpbb_login_attempts (
 	username varchar(255) DEFAULT '0' NOT NULL,
 	username_clean varchar(255) DEFAULT '0' NOT NULL,
 	PRIMARY KEY (attempt_id),
-	KEY attempt_ip (attempt_ip, attempt_time),
-	KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
-	KEY attempt_time (attempt_time),
+	KEY att_ip (attempt_ip, attempt_time),
+	KEY att_for (attempt_forwarded_for, attempt_time),
+	KEY att_time (attempt_time),
 	KEY user_id (user_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 5a1e4930b2..8c79e870cb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -756,11 +756,11 @@ CREATE TABLE phpbb_login_attempts (
 )
 /
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
 /
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
 /
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time)
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time)
 /
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c4c2307c3a..359ec325d7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -541,9 +541,9 @@ CREATE TABLE phpbb_login_attempts (
 	PRIMARY KEY (attempt_id)
 );
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
 /*
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 9668c8d5f1..3158c1a177 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -369,9 +369,9 @@ CREATE TABLE phpbb_login_attempts (
 	username_clean varchar(255) NOT NULL DEFAULT '0'
 );
 
-CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
-CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
+CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
+CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time);
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
 
 # Table: 'phpbb_moderator_cache'
-- 
cgit v1.2.1


From c090e1c9e9fc2e435a4ae2f63923955d66dccd6d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 13 Jun 2011 06:14:59 +0200
Subject: [ticket/10214] Correct Oracle create table query syntax in db_tools

Removes the semicolon at end of oracle CREATE TABLE queries and adds a
semicolon to the end of a SELECT query inside of the trigger for a new
table's auto increment column before the end keyword

PHPBB3-10214
---
 phpBB/includes/db/db_tools.php    | 4 ++--
 phpBB/install/database_update.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index c1af2782f8..50e308dea2 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -543,7 +543,7 @@ class phpbb_db_tools
 			break;
 
 			case 'oracle':
-				$table_sql .= "\n);";
+				$table_sql .= "\n)";
 				$statements[] = $table_sql;
 
 				// do we need to add a sequence and a tigger for auto incrementing columns?
@@ -561,7 +561,7 @@ class phpbb_db_tools
 					$trigger .= "BEGIN\n";
 					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
 					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual\n";
+					$trigger .= "\tFROM dual;\n";
 					$trigger .= "END;";
 
 					$statements[] = $trigger;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 75b8644105..504d9afd68 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2484,7 +2484,7 @@ class updater_db_tools
 			break;
 
 			case 'oracle':
-				$table_sql .= "\n);";
+				$table_sql .= "\n)";
 				$statements[] = $table_sql;
 
 				// do we need to add a sequence and a tigger for auto incrementing columns?
@@ -2502,7 +2502,7 @@ class updater_db_tools
 					$trigger .= "BEGIN\n";
 					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
 					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual\n";
+					$trigger .= "\tFROM dual;\n";
 					$trigger .= "END;";
 
 					$statements[] = $trigger;
-- 
cgit v1.2.1


From bf61602a285bce86cb4f26c2155fd781fb09f7c5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 13 Jun 2011 22:23:28 +0200
Subject: [develop-olympus] Incrementing the version to 3.0.10-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 9cde068773..03b1102602 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.9-RC1');
+define('PHPBB_VERSION', '3.0.10-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 504d9afd68..f3586a5087 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.9-RC1';
+$updates_to_version = '3.0.10-dev';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 52f9a94746..153ac61157 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-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');
 
-- 
cgit v1.2.1


From f8eb15471488fe5f84669a9abbc2fc3a705903de Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 14 Jun 2011 06:11:35 -0400
Subject: [ticket/10218] Moving global deregistration, etc. to startup.php

Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
---
 phpBB/common.php                  | 107 +--------------------------------
 phpBB/download/file.php           |   7 +--
 phpBB/includes/startup.php        | 121 ++++++++++++++++++++++++++++++++++++++
 phpBB/install/database_update.php |  36 ++++--------
 phpBB/install/index.php           |  99 +------------------------------
 phpBB/style.php                   |  13 +---
 6 files changed, 138 insertions(+), 245 deletions(-)
 create mode 100644 phpBB/includes/startup.php

diff --git a/phpBB/common.php b/phpBB/common.php
index a176a45c38..491addc5e0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -16,112 +16,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
-/*
-* Remove variables created by register_globals from the global scope
-* Thanks to Matt Kavanagh
-*/
-function deregister_globals()
-{
-	$not_unset = array(
-		'GLOBALS'	=> true,
-		'_GET'		=> true,
-		'_POST'		=> true,
-		'_COOKIE'	=> true,
-		'_REQUEST'	=> true,
-		'_SERVER'	=> true,
-		'_SESSION'	=> true,
-		'_ENV'		=> true,
-		'_FILES'	=> true,
-		'phpEx'		=> true,
-		'phpbb_root_path'	=> true
-	);
-
-	// Not only will array_merge and array_keys give a warning if
-	// a parameter is not an array, array_merge will actually fail.
-	// So we check if _SESSION has been initialised.
-	if (!isset($_SESSION) || !is_array($_SESSION))
-	{
-		$_SESSION = array();
-	}
-
-	// Merge all into one extremely huge array; unset this later
-	$input = array_merge(
-		array_keys($_GET),
-		array_keys($_POST),
-		array_keys($_COOKIE),
-		array_keys($_SERVER),
-		array_keys($_SESSION),
-		array_keys($_ENV),
-		array_keys($_FILES)
-	);
-
-	foreach ($input as $varname)
-	{
-		if (isset($not_unset[$varname]))
-		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE (so a cookie called GLOBALS doesn't lock users out completely)
-			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
-			{
-				exit;
-			}
-			else
-			{
-				$cookie = &$_COOKIE;
-				while (isset($cookie['GLOBALS']))
-				{
-					if (!is_array($cookie['GLOBALS']))
-					{
-						break;
-					}
-
-					foreach ($cookie['GLOBALS'] as $registered_var => $value)
-					{
-						if (!isset($not_unset[$registered_var]))
-						{
-							unset($GLOBALS[$registered_var]);
-						}
-					}
-					$cookie = &$cookie['GLOBALS'];
-				}
-			}
-		}
-
-		unset($GLOBALS[$varname]);
-	}
-
-	unset($input);
-}
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-
-	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
-	{
-		deregister_globals();
-	}
-
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 if (file_exists($phpbb_root_path . 'config.' . $phpEx))
 {
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index ed5c4f55b8..c17f0cf018 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -31,12 +31,7 @@ else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'
 
 if (isset($_GET['avatar']))
 {
-	if (!defined('E_DEPRECATED'))
-	{
-		define('E_DEPRECATED', 8192);
-	}
-	error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
+	require($phpbb_root_path . 'includes/startup.' . $phpEx);
 	require($phpbb_root_path . 'config.' . $phpEx);
 
 	if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
new file mode 100644
index 0000000000..2958277174
--- /dev/null
+++ b/phpBB/includes/startup.php
@@ -0,0 +1,121 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+$starttime = explode(' ', microtime());
+$starttime = $starttime[1] + $starttime[0];
+
+// Report all errors, except notices and deprecation messages
+if (!defined('E_DEPRECATED'))
+{
+	define('E_DEPRECATED', 8192);
+}
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+
+/*
+* Remove variables created by register_globals from the global scope
+* Thanks to Matt Kavanagh
+*/
+function deregister_globals()
+{
+	$not_unset = array(
+		'GLOBALS'	=> true,
+		'_GET'		=> true,
+		'_POST'		=> true,
+		'_COOKIE'	=> true,
+		'_REQUEST'	=> true,
+		'_SERVER'	=> true,
+		'_SESSION'	=> true,
+		'_ENV'		=> true,
+		'_FILES'	=> true,
+		'phpEx'		=> true,
+		'phpbb_root_path'	=> true
+	);
+
+	// Not only will array_merge and array_keys give a warning if
+	// a parameter is not an array, array_merge will actually fail.
+	// So we check if _SESSION has been initialised.
+	if (!isset($_SESSION) || !is_array($_SESSION))
+	{
+		$_SESSION = array();
+	}
+
+	// Merge all into one extremely huge array; unset this later
+	$input = array_merge(
+		array_keys($_GET),
+		array_keys($_POST),
+		array_keys($_COOKIE),
+		array_keys($_SERVER),
+		array_keys($_SESSION),
+		array_keys($_ENV),
+		array_keys($_FILES)
+	);
+
+	foreach ($input as $varname)
+	{
+		if (isset($not_unset[$varname]))
+		{
+			// Hacking attempt. No point in continuing unless it's a COOKIE (so a cookie called GLOBALS doesn't lock users out completely)
+			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
+			{
+				exit;
+			}
+			else
+			{
+				$cookie = &$_COOKIE;
+				while (isset($cookie['GLOBALS']))
+				{
+					if (!is_array($cookie['GLOBALS']))
+					{
+						break;
+					}
+
+					foreach ($cookie['GLOBALS'] as $registered_var => $value)
+					{
+						if (!isset($not_unset[$registered_var]))
+						{
+							unset($GLOBALS[$registered_var]);
+						}
+					}
+					$cookie = &$cookie['GLOBALS'];
+				}
+			}
+		}
+
+		unset($GLOBALS[$varname]);
+	}
+
+	unset($input);
+}
+
+// If we are on PHP >= 6.0.0 we do not need some code
+if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+{
+	/**
+	* @ignore
+	*/
+	define('STRIP', false);
+}
+else
+{
+	@set_magic_quotes_runtime(0);
+
+	// Be paranoid with passed vars
+	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
+	{
+		deregister_globals();
+	}
+
+	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
+}
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 504d9afd68..478ec36c23 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,17 +8,21 @@
 *
 */
 
-$updates_to_version = '3.0.9-RC1';
+define('UPDATES_TO_VERSION', '3.0.9-RC1');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
-$debug_from_version = false;
+define('DEBUG_FROM_VERSION', false);
 
 // Which oldest version does this updater support?
-$oldest_from_version = '3.0.0';
+define('OLDEST_FROM_VERSION', '3.0.0');
 
 // Return if we "just include it" to find out for which version the database update is responsible for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
 {
+	$updates_to_version = UPDATES_TO_VERSION;
+	$debug_from_version = DEBUG_FROM_VERSION;
+	$oldest_from_version = OLDEST_FROM_VERSION;
+
 	return;
 }
 
@@ -30,12 +34,12 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-//error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
+
+$updates_to_version = UPDATES_TO_VERSION;
+$debug_from_version = DEBUG_FROM_VERSION;
+$oldest_from_version = OLDEST_FROM_VERSION;
+
 error_reporting(E_ALL);
 
 @set_time_limit(0);
@@ -85,20 +89,6 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
 	define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
 }
 
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
-
 $user = new user();
 $cache = new cache();
 $db = new $sql_db();
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index bace22f177..ff6a297022 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -18,110 +18,13 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
 // @todo Review this test and see if we can find out what it is which prevents PHP 4.2.x from even displaying the page with requirements on it
 if (version_compare(PHP_VERSION, '4.3.3') < 0)
 {
 	die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0');
 }
 
-/*
-* Remove variables created by register_globals from the global scope
-* Thanks to Matt Kavanagh
-*/
-function deregister_globals()
-{
-	$not_unset = array(
-		'GLOBALS'	=> true,
-		'_GET'		=> true,
-		'_POST'		=> true,
-		'_COOKIE'	=> true,
-		'_REQUEST'	=> true,
-		'_SERVER'	=> true,
-		'_SESSION'	=> true,
-		'_ENV'		=> true,
-		'_FILES'	=> true,
-		'phpEx'		=> true,
-		'phpbb_root_path'	=> true
-	);
-
-	// Not only will array_merge and array_keys give a warning if
-	// a parameter is not an array, array_merge will actually fail.
-	// So we check if _SESSION has been initialised.
-	if (!isset($_SESSION) || !is_array($_SESSION))
-	{
-		$_SESSION = array();
-	}
-
-	// Merge all into one extremely huge array; unset this later
-	$input = array_merge(
-		array_keys($_GET),
-		array_keys($_POST),
-		array_keys($_COOKIE),
-		array_keys($_SERVER),
-		array_keys($_SESSION),
-		array_keys($_ENV),
-		array_keys($_FILES)
-	);
-
-	foreach ($input as $varname)
-	{
-		if (isset($not_unset[$varname]))
-		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE
-			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
-			{
-				exit;
-			}
-			else
-			{
-				$cookie = &$_COOKIE;
-				while (isset($cookie['GLOBALS']))
-				{
-					foreach ($cookie['GLOBALS'] as $registered_var => $value)
-					{
-						if (!isset($not_unset[$registered_var]))
-						{
-							unset($GLOBALS[$registered_var]);
-						}
-					}
-					$cookie = &$cookie['GLOBALS'];
-				}
-			}
-		}
-
-		unset($GLOBALS[$varname]);
-	}
-
-	unset($input);
-}
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-
-	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
-	{
-		deregister_globals();
-	}
-
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 // Try to override some limits - maybe it helps some...
 @set_time_limit(0);
diff --git a/phpBB/style.php b/phpBB/style.php
index f3e1b4c89e..916aa8ce5c 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -15,13 +15,7 @@ define('IN_PHPBB', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
 require($phpbb_root_path . 'config.' . $phpEx);
 
 if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
@@ -29,11 +23,6 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
 	exit;
 }
 
-if (version_compare(PHP_VERSION, '6.0.0-dev', '<'))
-{
-	@set_magic_quotes_runtime(0);
-}
-
 // Load Extensions
 if (!empty($load_extensions) && function_exists('dl'))
 {
-- 
cgit v1.2.1


From bc7aebe0fb10e3a3bf0606ec4b8ebc1e6f622592 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 14 Jun 2011 23:18:33 +0200
Subject: [ticket/10219] Remove invalid and invisible character from
 web.config.

PHPBB3-10219
---
 phpBB/web.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/web.config b/phpBB/web.config
index 128fe3c98f..a73c328626 100644
--- a/phpBB/web.config
+++ b/phpBB/web.config
@@ -6,7 +6,7 @@
 				<hiddenSegments>
 					<add segment="cache" />
 					<add segment="files" />
-					<add segment="store" />­
+					<add segment="store" />
 					<add segment="config.php" />
 					<add segment="common.php" />
 				</hiddenSegments>
-- 
cgit v1.2.1


From 4bb98fb0463d543f60201c3f8435ada3e0b070da Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 15 Jun 2011 00:50:12 -0400
Subject: [ticket/10218] Prevent startime from being overwritten by
 deregister_globals()

PHPBB3-10218
---
 phpBB/includes/startup.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 2958277174..be46c17ba6 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -13,8 +13,6 @@ if (!defined('IN_PHPBB'))
 {
 	exit;
 }
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
 
 // Report all errors, except notices and deprecation messages
 if (!defined('E_DEPRECATED'))
@@ -119,3 +117,6 @@ else
 
 	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
 }
+
+$starttime = explode(' ', microtime());
+$starttime = $starttime[1] + $starttime[0];
-- 
cgit v1.2.1


From 74785a8bdaab17cd698028ac0c8ccfb3c570cd5d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 15 Jun 2011 18:10:15 +0200
Subject: [ticket/10220] Limit user agent value length for storage in login
 attempt table

PHPBB3-10220
---
 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 fe3ea30b2a..018d5cce70 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -90,7 +90,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 
 		$attempt_data = array(
 			'attempt_ip'			=> $ip,
-			'attempt_browser'		=> $browser,
+			'attempt_browser'		=> trim(substr($browser, 0, 149)),
 			'attempt_forwarded_for'	=> $forwarded_for,
 			'attempt_time'			=> time(),
 			'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
-- 
cgit v1.2.1


From 48e5e56146bdf1b2b30556e8fb353e7aa20f7fb6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 15 Jun 2011 19:41:14 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.

---
 build/build.xml                       | 6 +++---
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index c22f41691b..30dfa0c8da 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.9-RC1" />
-	<property name="prevversion" value="3.0.8" />
-	<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" />
+	<property name="newversion" value="3.0.9-RC2" />
+	<property name="prevversion" value="3.0.9-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" />
 	<!-- 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 9cde068773..a372b96017 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.9-RC1');
+define('PHPBB_VERSION', '3.0.9-RC2');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 478ec36c23..e9213cac9d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC1');
+define('UPDATES_TO_VERSION', '3.0.9-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -953,6 +953,8 @@ function database_update_info()
 				),
 			),
 		),
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		'3.0.9-RC1'		=> array(),
 	);
 }
 
@@ -1944,6 +1946,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.9-RC1 to 3.0.9-RC2
+		case '3.0.9-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 52f9a94746..5e8aee85ef 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-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');
 
-- 
cgit v1.2.1


From 63b9b91dee9da85b68f4c4316a01be54d24fde9f Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 16 Jun 2011 16:02:34 +0200
Subject: [ticket/10221] Append unit (seconds) after input field, remove from
 explanation

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

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9f00145f3b..d8ab42ed2d 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -387,7 +387,7 @@ class acp_board
 						'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),
 						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
+						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'ip_login_limit_use_forwarded'	=> array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 556ad212c0..68474ee893 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -465,7 +465,7 @@ $lang = array_merge($lang, array(
 	'IP_LOGIN_LIMIT_MAX'			=> 'Maximum number of login attempts per IP address',
 	'IP_LOGIN_LIMIT_MAX_EXPLAIN'	=> 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.',
 	'IP_LOGIN_LIMIT_TIME'			=> 'IP address login attempt expiration time',
-	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period, in seconds.',
+	'IP_LOGIN_LIMIT_TIME_EXPLAIN'	=> 'Login attempts expire after this period.',
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
 	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
 	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts per username',
-- 
cgit v1.2.1


From 2bae5298e01c037fc552da9b5f160821a627a417 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 16 Jun 2011 16:16:55 +0200
Subject: [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.

---
 phpBB/docs/CHANGELOG.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 915f7e6a71..499afb43bd 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -301,6 +301,14 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10211'>PHPBB3-10211</a>] -         Missing space on the recent PHPBB3-9992 changes
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10218'>PHPBB3-10218</a>] -         STRIP is not defined in style.php causing a notice to be thrown
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10219'>PHPBB3-10219</a>] -         Inappropriate character in web.config file
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10220'>PHPBB3-10220</a>] -         Logging in with Mobile Device triggers SQL error on *_login_attempts.
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10221'>PHPBB3-10221</a>] -         Inconsistent usage of &quot;Seconds&quot; in ACP Settings
+</li>
 </ul>
     
 <h4>        Improvement
-- 
cgit v1.2.1


From 1b0821a11baf7e15686dae9c2648878a826be80e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 01:02:58 +0200
Subject: [ticket/10223] requiring the new startup.php file conditionally.

Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
---
 phpBB/install/database_update.php | 24 +++++++++++++++++++-----
 phpBB/install/index.php           | 24 +++++++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e9213cac9d..0d424d0d88 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -34,7 +34,24 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
+function phpbb_require_updated($path, $optional = false)
+{
+    global $phpbb_root_path;
+
+    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
+    $old_path = $phpbb_root_path . $path;
+
+    if (file_exists($new_path))
+    {
+        require($new_path);
+    }
+    else if (file_exists($old_path) || !$optional)
+    {
+        require($old_path);
+    }
+}
+
+phpbb_require_updated('includes/startup.' . $phpEx);
 
 $updates_to_version = UPDATES_TO_VERSION;
 $debug_from_version = DEBUG_FROM_VERSION;
@@ -72,10 +89,7 @@ require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
-{
-	require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-}
+phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
 
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index ff6a297022..c82c3dbc13 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -24,7 +24,24 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0)
 	die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0');
 }
 
-require($phpbb_root_path . 'includes/startup.' . $phpEx);
+function phpbb_require_updated($path, $optional = false)
+{
+    global $phpbb_root_path;
+
+    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
+    $old_path = $phpbb_root_path . $path;
+
+    if (file_exists($new_path))
+    {
+        require($new_path);
+    }
+    else if (file_exists($old_path) || !$optional)
+    {
+        require($old_path);
+    }
+}
+
+phpbb_require_updated('includes/startup.' . $phpEx);
 
 // Try to override some limits - maybe it helps some...
 @set_time_limit(0);
@@ -57,10 +74,7 @@ else
 // Include essential scripts
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
-{
-	require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
-}
+phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
-- 
cgit v1.2.1


From dd0606a31736f0f7c26da43bcbd1c121b5264244 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Sat, 18 Jun 2011 15:00:39 +0200
Subject: [ticket/10229] On languge/acp/styles.php "%s" should be %s

PHPBB3-10229
---
 phpBB/language/en/acp/styles.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 8f65b3ef5f..3c8c4a328f 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -285,9 +285,9 @@ $lang = array_merge($lang, array(
 	'INSTALLED_TEMPLATE'		=> 'Installed templates',
 	'INSTALLED_THEME'			=> 'Installed themes',
 
-	'KEEP_IMAGESET'				=> 'Keep "%s" imageset',
-	'KEEP_TEMPLATE'				=> 'Keep "%s" template',
-	'KEEP_THEME'				=> 'Keep "%s" theme',
+	'KEEP_IMAGESET'				=> 'Keep “%s” imageset',
+	'KEEP_TEMPLATE'				=> 'Keep “%s” template',
+	'KEEP_THEME'				=> 'Keep “%s” theme',
 
 	'LINE_SPACING'				=> 'Line spacing',
 	'LOCALISED_IMAGES'			=> 'Localised',
@@ -325,7 +325,7 @@ $lang = array_merge($lang, array(
 	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
 	'REPLACE_THEME'				=> 'Replace theme with',
 	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
-	'REPLACE_WITH_OPTION'		=> 'Replace with "%s"',
+	'REPLACE_WITH_OPTION'		=> 'Replace with “%s”',
 	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
 	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
 	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
-- 
cgit v1.2.1


From 6458a1a16ac3d9935a4933b0de7b6e464b33fce3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 23:21:45 +0200
Subject: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to
 S_SEARCH_LOCAL_HIDDEN_FIELDS

Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
---
 phpBB/styles/prosilver/template/viewforum_body.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 phpBB/styles/subsilver2/template/searchbox.html     | 2 +-
 phpBB/viewforum.php                                 | 2 +-
 phpBB/viewtopic.php                                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 6a789074b1..02f42fa097 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -49,7 +49,7 @@
 			<fieldset>
 				<input class="inputbox search tiny" type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_FORUM}" onclick="if (this.value == '{LA_SEARCH_FORUM}') this.value = '';" onblur="if (this.value == '') this.value = '{LA_SEARCH_FORUM}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />
-				{S_SEARCH_HIDDEN_FIELDS}
+				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 98e1988d10..32292f89ef 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -42,7 +42,7 @@
 			<fieldset>
 				<input class="inputbox search tiny"  type="text" name="keywords" id="search_keywords" size="20" value="{L_SEARCH_TOPIC}" onclick="if(this.value=='{LA_SEARCH_TOPIC}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_TOPIC}';" />
 				<input class="button2" type="submit" value="{L_SEARCH}" />
-				{S_SEARCH_HIDDEN_FIELDS}
+				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
 		</div>
diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html
index 09b87a15d8..622961c881 100644
--- a/phpBB/styles/subsilver2/template/searchbox.html
+++ b/phpBB/styles/subsilver2/template/searchbox.html
@@ -1 +1 @@
-<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_HIDDEN_FIELDS}</form>
+<form method="get" name="search" action="{S_SEARCHBOX_ACTION}"><span class="gensmall">{L_SEARCH_FOR}:</span> <input class="post" type="text" name="keywords" size="20" /> <input class="btnlite" type="submit" value="{L_GO}" />{S_SEARCH_LOCAL_HIDDEN_FIELDS}</form>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index fff5be69d3..cce25d115c 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -311,7 +311,7 @@ $template->assign_vars(array(
 	'S_FORUM_ACTION'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . (($start == 0) ? '' : "&amp;start=$start")),
 	'S_DISPLAY_SEARCHBOX'	=> ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,
 	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
-	'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
+	'S_SEARCH_LOCAL_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 	'S_SINGLE_MODERATOR'	=> (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
 	'S_IS_LOCKED'			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
 	'S_VIEWFORUM'			=> true,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index e4c02a88fb..08e82591de 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -646,7 +646,7 @@ $template->assign_vars(array(
 	'S_VIEWTOPIC'			=> true,
 	'S_DISPLAY_SEARCHBOX'	=> ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,
 	'S_SEARCHBOX_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
-	'S_SEARCH_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
+	'S_SEARCH_LOCAL_HIDDEN_FIELDS'	=> build_hidden_fields($s_search_hidden_fields),
 
 	'S_DISPLAY_POST_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
 	'S_DISPLAY_REPLY_INFO'	=> ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false,
-- 
cgit v1.2.1


From d3f1b6029248d20d4a3a4bc2f3684f8aad88559d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Jun 2011 23:48:37 +0200
Subject: [ticket/10223] Check optional before file_exists and correct require
 path

PHPBB3-10223
---
 phpBB/install/database_update.php | 4 ++--
 phpBB/install/index.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0d424d0d88..337f08b626 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -45,7 +45,7 @@ function phpbb_require_updated($path, $optional = false)
     {
         require($new_path);
     }
-    else if (file_exists($old_path) || !$optional)
+    else if (!$optional || file_exists($old_path))
     {
         require($old_path);
     }
@@ -89,7 +89,7 @@ require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
+phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index c82c3dbc13..5189cbfc8e 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -35,7 +35,7 @@ function phpbb_require_updated($path, $optional = false)
     {
         require($new_path);
     }
-    else if (file_exists($old_path) || !$optional)
+    else if (!$optional || file_exists($old_path))
     {
         require($old_path);
     }
@@ -74,7 +74,7 @@ else
 // Include essential scripts
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
-phpbb_require_updated($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
+phpbb_require_updated('includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);
-- 
cgit v1.2.1


From d37e8dd6d38bc288ae9179389ac845cab1f61386 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 19 Jun 2011 00:13:33 +0200
Subject: [ticket/10223] The search fid parameter is an array of forums not
 just an id

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

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index fff5be69d3..cfdc90c947 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -267,7 +267,7 @@ $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LO
 // Display active topics?
 $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
 
-$s_search_hidden_fields = array('fid' => $forum_id);
+$s_search_hidden_fields = array('fid' => array($forum_id));
 if ($_SID)
 {
 	$s_search_hidden_fields['sid'] = $_SID;
-- 
cgit v1.2.1


From 7de078b26e2a0b2672f24efe715b440cca7f5979 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 19 Jun 2011 19:03:53 +0800
Subject: [ticket/10227] Allow persistent connections for mysqli with PHP
 5.3.0+

PHPBB3-10227
---
 phpBB/includes/db/mysqli.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 862d62f4ba..dcf8727e18 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -33,13 +33,16 @@ class dbal_mysqli extends dbal
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
 	{
-		$this->persistency = $persistency;
+		// Mysqli extension supports persistent connection since PHP 5.3.0
+		$this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false;
 		$this->user = $sqluser;
-		$this->server = $sqlserver;
+
+		// If persistent connection, set dbhost to localhost when empty and prepend it with 'p:' prefix
+		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;
+
 		$this->dbname = $database;
 		$port = (!$port) ? NULL : $port;
 
-		// Persistant connections not supported by the mysqli extension?
 		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port);
 
 		if ($this->db_connect_id && $this->dbname != '')
-- 
cgit v1.2.1


From 67fde80fbbfc219352ad19124446bb63451306eb Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 19 Jun 2011 23:02:59 +0200
Subject: [ticket/10223] Replace spaces with tabs

PHPBB3-10223
---
 phpBB/install/database_update.php | 26 +++++++++++++-------------
 phpBB/install/index.php           | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 337f08b626..e0901eedb1 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -36,19 +36,19 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
 function phpbb_require_updated($path, $optional = false)
 {
-    global $phpbb_root_path;
-
-    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
-    $old_path = $phpbb_root_path . $path;
-
-    if (file_exists($new_path))
-    {
-        require($new_path);
-    }
-    else if (!$optional || file_exists($old_path))
-    {
-        require($old_path);
-    }
+	global $phpbb_root_path;
+
+	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+	$old_path = $phpbb_root_path . $path;
+
+	if (file_exists($new_path))
+	{
+		require($new_path);
+	}
+	else if (!$optional || file_exists($old_path))
+	{
+		require($old_path);
+	}
 }
 
 phpbb_require_updated('includes/startup.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 5189cbfc8e..f534980389 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -26,19 +26,19 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0)
 
 function phpbb_require_updated($path, $optional = false)
 {
-    global $phpbb_root_path;
-
-    $new_path = $phpbb_root_path . 'install/update/new/' . $path;
-    $old_path = $phpbb_root_path . $path;
-
-    if (file_exists($new_path))
-    {
-        require($new_path);
-    }
-    else if (!$optional || file_exists($old_path))
-    {
-        require($old_path);
-    }
+	global $phpbb_root_path;
+
+	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+	$old_path = $phpbb_root_path . $path;
+
+	if (file_exists($new_path))
+	{
+		require($new_path);
+	}
+	else if (!$optional || file_exists($old_path))
+	{
+		require($old_path);
+	}
 }
 
 phpbb_require_updated('includes/startup.' . $phpEx);
-- 
cgit v1.2.1


From ad5ed9d0ee987da29a6d49c42cc3118d4868e539 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 20 Jun 2011 00:00:30 +0200
Subject: [ticket/10223] Make definition of phpbb_require_updated conditional

The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
---
 phpBB/install/database_update.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e0901eedb1..edfc3b1027 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -34,20 +34,23 @@ define('IN_INSTALL', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
-function phpbb_require_updated($path, $optional = false)
+if (!function_exists('phpbb_require_updated'))
 {
-	global $phpbb_root_path;
+	function phpbb_require_updated($path, $optional = false)
+	{
+		global $phpbb_root_path;
 
-	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
-	$old_path = $phpbb_root_path . $path;
+		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
+		$old_path = $phpbb_root_path . $path;
 
-	if (file_exists($new_path))
-	{
-		require($new_path);
-	}
-	else if (!$optional || file_exists($old_path))
-	{
-		require($old_path);
+		if (file_exists($new_path))
+		{
+			require($new_path);
+		}
+		else if (!$optional || file_exists($old_path))
+		{
+			require($old_path);
+		}
 	}
 }
 
-- 
cgit v1.2.1


From 8c01ed578da2a501b9ad1fc8541e3eb237d1b765 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 20 Jun 2011 00:03:20 +0200
Subject: [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of
 "PHP Notice"

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b8d9e0b92e..a89b47b170 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3776,7 +3776,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 				// remove complete path to installation, with the risk of changing backslashes meant to be there
 				$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
 				$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
-				echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
+				$error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice';
+				echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
 
 				// we are writing an image - the user won't see the debug, so let's place it in the log
 				if (defined('IMAGE_OUTPUT') || defined('IN_CRON'))
-- 
cgit v1.2.1


From 578f9dffa607de1da2aa181b49be583f27f3bf28 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 21 Jun 2011 00:21:42 +0800
Subject: [ticket/10226] Allow mysqli connections via local sockets/pipes

PHPBB3-10226
---
 phpBB/includes/db/mysqli.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index dcf8727e18..1901847c0f 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -43,7 +43,23 @@ class dbal_mysqli extends dbal
 		$this->dbname = $database;
 		$port = (!$port) ? NULL : $port;
 
-		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port);
+		// If port is set and it is not numeric, most likely mysqli socket is set.
+		// Try to map it to the $socket parameter.
+		$socket = NULL;
+		if ($port)
+		{
+			if (preg_match('#^[0-9]+$#', $port))
+			{
+				$port = (int) $port;
+			}
+			else
+			{
+				$socket = $port;
+				$port = NULL;
+			}
+		}
+
+		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket);
 
 		if ($this->db_connect_id && $this->dbname != '')
 		{
-- 
cgit v1.2.1


From 18fb3d86cdac01c2dd1469982a51526fa1480b42 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 21 Jun 2011 22:03:19 +0800
Subject: [ticket/10226] Use is_numeric() instead of preg_replace()

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

diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 1901847c0f..46c2f9210b 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -48,7 +48,7 @@ class dbal_mysqli extends dbal
 		$socket = NULL;
 		if ($port)
 		{
-			if (preg_match('#^[0-9]+$#', $port))
+			if (is_numeric($port))
 			{
 				$port = (int) $port;
 			}
-- 
cgit v1.2.1


From 237af043d62aaafba77e053417e88ca912a04d82 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 22 Jun 2011 02:27:37 +0200
Subject: [ticket/10228] Correct "trigger" to "triggered" in acp registration
 settings

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 68474ee893..0254bff992 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -469,7 +469,7 @@ $lang = array_merge($lang, array(
 	'IP_LOGIN_LIMIT_USE_FORWARDED'	=> 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',
 	'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN'	=> 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>',
 	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts per username',
-	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being trigger for distinct user accounts.',
+	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered for distinct user accounts.',
 	'NO_IP_VALIDATION'				=> 'None',
 	'NO_REF_VALIDATION'				=> 'None',
 	'PASSWORD_TYPE'					=> 'Password complexity',
-- 
cgit v1.2.1


From 9f3b159998a2ffeb5476cd77e08c372a196360a4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 20 Jun 2011 01:23:43 +0200
Subject: [ticket/7729] Prevent date/time functions from throwing E_WARNING on
 PHP 5.3.

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

diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index be46c17ba6..ca9665da29 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -118,5 +118,33 @@ else
 	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
 }
 
+// Prevent date/time functions from throwing E_WARNING on PHP 5.3 by setting a default timezone
+if (function_exists('date_default_timezone_set') && function_exists('date_default_timezone_get'))
+{
+	// For PHP 5.1.0 the date/time functions have been rewritten
+	// and setting a timezone is required prior to calling any date/time function.
+
+	// Since PHP 5.2.0 calls to date/time functions without having a timezone set
+	// result in E_STRICT errors being thrown.
+	// Note: We already exclude E_STRICT errors
+	// (to be exact: they are not included in E_ALL in PHP 5.2)
+
+	// In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems
+	// because we show E_WARNING errors and do not set a default timezone.
+	// This is because we have our own timezone handling and work in UTC only anyway.
+
+	// So what we basically want to do is set our timezone to UTC,
+	// but we don't know what other scripts (such as bridges) are involved,
+	// so we check whether a timezone is already set by calling date_default_timezone_get().
+
+	// Unfortunately, date_default_timezone_get() itself might throw E_WARNING
+	// if no timezone has been set, so we have to keep it quiet with @.
+
+	// date_default_timezone_get() tries to guess the correct timezone first
+	// and then falls back to UTC when everything fails.
+	// We just set the timezone to whatever date_default_timezone_get() returns.
+	date_default_timezone_set(@date_default_timezone_get());
+}
+
 $starttime = explode(' ', microtime());
 $starttime = $starttime[1] + $starttime[0];
-- 
cgit v1.2.1


From d59482366ad7c727dd5519b5acc898dd495473ba Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Sun, 19 Jun 2011 16:40:25 +0200
Subject: [ticket/10233] IE Emulation fix breaks PM posting layout

The minimum and maximum width of 100% make the textarea dynamically
adjust. However the smilies next to the textarea will float out of
their containing div when the default width pre-min/max is specified
as a too high value.

PHPBB3-10233
---
 phpBB/styles/prosilver/theme/forms.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 3f85aa3099..803c608bcf 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -262,7 +262,7 @@ fieldset.submit-buttons input {
 
 #message-box textarea {
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
-	width: 700px;
+	width: 450px;
 	height: 270px;
 	min-width: 100%;
 	max-width: 100%;
-- 
cgit v1.2.1


From a5ef6c3b2070f45f88b9d5942cd974c9c26376c5 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 26 Jun 2011 11:01:46 +0200
Subject: [ticket/10188] Prevent semi-compressed output

When a non-fatal error occurs at the beginning of the script before any custom
error handler is set one of two situations can be encountered:

1) if the ini option output buffer is disabled:
      - headers are sent to the http client
      - the error message is output
2) if the ini option output_buffer is enabled or the script
   is run within an ob_start()/ob_end() wrapper:
      - the error message is written to the output buffer

Once the script reaches page_header() phpbb starts gzip compression if enabled.
This is done through ob_start with a ob_gzhandler as a callback. The
compression is skipped if headers have already been sent. In situation 1) the
error message sent in plain text comes with headers and this gzip compression
is skipped. The client receives a plaintext version of the page. However in
situation 2) headers have not been sent yet and the rest of the page will be
compressed. The result is a plaintext error message followed by compressed
output. The client does not understand this output resulting in either an
error message or simply a blank page in the browser.

In addition to the above situation this problem occurs with errors that are
triggered after the custom error handler is loaded. The problem has been
noticed before, and a workaround was found. The error handler would call
ob_flush() for particular configuration settings before outputting the error
message. This resulted in headers being sent when output buffering was enabled
thus disabling gzip compression for the rest of the page. The constraints under
which ob_flush() was called were lessened over time whenever a new case was
found that would trigger this problem. Eventually ob_flush() would be called
even when code causing an E_NOTICE was simply run within an ob_start/ob_end.
This makes it impossible to use output buffering to retrieve the content of an
error message without prohibiting the page from setting headers afterwards.

This commit removes all flushing in msg_handler completely and instead fixes
the problem for both errors before and after the error handler is registered.
GZIP compression is only enabled if there is at most one level of output
buffering (e.g. the output_buffer php.ini option is enabled) and if there has
not yet been any output in this buffer. This should avoid any partial output
compression.

PHPBB3-10188
---
 phpBB/includes/functions.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a89b47b170..d05cccc440 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3758,21 +3758,6 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 			{
-				// flush the content, else we get a white page if output buffering is on
-				if (ob_get_level() > 0)
-				{
-					@ob_flush();
-				}
-
-				// Another quick fix for those having gzip compression enabled, but do not flush if the coder wants to catch "something". ;)
-				if (!empty($config['gzip_compress']))
-				{
-					if (@extension_loaded('zlib') && !headers_sent() && !ob_get_level())
-					{
-						@ob_flush();
-					}
-				}
-
 				// remove complete path to installation, with the risk of changing backslashes meant to be there
 				$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
 				$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
@@ -4332,7 +4317,21 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	// gzip_compression
 	if ($config['gzip_compress'])
 	{
-		if (@extension_loaded('zlib') && !headers_sent())
+		// to avoid partially compressed output resulting in blank pages in
+		// the browser or error messages, compression is disabled in a few cases:
+		//
+		// 1) if headers have already been sent, this indicates plaintext output
+		//    has been started so further content must not be compressed
+		// 2) the length of the current output buffer is non-zero. This means
+		//    there is already some uncompressed content in this output buffer
+		//    so further output must not be compressed
+		// 3) if more than one level of output buffering is used because we
+		//    cannot test all output buffer level content lengths. One level
+		//    could be caused by php.ini output_buffering. Anything
+		//    beyond that is manual, so the code wrapping phpBB in output buffering
+		//    can easily compress the output itself.
+		//
+		if (@extension_loaded('zlib') && !headers_sent() && ob_get_level() <= 1 && ob_get_length() == 0)
 		{
 			ob_start('ob_gzhandler');
 		}
-- 
cgit v1.2.1


From fe0932fdf02a45be914414eca586add1c083cbee Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 20:47:33 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.

---
 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, 11 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 30dfa0c8da..ed9643c12f 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.9-RC2" />
-	<property name="prevversion" value="3.0.9-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" />
+	<property name="newversion" value="3.0.9-RC3" />
+	<property name="prevversion" value="3.0.9-RC2" />
+	<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-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 a372b96017..2f485fb4d7 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.9-RC2');
+define('PHPBB_VERSION', '3.0.9-RC3');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index edfc3b1027..bfbddf2dc5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -972,6 +972,8 @@ function database_update_info()
 		),
 		// No changes from 3.0.9-RC1 to 3.0.9-RC2
 		'3.0.9-RC1'		=> array(),
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		'3.0.9-RC2'		=> array(),
 	);
 }
 
@@ -1967,6 +1969,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC1 to 3.0.9-RC2
 		case '3.0.9-RC1':
 		break;
+
+		// No changes from 3.0.9-RC2 to 3.0.9-RC3
+		case '3.0.9-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5e8aee85ef..b3f136ff7a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC3');
 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');
 
-- 
cgit v1.2.1


From 172e3c07d6eac211aaa8302f3802182fa7b1d0d9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 20:52:54 +0200
Subject: [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.

---
 phpBB/docs/CHANGELOG.html | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 499afb43bd..6b12cb81bf 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -207,6 +207,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10021'>PHPBB3-10021</a>] -         &quot;Find a member&quot; generates SQL error when large dates are entered
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10029'>PHPBB3-10029</a>] -         No such thing as $_SERVER[&#39;HTTP_VERSION&#39;]
+</li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10033'>PHPBB3-10033</a>] -         &quot;Disallow usernames&quot; does not check already disallowed names
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10035'>PHPBB3-10035</a>] -         ACP template edit feature allows to read any files on webserver and to upload/execute any script on it
@@ -285,7 +287,9 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10178'>PHPBB3-10178</a>] -         build.xml does not specify path to find - breaks on FreeBSD
 </li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10188'>PHPBB3-10188</a>] -         Wrong handling of output_buffering value in message handler
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10188'>PHPBB3-10188</a>] -         Broken compressed output when errors/warnings are handled by phpbb and output_buffering is set to 4096 and phpbb gzip is enabled
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10191'>PHPBB3-10191</a>] -         Duplicate output when output_handler is set in php.ini
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10192'>PHPBB3-10192</a>] -         Missing semicolon in MySQL Upgrader
 </li>
@@ -301,6 +305,10 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10211'>PHPBB3-10211</a>] -         Missing space on the recent PHPBB3-9992 changes
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10213'>PHPBB3-10213</a>] -         IP limit index name too long on Oracle
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10214'>PHPBB3-10214</a>] -         Cannot configure Q&amp;A on Oracle
+</li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10218'>PHPBB3-10218</a>] -         STRIP is not defined in style.php causing a notice to be thrown
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10219'>PHPBB3-10219</a>] -         Inappropriate character in web.config file
@@ -309,6 +317,22 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10221'>PHPBB3-10221</a>] -         Inconsistent usage of &quot;Seconds&quot; in ACP Settings
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-7729'>PHPBB3-7729</a>] -         Prevent date/time functions from throwing E_WARNING on PHP 5.3 by setting a default timezone
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10188'>PHPBB3-10188</a>] -         Broken compressed output when errors/warnings are handled by phpbb and output_buffering is set to 4096 and phpbb gzip is enabled
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10223'>PHPBB3-10223</a>] -         Updater references startup.php from board path
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10228'>PHPBB3-10228</a>] -         Typo in 3.0.9-RC1 user registration settings
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10229'>PHPBB3-10229</a>] -         On languge/acp/styles.php &quot;%s&quot; should be &quot;%s&quot;
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10232'>PHPBB3-10232</a>] -         Search within topic/forum searches all posts
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10233'>PHPBB3-10233</a>] -         IE Emulation fix breaks posting layout when PMing
+</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10234'>PHPBB3-10234</a>] -         msg_handler() reports E_WARNING as &quot;PHP Notice: &quot;
+</li>
 </ul>
     
 <h4>        Improvement
-- 
cgit v1.2.1


From ffa6f3448fdfe6d076c894231ebbd59e3b51e2ba Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 21:50:02 +0200
Subject: [prep-release-3.0.9] Bump database version to RC3 too.

---
 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 bfbddf2dc5..92bafcb32a 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC2');
+define('UPDATES_TO_VERSION', '3.0.9-RC3');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
-- 
cgit v1.2.1


From cf4b639be5a178c73224246b1232e5044b9a5738 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Jul 2011 02:15:40 -0400
Subject: [ticket/10247] Remove unecessary attempt_id primary key column

The database update drops any key of the same name (potential primary key) and
afterwards the column. This does not work on some of the supported DBMS and
needs further changes.

PHPBB3-10247
---
 phpBB/develop/create_schema_files.php     |  2 --
 phpBB/install/database_update.php         | 12 +++++++++++-
 phpBB/install/schemas/firebird_schema.sql | 14 --------------
 phpBB/install/schemas/mssql_schema.sql    |  8 --------
 phpBB/install/schemas/mysql_40_schema.sql |  2 --
 phpBB/install/schemas/mysql_41_schema.sql |  2 --
 phpBB/install/schemas/oracle_schema.sql   | 20 +-------------------
 phpBB/install/schemas/postgres_schema.sql |  6 +-----
 phpBB/install/schemas/sqlite_schema.sql   |  1 -
 9 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index f4d89e5562..efe8837b26 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1223,7 +1223,6 @@ function get_schema_struct()
 
 	$schema_data['phpbb_login_attempts'] = array(
 		'COLUMNS'		=> array(
-			'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
 			'attempt_ip'			=> array('VCHAR:40', ''),
 			'attempt_browser'		=> array('VCHAR:150', ''),
 			'attempt_forwarded_for'	=> array('VCHAR:255', ''),
@@ -1232,7 +1231,6 @@ function get_schema_struct()
 			'username'				=> array('VCHAR_UNI:255', 0),
 			'username_clean'		=> array('VCHAR_CI', 0),
 		),
-		'PRIMARY_KEY'	=> 'attempt_id',
 		'KEYS'			=> array(
 			'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
 			'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 92bafcb32a..72eb8a6480 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC3');
+define('UPDATES_TO_VERSION', '3.0.9-RC4');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -974,6 +974,16 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
+
+		// Changes from 3.0.9-RC-3 to 3.0.9-RC4
+		'3.0.9-RC3'     => array(
+			'drop_keys' => array(
+				LOGIN_ATTEMPT_TABLE => array('attempt_id')
+			),
+			'drop_columns' => array(
+				LOGIN_ATTEMPT_TABLE => array('attempt_id')
+			),
+		),
 	);
 }
 
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 5df7dfe9a5..40041b13cb 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -547,7 +547,6 @@ END;;
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INTEGER NOT NULL,
 	attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
@@ -557,24 +556,11 @@ CREATE TABLE phpbb_login_attempts (
 	username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
 );;
 
-ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
-
 CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
 CREATE INDEX phpbb_login_attempts_att_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
 CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts(attempt_time);;
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
 
-CREATE GENERATOR phpbb_login_attempts_gen;;
-SET GENERATOR phpbb_login_attempts_gen TO 0;;
-
-CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
-BEFORE INSERT
-AS
-BEGIN
-	NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
-END;;
-
-
 # Table: 'phpbb_moderator_cache'
 CREATE TABLE phpbb_moderator_cache (
 	forum_id INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0bc76c05e6..c4fc2d4eec 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -653,7 +653,6 @@ GO
 	Table: 'phpbb_login_attempts'
 */
 CREATE TABLE [phpbb_login_attempts] (
-	[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
 	[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -664,13 +663,6 @@ CREATE TABLE [phpbb_login_attempts] (
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY  CLUSTERED 
-	(
-		[attempt_id]
-	)  ON [PRIMARY] 
-GO
-
 CREATE  INDEX [att_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 6b13485a3d..06d32166f3 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	attempt_ip varbinary(40) DEFAULT '' NOT NULL,
 	attempt_browser varbinary(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	username blob NOT NULL,
 	username_clean blob NOT NULL,
-	PRIMARY KEY (attempt_id),
 	KEY att_ip (attempt_ip, attempt_time),
 	KEY att_for (attempt_forwarded_for, attempt_time),
 	KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index b400e8fcff..1db2790ec7 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -371,7 +371,6 @@ CREATE TABLE phpbb_log (
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	attempt_ip varchar(40) DEFAULT '' NOT NULL,
 	attempt_browser varchar(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
@@ -379,7 +378,6 @@ CREATE TABLE phpbb_login_attempts (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	username varchar(255) DEFAULT '0' NOT NULL,
 	username_clean varchar(255) DEFAULT '0' NOT NULL,
-	PRIMARY KEY (attempt_id),
 	KEY att_ip (attempt_ip, attempt_time),
 	KEY att_for (attempt_forwarded_for, attempt_time),
 	KEY att_time (attempt_time),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8c79e870cb..783261e365 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -744,15 +744,13 @@ END;
 	Table: 'phpbb_login_attempts'
 */
 CREATE TABLE phpbb_login_attempts (
-	attempt_id number(8) NOT NULL,
 	attempt_ip varchar2(40) DEFAULT '' ,
 	attempt_browser varchar2(150) DEFAULT '' ,
 	attempt_forwarded_for varchar2(255) DEFAULT '' ,
 	attempt_time number(11) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	username varchar2(765) DEFAULT '0' NOT NULL,
-	username_clean varchar2(255) DEFAULT '0' NOT NULL,
-	CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
+	username_clean varchar2(255) DEFAULT '0' NOT NULL
 )
 /
 
@@ -765,22 +763,6 @@ CREATE INDEX phpbb_login_attempts_att_time ON phpbb_login_attempts (attempt_time
 CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
 /
 
-CREATE SEQUENCE phpbb_login_attempts_seq
-/
-
-CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
-BEFORE INSERT ON phpbb_login_attempts
-FOR EACH ROW WHEN (
-	new.attempt_id IS NULL OR new.attempt_id = 0
-)
-BEGIN
-	SELECT phpbb_login_attempts_seq.nextval
-	INTO :new.attempt_id
-	FROM dual;
-END;
-/
-
-
 /*
 	Table: 'phpbb_moderator_cache'
 */
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 359ec325d7..cf655cb1c7 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -527,18 +527,14 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 /*
 	Table: 'phpbb_login_attempts'
 */
-CREATE SEQUENCE phpbb_login_attempts_seq;
-
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
 	attempt_ip varchar(40) DEFAULT '' NOT NULL,
 	attempt_browser varchar(150) DEFAULT '' NOT NULL,
 	attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
 	attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	username varchar(255) DEFAULT '0' NOT NULL,
-	username_clean varchar_ci DEFAULT '0' NOT NULL,
-	PRIMARY KEY (attempt_id)
+	username_clean varchar_ci DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX phpbb_login_attempts_att_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 3158c1a177..dae1eb839c 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -359,7 +359,6 @@ CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
 
 # Table: 'phpbb_login_attempts'
 CREATE TABLE phpbb_login_attempts (
-	attempt_id INTEGER PRIMARY KEY NOT NULL ,
 	attempt_ip varchar(40) NOT NULL DEFAULT '',
 	attempt_browser varchar(150) NOT NULL DEFAULT '',
 	attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
-- 
cgit v1.2.1


From 984fd07319d9c9dbd8af7298a94e08132e790f98 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Jul 2011 02:29:51 -0400
Subject: [ticket/10247] Add empty data section to database update for RC4

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

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 72eb8a6480..e1223335f0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1983,6 +1983,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		case '3.0.9-RC2':
 		break;
+
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		case '3.0.9-RC3':
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From 96eab49a7a5d803fcc121fe5490b2484c6499d40 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Jul 2011 18:09:56 -0400
Subject: [ticket/10247] Add a db_tools test for the removal of a primary key
 column.

The previous drop column test already deleted the primary key, so that one was
replaced with an ordinary column.

PHPBB3-10247
---
 tests/dbal/db_tools_test.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index eb2af4c4cc..ddea500f83 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -241,6 +241,15 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 	}
 
 	public function test_column_remove()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_int_size'));
+
+		$this->assertTrue($this->tools->sql_column_remove('prefix_table_name', 'c_int_size'));
+
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_int_size'));
+	}
+
+	public function test_column_remove_primary()
 	{
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
 
@@ -264,5 +273,4 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 		$this->tools->sql_table_drop('prefix_test_table');
 	}
-
 }
-- 
cgit v1.2.1


From cb7604dcd83bf3a4ddf6ace1282974eaf475c8d8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 4 Jul 2011 02:31:00 -0400
Subject: [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1
 updater.

To make sure that this column (which was too small and unecessary) does not
remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC,
the 3.0.10-RC1 release must correctly drop the column after db_tools has been
corrected and fully reviewed. The current version is not capable of dropping
primary keys correctly on all supported DBMSs.

PHPBB3-10247
---
 phpBB/install/database_update.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e1223335f0..a45424afea 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -946,7 +946,12 @@ function database_update_info()
 			'add_tables'		=> array(
 				LOGIN_ATTEMPT_TABLE	=> array(
 					'COLUMNS'			=> array(
-						'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						// 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.10 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', ''),
 						'attempt_browser'		=> array('VCHAR:150', ''),
 						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
@@ -974,16 +979,10 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		'3.0.9-RC3'     => array(),
 
-		// Changes from 3.0.9-RC-3 to 3.0.9-RC4
-		'3.0.9-RC3'     => array(
-			'drop_keys' => array(
-				LOGIN_ATTEMPT_TABLE => array('attempt_id')
-			),
-			'drop_columns' => array(
-				LOGIN_ATTEMPT_TABLE => array('attempt_id')
-			),
-		),
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
 	);
 }
 
-- 
cgit v1.2.1


From d8ac2cc5f0c253842185506b174a8355dfd5f3fb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Jul 2011 00:40:45 +0200
Subject: [prep-release-3.0.9] Bumping version number for the final 3.0.9
 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 ed9643c12f..42642dcefa 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.9-RC3" />
-	<property name="prevversion" value="3.0.9-RC2" />
-	<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-RC1" />
+	<property name="newversion" value="3.0.9" />
+	<property name="prevversion" value="3.0.8" />
+	<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" />
 	<!-- 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 2f485fb4d7..3940888216 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.9-RC3');
+define('PHPBB_VERSION', '3.0.9');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a45424afea..a2cb4515da 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC4');
+define('UPDATES_TO_VERSION', '3.0.9');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -979,7 +979,7 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		// No changes from 3.0.9-RC3 to 3.0.9
 		'3.0.9-RC3'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.9-RC2':
 		break;
 
-		// No changes from 3.0.9-RC3 to 3.0.9-RC4
+		// No changes from 3.0.9-RC3 to 3.0.9
 		case '3.0.9-RC3':
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index b3f136ff7a..0153bd8ec2 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9');
 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');
 
-- 
cgit v1.2.1


From 7ca9c33157ad360750df8bf025a1155e14c6b2bb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Jul 2011 00:43:09 +0200
Subject: [prep-release-3.0.9] Update Changelog for 3.0.9 release.

---
 phpBB/docs/CHANGELOG.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6b12cb81bf..c0ec93cafb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -333,6 +333,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10234'>PHPBB3-10234</a>] -         msg_handler() reports E_WARNING as &quot;PHP Notice: &quot;
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] -         mediumint(8) too small for phpbb_login_attempts.attempt_id
+</li>
 </ul>
     
 <h4>        Improvement
-- 
cgit v1.2.1


From 0d602e1722a0a75f2f4a9ab90eeeb2a47042417f Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 4 Jul 2011 19:57:54 -0400
Subject: [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)

attempt_id column was deleted

PHPBB3-10247
---
 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 018d5cce70..6ca69d9174 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -72,7 +72,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 	if (($ip && !$config['ip_login_limit_use_forwarded']) ||
 		($forwarded_for && $config['ip_login_limit_use_forwarded']))
 	{
-		$sql = 'SELECT COUNT(attempt_id) AS attempts
+		$sql = 'SELECT COUNT(*) AS attempts
 			FROM ' . LOGIN_ATTEMPT_TABLE . '
 			WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
 		if ($config['ip_login_limit_use_forwarded'])
-- 
cgit v1.2.1


From 77c942263062fbb417630a037abbc34b57d1f690 Mon Sep 17 00:00:00 2001
From: Sam Thompson <sam@websyntax.net>
Date: Mon, 4 Jul 2011 17:10:34 -0700
Subject: [ticket/10250] Added the new phpBB Logo with the Registered Trademark
 Symbol

PHPBB3-10250
---
 phpBB/styles/prosilver/imageset/site_logo.gif | Bin 3430 -> 5070 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/phpBB/styles/prosilver/imageset/site_logo.gif b/phpBB/styles/prosilver/imageset/site_logo.gif
index 909114c377..2517fbedd6 100644
Binary files a/phpBB/styles/prosilver/imageset/site_logo.gif and b/phpBB/styles/prosilver/imageset/site_logo.gif differ
-- 
cgit v1.2.1


From 0c93e92eef248c306c743601f6fadb8dc4eb8aa3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 5 Jul 2011 23:19:39 +0200
Subject: [ticket/10247] Remove attempt_id as primary key from
 database_update.php

PHPBB3-10247
---
 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 a2cb4515da..47c278ed4e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -960,7 +960,7 @@ function database_update_info()
 						'username'				=> array('VCHAR_UNI:255', 0),
 						'username_clean'		=> array('VCHAR_CI', 0),
 					),
-					'PRIMARY_KEY'		=> 'attempt_id',
+					//'PRIMARY_KEY'		=> 'attempt_id',
 					'KEYS'				=> array(
 						'att_ip'			=> array('INDEX', array('attempt_ip', 'attempt_time')),
 						'att_for'	=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-- 
cgit v1.2.1


From f610f44a4e23eef8ed7698a32b10bc28789bdf00 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 5 Jul 2011 19:09:09 -0400
Subject: [ticket/10250] Overwrite the site_logo width&height when the phpbb
 logo is used

The new logo is slightly wider than the old logo. If we changed the size in the
imageset.cfg we would cause a conflict for everyone who replaced the logo with
their own and modified the size. Instead we overwrite the width and height in
the img() function in session.php only if its contents are that of the stock
phpbb logo.

PHPBB3-10250
---
 phpBB/includes/session.php | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 7ef6e02a8d..f509957f96 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2272,9 +2272,36 @@ class user extends session
 			// Use URL if told so
 			$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
 
-			$img_data['src'] = $root_path . 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
+			$path = 'styles/' . rawurlencode($this->theme['imageset_path']) . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
+
+			$img_data['src'] = $root_path . $path;
 			$img_data['width'] = $this->img_array[$img]['image_width'];
 			$img_data['height'] = $this->img_array[$img]['image_height'];
+
+			// We overwrite the width and height to the phpbb logo's width
+			// and height here if the contents of the site_logo file are
+			// really equal to the phpbb_logo
+			// This allows us to change the dimensions of the phpbb_logo without
+			// modifying the imageset.cfg and causing a conflict for everyone
+			// who modified it for their custom logo on updating
+			if ($img == 'site_logo' && file_exists($phpbb_root_path . $path))
+			{
+				global $cache;
+
+				if (($img_file_hash = $cache->get('imageset_site_logo_md5')) === false)
+				{
+					$img_file_hash = md5(file_get_contents($phpbb_root_path . $path));
+					$cache->put('imageset_site_logo_md5', $img_file_hash);
+				}
+
+				$phpbb_logo_hash = '0c461a32cd3621643105f0d02a772c10';
+
+				if ($phpbb_logo_hash == $img_file_hash)
+				{
+					$img_data['width'] = '149';
+					$img_data['height'] = '52';
+				}
+			}
 		}
 
 		$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt;
-- 
cgit v1.2.1


From 8ec737e9c4d36711b09250df72492a8f89e7bfb1 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 5 Jul 2011 19:38:15 -0400
Subject: [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an
 imageset

PHPBB3-10250
---
 phpBB/includes/acp/acp_styles.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 37cf8d1f72..3bc8c86500 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -510,6 +510,7 @@ parse_css_file = {PARSE_CSS_FILE}
 							$db->sql_transaction('commit');
 
 							$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
+							$cache->destroy('imageset_site_logo_md5');
 
 							add_log('admin', 'LOG_IMAGESET_REFRESHED', $imageset_row['imageset_name']);
 							trigger_error($user->lang['IMAGESET_REFRESHED'] . adm_back_link($this->u_action));
-- 
cgit v1.2.1


From b261a1a31ae8500cc090d412ed569123ae3cb9ca Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 6 Jul 2011 17:53:57 -0400
Subject: [ticket/10250] The site_logo hash is different depending on imageset
 & language

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

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f509957f96..e9e706e2b8 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2288,15 +2288,23 @@ class user extends session
 			{
 				global $cache;
 
-				if (($img_file_hash = $cache->get('imageset_site_logo_md5')) === false)
+				$img_file_hashes = $cache->get('imageset_site_logo_md5');
+
+				if ($img_file_hashes === false)
+				{
+					$img_file_hashes = array();
+				}
+
+				$key = $this->theme['imageset_path'] . '::' . $this->img_array[$img]['image_lang'];
+				if (!isset($img_file_hashes[$key]))
 				{
-					$img_file_hash = md5(file_get_contents($phpbb_root_path . $path));
-					$cache->put('imageset_site_logo_md5', $img_file_hash);
+					$img_file_hashes[$key] = md5(file_get_contents($phpbb_root_path . $path));
+					$cache->put('imageset_site_logo_md5', $img_file_hashes);
 				}
 
 				$phpbb_logo_hash = '0c461a32cd3621643105f0d02a772c10';
 
-				if ($phpbb_logo_hash == $img_file_hash)
+				if ($phpbb_logo_hash == $img_file_hashes[$key])
 				{
 					$img_data['width'] = '149';
 					$img_data['height'] = '52';
-- 
cgit v1.2.1


From f22081d21e21b5a07d36df8dd132cc2bdffcd9ea Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 6 Jul 2011 19:36:25 -0400
Subject: [ticket/9859] New footer copyright line with registered symbol

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

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 1a044b0ca1..b252ff0de9 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> &copy; phpBB Group
+	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 		<!-- 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 -->
-- 
cgit v1.2.1


From a275d17625325e0353b67fabf5a9b0c4fb35877e Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 6 Jul 2011 20:38:02 -0400
Subject: [ticket/9859] Changing all phpBB footers to match the new credit line

PHPBB3-9859
---
 phpBB/adm/style/install_footer.html                            | 2 +-
 phpBB/adm/style/overall_footer.html                            | 2 +-
 phpBB/adm/style/simple_footer.html                             | 2 +-
 phpBB/develop/create_variable_overview.php                     | 6 +++---
 phpBB/includes/db/dbal.php                                     | 2 +-
 phpBB/includes/functions.php                                   | 2 +-
 phpBB/install/database_update.php                              | 2 +-
 phpBB/install/index.php                                        | 2 +-
 phpBB/styles/prosilver/template/simple_footer.html             | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html           | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html           | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index 9b5494b8b6..26a3c6ab3d 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -8,7 +8,7 @@
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 03ca369562..b48b449597 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> &copy; phpBB Group
+			Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 			<!-- 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 7276fb4b63..ac9c26a690 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> &copy; phpBB Group
+		<br />Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- ENDIF -->
 
diff --git a/phpBB/develop/create_variable_overview.php b/phpBB/develop/create_variable_overview.php
index b5ed090a75..fe7cacf0d1 100644
--- a/phpBB/develop/create_variable_overview.php
+++ b/phpBB/develop/create_variable_overview.php
@@ -83,7 +83,7 @@ $html_skeleton .= '<br><br><a name="ref"></a><b>References: </b>{SEE_FILES}';
 
 $html_skeleton .= '
 <br><br>
-<div class="copyright" align="center">Powered by phpBB 2.2 &copy; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a>, 2003</div>
+<div class="copyright" align="center">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</div>
 
 		<br clear="all" /></td>
 	</tr>
@@ -405,7 +405,7 @@ $html_data .= '<br><li><a href="./lang_index.html" class="gen">Appendix A: Langu
 
 $html_data .= '
 </ol><br><br>
-<div class="copyright" align="center">Powered by phpBB 2.2 &copy; <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a>, 2003</div>
+<div class="copyright" align="center">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</div>
 
 		<br clear="all" /></td>
 	</tr>
@@ -528,7 +528,7 @@ foreach ($lang_fp as $filepointer)
 
 $html_data .= '
 <br><br>
-<div class="copyright" align="center">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group</div>
+<div class="copyright" align="center">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</div>
 
 		<br clear="all" /></td>
 	</tr>
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 2f9619c8ea..9b45c085a2 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -777,7 +777,7 @@ class dbal
 							</div>
 						</div>
 						<div id="page-footer">
-							Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+							Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 						</div>
 					</div>
 					</body>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d05cccc440..b1c1c14d0c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3851,7 +3851,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			echo '	</div>';
 			echo '	</div>';
 			echo '	<div id="page-footer">';
-			echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
+			echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
 			echo '	</div>';
 			echo '</div>';
 			echo '</body>';
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 47c278ed4e..ac08466a01 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -525,7 +525,7 @@ function _print_footer()
 	</div>
 
 	<div id="page-footer">
-		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
+		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	</div>
 </div>
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index f534980389..5135e2dbd8 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -569,7 +569,7 @@ class module
 		echo '		</div>';
 		echo '	</div>';
 		echo '	<div id="page-footer">';
-		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
+		echo '		Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
 		echo '	</div>';
 		echo '</div>';
 		echo '</body>';
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index daeb786fcb..9795140c47 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> &copy; phpBB Group
+	<div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index c69bb82382..b1a93296bd 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -112,7 +112,7 @@ hr.sep	{
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 541c48a53d..0fd0e6dfa6 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -44,7 +44,7 @@
 
 	<div id="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
 	</div>
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index b53fff9f7f..5d6b63986f 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> &copy; phpBB Group
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 	<!-- 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 1bd146b599..043be16cdb 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> &copy; phpBB Group</span>
+	<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group</span>
 </div>
 
 </body>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index eff4a2a7dd..6753a5bc33 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -114,7 +114,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 38ec10fad8..964c95f677 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -128,7 +128,7 @@ hr.sep {
 	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
 </tr>
 <tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
+	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
 </tr>
 </table>
 
-- 
cgit v1.2.1


From b2a65ac76db38e47c0644389ba737492ef6307f6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 6 Jul 2011 13:40:21 +0200
Subject: [ticket/10237] Use confirm-box to handle unwatching a forum/topic
 actions

PHPBB3-10237
---
 phpBB/includes/functions_display.php | 30 +++++++++++++++++++++---------
 phpBB/language/en/common.php         |  2 ++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index d7422aa2c9..496da72344 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1097,22 +1097,34 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
 					trigger_error($message);
 				}
-				if ($_GET['unwatch'] == $mode)
-				{
-					$is_watching = 0;
 
+				if (confirm_box(true))
+				{
 					$sql = 'DELETE FROM ' . $table_sql . "
 						WHERE $where_sql = $match_id
 							AND user_id = $user_id";
 					$db->sql_query($sql);
-				}
-
-				$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
 
-				meta_refresh(3, $redirect_url);
+					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
+					$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+					meta_refresh(3, $redirect_url);
+					trigger_error($message);
+				}
+				else
+				{
+					$s_hidden_fields = array(
+						'uid'		=> $user->data['user_id'],
+						'unwatch'	=> $mode,
+						'start'		=> $start,
+						'f'			=> $forum_id,
+					);
+					if ($mode != 'forum')
+					{
+						$s_hidden_fields['t'] = $topic_id;
+					}
 
-				$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-				trigger_error($message);
+					confirm_box(false, 'UNWATCH_' . strtoupper($mode), build_hidden_fields($s_hidden_fields));
+				}
 			}
 			else
 			{
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 078a280223..b48a92124a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -652,6 +652,8 @@ $lang = array_merge($lang, array(
 	'UNREAD_PMS'			=> '<strong>%d</strong> unread messages',
 	'UNREAD_POST'			=> 'Unread post',
 	'UNREAD_POSTS'			=> 'Unread posts',
+	'UNWATCH_FORUM_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this forum?',
+	'UNWATCH_TOPIC_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this topic?',
 	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
 	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
 	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
-- 
cgit v1.2.1


From 787245a113bc8a4d99050414fd06662c60cc2e57 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 7 Jul 2011 20:19:11 +0200
Subject: [prep-release-3.0.9] Decreasing version for an RC4 release.

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

diff --git a/build/build.xml b/build/build.xml
index 42642dcefa..c2ebff5d21 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.0.9" />
+	<property name="newversion" value="3.0.9-RC4" />
 	<property name="prevversion" value="3.0.8" />
 	<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" />
 	<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 3940888216..a139ecc554 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.9');
+define('PHPBB_VERSION', '3.0.9-RC4');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ac08466a01..097f6302dc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9');
+define('UPDATES_TO_VERSION', '3.0.9-RC4');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -979,7 +979,7 @@ function database_update_info()
 		'3.0.9-RC1'		=> array(),
 		// No changes from 3.0.9-RC2 to 3.0.9-RC3
 		'3.0.9-RC2'		=> array(),
-		// No changes from 3.0.9-RC3 to 3.0.9
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		'3.0.9-RC3'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version)
 		case '3.0.9-RC2':
 		break;
 
-		// No changes from 3.0.9-RC3 to 3.0.9
+		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		case '3.0.9-RC3':
 		break;
 	}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0153bd8ec2..1eb2f51645 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-RC4');
 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');
 
-- 
cgit v1.2.1


From 1fa77c2fd5f6a17dc2b99d15063e0a9d9f689211 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 7 Jul 2011 20:20:52 +0200
Subject: [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.

---
 phpBB/docs/CHANGELOG.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c0ec93cafb..6437fef1d5 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -335,6 +335,8 @@
 </li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] -         mediumint(8) too small for phpbb_login_attempts.attempt_id
 </li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10250'>PHPBB3-10250</a>] -         phpBB Logo needs the Registered Trademark Symbol
+</li>
 </ul>
     
 <h4>        Improvement
-- 
cgit v1.2.1


From 919ba8eb3fd454d9a485bea7daf791a0858dec94 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:32:12 -0400
Subject: [ticket/10003] Delete the copy of db_tools in database_update.php.

PHPBB3-10003
---
 phpBB/install/database_update.php | 2239 -------------------------------------
 1 file changed, 2239 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 99928e1007..d73848c871 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1989,2243 +1989,4 @@ function change_database_data(&$no_updates, $version)
 	}
 }
 
-
-/**
-* Database Tools for handling cross-db actions such as altering columns, etc.
-* Currently not supported is returning SQL for creating tables.
-*
-* @package dbal
-*/
-class updater_db_tools
-{
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* @var object DB object
-	*/
-	var $db = NULL;
-
-	/**
-	* The Column types for every database we support
-	* @var array
-	*/
-	var $dbms_type_map = array(
-		'mysql_41'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT'		=> 'text',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT'		=> 'text',
-			'TEXT_UNI'	=> 'text',
-			'MTEXT'		=> 'mediumtext',
-			'MTEXT_UNI'	=> 'mediumtext',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'mysql_40'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varbinary(255)',
-			'VCHAR:'	=> 'varbinary(%d)',
-			'CHAR:'		=> 'binary(%d)',
-			'XSTEXT'	=> 'blob',
-			'XSTEXT_UNI'=> 'blob',
-			'STEXT'		=> 'blob',
-			'STEXT_UNI'	=> 'blob',
-			'TEXT'		=> 'blob',
-			'TEXT_UNI'	=> 'blob',
-			'MTEXT'		=> 'mediumblob',
-			'MTEXT_UNI'	=> 'mediumblob',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'blob',
-			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-			'VCHAR_CI'	=> 'blob',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'firebird'	=> array(
-			'INT:'		=> 'INTEGER',
-			'BINT'		=> 'DOUBLE PRECISION',
-			'UINT'		=> 'INTEGER',
-			'UINT:'		=> 'INTEGER',
-			'TINT:'		=> 'INTEGER',
-			'USINT'		=> 'INTEGER',
-			'BOOL'		=> 'INTEGER',
-			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'TIMESTAMP'	=> 'INTEGER',
-			'DECIMAL'	=> 'DOUBLE PRECISION',
-			'DECIMAL:'	=> 'DOUBLE PRECISION',
-			'PDECIMAL'	=> 'DOUBLE PRECISION',
-			'PDECIMAL:'	=> 'DOUBLE PRECISION',
-			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-		),
-
-		'mssql'		=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'mssqlnative'	=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'oracle'	=> array(
-			'INT:'		=> 'number(%d)',
-			'BINT'		=> 'number(20)',
-			'UINT'		=> 'number(8)',
-			'UINT:'		=> 'number(%d)',
-			'TINT:'		=> 'number(%d)',
-			'USINT'		=> 'number(4)',
-			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
-			'TEXT'		=> 'clob',
-			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
-			'TEXT_UNI'	=> 'clob',
-			'MTEXT_UNI'	=> 'clob',
-			'TIMESTAMP'	=> 'number(11)',
-			'DECIMAL'	=> 'number(5, 2)',
-			'DECIMAL:'	=> 'number(%d, 2)',
-			'PDECIMAL'	=> 'number(6, 3)',
-			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
-			'VARBINARY'	=> 'raw(255)',
-		),
-
-		'sqlite'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
-			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text(65535)',
-			'STEXT'		=> 'text(65535)',
-			'TEXT'		=> 'text(65535)',
-			'MTEXT'		=> 'mediumtext(16777215)',
-			'XSTEXT_UNI'=> 'text(65535)',
-			'STEXT_UNI'	=> 'text(65535)',
-			'TEXT_UNI'	=> 'text(65535)',
-			'MTEXT_UNI'	=> 'mediumtext(16777215)',
-			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'blob',
-		),
-
-		'postgres'	=> array(
-			'INT:'		=> 'INT4',
-			'BINT'		=> 'INT8',
-			'UINT'		=> 'INT4', // unsigned
-			'UINT:'		=> 'INT4', // unsigned
-			'USINT'		=> 'INT2', // unsigned
-			'BOOL'		=> 'INT2', // unsigned
-			'TINT:'		=> 'INT2',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar(1000)',
-			'STEXT'		=> 'varchar(3000)',
-			'TEXT'		=> 'varchar(8000)',
-			'MTEXT'		=> 'TEXT',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT_UNI'	=> 'varchar(4000)',
-			'MTEXT_UNI'	=> 'TEXT',
-			'TIMESTAMP'	=> 'INT4', // unsigned
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar_ci',
-			'VARBINARY'	=> 'bytea',
-		),
-	);
-
-	/**
-	* A list of types being unsigned for better reference in some db's
-	* @var array
-	*/
-	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-
-	/**
-	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
-	* @var array
-	*/
-	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-	/**
-	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
-	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
-	*/
-	var $return_statements = false;
-
-	/**
-	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
-	*
-	* @param phpbb_dbal	$db					DBAL object
-	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
-	*/
-	function updater_db_tools(&$db, $return_statements = false)
-	{
-		$this->db = $db;
-		$this->return_statements = $return_statements;
-
-		// Determine mapping database type
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-				$this->sql_layer = 'mysql_40';
-			break;
-
-			case 'mysql4':
-				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$this->sql_layer = 'mysql_41';
-				}
-				else
-				{
-					$this->sql_layer = 'mysql_40';
-				}
-			break;
-
-			case 'mysqli':
-				$this->sql_layer = 'mysql_41';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-				$this->sql_layer = 'mssql';
-			break;
-
-			case 'mssqlnative':
-				$this->sql_layer = 'mssqlnative';
-			break;
-
-			default:
-				$this->sql_layer = $this->db->sql_layer;
-			break;
-		}
-	}
-
-	/**
-	* Check if table exists
-	*
-	*
-	* @param string	$table_name	The table name to check for
-	* @return bool true if table exists, else false
-	*/
-	function sql_table_exists($table_name)
-	{
-		$this->db->sql_return_on_error(true);
-		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
-		$this->db->sql_return_on_error(false);
-
-		if ($result)
-		{
-			$this->db->sql_freeresult($result);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Create SQL Table
-	*
-	* @param string	$table_name	The table name to create
-	* @param array	$table_data	Array containing table data.
-	* @return array	Statements if $return_statements is true.
-	*/
-	function sql_create_table($table_name, $table_data)
-	{
-		// holds the DDL for a column
-		$columns = $statements = array();
-
-		if ($this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// Begin transaction
-		$statements[] = 'begin';
-
-		// Determine if we have created a PRIMARY KEY in the earliest
-		$primary_key_gen = false;
-
-		// Determine if the table must be created with TEXTIMAGE
-		$create_textimage = false;
-
-		// Determine if the table requires a sequence
-		$create_sequence = false;
-
-		// Begin table sql statement
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
-			break;
-
-			default:
-				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
-			break;
-		}
-
-		// Iterate through the columns to create a table
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// here lies an array, filled with information compiled on the column's data
-			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-
-			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
-			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
-			}
-
-			// here we add the definition of the new column to the list of columns
-			switch ($this->sql_layer)
-			{
-				case 'mssql':
-				case 'mssqlnative':
-					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
-				break;
-
-				default:
-					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
-				break;
-			}
-
-			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
-			if (!$primary_key_gen)
-			{
-				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
-			}
-
-			// create textimage DDL based off of the existance of certain column types
-			if (!$create_textimage)
-			{
-				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
-			}
-
-			// create sequence DDL based off of the existance of auto incrementing columns
-			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
-			{
-				$create_sequence = $column_name;
-			}
-		}
-
-		// this makes up all the columns in the create table statement
-		$table_sql .= implode(",\n", $columns);
-
-		// Close the table for two DBMS and add to the statements
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
-				$statements[] = $table_sql;
-			break;
-		}
-
-		// we have yet to create a primary key for this table,
-		// this means that we can add the one we really wanted instead
-		if (!$primary_key_gen)
-		{
-			// Write primary key
-			if (isset($table_data['PRIMARY_KEY']))
-			{
-				if (!is_array($table_data['PRIMARY_KEY']))
-				{
-					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-					case 'postgres':
-					case 'sqlite':
-						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-
-					case 'firebird':
-					case 'mssql':
-					case 'mssqlnative':
-						// We need the data here
-						$old_return_statements = $this->return_statements;
-						$this->return_statements = true;
-
-						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
-						foreach ($primary_key_stmts as $pk_stmt)
-						{
-							$statements[] = $pk_stmt;
-						}
-
-						$this->return_statements = $old_return_statements;
-					break;
-
-					case 'oracle':
-						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-				}
-			}
-		}
-
-		// close the table
-		switch ($this->sql_layer)
-		{
-			case 'mysql_41':
-				// make sure the table is in UTF-8 mode
-				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mysql_40':
-			case 'sqlite':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'postgres':
-				// do we need to add a sequence for auto incrementing columns?
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'oracle':
-				$table_sql .= "\n)";
-				$statements[] = $table_sql;
-
-				// do we need to add a sequence and a tigger for auto incrementing columns?
-				if ($create_sequence)
-				{
-					// create the actual sequence
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
-
-					// the trigger is the mechanism by which we increment the counter
-					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$trigger .= "BEFORE INSERT ON {$table_name}\n";
-					$trigger .= "FOR EACH ROW WHEN (\n";
-					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
-					$trigger .= ")\n";
-					$trigger .= "BEGIN\n";
-					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
-					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual;\n";
-					$trigger .= "END;";
-
-					$statements[] = $trigger;
-				}
-			break;
-
-			case 'firebird':
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
-					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
-
-					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
-					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
-					$statements[] = $trigger;
-				}
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				$old_return_statements = $this->return_statements;
-				$this->return_statements = true;
-
-				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
-
-				foreach ($key_stmts as $key_stmt)
-				{
-					$statements[] = $key_stmt;
-				}
-
-				$this->return_statements = $old_return_statements;
-			}
-		}
-
-		// Commit Transaction
-		$statements[] = 'commit';
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Handle passed database update array.
-	* Expected structure...
-	* Key being one of the following
-	*	change_columns: Column changes (only type, not name)
-	*	add_columns: Add columns to a table
-	*	drop_keys: Dropping keys
-	*	drop_columns: Removing/Dropping columns
-	*	add_primary_keys: adding primary keys
-	*	add_unique_index: adding an unique index
-	*	add_index: adding an index (can be column:index_size if you need to provide size)
-	*
-	* The values are in this format:
-	*		{TABLE NAME}		=> array(
-	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
-	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
-	*		)
-	*
-	* For more information have a look at /develop/create_schema_files.php (only available through SVN)
-	*/
-	function perform_schema_changes($schema_changes)
-	{
-		if (empty($schema_changes))
-		{
-			return;
-		}
-
-		$statements = array();
-		$sqlite = false;
-
-		// For SQLite we need to perform the schema changes in a much more different way
-		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
-		{
-			$sqlite_data = array();
-			$sqlite = true;
-		}
-
-		// Add tables?
-		if (!empty($schema_changes['add_tables']))
-		{
-			foreach ($schema_changes['add_tables'] as $table => $table_data)
-			{
-				$result = $this->sql_create_table($table, $table_data);
-				if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Change columns?
-		if (!empty($schema_changes['change_columns']))
-		{
-			foreach ($schema_changes['change_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// If the column exists we change it, else we add it ;)
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add columns?
-		if (!empty($schema_changes['add_columns']))
-		{
-			foreach ($schema_changes['add_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// Only add the column if it does not exist yet
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						continue;
-						// This is commented out here because it can take tremendous time on updates
-//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							continue;
-//							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Remove keys?
-		if (!empty($schema_changes['drop_keys']))
-		{
-			foreach ($schema_changes['drop_keys'] as $table => $indexes)
-			{
-				foreach ($indexes as $index_name)
-				{
-					if (!$this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_index_drop($table, $index_name);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Drop columns?
-		if (!empty($schema_changes['drop_columns']))
-		{
-			foreach ($schema_changes['drop_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column)
-				{
-					// Only remove the column if it exists...
-					if ($this->sql_column_exists($table, $column))
-					{
-						$result = $this->sql_column_remove($table, $column, true);
-
-						if ($sqlite)
-						{
-							$sqlite_data[$table]['drop_columns'][] = $result;
-						}
-						else if ($this->return_statements)
-						{
-							$statements = array_merge($statements, $result);
-						}
-					}
-				}
-			}
-		}
-
-		// Add primary keys?
-		if (!empty($schema_changes['add_primary_keys']))
-		{
-			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
-			{
-				$result = $this->sql_create_primary_key($table, $columns, true);
-
-				if ($sqlite)
-				{
-					$sqlite_data[$table]['primary_key'] = $result;
-				}
-				else if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Add unqiue indexes?
-		if (!empty($schema_changes['add_unique_index']))
-		{
-			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_unique_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_unique_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add indexes?
-		if (!empty($schema_changes['add_index']))
-		{
-			foreach ($schema_changes['add_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		if ($sqlite)
-		{
-			foreach ($sqlite_data as $table_name => $sql_schema_changes)
-			{
-				// Create temporary table with original data
-				$statements[] = 'begin';
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					continue;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				// Get the columns...
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$plain_table_cols = trim($matches[1]);
-				$new_table_cols = preg_split('/,(?![\s\w]+\))/m', $plain_table_cols);
-				$column_list = array();
-
-				foreach ($new_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				// note down the primary key notation because sqlite only supports adding it to the end for the new table
-				$primary_key = false;
-				$_new_cols = array();
-
-				foreach ($new_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						$primary_key = $declaration;
-						continue;
-					}
-					$_new_cols[] = $declaration;
-				}
-
-				$new_table_cols = $_new_cols;
-
-				// First of all... change columns
-				if (!empty($sql_schema_changes['change_columns']))
-				{
-					foreach ($sql_schema_changes['change_columns'] as $column_sql)
-					{
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_sql, $entities[0] . ' ') === 0)
-							{
-								$new_table_cols[$key] = $column_sql;
-							}
-						}
-					}
-				}
-
-				if (!empty($sql_schema_changes['add_columns']))
-				{
-					foreach ($sql_schema_changes['add_columns'] as $column_sql)
-					{
-						$new_table_cols[] = $column_sql;
-					}
-				}
-
-				// Now drop them...
-				if (!empty($sql_schema_changes['drop_columns']))
-				{
-					foreach ($sql_schema_changes['drop_columns'] as $column_name)
-					{
-						// Remove from column list...
-						$new_column_list = array();
-						foreach ($column_list as $key => $value)
-						{
-							if ($value === $column_name)
-							{
-								continue;
-							}
-
-							$new_column_list[] = $value;
-						}
-
-						$column_list = $new_column_list;
-
-						// Remove from table...
-						$_new_cols = array();
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_name . ' ', $entities[0] . ' ') === 0)
-							{
-								continue;
-							}
-							$_new_cols[] = $declaration;
-						}
-						$new_table_cols = $_new_cols;
-					}
-				}
-
-				// Primary key...
-				if (!empty($sql_schema_changes['primary_key']))
-				{
-					$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
-				}
-				// Add a new one or the old primary key
-				else if ($primary_key !== false)
-				{
-					$new_table_cols[] = $primary_key;
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			}
-		}
-
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-	}
-
-	/**
-	* Check if a specified column exist
-	*
-	* @param string	$table			Table to check the column at
-	* @param string	$column_name	The column to check
-	*
-	* @return bool True if column exists, else false
-	*/
-	function sql_column_exists($table, $column_name)
-	{
-		switch ($this->sql_layer)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-
-				$sql = "SHOW COLUMNS FROM $table";
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['Field']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// PostgreSQL has a way of doing this in a much simpler way but would
-			// not allow us to support all versions of PostgreSQL
-			case 'postgres':
-				$sql = "SELECT a.attname
-					FROM pg_class c, pg_attribute a
-					WHERE c.relname = '{$table}'
-						AND a.attnum > 0
-						AND a.attrelid = c.oid";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['attname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-
-				return false;
-			break;
-
-			// same deal with PostgreSQL, we must perform more complex operations than
-			// we technically could
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "SELECT c.name
-					FROM syscolumns c
-					LEFT JOIN sysobjects o ON c.id = o.id
-					WHERE o.name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'oracle':
-				$sql = "SELECT column_name
-					FROM user_tab_columns
-					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['column_name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			case 'firebird':
-				$sql = "SELECT RDB\$FIELD_NAME as FNAME
-					FROM RDB\$RELATION_FIELDS
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['fname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
-			break;
-
-			// ugh, SQLite
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					return false;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$cols = trim($matches[1]);
-				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
-
-				foreach ($col_array as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-
-					if (strtolower($entities[0]) == $column_name)
-					{
-						return true;
-					}
-				}
-				return false;
-			break;
-		}
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisunique != 't')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'NONUNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-				case 'oracle':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Check if a specified UNIQUE index exists in table.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_unique_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				// Usually NON_UNIQUE is the column we want to check, but we allow for both
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NOT NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name, i.indisunique
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name, table_owner
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'UNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'sqlite' && !$row['unique'])
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'oracle':
-					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
-					if (strpos($row[$col], 'U_') === 0)
-					{
-						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
-					}
-					else if (strpos($row[$col], strtoupper($table_name)) === 0)
-					{
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					}
-				break;
-
-				case 'firebird':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Private method for performing sql statements (either execute them or return them)
-	* @access private
-	*/
-	function _sql_run_sql($statements)
-	{
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-
-		// We could add error handling here...
-		foreach ($statements as $sql)
-		{
-			if ($sql === 'begin')
-			{
-				$this->db->sql_transaction('begin');
-			}
-			else if ($sql === 'commit')
-			{
-				$this->db->sql_transaction('commit');
-			}
-			else
-			{
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function to prepare some column information for better usage
-	* @access private
-	*/
-	function sql_prepare_column_data($table_name, $column_name, $column_data)
-	{
-		if (strlen($column_name) > 30)
-		{
-			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
-		}
-
-		// Get type
-		if (strpos($column_data[0], ':') !== false)
-		{
-			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
-			{
-				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
-			}
-			else
-			{
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
-					{
-						case 'div':
-							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
-							$column_length = ceil($column_length);
-							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-						break;
-					}
-				}
-
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
-					{
-						case 'mult':
-							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
-							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
-							{
-								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
-							}
-							else
-							{
-								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-							}
-						break;
-					}
-				}
-			}
-			$orig_column_type .= ':';
-		}
-		else
-		{
-			$orig_column_type = $column_data[0];
-			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
-		}
-
-		// Adjust default value if db-dependant specified
-		if (is_array($column_data[1]))
-		{
-			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
-		}
-
-		$sql = '';
-
-		$return_array = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql .= " {$column_type} ";
-				$return_array['column_type_sql_type'] = " {$column_type} ";
-
-				if (!is_null($column_data[1]))
-				{
-					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					$return_array['column_type_sql_default'] = ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-				}
-
-				$sql .= 'NOT NULL';
-
-				// This is a UNICODE column and thus should be given it's fair share
-				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-				{
-					$sql .= ' COLLATE UNICODE';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql .= " {$column_type} ";
-				$sql_default = " {$column_type} ";
-
-				// For adding columns we need the default definition
-				if (!is_null($column_data[1]))
-				{
-					// For hexadecimal values do not use single quotes
-					if (strpos($column_data[1], '0x') === 0)
-					{
-						$return_array['default'] = 'DEFAULT (' . $column_data[1] . ') ';
-						$sql_default .= $return_array['default'];
-					}
-					else
-					{
-						$return_array['default'] = 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						$sql_default .= $return_array['default'];
-					}
-				}
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-//					$sql .= 'IDENTITY (1, 1) ';
-					$sql_default .= 'IDENTITY (1, 1) ';
-				}
-
-				$return_array['textimage'] = $column_type === '[text]';
-
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
-
-				$return_array['column_type_sql_default'] = $sql_default;
-
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql .= " {$column_type} ";
-
-				// For hexadecimal values do not use single quotes
-				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-				{
-					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-				}
-				$sql .= 'NOT NULL';
-
-				if (isset($column_data[2]))
-				{
-					if ($column_data[2] == 'auto_increment')
-					{
-						$sql .= ' auto_increment';
-					}
-					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
-					{
-						$sql .= ' COLLATE utf8_unicode_ci';
-					}
-				}
-
-			break;
-
-			case 'oracle':
-				$sql .= " {$column_type} ";
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-				// In Oracle empty strings ('') are treated as NULL.
-				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
-				if (!preg_match('/number/i', $column_type))
-				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'postgres':
-				$return_array['column_type'] = $column_type;
-
-				$sql .= " {$column_type} ";
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$default_val = "nextval('{$table_name}_seq')";
-					$return_array['auto_increment'] = true;
-				}
-				else if (!is_null($column_data[1]))
-				{
-					$default_val = "'" . $column_data[1] . "'";
-					$return_array['null'] = 'NOT NULL';
-					$sql .= 'NOT NULL ';
-				}
-
-				$return_array['default'] = $default_val;
-
-				$sql .= "DEFAULT {$default_val}";
-
-				// Unsigned? Then add a CHECK contraint
-				if (in_array($orig_column_type, $this->unsigned_types))
-				{
-					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
-					$sql .= " CHECK ({$column_name} >= 0)";
-				}
-
-			break;
-
-			case 'sqlite':
-				$return_array['primary_key_set'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' INTEGER PRIMARY KEY';
-					$return_array['primary_key_set'] = true;
-				}
-				else
-				{
-					$sql .= ' ' . $column_type;
-				}
-
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-
-			break;
-		}
-
-		$return_array['column_type_sql'] = $sql;
-
-		return $return_array;
-	}
-
-	/**
-	* Add new column
-	*/
-	function sql_column_add($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Does not support AFTER statement, only POSITION (and there you need the column position)
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
-			break;
-
-			case 'oracle':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				// Does not support AFTER, only through temporary table
-
-				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
-				}
-				else
-				{
-					// old versions cannot add columns with default and null information
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint'];
-
-					if (isset($column_data['null']))
-					{
-						if ($column_data['null'] == 'NOT NULL')
-						{
-							$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-						}
-					}
-
-					if (isset($column_data['default']))
-					{
-						$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-					}
-				}
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop column
-	*/
-	function sql_column_remove($table_name, $column_name, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP "' . strtoupper($column_name) . '"';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name;
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Index
-	*/
-	function sql_index_drop($table_name, $index_name)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
-			break;
-
-			case 'firebird':
-			case 'oracle':
-			case 'postgres':
-			case 'sqlite':
-				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add primary key
-	*/
-	function sql_create_primary_key($table_name, $column, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
-				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
-				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
-				$sql .= ') ON [PRIMARY]';
-
-				$statements[] = $sql;
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column;
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add unique index
-	*/
-	function sql_create_unique_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = $table_prefix + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add index
-	*/
-	function sql_create_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = $table_prefix + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		// remove index length unless MySQL4
-		if ('mysql_40' != $this->sql_layer)
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-				// add index size to definition as required by MySQL4
-				foreach ($column as $i => $col)
-				{
-					if (false !== strpos($col, ':'))
-					{
-						list($col, $index_size) = explode(':', $col);
-						$column[$i] = "$col($index_size)";
-					}
-				}
-			// no break
-			case 'mysql_41':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Change column type (not name!)
-	*/
-	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Change type...
-				if (!empty($column_data['column_type_sql_default']))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" SET DEFAULT ' . ' ' . $column_data['column_type_sql_default'];
-				}
-				else
-				{
-					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-				}
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
-
-				if (!empty($column_data['default']))
-				{
-					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
-					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-						SET @drop_default_name =
-							(SELECT so.name FROM sysobjects so
-							JOIN sysconstraints sc ON so.id = sc.constid
-							WHERE object_name(so.parent_obj) = '{$table_name}'
-								AND so.xtype = 'D'
-								AND sc.colid = (SELECT colid FROM syscolumns
-									WHERE id = object_id('{$table_name}')
-										AND name = '{$column_name}'))
-						IF @drop_default_name <> ''
-						BEGIN
-							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-							EXEC(@cmd)
-						END
-						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'
-						EXEC(@cmd)";
-				}
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$sql = 'ALTER TABLE ' . $table_name . ' ';
-
-				$sql_array = array();
-				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
-
-				if (isset($column_data['null']))
-				{
-					if ($column_data['null'] == 'NOT NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-					}
-					else if ($column_data['null'] == 'NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
-					}
-				}
-
-				if (isset($column_data['default']))
-				{
-					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-				}
-
-				// we don't want to double up on constraints if we change different number data types
-				if (isset($column_data['constraint']))
-				{
-					$constraint_sql = "SELECT consrc as constraint_data
-								FROM pg_constraint, pg_class bc
-								WHERE conrelid = bc.oid
-									AND bc.relname = '{$table_name}'
-									AND NOT EXISTS (
-										SELECT *
-											FROM pg_constraint as c, pg_inherits as i
-											WHERE i.inhrelid = pg_constraint.conrelid
-												AND c.conname = pg_constraint.conname
-												AND c.consrc = pg_constraint.consrc
-												AND c.conrelid = i.inhparent
-									)";
-
-					$constraint_exists = false;
-
-					$result = $this->db->sql_query($constraint_sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (trim($row['constraint_data']) == trim($column_data['constraint']))
-						{
-							$constraint_exists = true;
-							break;
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					if (!$constraint_exists)
-					{
-						$sql_array[] = 'ADD ' . $column_data['constraint'];
-					}
-				}
-
-				$sql .= implode(', ', $sql_array);
-
-				$statements[] = $sql;
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					$column_list[] = $entities[0];
-					if ($entities[0] == $column_name)
-					{
-						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
-					}
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-}
-
 ?>
-- 
cgit v1.2.1


From 5b5c2274232bee869548a17399645a70cf550577 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:33:16 -0400
Subject: [ticket/10003] Use phpbb_db_tools in database_update.php.

Now that the copy of db tools has been deleted, change which
class name is used.

PHPBB3-10003
---
 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 d73848c871..7b6deb5727 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -180,7 +180,7 @@ $db->sql_freeresult($result);
 
 // We do not include DB Tools here, because we can not be sure the file is up-to-date ;)
 // Instead, this file defines a clean db_tools version (we are also not able to provide a different file, else the database update will not work standalone)
-$db_tools = new updater_db_tools($db, true);
+$db_tools = new phpbb_db_tools($db, true);
 
 $database_update_info = database_update_info();
 
-- 
cgit v1.2.1


From fd728c2815d3e21f5f6022b973109a839fe0164f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 8 Jul 2011 20:36:39 -0400
Subject: [ticket/10003] Require db_tools.php in database_update.php.

Use require_updated to use the new version of db_tools if one
is present.

PHPBB3-10003
---
 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 7b6deb5727..8154155650 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -99,6 +99,8 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+phpbb_require_updated('includes/db/db_tools.' . $phpEx);
+
 // new table constants are separately defined here in case the updater is run
 // before the files are updated
 if (!defined('LOGIN_ATTEMPT_TABLE'))
-- 
cgit v1.2.1


From 00f7db66f24327b6d115e18d1dad8bf48ea22290 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 9 Jul 2011 01:56:43 -0400
Subject: [ticket/10003] Fixed comment referring to db_tools duplication.

PHPBB3-10003
---
 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 8154155650..36d8bab467 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -180,8 +180,8 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-// We do not include DB Tools here, because we can not be sure the file is up-to-date ;)
-// Instead, this file defines a clean db_tools version (we are also not able to provide a different file, else the database update will not work standalone)
+// phpbb_db_tools will be taken from new files (under install/update/new)
+// if possible, falling back to the board's copy.
 $db_tools = new phpbb_db_tools($db, true);
 
 $database_update_info = database_update_info();
-- 
cgit v1.2.1


From e6572b766f7fd5f8547b28fd52d25e4a96cfc2cd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 10 Jul 2011 22:36:17 +0200
Subject: [prep-release-3.0.9] Bumping version number for 3.0.9 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 c2ebff5d21..78dbdd379c 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.9-RC4" />
+	<property name="newversion" value="3.0.9" />
 	<property name="prevversion" value="3.0.8" />
-	<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" />
+	<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3, 3.0.9-RC4" />
 	<!-- 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 a139ecc554..3940888216 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.9-RC4');
+define('PHPBB_VERSION', '3.0.9');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 097f6302dc..e73f859758 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.9-RC4');
+define('UPDATES_TO_VERSION', '3.0.9');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -981,6 +981,8 @@ function database_update_info()
 		'3.0.9-RC2'		=> array(),
 		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		'3.0.9-RC3'     => array(),
+		// No changes from 3.0.9-RC4 to 3.0.9
+		'3.0.9-RC4'     => array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
 	);
@@ -1986,6 +1988,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC3 to 3.0.9-RC4
 		case '3.0.9-RC3':
 		break;
+
+		// No changes from 3.0.9-RC4 to 3.0.9
+		case '3.0.9-RC4':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 1eb2f51645..0153bd8ec2 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -245,7 +245,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.9-RC4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9');
 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');
 
-- 
cgit v1.2.1


From 773561f862e9cf4016a4176454e3fb59489259ac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Jul 2011 19:20:45 +0200
Subject: [ticket/10237] Handle watching and unwatching the same way.

Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
---
 phpBB/includes/functions_display.php | 54 +++++++++++++++++++++++++-----------
 phpBB/language/en/common.php         |  6 ++++
 phpBB/viewforum.php                  |  2 +-
 phpBB/viewtopic.php                  |  2 +-
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 496da72344..391b56ab69 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1058,7 +1058,7 @@ function display_user_activity(&$userdata)
 /**
 * Topic and forum watching common code
 */
-function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0)
+function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0, $item_title = '')
 {
 	global $template, $db, $user, $phpEx, $start, $phpbb_root_path;
 
@@ -1091,15 +1091,17 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 			if (isset($_GET['unwatch']))
 			{
 				$uid = request_var('uid', 0);
-				if ($uid != $user_id)
-				{
-					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-					$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-					trigger_error($message);
-				}
+				$token = request_var('hash', '');
 
-				if (confirm_box(true))
+				if (($token && check_link_hash($token, "{$mode}_$match_id")) || confirm_box(true))
 				{
+					if (($uid != $user_id) || ($_GET['unwatch'] != $mode))
+					{
+						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
+						$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+						trigger_error($message);
+					}
+
 					$sql = 'DELETE FROM ' . $table_sql . "
 						WHERE $where_sql = $match_id
 							AND user_id = $user_id";
@@ -1123,7 +1125,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 						$s_hidden_fields['t'] = $topic_id;
 					}
 
-					confirm_box(false, 'UNWATCH_' . strtoupper($mode), build_hidden_fields($s_hidden_fields));
+					$confirm_box_message = (($item_title == '') ? 'UNWATCH_' . strtoupper($mode) : $user->lang('UNWATCH_' . strtoupper($mode) . '_DETAILED', $item_title));
+					confirm_box(false, $confirm_box_message, build_hidden_fields($s_hidden_fields));
 				}
 			}
 			else
@@ -1144,26 +1147,45 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 		{
 			if (isset($_GET['watch']))
 			{
+				$uid = request_var('uid', 0);
 				$token = request_var('hash', '');
-				$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
 
-				if ($_GET['watch'] == $mode && check_link_hash($token, "{$mode}_$match_id"))
+				if (($token && check_link_hash($token, "{$mode}_$match_id")) || confirm_box(true))
 				{
+					if (($uid != $user_id) || ($_GET['watch'] != $mode))
+					{
+						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
+						$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+						trigger_error($message);
+					}
+
 					$is_watching = true;
 
 					$sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status)
 						VALUES ($user_id, $match_id, " . NOTIFY_YES . ')';
 					$db->sql_query($sql);
+
+					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
 					$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+					meta_refresh(3, $redirect_url);
+					trigger_error($message);
 				}
 				else
 				{
-					$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
-				}
-
-				meta_refresh(3, $redirect_url);
+					$s_hidden_fields = array(
+						'uid'		=> $user->data['user_id'],
+						'watch'		=> $mode,
+						'start'		=> $start,
+						'f'			=> $forum_id,
+					);
+					if ($mode != 'forum')
+					{
+						$s_hidden_fields['t'] = $topic_id;
+					}
 
-				trigger_error($message);
+					$confirm_box_message = (($item_title == '') ? 'WATCH_' . strtoupper($mode) : $user->lang('WATCH_' . strtoupper($mode) . '_DETAILED', $item_title));
+					confirm_box(false, $confirm_box_message, build_hidden_fields($s_hidden_fields));
+				}
 			}
 			else
 			{
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b48a92124a..1c96818346 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -653,7 +653,9 @@ $lang = array_merge($lang, array(
 	'UNREAD_POST'			=> 'Unread post',
 	'UNREAD_POSTS'			=> 'Unread posts',
 	'UNWATCH_FORUM_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this forum?',
+	'UNWATCH_FORUM_DETAILED'	=> 'Are you sure you wish to unsubscribe from the forum “%s”?',
 	'UNWATCH_TOPIC_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this topic?',
+	'UNWATCH_TOPIC_DETAILED'	=> 'Are you sure you wish to unsubscribe from the topic “%s”?',
 	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
 	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
 	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
@@ -702,6 +704,10 @@ $lang = array_merge($lang, array(
 
 	'WARNINGS'			=> 'Warnings',
 	'WARN_USER'			=> 'Warn user',
+	'WATCH_FORUM_CONFIRM'	=> 'Are you sure you wish to subscribe to this forum?',
+	'WATCH_FORUM_DETAILED'	=> 'Are you sure you wish to subscribe to the forum “%s”?',
+	'WATCH_TOPIC_CONFIRM'	=> 'Are you sure you wish to subscribe to this topic?',
+	'WATCH_TOPIC_DETAILED'	=> 'Are you sure you wish to subscribe to the topic “%s”?',
 	'WELCOME_SUBJECT'	=> 'Welcome to %s forums',
 	'WEBSITE'			=> 'Website',
 	'WHOIS'				=> 'Whois',
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 61ec27ed79..e0b51bf782 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -208,7 +208,7 @@ $s_watching_forum = array(
 if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && $auth->acl_get('f_subscribe', $forum_id))
 {
 	$notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL;
-	watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status);
+	watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status, $start, $forum_data['forum_name']);
 }
 
 $s_forum_rules = '';
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 08e82591de..8b081b4aec 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -488,7 +488,7 @@ $s_watching_topic = array(
 
 if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'] && $user->data['is_registered'])
 {
-	watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start);
+	watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start, $topic_data['topic_title']);
 
 	// Reset forum notification if forum notify is set
 	if ($config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id))
-- 
cgit v1.2.1


From d60ffdd55c4066b8e69c0522c464ec1ada4b0913 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Jul 2011 19:31:11 +0200
Subject: [ticket/10237] Also display login-box on subscribing

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 391b56ab69..7982b9908d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1195,7 +1195,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 	}
 	else
 	{
-		if (isset($_GET['unwatch']) && $_GET['unwatch'] == $mode)
+		if ((isset($_GET['unwatch']) && $_GET['unwatch'] == $mode) || (isset($_GET['watch']) && $_GET['watch'] == $mode))
 		{
 			login_box();
 		}
-- 
cgit v1.2.1


From db352c17f8ce7e0abb06d6c71755ae2d9fd4c58d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 Jun 2011 02:19:51 +0200
Subject: [ticket/10243] Adding wrapper function for getdate() for UTC
 timestamps.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b1c1c14d0c..86eab4666f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -265,6 +265,27 @@ function phpbb_mt_rand($min, $max)
 	return ($min > $max) ? mt_rand($max, $min) : mt_rand($min, $max);
 }
 
+/**
+* Wrapper for getdate() which returns the equivalent array for UTC timestamps.
+*
+* @param int $time		Unix timestamp (optional)
+*
+* @return array			Returns an associative array of information related to the timestamp.
+*						See http://www.php.net/manual/en/function.getdate.php
+*/
+function phpbb_gmgetdate($time = false)
+{
+	if ($time === false)
+	{
+		$time = time();
+	}
+
+	// getdate() interprets timestamps in local time.
+	// What follows uses the fact that getdate() and
+	// date('Z') balance each other out.
+	return getdate($time - date('Z'));
+}
+
 /**
 * Return formatted string for filesizes
 *
-- 
cgit v1.2.1


From 91fd6df4308583c570dd7710d80a142a84c106aa Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 00:01:37 +0200
Subject: [ticket/10243] Call phpbb_gmgetdate() from various places.

PHPBB3-10243
---
 phpBB/index.php      | 2 +-
 phpBB/memberlist.php | 2 +-
 phpBB/viewtopic.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/index.php b/phpBB/index.php
index cc83641acd..3b58646af0 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -83,7 +83,7 @@ $legend = implode(', ', $legend);
 $birthday_list = '';
 if ($config['load_birthdays'] && $config['allow_birthdays'])
 {
-	$now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+	$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
 	$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday
 		FROM ' . USERS_TABLE . ' u
 		LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 589877305f..b3800ca0dd 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1667,7 +1667,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 
 		if ($bday_year)
 		{
-			$now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+			$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
 
 			$diff = $now['mon'] - $bday_month;
 			if ($diff == 0)
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 08e82591de..3f73fe356a 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -995,7 +995,7 @@ $sql = $db->sql_build_query('SELECT', array(
 
 $result = $db->sql_query($sql);
 
-$now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
 
 // Posts are stored in the $rowset array while $attach_list, $user_cache
 // and the global bbcode_bitfield are built
-- 
cgit v1.2.1


From 0e85704d75c2edefdbdfb9d5542ab366744e65fb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 00:44:10 +0200
Subject: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().

PHPBB3-10243
---
 tests/wrapper/gmgetdate_test.php | 49 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 tests/wrapper/gmgetdate_test.php

diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
new file mode 100644
index 0000000000..0b4c3378a9
--- /dev/null
+++ b/tests/wrapper/gmgetdate_test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
+{
+	public function test_gmgetdate()
+	{
+		$this->run_gmgetdate_assertion();
+		$this->run_test_with_timezone('UTC');
+		$this->run_test_with_timezone('Europe/Berlin');
+		$this->run_test_with_timezone('America/Los_Angeles');
+		$this->run_test_with_timezone('Antarctica/South_Pole');
+	}
+
+	protected function run_test_with_timezone($timezone_identifier)
+	{
+		$current_timezone = date_default_timezone_get();
+
+		date_default_timezone_set($timezone_identifier);
+		$this->run_gmgetdate_assertion();
+		date_default_timezone_set($current_timezone);
+	}
+
+	protected function run_gmgetdate_assertion()
+	{
+		$expected = time();
+
+		$date_array = phpbb_gmgetdate($expected);
+
+		$actual = gmmktime(
+			$date_array['hours'],
+			$date_array['minutes'],
+			$date_array['seconds'],
+			$date_array['mon'],
+			$date_array['mday'],
+			$date_array['year']
+		);
+
+		$this->assertEquals($expected, $actual);
+	}
+}
-- 
cgit v1.2.1


From 99db533524177a986e255fe02bb2e23df02bb238 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 00:55:26 +0200
Subject: [ticket/10257] Add missing break statement after CNAME block.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b1c1c14d0c..e113a32a87 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3686,6 +3686,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 					{
 						return true;
 					}
+				break;
 
 				default:
 				case 'A':
-- 
cgit v1.2.1


From ae8eee16cce29ea3ecae95ac19c49b0fa62ff978 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 9 Jul 2011 16:03:02 -0500
Subject: [ticket/10257] Fix AAAA record parsing for old versions of Windows

Older versions of Windows use a different output format for AAAA records.

PHPBB3-10257
---
 phpBB/includes/functions.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e113a32a87..c878efcd6b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3689,8 +3689,13 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 				break;
 
 				default:
-				case 'A':
 				case 'AAAA':
+					if (stripos($line, "$host AAAA IPv6 address") === 0)
+					{
+						return true;
+					}
+					//No break, newer versions of Windows output AAAA in the same way as the A records
+				case 'A':
 					if (!empty($host_matches))
 					{
 						// Second line
-- 
cgit v1.2.1


From 271c277ecc570de1ed0f5e38347eb00d987fbbd1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 01:05:34 +0200
Subject: [ticket/10257] Slightly adjust comments about AAAA records on Windows
 XP/2003.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c878efcd6b..121386b769 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3690,11 +3690,14 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 
 				default:
 				case 'AAAA':
+					// AAAA records returned by nslookup on Windows XP/2003 have this format.
+					// Later Windows versions use the A record format below for AAAA records.
 					if (stripos($line, "$host AAAA IPv6 address") === 0)
 					{
 						return true;
 					}
-					//No break, newer versions of Windows output AAAA in the same way as the A records
+				// No break
+
 				case 'A':
 					if (!empty($host_matches))
 					{
-- 
cgit v1.2.1


From e11f9afdce7649cebbe3f40d8af6ef62f8042434 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 00:49:48 +0200
Subject: [ticket/10265] Move mt_rand.php to wrapper folder and add _test
 suffix.

PHPBB3-10265
---
 tests/random/mt_rand.php       | 46 ------------------------------------------
 tests/wrapper/mt_rand_test.php | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 tests/random/mt_rand.php
 create mode 100644 tests/wrapper/mt_rand_test.php

diff --git a/tests/random/mt_rand.php b/tests/random/mt_rand.php
deleted file mode 100644
index d6502c4e80..0000000000
--- a/tests/random/mt_rand.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_random_mt_rand_test extends phpbb_test_case
-{
-	public function test_max_equals_min()
-	{
-		$result = phpbb_mt_rand(42, 42);
-		$this->assertEquals(42, $result);
-	}
-
-	public function test_max_equals_min_negative()
-	{
-		$result = phpbb_mt_rand(-42, -42);
-		$this->assertEquals(-42, $result);
-	}
-
-	public function test_max_greater_min()
-	{
-		$result = phpbb_mt_rand(3, 4);
-		$this->assertGreaterThanOrEqual(3, $result);
-		$this->assertLessThanOrEqual(4, $result);
-	}
-
-	public function test_min_greater_max()
-	{
-		$result = phpbb_mt_rand(4, 3);
-		$this->assertGreaterThanOrEqual(3, $result);
-		$this->assertLessThanOrEqual(4, $result);
-	}
-
-	public function test_min_greater_max_negative()
-	{
-		$result = phpbb_mt_rand(-3, -4);
-		$this->assertGreaterThanOrEqual(-4, $result);
-		$this->assertLessThanOrEqual(-3, $result);
-	}
-}
diff --git a/tests/wrapper/mt_rand_test.php b/tests/wrapper/mt_rand_test.php
new file mode 100644
index 0000000000..c8bcb3d14c
--- /dev/null
+++ b/tests/wrapper/mt_rand_test.php
@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_mt_rand_test extends phpbb_test_case
+{
+	public function test_max_equals_min()
+	{
+		$result = phpbb_mt_rand(42, 42);
+		$this->assertEquals(42, $result);
+	}
+
+	public function test_max_equals_min_negative()
+	{
+		$result = phpbb_mt_rand(-42, -42);
+		$this->assertEquals(-42, $result);
+	}
+
+	public function test_max_greater_min()
+	{
+		$result = phpbb_mt_rand(3, 4);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max()
+	{
+		$result = phpbb_mt_rand(4, 3);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max_negative()
+	{
+		$result = phpbb_mt_rand(-3, -4);
+		$this->assertGreaterThanOrEqual(-4, $result);
+		$this->assertLessThanOrEqual(-3, $result);
+	}
+}
-- 
cgit v1.2.1


From f926acf1b870a6dddcdfb25ee77bb25ec58e3ec0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 02:33:29 +0200
Subject: [ticket/10263] Add wrapper for version_compare() that allows the use
 of A and B

Add wrapper function for version_compare() that allows using uppercase A and B
for alpha and beta release version strings.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b1c1c14d0c..a926095004 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -598,6 +598,34 @@ function phpbb_email_hash($email)
 	return sprintf('%u', crc32(strtolower($email))) . strlen($email);
 }
 
+/**
+* Wrapper for version_compare() that allows using uppercase A and B
+* for alpha and beta releases.
+*
+* See http://www.php.net/manual/en/function.version-compare.php
+*
+* @param string $version1		First version number
+* @param string $version2		Second version number
+* @param string $operator		Comparison operator (optional)
+*
+* @return mixed					Integer (-1, 0, 1) if comparison operator is specified.
+*								Boolean (true, false) otherwise.
+*/
+function phpbb_version_compare($version1, $version2, $operator = null)
+{
+	$version1 = strtolower($version1);
+	$version2 = strtolower($version2);
+
+	if (is_null($operator))
+	{
+		return version_compare($version1, $version2);
+	}
+	else
+	{
+		return version_compare($version1, $version2, $operator);
+	}
+}
+
 /**
 * Global function for chmodding directories and files for internal use
 *
-- 
cgit v1.2.1


From fdfd4ce5fdec03f3341a6b477e242f2674f20b1e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 02:35:11 +0200
Subject: [ticket/10263] Adding unit tests for phpbb_version_compare().

PHPBB3-10263
---
 tests/wrapper/version_compare_test.php | 130 +++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 tests/wrapper/version_compare_test.php

diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php
new file mode 100644
index 0000000000..f718cfd16b
--- /dev/null
+++ b/tests/wrapper/version_compare_test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_version_compare_test extends phpbb_test_case
+{
+	public function test_two_parameters()
+	{
+		$this->assertEquals(-1, phpbb_version_compare('1.0.0', '1.0.1'));
+		$this->assertEquals(0, phpbb_version_compare('1.0.0', '1.0.0'));
+		$this->assertEquals(1, phpbb_version_compare('1.0.1', '1.0.0'));
+	}
+	
+	public function test_three_parameters()
+	{
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.1', '<'));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '<='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '>='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.1', '1.0.0', '>'));
+	}
+
+	public function test_strict_order()
+	{
+		$releases = array(
+			'2.0.0',
+			'2.0.1',
+			// Those are not version_compare() compatible
+			//'2.0.6a',
+			//'2.0.6b',
+			//'2.0.6c',
+			//'2.0.6d',
+			'2.0.7',
+			'2.0.23',
+			'3.0.A1',
+			'3.0.A2',
+			'3.0.A3',
+			'3.0.B1',
+			'3.0.B2',
+			'3.0.B4',
+			'3.0.B5',
+			'3.0.RC1',
+			'3.0.RC5',
+			'3.0.0',
+			'3.0.1',
+			'3.0.2',
+			'3.0.7',
+			'3.0.7-PL1',
+			'3.0.8-RC1',
+			'3.0.8',
+			'3.0.9-dev',
+			'3.0.9-RC1',
+			'3.0.9-RC2',
+			'3.0.9-RC4',
+			'3.0.10-RC1',
+			'3.1-dev',
+			'3.2-A1',
+		);
+
+		for ($i = 0, $size = sizeof($releases); $i < $size - 1; ++$i)
+		{
+			$version1 = $releases[$i];
+			$version2 = $releases[$i + 1];
+
+			$this->assertEquals(
+				true,
+				phpbb_version_compare($version1, $version2, '<'),
+				"Result of version comparison $version1 < $version2 is incorrect."
+			);
+		}
+	}
+
+	/**
+	* @dataProvider equality_test_data
+	*/
+	public function test_equality($version1, $version2)
+	{
+		$this->assertEquals(
+			0,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+
+		$this->assertEquals(
+			true,
+			phpbb_version_compare($version1, $version2, '='),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+	}
+
+	public function equality_test_data()
+	{
+		return array(
+			array('1.1.0-A2', '1.1.0-a2'),
+			array('1.1.0-B1', '1.1.0-b1'),
+		);
+	}
+
+	/**
+	* @dataProvider alpha_beta_test_data
+	*/
+	public function test_alpha_beta($expected, $version1, $version2)
+	{
+		$this->assertEquals(
+			$expected,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison ($version1, $version2) = $expected is incorrect."
+		);
+		
+	}
+
+	public function alpha_beta_test_data()
+	{
+		return array(
+			array(-1, '1.1.0-A2', '1.1.0-B1'),
+			array(-1, '1.1.0-a2', '1.1.0-b1'),
+
+			array(-1, '1.1.0-a2', '1.1.0-B1'),
+			array(-1, '1.1.0-A2', '1.1.0-b1'),
+		);
+	}
+
+}
-- 
cgit v1.2.1


From b1608ae860d8b72d56916c08fdf78ca2135a08db Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 14 Jul 2011 02:09:22 +0200
Subject: [ticket/10267] Call strlen() on $table_prefix for $max_length
 calculation.

PHPBB3-10267
---
 phpBB/includes/db/db_tools.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 50e308dea2..d23323a5b1 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2059,7 +2059,7 @@ class phpbb_db_tools
 		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
 		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			$max_length = $table_prefix + 24;
+			$max_length = strlen($table_prefix) + 24;
 			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
@@ -2096,7 +2096,7 @@ class phpbb_db_tools
 		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
 		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
 		{
-			$max_length = $table_prefix + 24;
+			$max_length = strlen($table_prefix) + 24;
 			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
 		}
 
-- 
cgit v1.2.1


From b7459cc5f7de19db1871a86764e3feb9106cfab9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 02:33:32 +0200
Subject: [ticket/10255] Add leading slash in gitignore to only ignore
 specified files

PHPBB3-10255
---
 .gitignore | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8298f5a894..65058b2eaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
 *~
-phpunit.xml
-phpBB/cache/*.php
-phpBB/cache/queue.php.lock
-phpBB/config.php
-phpBB/files/*
-phpBB/images/avatars/gallery/*
-phpBB/images/avatars/upload/*
-phpBB/store/*
-tests/phpbb_unit_tests.sqlite2
-tests/test_config.php
-tests/utf/data/*.txt
+/phpunit.xml
+/phpBB/cache/*.php
+/phpBB/cache/queue.php.lock
+/phpBB/config.php
+/phpBB/files/*
+/phpBB/images/avatars/gallery/*
+/phpBB/images/avatars/upload/*
+/phpBB/store/*
+/tests/phpbb_unit_tests.sqlite2
+/tests/test_config.php
+/tests/utf/data/*.txt
-- 
cgit v1.2.1


From 1ff0f221faaf40d742e7dc6d6947e62fe6d89268 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 02:52:05 +0200
Subject: [ticket/10266] Add "Return to forum" link after reporting a post

PHPBB3-10266
---
 phpBB/report.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/report.php b/phpBB/report.php
index ca8c7bbd0e..c1172ec1d5 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -39,11 +39,13 @@ if (!$post_id && (!$pm_id || !$config['allow_pm_report']))
 if ($post_id)
 {
 	$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;p=$post_id") . "#p$post_id";
+	$return_forum_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id");
 	$pm_id = 0;
 }
 else
 {
 	$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&p=$pm_id");
+	$return_forum_url = '';
 	$post_id = 0;
 	$forum_id = 0;
 }
@@ -101,6 +103,7 @@ if ($post_id)
 	{
 		$message = $user->lang['ALREADY_REPORTED'];
 		$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
+		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
 		trigger_error($message);
 	}
 }
@@ -209,6 +212,10 @@ if ($submit && $reason_id)
 	meta_refresh(3, $redirect_url);
 
 	$message = $lang_success . '<br /><br />' . sprintf($lang_return, '<a href="' . $redirect_url . '">', '</a>');
+	if ($return_forum_url)
+	{
+		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
+	}
 	trigger_error($message);
 }
 
-- 
cgit v1.2.1


From 8ebc8ec18277aea45079da3972e1ae0a3eb139ef Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 04:05:20 +0200
Subject: [ticket/5506] Do not display an empty last page after deleting logs.

The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway
---
 phpBB/includes/acp/acp_inactive.php |  2 +-
 phpBB/includes/acp/acp_logs.php     |  4 ++--
 phpBB/includes/acp/acp_users.php    |  2 +-
 phpBB/includes/functions_admin.php  | 47 +++++++++++++++++++++++++------------
 phpBB/includes/mcp/mcp_logs.php     |  4 ++--
 phpBB/includes/mcp/mcp_notes.php    |  2 +-
 6 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 1a12c4967c..c93cbc457f 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -301,7 +301,7 @@ class acp_inactive
 			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page", $inactive_count, $per_page, $start, true),
 			'USERS_PER_PAGE'	=> $per_page,
 
-			'U_ACTION'		=> $this->u_action . '&amp;start=' . $start,
+			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page&amp;start=$start",
 		));
 
 		$this->tpl_name = 'acp_inactive';
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 0f4f78fcdd..2fc86e325f 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -127,12 +127,12 @@ class acp_logs
 		// Grab log data
 		$log_data = array();
 		$log_count = 0;
-		view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
+		$start = view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort, $keywords);
 
 		$template->assign_vars(array(
 			'L_TITLE'		=> $l_title,
 			'L_EXPLAIN'		=> $l_title_explain,
-			'U_ACTION'		=> $this->u_action,
+			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param$keywords_param&amp;start=$start",
 
 			'S_ON_PAGE'		=> on_page($log_count, $config['topics_per_page'], $start),
 			'PAGINATION'	=> generate_pagination($this->u_action . "&amp;$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 6be0760be0..789003e31b 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1124,7 +1124,7 @@ class acp_users
 				// Grab log data
 				$log_data = array();
 				$log_count = 0;
-				view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
+				$start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
 
 				$template->assign_vars(array(
 					'S_FEEDBACK'	=> true,
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index cb0cf34e69..f7e19f3e7d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2595,6 +2595,31 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		$sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
 	}
 
+	if ($log_count !== false)
+	{
+		$sql = 'SELECT COUNT(l.log_id) AS total_entries
+			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
+			WHERE l.log_type = $log_type
+				AND l.user_id = u.user_id
+				AND l.log_time >= $limit_days
+				$sql_keywords
+				$sql_forum";
+		$result = $db->sql_query($sql);
+		$log_count = (int) $db->sql_fetchfield('total_entries');
+		$db->sql_freeresult($result);
+	}
+
+	if ($log_count == 0)
+	{
+		// Save the queries, because there are no logs to display
+		return 0;
+	}
+
+	if ($offset >= $log_count)
+	{
+		$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
+	}
+
 	$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
 		FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
 		WHERE l.log_type = $log_type
@@ -2762,21 +2787,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		}
 	}
 
-	if ($log_count !== false)
-	{
-		$sql = 'SELECT COUNT(l.log_id) AS total_entries
-			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
-			WHERE l.log_type = $log_type
-				AND l.user_id = u.user_id
-				AND l.log_time >= $limit_days
-				$sql_keywords
-				$sql_forum";
-		$result = $db->sql_query($sql);
-		$log_count = (int) $db->sql_fetchfield('total_entries');
-		$db->sql_freeresult($result);
-	}
-
-	return;
+	return $offset;
 }
 
 /**
@@ -2908,6 +2919,12 @@ function view_inactive_users(&$users, &$user_count, $limit = 0, $offset = 0, $li
 	$user_count = (int) $db->sql_fetchfield('user_count');
 	$db->sql_freeresult($result);
 
+	if ($user_count == 0)
+	{
+		// Save the queries, because there are no users to display
+		return 0;
+	}
+
 	if ($offset >= $user_count)
 	{
 		$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 6da810a489..73ff72c177 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -170,7 +170,7 @@ class mcp_logs
 		// Grab log data
 		$log_data = array();
 		$log_count = 0;
-		view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $keywords);
+		$start = view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort, $keywords);
 
 		$template->assign_vars(array(
 			'PAGE_NUMBER'		=> on_page($log_count, $config['topics_per_page'], $start),
@@ -179,7 +179,7 @@ class mcp_logs
 
 			'L_TITLE'			=> $user->lang['MCP_LOGS'],
 
-			'U_POST_ACTION'			=> $this->u_action,
+			'U_POST_ACTION'			=> $this->u_action . "&amp;$u_sort_param$keywords_param&amp;start=$start",
 			'S_CLEAR_ALLOWED'		=> ($auth->acl_get('a_clearlogs')) ? true : false,
 			'S_SELECT_SORT_DIR'		=> $s_sort_dir,
 			'S_SELECT_SORT_KEY'		=> $s_sort_key,
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index c684eb6f52..02a89c0251 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -198,7 +198,7 @@ class mcp_notes
 
 		$log_data = array();
 		$log_count = 0;
-		view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $keywords);
+		$start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort, $keywords);
 
 		if ($log_count)
 		{
-- 
cgit v1.2.1


From bb733b0204aef71c40290a9c8db8ad0a7e3e3d0a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 15:05:25 +0200
Subject: [ticket/6632] Better viewing of topics for wide screen displays

Also fixes PHPBB3-6458 "Width of Topics and Posts columns in Board Index is causing problems with language packs" by increasing the size to 90px instead of the ~70 it was like. Also tested on RTL languages.

PHPBB3-6458
PHPBB3-6632
---
 phpBB/styles/prosilver/template/forumlist_body.html |  6 +++---
 phpBB/styles/prosilver/template/viewforum_body.html |  6 +++---
 phpBB/styles/prosilver/theme/content.css            | 12 +++++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index e9ed5d9daf..2c2a242a9f 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -13,7 +13,7 @@
 			<ul class="topiclist">
 				<li class="header">
 					<dl class="icon">
-						<dt><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></dt>
+						<dt><div class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
 						<dd class="topics">{L_TOPICS}</dd>
 						<dd class="posts">{L_POSTS}</dd>
 						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -26,7 +26,7 @@
 	<!-- IF not forumrow.S_IS_CAT -->
 		<li class="row">
 			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
+				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><div class="wrap-content">
 				<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
 
 					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
@@ -36,7 +36,7 @@
 						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
 					<!-- ENDIF -->
 					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
-				</dt>
+				</div></dt>
 				<!-- IF forumrow.CLICKS -->
 					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
 				<!-- ELSEIF not forumrow.S_IS_LINK -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 02f42fa097..4ad0990d98 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -127,7 +127,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
-					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
+					<dt><div class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -139,12 +139,12 @@
 
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
 			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><div class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
 					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
 					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</dt>
+				</div></dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 64beb97a37..2dad706bf5 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -29,10 +29,15 @@ ul.topiclist li.row dl {
 ul.topiclist dt {
 	display: block;
 	float: left;
-	width: 50%;
+	width: 100%;
 	font-size: 1.1em;
 	padding-left: 5px;
 	padding-right: 5px;
+	margin-right: -465px;
+}
+
+ul.topiclist dt .wrap-content {
+	padding-right: 465px;
 }
 
 ul.topiclist dd {
@@ -96,6 +101,7 @@ li.header dt, li.header dd {
 
 li.header dt {
 	font-weight: bold;
+	margin-right: -465px;
 }
 
 li.header dd {
@@ -126,7 +132,7 @@ dl.icon dt {
 }
 
 dd.posts, dd.topics, dd.views {
-	width: 8%;
+	width: 90px;
 	text-align: center;
 	line-height: 2.2em;
 	font-size: 1.2em;
@@ -145,7 +151,7 @@ dl.icon dt li {
 }
 
 dd.lastpost {
-	width: 25%;
+	width: 230px;
 	font-size: 1.1em;
 }
 
-- 
cgit v1.2.1


From e9319ee2aadb61b86ec0e370d22d47cc9a47b97f Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 14 Jul 2011 18:34:55 +0100
Subject: [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.

Previously "errors are listing below", should have said "errors are
listed below".

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 37147cc6a0..befa7c6f40 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -494,7 +494,7 @@ $lang = array_merge($lang, array(
 	'SHOW_DIFF_NEW'				=> 'Show file contents',
 	'SHOW_DIFF_NEW_CONFLICT'	=> 'Show differences',
 	'SHOW_DIFF_NOT_MODIFIED'	=> 'Show differences',
-	'SOME_QUERIES_FAILED'		=> 'Some queries failed, the statements and errors are listing below.',
+	'SOME_QUERIES_FAILED'		=> 'Some queries failed, the statements and errors are listed below.',
 	'SQL'						=> 'SQL',
 	'SQL_FAILURE_EXPLAIN'		=> 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
 	'STAGE_FILE_CHECK'			=> 'Check files',
-- 
cgit v1.2.1


From 16c5352a12cef9572712f4600b8dd9313d2c9d2a Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 14 Jul 2011 21:00:10 +0100
Subject: [ticket/10032] Fixed typos in bbcode button name.

addlistitem was addlitsitem.

PHPBB3-10032
---
 phpBB/adm/style/acp_users_signature.html              | 2 +-
 phpBB/styles/prosilver/template/posting_buttons.html  | 2 +-
 phpBB/styles/subsilver2/template/posting_buttons.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 69c6d8f3fb..c91d199eb3 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -56,7 +56,7 @@
 			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
 			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
 			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
 			<!-- IF S_BBCODE_IMG -->
 				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 19d55d1a4a..9d08bf851d 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -79,7 +79,7 @@
 	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
 	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
 	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
+	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
 	<!-- IF S_BBCODE_IMG -->
 		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
 	<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 92b4bd3e39..26d1e5e1a5 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -45,7 +45,7 @@
 		<input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
 		<input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-		<input type="button" class="btnbbcode" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />				
+		<input type="button" class="btnbbcode" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />				
 		<!-- IF S_BBCODE_IMG -->
 			<input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
 		<!-- ENDIF -->
-- 
cgit v1.2.1


From 91b20ddba505ebfb38aef8de4db1e63aad5bf1fb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Jul 2011 22:29:27 +0200
Subject: [ticket/7291] Use template loop for character list, to avoid double
 &first_char

PHPBB3-7291
---
 phpBB/memberlist.php                               | 34 +++++++++++++++++-----
 .../styles/prosilver/template/memberlist_body.html | 33 ++++-----------------
 .../subsilver2/template/memberlist_body.html       |  7 ++++-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 589877305f..ec1ceba8e4 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1293,13 +1293,6 @@ switch ($mode)
 			$total_users = $config['num_users'];
 		}
 
-		$s_char_options = '<option value=""' . ((!$first_char) ? ' selected="selected"' : '') . '>&nbsp; &nbsp;</option>';
-		for ($i = 97; $i < 123; $i++)
-		{
-			$s_char_options .= '<option value="' . chr($i) . '"' . (($first_char == chr($i)) ? ' selected="selected"' : '') . '>' . chr($i-32) . '</option>';
-		}
-		$s_char_options .= '<option value="other"' . (($first_char == 'other') ? ' selected="selected"' : '') . '>' . $user->lang['OTHER'] . '</option>';
-
 		// Build a relevant pagination_url
 		$params = $sort_params = array();
 
@@ -1329,6 +1322,7 @@ switch ($mode)
 			'first_char'	=> array('first_char', ''),
 		);
 
+		$u_first_char_params = array();
 		foreach ($check_params as $key => $call)
 		{
 			if (!isset($_REQUEST[$key]))
@@ -1340,6 +1334,10 @@ switch ($mode)
 			$param = urlencode($key) . '=' . ((is_string($param)) ? urlencode($param) : $param);
 			$params[] = $param;
 
+			if ($key != 'first_char')
+			{
+				$u_first_char_params[] = $param;
+			}
 			if ($key != 'sk' && $key != 'sd')
 			{
 				$sort_params[] = $param;
@@ -1359,6 +1357,27 @@ switch ($mode)
 
 		unset($search_params, $sort_params);
 
+		$u_first_char_params = implode('&amp;', $u_first_char_params);
+		$u_first_char_params .= ($u_first_char_params) ? '&amp;' : '';
+
+		$first_characters = array();
+		$first_characters[''] = $user->lang['ALL'];
+		for ($i = 97; $i < 123; $i++)
+		{
+			$first_characters[chr($i)] = chr($i - 32);
+		}
+		$first_characters['other'] = $user->lang['OTHER'];
+
+		foreach ($first_characters as $char => $desc)
+		{
+			$template->assign_block_vars('first_char', array(
+				'DESC'			=> $desc,
+				'VALUE'			=> $char,
+				'S_SELECTED'	=> ($first_char == $char) ? true : false,
+				'U_SORT'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", $u_first_char_params . 'first_char=' . $char) . '#memberlist',
+			));
+		}
+
 		// Some search user specific data
 		if ($mode == 'searchuser' && ($config['load_search'] || $auth->acl_get('a_')))
 		{
@@ -1603,7 +1622,6 @@ switch ($mode)
 			'S_LEADERS_SET'		=> $leaders_set,
 			'S_MODE_SELECT'		=> $s_sort_key,
 			'S_ORDER_SELECT'	=> $s_sort_dir,
-			'S_CHAR_OPTIONS'	=> $s_char_options,
 			'S_MODE_ACTION'		=> $pagination_url)
 		);
 }
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 197cbd4a0c..9e6f8c3aab 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -34,34 +34,11 @@
 				<li>
 
 				<!-- IF U_FIND_MEMBER and not S_SEARCH_USER --><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a> &bull; <!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP --><a href="{U_HIDE_FIND_MEMBER}">{L_HIDE_MEMBER_SEARCH}</a> &bull; <!-- ENDIF -->
-				<strong style="font-size: 0.95em;"><a href="{S_MODE_ACTION}&amp;first_char=">{L_ALL}</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=a#memberlist">A</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=b#memberlist">B</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=c#memberlist">C</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=d#memberlist">D</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=e#memberlist">E</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=f#memberlist">F</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=g#memberlist">G</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=h#memberlist">H</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=i#memberlist">I</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=j#memberlist">J</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=k#memberlist">K</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=l#memberlist">L</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=m#memberlist">M</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=n#memberlist">N</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=o#memberlist">O</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=p#memberlist">P</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=q#memberlist">Q</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=r#memberlist">R</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=s#memberlist">S</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=t#memberlist">T</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=u#memberlist">U</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=v#memberlist">V</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=w#memberlist">W</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=x#memberlist">X</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=y#memberlist">Y</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=z#memberlist">Z</a>&nbsp; 
-				<a href="{S_MODE_ACTION}&amp;first_char=other">#</a></strong>
+				<strong style="font-size: 0.95em;">
+				<!-- BEGIN first_char -->
+					<a href="{first_char.U_SORT}">{first_char.DESC}</a>&nbsp; 
+				<!-- END first_char -->
+				</strong>
 				</li>
 				<li class="rightside pagination">
 					{TOTAL_USERS} &bull; 
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index cb7a7b20c7..800162b7b0 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -14,7 +14,12 @@
 	<form method="post" name="charsearch" action="{S_MODE_ACTION}">
 		<table width="100%" cellspacing="1">
 		<tr>
-			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}: </span><select name="first_char" onchange="this.form.submit();">{S_CHAR_OPTIONS}</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
+			<td align="{S_CONTENT_FLOW_BEGIN}"><span class="genmed">{L_USERNAME_BEGINS_WITH}: </span>
+				<select name="first_char" onchange="this.form.submit();">
+					<!-- BEGIN first_char -->
+						<option value="{first_char.VALUE}"<!-- IF first_char.S_SELECTED --> selected="selected"<!-- ENDIF -->>{first_char.DESC}</option>
+					<!-- END first_char -->
+				</select>&nbsp;<input type="submit" name="char" value="{L_DISPLAY}" class="btnlite" /></td>
 	<!-- IF U_FIND_MEMBER and not S_SEARCH_USER -->
 			<td class="genmed" align="{S_CONTENT_FLOW_END}"><a href="{U_FIND_MEMBER}">{L_FIND_USERNAME}</a></td>
 	<!-- ELSEIF S_SEARCH_USER and U_HIDE_FIND_MEMBER and not S_IN_SEARCH_POPUP -->
-- 
cgit v1.2.1


From b0940f52e5f3ae096b63b82d449aa6fa8bb8555a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 13 Jul 2011 02:40:00 +0200
Subject: [ticket/10263] Call phpbb_version_compare() from
 includes/acp/acp_update.php

PHPBB3-10263
---
 phpBB/includes/acp/acp_update.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index b0ce8f1084..931fa53165 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -69,12 +69,9 @@ class acp_update
 
 		$current_version = (!empty($version_update_from)) ? $version_update_from : $config['version'];
 
-		$up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
-		$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
-
 		$template->assign_vars(array(
-			'S_UP_TO_DATE'		=> $up_to_date,
-			'S_UP_TO_DATE_AUTO'	=> $up_to_date_automatic,
+			'S_UP_TO_DATE'		=> phpbb_version_compare($latest_version, $config['version'], '<='),
+			'S_UP_TO_DATE_AUTO'	=> phpbb_version_compare($latest_version, $current_version, '<='),
 			'S_VERSION_CHECK'	=> true,
 			'U_ACTION'			=> $this->u_action,
 			'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&amp;versioncheck_force=1'),
-- 
cgit v1.2.1


From 7f56c05f2450dbf33e48d2c1b9885353ddd58beb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 14 Jul 2011 23:58:51 +0200
Subject: [ticket/10263] Call phpbb_version_compare() from
 includes/acp/acp_main.php

PHPBB3-10263
---
 phpBB/includes/acp/acp_main.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 60cebe3c08..68445d814f 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -415,11 +415,8 @@ class acp_main
 		{
 			$latest_version_info = explode("\n", $latest_version_info);
 
-			$latest_version = str_replace('rc', 'RC', strtolower(trim($latest_version_info[0])));
-			$current_version = str_replace('rc', 'RC', strtolower($config['version']));
-
 			$template->assign_vars(array(
-				'S_VERSION_UP_TO_DATE'	=> version_compare($current_version, $latest_version, '<') ? false : true,
+				'S_VERSION_UP_TO_DATE'	=> phpbb_version_compare(trim($latest_version_info[0]), $config['version'], '<='),
 			));
 		}
 
-- 
cgit v1.2.1


From 0690e9f10388a14c3bceafc81e7bb226e697268c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 15 Jul 2011 00:05:20 +0200
Subject: [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE
 on acp_main

PHPBB3-10274
---
 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 60cebe3c08..f2aa3c0fb0 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -521,7 +521,7 @@ class acp_main
 			'U_ADMIN_LOG'		=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
 			'U_INACTIVE_USERS'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&amp;mode=list'),
 			'U_VERSIONCHECK'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=update&amp;mode=version_check'),
-			'U_VERSIONCHECK_FORCE'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'i=1&amp;versioncheck_force=1'),
+			'U_VERSIONCHECK_FORCE'	=> append_sid("{$phpbb_admin_path}index.$phpEx", 'versioncheck_force=1'),
 
 			'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,
 			'S_FOUNDER'			=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,
-- 
cgit v1.2.1


From 2231488543bcd309f036f027a353c157d2c903ad Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 15 Jul 2011 10:23:06 +0200
Subject: [ticket/10252] Correctly document behaviour of acl_get_list() for a_
 permission

Be careful when using this function with permissions a_, m_, u_ and f_ ! It may not work correctly. When a user group grants an a_* permission, e.g. a_foo, but the user's a_foo permission is set to "Never", then the user does not in fact have the a_ permission. But the user will still be listed as having the a_ permission.

PHPBB3-10252
---
 phpBB/includes/auth.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 5564de2943..0585921426 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -349,6 +349,14 @@ class auth
 
 	/**
 	* Get permission listing based on user_id/options/forum_ids
+	*
+	* Be careful when using this function with permissions a_, m_, u_ and f_ !
+	* It may not work correctly. When a user group grants an a_* permission,
+	* e.g. a_foo, but the user's a_foo permission is set to "Never", then
+	* the user does not in fact have the a_ permission.
+	* But the user will still be listed as having the a_ permission.
+	*
+	* For more information see: http://tracker.phpbb.com/browse/PHPBB3-10252
 	*/
 	function acl_get_list($user_id = false, $opts = false, $forum_id = false)
 	{
-- 
cgit v1.2.1


From 2bba22e9d32785c4f998a39ab008a7551e7b9928 Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <tabitha_backoff@yahoo.com>
Date: Sat, 16 Jul 2011 01:10:24 +0200
Subject: [ticket/10208] Explain what happens when 'Warning duration' is set to
 0.

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

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0254bff992..5a9ca6231d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
 	'WARNINGS_EXPIRE'				=> 'Warning duration',
-	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
+	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record. Set this value to 0 to make warnings permanent.',
 ));
 
 // Board Features
-- 
cgit v1.2.1


From 627e2644a2aee478303e63577213329225a39173 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 17 Jul 2011 00:44:39 -0400
Subject: [ticket/8937] Keep space characters in front of [code] bbcode content

PHPBB3-8937
---
 phpBB/includes/bbcode.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index d77bb3c4a7..9356e3e9b4 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -584,6 +584,13 @@ class bbcode
 				$code = str_replace("\t", '&nbsp; &nbsp;', $code);
 				$code = str_replace('  ', '&nbsp; ', $code);
 				$code = str_replace('  ', ' &nbsp;', $code);
+				$code = str_replace("\n ", "\n&nbsp;", $code);
+
+				// keep space at the beginning
+				if (!empty($code) && $code[0] == ' ')
+				{
+					$code = '&nbsp;' . substr($code, 1);
+				}
 
 				// remove newline at the beginning
 				if (!empty($code) && $code[0] == "\n")
-- 
cgit v1.2.1


From b4949675bfdd11212b9e38681b0ecce79d72ab24 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jul 2011 00:25:45 +0200
Subject: [ticket/8571] Also display age on memberlist/viewprofile when age is
 0.

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

diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 031bfec6ff..3398bb5e9e 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -28,7 +28,7 @@
 		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}:</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF LOCATION --><dt>{L_LOCATION}:</dt> <dd>{LOCATION}</dd><!-- ENDIF -->
-		<!-- IF AGE --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF -->
+		<!-- IF AGE !== '' --><dt>{L_AGE}:</dt> <dd>{AGE}</dd><!-- ENDIF -->
 		<!-- IF OCCUPATION --><dt>{L_OCCUPATION}:</dt> <dd>{OCCUPATION}</dd><!-- ENDIF -->
 		<!-- IF INTERESTS --><dt>{L_INTERESTS}:</dt> <dd>{INTERESTS}</dd><!-- ENDIF -->
 		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}:</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 9ef2b85878..0afa750c79 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -148,10 +148,10 @@
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LOCATION}: </td>
 				<td><!-- IF LOCATION --><b class="genmed">{LOCATION}</b><!-- ENDIF --></td>
 			</tr>
-			<!-- IF AGE -->
+			<!-- IF AGE !== '' -->
 			<tr>
 				<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_AGE}: </td>
-				<td><b class="genmed"><!-- IF AGE -->{AGE}<!-- ELSE --> - <!-- ENDIF --></b></td>
+				<td><b class="genmed">{AGE}</b></td>
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-- 
cgit v1.2.1


From 106cf14d27421b1e3b1c5af8ac79a8b1baa910f5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jul 2011 00:26:52 +0200
Subject: [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the
 future.

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

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 351759fcbd..8169ee7a3e 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1697,7 +1697,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
 				$diff = ($diff < 0) ? 1 : 0;
 			}
 
-			$age = (int) ($now['year'] - $bday_year - $diff);
+			$age = max(0, (int) ($now['year'] - $bday_year - $diff));
 		}
 	}
 
-- 
cgit v1.2.1


From 49c89023fcc946ed8c81181fabfea164128d8d5a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 20 Jul 2011 00:53:28 +0200
Subject: [ticket/8571] Show age as 0 in birthday list when birthday is in the
 future.

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

diff --git a/phpBB/index.php b/phpBB/index.php
index 3b58646af0..91cbd326b9 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -99,7 +99,7 @@ if ($config['load_birthdays'] && $config['allow_birthdays'])
 
 		if ($age = (int) substr($row['user_birthday'], -4))
 		{
-			$birthday_list .= ' (' . ($now['year'] - $age) . ')';
+			$birthday_list .= ' (' . max(0, $now['year'] - $age) . ')';
 		}
 	}
 	$db->sql_freeresult($result);
-- 
cgit v1.2.1


From 0648923b19e450d44e02426e7a510efb831f78d1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 9 May 2011 02:04:58 -0400
Subject: [ticket/10199] Delete a useless join in viewtopic.

PHPBB3-10199
---
 phpBB/viewtopic.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 2f3a4cf2e4..f1ab30aad3 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -196,7 +196,7 @@ if ($db->sql_layer === 'firebird')
 // The FROM-Order is quite important here, else t.* columns can not be correctly bound.
 if ($post_id)
 {
-	$sql_array['SELECT'] .= ', p.post_approved';
+	$sql_array['SELECT'] .= ', p.post_approved, p.post_time';
 	$sql_array['FROM'][POSTS_TABLE] = 'p';
 }
 
@@ -314,12 +314,11 @@ if ($post_id)
 	}
 	else
 	{
-		$sql = 'SELECT COUNT(p1.post_id) AS prev_posts
-			FROM ' . POSTS_TABLE . ' p1, ' . POSTS_TABLE . " p2
-			WHERE p1.topic_id = {$topic_data['topic_id']}
-				AND p2.post_id = {$post_id}
-				" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p1.post_approved = 1' : '') . '
-				AND ' . (($sort_dir == 'd') ? 'p1.post_time >= p2.post_time' : 'p1.post_time <= p2.post_time');
+		$sql = 'SELECT COUNT(p.post_id) AS prev_posts
+			FROM ' . POSTS_TABLE . " p
+			WHERE p.topic_id = {$topic_data['topic_id']}
+				" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
+				AND ' . (($sort_dir == 'd') ? "p.post_time >= {$topic_data['post_time']}" : "p.post_time <= {$topic_data['post_time']}");
 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
-- 
cgit v1.2.1


From f51b2f8fecab566c625cf5811b70ba2f6272a8a5 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 25 Jul 2011 21:08:26 +0100
Subject: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.

There is no space between the first radio button and "Yes", while there
is a space between the second radio button and "No". This commit fixes
that.

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

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index 2ad8b3e8aa..1f45109517 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -35,7 +35,7 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
-		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> />{L_YES}</label>
+		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
-- 
cgit v1.2.1


From 7e01850a4252aa68df6ab5c23e8dc12e8b0b66bd Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 26 Jul 2011 13:28:08 +0100
Subject: [ticket/10293] Fixed the JavaScript in the jumpbox.

The current code is invalid, and results in an critical error which
aborts the script before it gets to return false, thus allowing the form
to submit with an invalid forum ID. This commit fixes that by
referencing "this" instead of "document.jumpbox", which didn't exist
because the form had no name.

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

diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index f7b4fca609..1029627561 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -10,7 +10,7 @@
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
+	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}">
 
 	<!-- IF $CUSTOM_FIELDSET_CLASS -->
 		<fieldset class="{$CUSTOM_FIELDSET_CLASS}">
-- 
cgit v1.2.1


From 65ec47abfa1f7c48e36518b387ccc520fe9ef9f5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Jul 2011 00:13:23 +0200
Subject: [ticket/10263] Fix comment about return value of
 phpbb_version_compare().

PHPBB3-10263
---
 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 a926095004..22de82cb29 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -608,8 +608,8 @@ function phpbb_email_hash($email)
 * @param string $version2		Second version number
 * @param string $operator		Comparison operator (optional)
 *
-* @return mixed					Integer (-1, 0, 1) if comparison operator is specified.
-*								Boolean (true, false) otherwise.
+* @return mixed					Boolean (true, false) if comparison operator is specified.
+*								Integer (-1, 0, 1) otherwise.
 */
 function phpbb_version_compare($version1, $version2, $operator = null)
 {
-- 
cgit v1.2.1


From c38b0830579ba2c13cb2a946a9c7e939e4b2d2cd Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 28 Jul 2011 15:57:09 +0200
Subject: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.

sqlsrv_rows_affected() expects a statement resource, not a connection resource.

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

diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 6810562d17..7fbc374e77 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -396,7 +396,7 @@ class dbal_mssqlnative extends dbal
 	*/
 	function sql_affectedrows()
 	{
-		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->db_connect_id) : false;
+		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 381ebcf195499c2656b7fc3e49b14a665320ba4b Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 11 Jul 2011 15:17:46 +0100
Subject: [ticket/9645] Added code to repair invalid anchor names in
 acp_php_info.

Some of the anchor tags produced by php_info had names like "module_Zend
Optimizer", which is obviously invalid. This commit adds some code that
repairs the names by replacing all spaces found in the names with
underscores.

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

diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php
index 0499095004..7dd345971a 100644
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -67,6 +67,9 @@ class acp_php_info
 		$output = preg_replace('#<img border="0"#i', '<img', $output);
 		$output = str_replace(array('class="e"', 'class="v"', 'class="h"', '<hr />', '<font', '</font>'), array('class="row1"', 'class="row2"', '', '', '<span', '</span>'), $output);
 
+		// Fix invalid anchor names (eg "module_Zend Optimizer")
+		$output = preg_replace_callback('#<a name="([^"]+)">#', array($this, 'remove_spaces'), $output);
+
 		if (empty($output))
 		{
 			trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
@@ -79,6 +82,11 @@ class acp_php_info
 
 		$template->assign_var('PHPINFO', $output);
 	}
+	
+	function remove_spaces($matches)
+	{
+		return '<a name="' . str_replace(' ', '_', $matches[1]) . '">';
+	}
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From 9c6339fb57d44caf86af43624d3308f6413b2c7d Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 11 Jul 2011 18:00:42 +0100
Subject: [ticket/8173] Removed some redundant code in the BBCode JavaScript.

The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
---
 phpBB/adm/style/acp_users_signature.html              | 5 ++---
 phpBB/language/en/posting.php                         | 4 ++--
 phpBB/styles/prosilver/template/posting_buttons.html  | 2 +-
 phpBB/styles/subsilver2/template/posting_buttons.html | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index 69c6d8f3fb..d7f445c8e1 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -22,9 +22,8 @@
 		w: '{LA_BBCODE_W_HELP}',
 		s: '{LA_BBCODE_S_HELP}',
 		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
 		d: '{LA_BBCODE_D_HELP}',
-		t: '{LA_BBCODE_T_HELP}',
 		tip: '{L_STYLES_TIP}'
 		<!-- BEGIN custom_tags -->
 			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
@@ -56,7 +55,7 @@
 			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
 			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
 			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
-			<input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('e')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="y" name="addlitsitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" />
 			<!-- IF S_BBCODE_IMG -->
 				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
 			<!-- ENDIF -->
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 8016a233fd..f8d265dddd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -48,7 +48,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_A_HELP'				=> 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
 	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
 	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
-	'BBCODE_E_HELP'				=> 'List: Add list element',
+	'BBCODE_D_HELP'				=> 'Flash: [flash=width,height]http://url[/flash]',
 	'BBCODE_F_HELP'				=> 'Font size: [size=85]small text[/size]',
 	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
 	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
@@ -61,7 +61,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
 	'BBCODE_U_HELP'				=> 'Underline text: [u]text[/u]',
 	'BBCODE_W_HELP'				=> 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]',
-	'BBCODE_D_HELP'				=> 'Flash: [flash=width,height]http://url[/flash]',
+	'BBCODE_Y_HELP'				=> 'List: Add list element',
 	'BUMP_ERROR'				=> 'You cannot bump this topic so soon after the last post.',
 
 	'CANNOT_DELETE_REPLIED'		=> 'Sorry but you may only delete posts which have not been replied to.',
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 19d55d1a4a..5cf6794a49 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -25,7 +25,7 @@
 		a: '{LA_BBCODE_A_HELP}',
 		s: '{LA_BBCODE_S_HELP}',
 		f: '{LA_BBCODE_F_HELP}',
-		e: '{LA_BBCODE_E_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
 		d: '{LA_BBCODE_D_HELP}'
 		<!-- BEGIN custom_tags -->
 			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 92b4bd3e39..5bab9c50ce 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -22,9 +22,8 @@
 			a: '{LA_BBCODE_A_HELP}',
 			s: '{LA_BBCODE_S_HELP}',
 			f: '{LA_BBCODE_F_HELP}',
-			e: '{LA_BBCODE_E_HELP}',
+			y: '{LA_BBCODE_Y_HELP}',
 			d: '{LA_BBCODE_D_HELP}',
-			t: '{LA_BBCODE_T_HELP}',
 			tip: '{L_STYLES_TIP}'
 			<!-- BEGIN custom_tags -->
 				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
-- 
cgit v1.2.1


From d59a894cd3b7875b28e438d98e4aa05e9d97cce1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 30 Jul 2011 16:58:33 +0200
Subject: [ticket/10298] Properly close embed tag for QuickTime in subsilver2.

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

diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html
index b5b547b2e6..fca620b481 100644
--- a/phpBB/styles/subsilver2/template/attachment.html
+++ b/phpBB/styles/subsilver2/template/attachment.html
@@ -72,7 +72,7 @@
 				<param name="controller" value="true">
 				<param name="autoplay" value="false" />
 				<param name="type" value="video/quicktime">
-				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"> 
+				<embed name="qtstream_{_file.ATTACH_ID}" src="{_file.U_DOWNLOAD_LINK}" pluginspage="http://www.apple.com/quicktime/download/" enablejavascript="true" controller="true" width="320" height="285" type="video/quicktime" autoplay="false"></embed>
 			</object>
 		<!-- ELSEIF _file.S_RM_FILE -->
 			<object id="rmstream_{_file.ATTACH_ID}" classid="clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA" width="200" height="50">
-- 
cgit v1.2.1


From e0bb46c852638ed22281cff88a425e6ec983f17a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 8 Jul 2011 12:33:29 +0200
Subject: [ticket/10253] Fix IE9 handling in javascript, to correctly quote
 text.

Since IE9 IE supports textarea.selectionStart and window.getSelection.
The only problem is, that the values are still incorrect.
Therefore we need to ensure that it is still treated the old way,
until IE fixes this completely.

PHPBB3-10253
---
 phpBB/styles/prosilver/template/editor.js   | 11 +++++++----
 phpBB/styles/prosilver/template/forum_fn.js |  2 +-
 phpBB/styles/subsilver2/template/editor.js  | 11 +++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index ddc862bb8c..cfdb54f54b 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -151,8 +151,10 @@ function insert_text(text, spaces, popup)
 	{
 		text = ' ' + text + ' ';
 	}
-	
-	if (!isNaN(textarea.selectionStart))
+
+	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
+	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
+	if (!isNaN(textarea.selectionStart) && !is_ie)
 	{
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
@@ -216,11 +218,12 @@ function addquote(post_id, username, l_wrote)
 	}
 
 	// Get text selection - not only the post content :(
-	if (window.getSelection)
+	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
+	if (window.getSelection && !is_ie)
 	{
 		theSelection = window.getSelection().toString();
 	}
-	else if (document.getSelection)
+	else if (document.getSelection && !is_ie)
 	{
 		theSelection = document.getSelection();
 	}
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 4a85858df5..240fe7e51d 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -200,7 +200,7 @@ function selectCode(a)
 	// Get ID of code block
 	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
 
-	// Not IE
+	// Not IE and IE9+
 	if (window.getSelection)
 	{
 		var s = window.getSelection();
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index cd22812bab..7cc5de9034 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -151,8 +151,10 @@ function insert_text(text, spaces, popup)
 	{
 		text = ' ' + text + ' ';
 	}
-	
-	if (!isNaN(textarea.selectionStart))
+
+	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
+	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
+	if (!isNaN(textarea.selectionStart) && !is_ie)
 	{
 		var sel_start = textarea.selectionStart;
 		var sel_end = textarea.selectionEnd;
@@ -218,11 +220,12 @@ function addquote(post_id, username, l_wrote)
 	}
 
 	// Get text selection - not only the post content :(
-	if (window.getSelection)
+	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
+	if (window.getSelection && !is_ie)
 	{
 		theSelection = window.getSelection().toString();
 	}
-	else if (document.getSelection)
+	else if (document.getSelection && !is_ie)
 	{
 		theSelection = document.getSelection();
 	}
-- 
cgit v1.2.1


From bb7e8bb4244eece7dbbe2a81216b9da976f6c0e9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 8 Apr 2011 14:44:21 +0200
Subject: [ticket/9976] Fix link to post when two posts have the same
 post_time.

When two posts have the same post_time, a link to the first post being on
page 1, leads you to the second post with the same timestamp on page two.
So in case the post_times are equal, we need to use the post_id to correctly
order the posts.

PHPBB3-9976
---
 phpBB/viewtopic.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index f1ab30aad3..203b8586ce 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -196,7 +196,7 @@ if ($db->sql_layer === 'firebird')
 // The FROM-Order is quite important here, else t.* columns can not be correctly bound.
 if ($post_id)
 {
-	$sql_array['SELECT'] .= ', p.post_approved, p.post_time';
+	$sql_array['SELECT'] .= ', p.post_approved, p.post_time, p.post_id';
 	$sql_array['FROM'][POSTS_TABLE] = 'p';
 }
 
@@ -317,8 +317,16 @@ if ($post_id)
 		$sql = 'SELECT COUNT(p.post_id) AS prev_posts
 			FROM ' . POSTS_TABLE . " p
 			WHERE p.topic_id = {$topic_data['topic_id']}
-				" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
-				AND ' . (($sort_dir == 'd') ? "p.post_time >= {$topic_data['post_time']}" : "p.post_time <= {$topic_data['post_time']}");
+				" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '');
+
+		if ($sort_dir == 'd')
+		{
+			$sql .= " AND (p.post_time > {$topic_data['post_time']} OR (p.post_time = {$topic_data['post_time']} AND p.post_id >= {$topic_data['post_id']}))";
+		}
+		else
+		{
+			$sql .= " AND (p.post_time < {$topic_data['post_time']} OR (p.post_time = {$topic_data['post_time']} AND p.post_id <= {$topic_data['post_id']}))";
+		}
 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
-- 
cgit v1.2.1


From 08ca84a3e7fe7f8aa837792be9f3a55e62f77345 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 31 Jul 2011 15:34:45 +0200
Subject: [ticket/10299] Fix typo in comment about $max_store_length in
 truncate_string()

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

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index faff9dd0de..b7650ecd6a 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1107,7 +1107,7 @@ function extension_allowed($forum_id, $extension, &$extensions)
 * @param int $max_length Maximum length of string (multibyte character count as 1 char / Html entity count as 1 char)
 * @param int $max_store_length Maximum character length of string (multibyte character count as 1 char / Html entity count as entity chars).
 * @param bool $allow_reply Allow Re: in front of string 
-* 	NOTE: This parameter can cause undesired behavior (returning strings longer than $max_store_legnth) and is deprecated. 
+* 	NOTE: This parameter can cause undesired behavior (returning strings longer than $max_store_length) and is deprecated. 
 * @param string $append String to be appended
 */
 function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
-- 
cgit v1.2.1


From cc87d553d0062767b5ac9c9d4fecef1ca8cd011e Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 5 Aug 2011 01:17:46 +0100
Subject: [ticket/10303] Removed HTTP_VERSION code path from
 send_status_line().

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 40d07ff770..6b6679bde5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2708,12 +2708,6 @@ function send_status_line($code, $message)
 		{
 			$version = $_SERVER['SERVER_PROTOCOL'];
 		}
-		else if (!empty($_SERVER['HTTP_VERSION']))
-		{
-			// I cannot remember where I got this from.
-			// This code path may never be reachable in reality.
-			$version = $_SERVER['HTTP_VERSION'];
-		}
 		else
 		{
 			$version = 'HTTP/1.0';
-- 
cgit v1.2.1


From f99719967955244b63ae01659a39f8b0890a6856 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 7 Aug 2011 16:12:48 -0400
Subject: [ticket/10309] Write unicode data to tests/tmp.

When the tests are run by a different user than the one which owns
phpbb source tree, writes will go into a single, known directory.

PHPBB3-10309
---
 tests/utf/normalizer_test.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index f78dba8004..5cd68bccfa 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -14,10 +14,13 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 */
 class phpbb_utf_normalizer_test extends phpbb_test_case
 {
+	private static $data_dir;
+
 	static public function setUpBeforeClass()
 	{
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', dirname(__FILE__).'/data');
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', dirname(__FILE__).'/data');
+		self::$data_dir = dirname(__file__) . '/../tmp';
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', self::$data_dir);
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', self::$data_dir);
 	}
 
 	public function test_normalizer()
@@ -62,7 +65,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		$tested_chars = array();
 
-		$fp = fopen(dirname(__FILE__).'/data/NormalizationTest.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/NormalizationTest.txt', 'rb');
 		while (!feof($fp))
 		{
 			$line = fgets($fp);
@@ -117,7 +120,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 	*/
 	public function test_invariants(array $tested_chars)
 	{
-		$fp = fopen(dirname(__FILE__).'/data/UnicodeData.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/UnicodeData.txt', 'rb');
 
 		while (!feof($fp))
 		{
-- 
cgit v1.2.1


From 43fc8142f59f2006aa9921dd376e34fc88eca249 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 8 Aug 2011 01:08:06 +0200
Subject: [ticket/10313] Include slow unit tests when running build script.

PHPBB3-10313
---
 build/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/build.xml b/build/build.xml
index 78dbdd379c..b59b8f65cc 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -46,6 +46,7 @@
 	<target name="test" depends="clean,prepare">
 		<exec dir="."
 			command="phpunit --log-junit build/logs/phpunit.xml
+			--configuration phpunit.xml.all
 			--coverage-clover build/logs/clover.xml
 			--coverage-html build/coverage"
 			passthru="true" />
-- 
cgit v1.2.1


From 32e15315a8097ef4fc9b84d07f75d3ddece4ba8b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 7 Aug 2011 21:28:35 -0400
Subject: [ticket/10313] Create a separate build task for slow tests.

PHPBB3-10313
---
 build/build.xml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index b59b8f65cc..7cfb5d0bf8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -46,23 +46,19 @@
 	<target name="test" depends="clean,prepare">
 		<exec dir="."
 			command="phpunit --log-junit build/logs/phpunit.xml
-			--configuration phpunit.xml.all
 			--coverage-clover build/logs/clover.xml
 			--coverage-html build/coverage"
 			passthru="true" />
+	</target>
 
-
-		<!-- Does not allow changing the working directory to tests/
-			 so this approach does not work for us unfortunately
-		<phpunit codecoverage="true" haltonfailure="true">
-			<formatter todir="build/logs" type="xml"/>
-			<batchtest>
-				<fileset dir="tests">
-					<include name="all_tests.php"/>
-				</fileset>
-			</batchtest>
-		</phpunit>
-		-->
+	<target name="test-slow" depends="clean,prepare">
+		<exec dir="."
+			command="phpunit --log-junit build/logs/phpunit.xml
+			--configuration phpunit.xml.all
+			--group slow
+			--coverage-clover build/logs/clover-slow.xml
+			--coverage-html build/coverage-slow"
+			passthru="true" />
 	</target>
 
 	<target name="docs">
-- 
cgit v1.2.1


From f9dbe33fa7917b6220a85a01ed9f395f3f1bb888 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 14 Jul 2011 18:05:34 +0100
Subject: [ticket/10240] Added code to strip control characters from messages.

It is possible to evade the word filter using control characters.

Seeing as control characters have no practical application in a bulletin
board software, it doesn't do any harm to remove them entirely. That is
what this commit does.

PHPBB3-10240
---
 phpBB/includes/functions_content.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index faff9dd0de..872ee8c7cc 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -691,6 +691,9 @@ function censor_text($text)
 		return '';
 	}
 
+	// Strip control characters
+	$text = preg_replace('/[\x00-\x0f]/', '', $text);
+
 	// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
 	if (!isset($censors) || !is_array($censors))
 	{
-- 
cgit v1.2.1


From 3df8b214cc15d8539f89df5f4a4c19d4cf8f37d0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 9 Aug 2011 21:16:38 -0400
Subject: [ticket/10309] Coding guidelines fix.

PHPBB3-10309
---
 tests/utf/normalizer_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 5cd68bccfa..a0ba470416 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 */
 class phpbb_utf_normalizer_test extends phpbb_test_case
 {
-	private static $data_dir;
+	static private $data_dir;
 
 	static public function setUpBeforeClass()
 	{
-- 
cgit v1.2.1


From 66553fb8574a9d2578f423f4db0461efe49ea099 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 10 Aug 2011 16:14:45 +0200
Subject: [ticket/9297] Add support for Extended Passive Mode (EPSV) in
 ftp_fsock class.

PHPBB3-9297
---
 phpBB/includes/functions_transfer.php | 55 ++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
index 046abede8e..5ab7a87efd 100644
--- a/phpBB/includes/functions_transfer.php
+++ b/phpBB/includes/functions_transfer.php
@@ -808,23 +808,56 @@ class ftp_fsock extends transfer
 	*/
 	function _open_data_connection()
 	{
-		$this->_send_command('PASV', '', false);
-
-		if (!$ip_port = $this->_check_command(true))
+		// Try to find out whether we have a IPv4 or IPv6 (control) connection
+		if (function_exists('stream_socket_get_name'))
 		{
-			return false;
+			$socket_name = stream_socket_get_name($this->connection, true);
+			$server_ip = substr($socket_name, 0, strrpos($socket_name, ':'));
 		}
 
-		// open the connection to start sending the file
-		if (!preg_match('#[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+#', $ip_port, $temp))
+		if (!isset($server_ip) || preg_match(get_preg_expression('ipv4'), $server_ip))
 		{
-			// bad ip and port
-			return false;
+			// Passive mode
+			$this->_send_command('PASV', '', false);
+
+			if (!$ip_port = $this->_check_command(true))
+			{
+				return false;
+			}
+
+			// open the connection to start sending the file
+			if (!preg_match('#[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+#', $ip_port, $temp))
+			{
+				// bad ip and port
+				return false;
+			}
+
+			$temp = explode(',', $temp[0]);
+			$server_ip = $temp[0] . '.' . $temp[1] . '.' . $temp[2] . '.' . $temp[3];
+			$server_port = $temp[4] * 256 + $temp[5];
+		}
+		else
+		{
+			// Extended Passive Mode - RFC2428
+			$this->_send_command('EPSV', '', false);
+
+			if (!$epsv_response = $this->_check_command(true))
+			{
+				return false;
+			}
+
+			// Response looks like "229 Entering Extended Passive Mode (|||12345|)"
+			// where 12345 is the tcp port for the data connection
+			if (!preg_match('#\(\|\|\|([0-9]+)\|\)#', $epsv_response, $match))
+			{
+				return false;
+			}
+			$server_port = (int) $match[1];
+
+			// fsockopen expects IPv6 address in square brackets
+			$server_ip = "[$server_ip]";
 		}
 
-		$temp = explode(',', $temp[0]);
-		$server_ip = $temp[0] . '.' . $temp[1] . '.' . $temp[2] . '.' . $temp[3];
-		$server_port = $temp[4] * 256 + $temp[5];
 		$errno = 0;
 		$errstr = '';
 
-- 
cgit v1.2.1


From 18f19b03ab703d0eb09627dcd162ba556316a451 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 10 Aug 2011 16:43:43 +0200
Subject: [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 tests/network/ftp_fsock_test.php

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
new file mode 100644
index 0000000000..c6364f7383
--- /dev/null
+++ b/tests/network/ftp_fsock_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
+
+/**
+* @group slow
+*/
+class phpbb_ftp_fsock_test extends phpbb_test_case
+{
+	public function test_pasv_epsv()
+	{
+		foreach (dns_get_record('ftp.debian.org', DNS_A | DNS_AAAA) as $row)
+		{
+			if (isset($row['ip']))
+			{
+				$ipv4 = $row['ip'];
+			}
+			else if (isset($row['ipv6']))
+			{
+				$ipv6 = $row['ipv6'];
+			}
+		}
+
+		$this->assert_ls_contains_debian($ipv4);
+		$this->assert_ls_contains_debian("[$ipv6]");
+	}
+
+	protected function assert_ls_contains_debian($hostname)
+	{
+		$o = $this->get_object($hostname);
+		$o->_init();
+		$this->assertContains('debian', $o->_ls());
+		$o->_close();
+	}
+
+	protected function get_object($hostname)
+	{
+		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localost.tld', '/');
+	}
+}
-- 
cgit v1.2.1


From 83fa6cffc3be5e89c9c5a992f02366d79aaf0406 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 11 Aug 2011 23:10:53 +0200
Subject: [ticket/9297] Make EPSV unit tests work without IPv6.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index c6364f7383..8b97a1c59d 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -17,20 +17,19 @@ class phpbb_ftp_fsock_test extends phpbb_test_case
 {
 	public function test_pasv_epsv()
 	{
-		foreach (dns_get_record('ftp.debian.org', DNS_A | DNS_AAAA) as $row)
+		$hostname = 'ftp.debian.org.';
+		$ipv4 = gethostbyname($hostname);
+
+		if ($ipv4 == $hostname)
 		{
-			if (isset($row['ip']))
-			{
-				$ipv4 = $row['ip'];
-			}
-			else if (isset($row['ipv6']))
-			{
-				$ipv6 = $row['ipv6'];
-			}
+			$this->markTestSkipped("Got no A record back from DNS query for $hostname");
 		}
 
+		// PASV
 		$this->assert_ls_contains_debian($ipv4);
-		$this->assert_ls_contains_debian("[$ipv6]");
+
+		// EPSV
+		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
 	}
 
 	protected function assert_ls_contains_debian($hostname)
-- 
cgit v1.2.1


From 7a40ab8f7a520ee5d446ce3cdebe130338c74fd5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Aug 2011 18:17:16 +0200
Subject: [ticket/9297] Update copyright year of unit test file.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index 8b97a1c59d..0470e63126 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package testing
-* @copyright (c) 2010 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
-- 
cgit v1.2.1


From 386883cda1b0be64a77ddeaff1b5a52acaa97648 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 14 Aug 2011 13:19:09 -0400
Subject: [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index 0470e63126..ab45c0202b 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -15,19 +15,28 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
 */
 class phpbb_ftp_fsock_test extends phpbb_test_case
 {
-	public function test_pasv_epsv()
+	static protected $ipv4;
+
+	static public function setUpBeforeClass()
 	{
 		$hostname = 'ftp.debian.org.';
-		$ipv4 = gethostbyname($hostname);
+		self::$ipv4 = gethostbyname($hostname);
 
-		if ($ipv4 == $hostname)
+		if (self::$ipv4 == $hostname)
 		{
 			$this->markTestSkipped("Got no A record back from DNS query for $hostname");
 		}
+	}
 
+	public function test_pasv()
+	{
 		// PASV
-		$this->assert_ls_contains_debian($ipv4);
+		$this->assert_ls_contains_debian(self::$ipv4);
+	}
 
+	public function test_epsv()
+	{
+		$ipv4 = self::$ipv4;
 		// EPSV
 		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
 	}
-- 
cgit v1.2.1


From 2973ccbd48f9cc8a16cfad8f3ab0e9fc36b36763 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 14 Aug 2011 14:11:58 -0400
Subject: [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.

It is possible to configure PHP without IPv6, in which case
IPv6-encapsulated IPv4 addresses won't be accepted by PHP.
Instead of failing the test suite on such setups, skip the
offending test.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index ab45c0202b..93b15074db 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -44,7 +44,16 @@ class phpbb_ftp_fsock_test extends phpbb_test_case
 	protected function assert_ls_contains_debian($hostname)
 	{
 		$o = $this->get_object($hostname);
-		$o->_init();
+		$result = $o->_init();
+		// PHP can connect to IPv6 addresses which are IPv6-encapsulated
+		// IPv4 addresses on systems that don't have IPv6 connectivity,
+		// provided that PHP was built with IPv6 support.
+		// If this test fails on such an IPv6-encapsulated IPv4 address,
+		// check whether you disabled IPv6 support in your PHP.
+		if ($result !== true)
+		{
+			$this->markTestSkipped("Failed to connect to $hostname: $result");
+		}
 		$this->assertContains('debian', $o->_ls());
 		$o->_close();
 	}
-- 
cgit v1.2.1


From c2114920925d753e7286145c01c7ef7486362619 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 14 Aug 2011 14:33:00 -0400
Subject: [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.

Need to use the static version here.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index 93b15074db..b801ae4037 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -24,7 +24,7 @@ class phpbb_ftp_fsock_test extends phpbb_test_case
 
 		if (self::$ipv4 == $hostname)
 		{
-			$this->markTestSkipped("Got no A record back from DNS query for $hostname");
+			self::markTestSkipped("Got no A record back from DNS query for $hostname");
 		}
 	}
 
-- 
cgit v1.2.1


From 2a0c9e4026d3f8e1f5bcfc9e00319ba4515f0b2f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 14 Aug 2011 14:42:53 -0400
Subject: [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to
 work.

Looks like IPv6-encapsulated IPv4 addresses do not actually work if
the host has no IPv6 connectivity.

PHPBB3-9297
---
 tests/network/ftp_fsock_test.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
index b801ae4037..cfffe8fd67 100644
--- a/tests/network/ftp_fsock_test.php
+++ b/tests/network/ftp_fsock_test.php
@@ -45,11 +45,9 @@ class phpbb_ftp_fsock_test extends phpbb_test_case
 	{
 		$o = $this->get_object($hostname);
 		$result = $o->_init();
-		// PHP can connect to IPv6 addresses which are IPv6-encapsulated
-		// IPv4 addresses on systems that don't have IPv6 connectivity,
-		// provided that PHP was built with IPv6 support.
-		// If this test fails on such an IPv6-encapsulated IPv4 address,
-		// check whether you disabled IPv6 support in your PHP.
+		// This test may fail on IPv6 addresses if IPv6 support is
+		// not available. PHP must be compiled with IPv6 support enabled,
+		// and your operating system must be configured for IPv6 as well.
 		if ($result !== true)
 		{
 			$this->markTestSkipped("Failed to connect to $hostname: $result");
-- 
cgit v1.2.1


From a7e709d92092de1eb9b0e35f45f1679ee10ce39b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 14 Aug 2011 14:47:16 -0400
Subject: [ticket/9297] Rename test class to reflect its contents.

setUpBeforeClass logic makes this test specific to PASV/EPSV tests.

PHPBB3-9297
---
 tests/network/ftp_fsock_pasv_epsv_test.php | 63 ++++++++++++++++++++++++++++++
 tests/network/ftp_fsock_test.php           | 63 ------------------------------
 2 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 tests/network/ftp_fsock_pasv_epsv_test.php
 delete mode 100644 tests/network/ftp_fsock_test.php

diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
new file mode 100644
index 0000000000..af45fc2d61
--- /dev/null
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
+
+/**
+* @group slow
+*/
+class phpbb_ftp_fsock_pasv_epsv_test extends phpbb_test_case
+{
+	static protected $ipv4;
+
+	static public function setUpBeforeClass()
+	{
+		$hostname = 'ftp.debian.org.';
+		self::$ipv4 = gethostbyname($hostname);
+
+		if (self::$ipv4 == $hostname)
+		{
+			self::markTestSkipped("Got no A record back from DNS query for $hostname");
+		}
+	}
+
+	public function test_pasv()
+	{
+		// PASV
+		$this->assert_ls_contains_debian(self::$ipv4);
+	}
+
+	public function test_epsv()
+	{
+		$ipv4 = self::$ipv4;
+		// EPSV
+		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
+	}
+
+	protected function assert_ls_contains_debian($hostname)
+	{
+		$o = $this->get_object($hostname);
+		$result = $o->_init();
+		// This test may fail on IPv6 addresses if IPv6 support is
+		// not available. PHP must be compiled with IPv6 support enabled,
+		// and your operating system must be configured for IPv6 as well.
+		if ($result !== true)
+		{
+			$this->markTestSkipped("Failed to connect to $hostname: $result");
+		}
+		$this->assertContains('debian', $o->_ls());
+		$o->_close();
+	}
+
+	protected function get_object($hostname)
+	{
+		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localost.tld', '/');
+	}
+}
diff --git a/tests/network/ftp_fsock_test.php b/tests/network/ftp_fsock_test.php
deleted file mode 100644
index cfffe8fd67..0000000000
--- a/tests/network/ftp_fsock_test.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
-
-/**
-* @group slow
-*/
-class phpbb_ftp_fsock_test extends phpbb_test_case
-{
-	static protected $ipv4;
-
-	static public function setUpBeforeClass()
-	{
-		$hostname = 'ftp.debian.org.';
-		self::$ipv4 = gethostbyname($hostname);
-
-		if (self::$ipv4 == $hostname)
-		{
-			self::markTestSkipped("Got no A record back from DNS query for $hostname");
-		}
-	}
-
-	public function test_pasv()
-	{
-		// PASV
-		$this->assert_ls_contains_debian(self::$ipv4);
-	}
-
-	public function test_epsv()
-	{
-		$ipv4 = self::$ipv4;
-		// EPSV
-		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
-	}
-
-	protected function assert_ls_contains_debian($hostname)
-	{
-		$o = $this->get_object($hostname);
-		$result = $o->_init();
-		// This test may fail on IPv6 addresses if IPv6 support is
-		// not available. PHP must be compiled with IPv6 support enabled,
-		// and your operating system must be configured for IPv6 as well.
-		if ($result !== true)
-		{
-			$this->markTestSkipped("Failed to connect to $hostname: $result");
-		}
-		$this->assertContains('debian', $o->_ls());
-		$o->_close();
-	}
-
-	protected function get_object($hostname)
-	{
-		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localost.tld', '/');
-	}
-}
-- 
cgit v1.2.1


From 702985c9279eb9b4704deb9e4356fe37e60b68a2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Aug 2011 20:55:21 +0200
Subject: [ticket/9297] Fix typo in localhost.

PHPBB3-9297
---
 tests/network/ftp_fsock_pasv_epsv_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
index af45fc2d61..110bd702a5 100644
--- a/tests/network/ftp_fsock_pasv_epsv_test.php
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -58,6 +58,6 @@ class phpbb_ftp_fsock_pasv_epsv_test extends phpbb_test_case
 
 	protected function get_object($hostname)
 	{
-		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localost.tld', '/');
+		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localhost.tld', '/');
 	}
 }
-- 
cgit v1.2.1


From 02a8cebd65111442f63d4819b74e27c8cbd61006 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Aug 2011 21:40:02 +0200
Subject: [ticket/9297] Add network to class name of unit tests.

PHPBB3-9297
---
 tests/network/ftp_fsock_pasv_epsv_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
index 110bd702a5..6ad811e3ca 100644
--- a/tests/network/ftp_fsock_pasv_epsv_test.php
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
 /**
 * @group slow
 */
-class phpbb_ftp_fsock_pasv_epsv_test extends phpbb_test_case
+class phpbb_network_ftp_fsock_pasv_epsv_test extends phpbb_test_case
 {
 	static protected $ipv4;
 
-- 
cgit v1.2.1


From b18b3363e95c8a626441969860facfbaf070b251 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Fri, 19 Aug 2011 18:32:09 +0100
Subject: [ticket/9978] Added semicolons to JavaScript in overall_header.

Semicolons have been added to the anonymous functions in the javascript
in overall_header.html. This makes JSLint happier, and also makes the
code easier to minify.

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

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e13c49b59a..a46c161542 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -68,7 +68,7 @@
 		{
 			eval(onload_functions[i]);
 		}
-	}
+	};
 
 	window.onunload = function()
 	{
@@ -76,7 +76,7 @@
 		{
 			eval(onunload_functions[i]);
 		}
-	}
+	};
 
 // ]]>
 </script>
-- 
cgit v1.2.1


From 57accade85a431725af7745230ac26b000ff831a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 20 Aug 2011 14:34:02 -0400
Subject: [ticket/10309] Update .gitignore and move .gitkeep.

PHPBB3-10309
---
 .gitignore              | 2 +-
 tests/tmp/.gitkeep      | 0
 tests/utf/data/.gitkeep | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tests/tmp/.gitkeep
 delete mode 100644 tests/utf/data/.gitkeep

diff --git a/.gitignore b/.gitignore
index 65058b2eaf..7d789c59a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@
 /phpBB/store/*
 /tests/phpbb_unit_tests.sqlite2
 /tests/test_config.php
-/tests/utf/data/*.txt
+/tests/tmp/*
diff --git a/tests/tmp/.gitkeep b/tests/tmp/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/utf/data/.gitkeep b/tests/utf/data/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.1


From 3c7dfc7e193200da80d53bd668cded239edf36d3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Aug 2011 01:44:15 +0200
Subject: [ticket/8177] Display birthdays of 29th february on 28th in non-leap
 years.

PHPBB3-8177
---
 phpBB/index.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/index.php b/phpBB/index.php
index 91cbd326b9..c3f7c871d3 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -84,12 +84,20 @@ $birthday_list = '';
 if ($config['load_birthdays'] && $config['allow_birthdays'])
 {
 	$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
+
+	// Display birthdays of 29th february on 28th february in non-leap-years
+	$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)) . "%'";
+	}
+
 	$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday
 		FROM ' . USERS_TABLE . ' u
 		LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
 		WHERE (b.ban_id IS NULL
 			OR b.ban_exclude = 1)
-			AND u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%'
+			AND (u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)
 			AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
 	$result = $db->sql_query($sql);
 
-- 
cgit v1.2.1


From dc149a43e49c1c2160549e25792c5ee650861e02 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Aug 2011 13:14:15 +0200
Subject: [ticket/10321] Do not append the ? if the param-list is empty anyway.

PHPBB3-10321
---
 phpBB/includes/functions.php      |  6 +++++
 tests/session/append_sid_test.php | 51 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 tests/session/append_sid_test.php

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6b6679bde5..c6258588ca 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2225,6 +2225,12 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL, $phpbb_hook;
 
+	if ($params === '' || (is_array($params) && empty($params)))
+	{
+		// Do not append the ? if the param-list is empty anyway.
+		$params = false;
+	}
+
 	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropriately.
 	// They could mimic most of what is within this function
 	if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
new file mode 100644
index 0000000000..4a95b2d20e
--- /dev/null
+++ b/tests/session/append_sid_test.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_session_append_sid_test extends phpbb_test_case
+{
+
+	public function append_sid_data()
+	{
+		return array(
+			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2'),
+			array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2'),
+			array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2'),
+
+			// Custom sid parameter
+			array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid'),
+
+			// Testing anchors
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
+
+			// Anchors and custom sid
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
+
+			// Empty parameters should not append the ?
+			array('viewtopic.php', false, true, false, 'viewtopic.php'),
+			array('viewtopic.php', '', true, false, 'viewtopic.php'),
+			array('viewtopic.php', array(), true, false, 'viewtopic.php'),
+		);
+	}
+
+	/**
+	* @dataProvider append_sid_data
+	*/
+	public function test_append_sid($url, $params, $is_amp, $session_id, $expected)
+	{
+		$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
+	}
+}
+
-- 
cgit v1.2.1


From 459207636699ce5c554af115a7677f42630a430e Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sun, 21 Aug 2011 13:14:30 +0100
Subject: [ticket/10240] Reverted a commit which added buggy code.

This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
---
 phpBB/includes/functions_content.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index b34976db2a..b7650ecd6a 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -691,9 +691,6 @@ function censor_text($text)
 		return '';
 	}
 
-	// Strip control characters
-	$text = preg_replace('/[\x00-\x0f]/', '', $text);
-
 	// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
 	if (!isset($censors) || !is_array($censors))
 	{
-- 
cgit v1.2.1


From 5d66faafc159da90fbbc6d9888b0a6eee9570cd8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Aug 2011 18:56:47 +0200
Subject: [ticket/10321] Add descriptions to the unit tests

PHPBB3-10321
---
 tests/session/append_sid_test.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
index 4a95b2d20e..1a3ad633e3 100644
--- a/tests/session/append_sid_test.php
+++ b/tests/session/append_sid_test.php
@@ -15,35 +15,35 @@ class phpbb_session_append_sid_test extends phpbb_test_case
 	public function append_sid_data()
 	{
 		return array(
-			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2'),
-			array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2'),
-			array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2'),
-			array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2'),
+			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument using amp'),
+			array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2', 'parameters in params-argument using &'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument as array'),
 
 			// Custom sid parameter
-			array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid'),
+			array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid', 'using session_id'),
 
 			// Testing anchors
-			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
-			array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
-			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
 
 			// Anchors and custom sid
-			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
-			array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
-			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in url-argument using session_id'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument using session_id'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
 
 			// Empty parameters should not append the ?
-			array('viewtopic.php', false, true, false, 'viewtopic.php'),
-			array('viewtopic.php', '', true, false, 'viewtopic.php'),
-			array('viewtopic.php', array(), true, false, 'viewtopic.php'),
+			array('viewtopic.php', false, true, false, 'viewtopic.php', 'no params using bool false'),
+			array('viewtopic.php', '', true, false, 'viewtopic.php', 'no params using empty string'),
+			array('viewtopic.php', array(), true, false, 'viewtopic.php', 'no params using empty array'),
 		);
 	}
 
 	/**
 	* @dataProvider append_sid_data
 	*/
-	public function test_append_sid($url, $params, $is_amp, $session_id, $expected)
+	public function test_append_sid($url, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
 	}
-- 
cgit v1.2.1


From fa5c7f6440282891dba1142920157971b90b5ad1 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Mon, 22 Aug 2011 15:35:47 +0100
Subject: [ticket/10240] Added censor_text tests.

PHPBB-10240
---
 tests/mock/cache.php                       | 22 +++++++++
 tests/mock_user.php                        | 12 +++++
 tests/text_processing/censor_text_test.php | 73 ++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 tests/text_processing/censor_text_test.php

diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 11e525ff79..020574b0bb 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -41,6 +41,28 @@ class phpbb_mock_cache
 	{
 		return $this->data['_bots'];
 	}
+	
+	/**
+	 * Obtain list of word censors. We don't need to parse them here,
+	 * that is tested elsewhere.
+	 */
+	public function obtain_word_list()
+	{
+		return array(
+			'match'		=> array(
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword1[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword2)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword3[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword4)(?![\\p{Nd}\\p{L}_-])#iu',
+			),
+			'replace'	=> array(
+				'replacement1',
+				'replacement2',
+				'replacement3',
+				'replacement4',
+			),
+		);
+	}
 
 	public function set_bots($bots)
 	{
diff --git a/tests/mock_user.php b/tests/mock_user.php
index 74d31c4c4a..a6ff5f6628 100644
--- a/tests/mock_user.php
+++ b/tests/mock_user.php
@@ -17,4 +17,16 @@ class phpbb_mock_user
 {
 	public $host = "testhost";
 	public $page = array('root_script_path' => '/');
+	
+	public function optionget($item)
+	{
+		switch ($item)
+		{
+			case 'viewcensors':
+				return false;
+			
+			default:
+				trigger_error('Option not found, add it to the mock user object.');
+		}
+	}
 }
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
new file mode 100644
index 0000000000..3820a1135f
--- /dev/null
+++ b/tests/text_processing/censor_text_test.php
@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../mock_user.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+
+class phpbb_text_processing_censor_text_test extends phpbb_test_case
+{
+	public function censor_text_data()
+	{
+		global $cache, $user;
+		$cache = new phpbb_mock_cache;
+		$user = new phpbb_mock_user;
+
+		return array(
+			array('', ''),
+
+			array('badword1', 'replacement1'),
+			array(' badword1', ' replacement1'),
+			array('badword1 ', 'replacement1 '),
+			array(' badword1 ', ' replacement1 '),
+			array('abadword1', 'replacement1'),
+			array('badword1w', 'replacement1'),
+			array('abadword1w', 'replacement1'),
+			array('anotherbadword1test', 'replacement1'),
+			array('this badword1', 'this replacement1'),
+			array('this badword1 word', 'this replacement1 word'),
+
+			array('badword2', 'replacement2'),
+			array('bbadword2', 'replacement2'),
+			array('bbbadword2', 'replacement2'),
+			array('badword2d', 'badword2d'),
+			array('bbadword2d', 'bbadword2d'),
+			array('test badword2', 'test replacement2'),
+			array('test badword2 word', 'test replacement2 word'),
+
+			array('badword3', 'replacement3'),
+			array('bbadword3', 'bbadword3'),
+			array('badword3d', 'replacement3'),
+			array('badword3ddd', 'replacement3'),
+			array('bbadword3d', 'bbadword3d'),
+			array(' badword3 ', ' replacement3 '),
+			array(' badword3', ' replacement3'),
+
+			array('badword4', 'replacement4'),
+			array('this badword4 word', 'this replacement4 word'),
+			array('abadword4', 'abadword4'),
+			array('badword4d', 'badword4d'),
+			array('abadword4d', 'abadword4d'),
+
+			array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+			array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),
+			array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_text_data
+	*/
+	public function test_censor_text($input, $expected)
+	{
+		$label = 'Testing word censor: ' . $input;
+		$this->assertEquals(censor_text($input), $expected, $label);
+	}
+}
-- 
cgit v1.2.1


From e7ab7f5f7a3e72c94df6e16360a1594c96618caa Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 23 Aug 2011 10:56:36 +0100
Subject: [ticket/10240] Added censor_text tests for special characters.

PHPBB3-10240
---
 tests/text_processing/censor_text_test.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index 3820a1135f..ac620597b9 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -59,6 +59,16 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case
 			array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
 			array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),
 			array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+			
+			array("new\nline\ntest", "new\nline\ntest"),
+			array("tab\ttest\t", "tab\ttest\t"),
+			array('öäü', 'öäü'),
+			array('badw' . chr(1) . 'ord1', 'badw' . chr(1) . 'ord1'),
+			array('badw' . chr(2) . 'ord1', 'badw' . chr(2) . 'ord1'),
+			array('badw' . chr(3) . 'ord1', 'badw' . chr(3) . 'ord1'),
+			array('badw' . chr(4) . 'ord1', 'badw' . chr(4) . 'ord1'),
+			array('badw' . chr(5) . 'ord1', 'badw' . chr(5) . 'ord1'),
+			array('badw' . chr(6) . 'ord1', 'badw' . chr(6) . 'ord1'),
 		);
 	}
 
-- 
cgit v1.2.1


From 0d104b00c887db311576ab390ed2c79d2fb8ec99 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 23 Aug 2011 11:32:35 +0100
Subject: [ticket/10240] Fixed censor_text test assetEquals param order.

Before, expected and input were the wrong way round.

PHPBB3-10240
---
 tests/text_processing/censor_text_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index ac620597b9..1d4b3fa943 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -78,6 +78,6 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case
 	public function test_censor_text($input, $expected)
 	{
 		$label = 'Testing word censor: ' . $input;
-		$this->assertEquals(censor_text($input), $expected, $label);
+		$this->assertEquals($expected, censor_text($input), $label);
 	}
 }
-- 
cgit v1.2.1


From d4f1b92479aeaab313d18c172e5e2fede7035281 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 23 Aug 2011 11:38:59 +0100
Subject: [ticket/10240] Fixed copyright year in censor_text_test.php.

PHPBB3-10240
---
 tests/text_processing/censor_text_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index 1d4b3fa943..6138d92e65 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package testing
-* @copyright (c) 2008 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
-- 
cgit v1.2.1


From 03da3c7c4c2d3957b738485935386723c536671b Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Tue, 23 Aug 2011 12:21:20 +0100
Subject: [ticket/10240] Added optionset to mock_user in the tests.

Also made optionset use the value set by optionset. We're not checking
whether the option is set or not, because we would just throw an error
if it wasn't set, and it throws an error anyway.

PHPBB3-10240
---
 tests/mock_user.php                        | 16 ++++++++++------
 tests/text_processing/censor_text_test.php |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/mock_user.php b/tests/mock_user.php
index a6ff5f6628..5b89ea3e19 100644
--- a/tests/mock_user.php
+++ b/tests/mock_user.php
@@ -18,15 +18,19 @@ class phpbb_mock_user
 	public $host = "testhost";
 	public $page = array('root_script_path' => '/');
 	
+	private $options = array();
 	public function optionget($item)
 	{
-		switch ($item)
+		if (!isset($this->options[$item]))
 		{
-			case 'viewcensors':
-				return false;
-			
-			default:
-				trigger_error('Option not found, add it to the mock user object.');
+			throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item));
 		}
+		
+		return $this->options[$item];
+	}
+	
+	public function optionset($item, $value)
+	{
+		$this->options[$item] = $value;
 	}
 }
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
index 6138d92e65..2843f0b20b 100644
--- a/tests/text_processing/censor_text_test.php
+++ b/tests/text_processing/censor_text_test.php
@@ -19,6 +19,8 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case
 		global $cache, $user;
 		$cache = new phpbb_mock_cache;
 		$user = new phpbb_mock_user;
+		
+		$user->optionset('viewcensors', false);
 
 		return array(
 			array('', ''),
-- 
cgit v1.2.1


From efc443aac930823a6ad6065fa7c52bef1ed922db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Aug 2011 14:49:22 +0200
Subject: [ticket/10334] Require permissions to view the birthday-list on board
 index

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

diff --git a/phpBB/index.php b/phpBB/index.php
index 91cbd326b9..fe5a179705 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -81,7 +81,7 @@ $legend = implode(', ', $legend);
 
 // Generate birthday list if required ...
 $birthday_list = '';
-if ($config['load_birthdays'] && $config['allow_birthdays'])
+if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
 {
 	$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
 	$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday
-- 
cgit v1.2.1


From 53e0e3240c5d76f9ad95a6869bd47be818342631 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 24 Aug 2011 10:33:12 +0200
Subject: [ticket/10339] Remove invalid template loop variable from
 mcp_front.html

PHPBB3-10339
---
 phpBB/styles/prosilver/template/mcp_front.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 0891948fb6..b71d120ed6 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -28,7 +28,6 @@
 				<dl>
 					<dt>
 						<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> {unapproved.ATTACH_ICON_IMG}<br />
-						<!-- IF report.PAGINATION --><strong class="pagination"><span>{report.PAGINATION}</span></strong><!-- ENDIF -->
 						{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
 					</dt>
 					<dd class="moderation"><span>
-- 
cgit v1.2.1


From 81f682a81252fa9199fe140b2b0e1a6caf575f72 Mon Sep 17 00:00:00 2001
From: callumacrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 09:28:45 +0100
Subject: [ticket/8599] Added ability to select all to add multiple smilies
 screen.

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

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html
index eedf39b440..a34a91043c 100644
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -74,7 +74,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table cellspacing="1">
+	<table cellspacing="1" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -94,7 +94,7 @@
 		<td>{L_ORDER}</td>
 	<!-- ENDIF -->
 	<!-- IF S_ADD -->
-		<td>{L_ADD}</td>
+		<td>{L_ADD} <a href="#" onclick="marklist('smilies', 'add_img', true); return false;">({L_MARK_ALL})</a></td>
 	<!-- ENDIF -->
 	</tr>
 	</thead>
-- 
cgit v1.2.1


From 7a36c3b34b82f7470d77e1028375ae14db6874be Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 24 Aug 2011 14:51:37 +0200
Subject: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know
 about bots.

PHPBB3-10335
---
 phpBB/feed.php               | 6 ++++++
 phpBB/includes/functions.php | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index d737b8e10c..964117c5c1 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -173,6 +173,12 @@ if (defined('DEBUG_EXTRA') && request_var('explain', 0) && $auth->acl_get('a_'))
 header("Content-Type: application/atom+xml; charset=UTF-8");
 header("Last-Modified: " . gmdate('D, d M Y H:i:s', $feed_updated_time) . ' GMT');
 
+if (!empty($user->data['is_bot']))
+{
+	// Let reverse proxies know we detected a bot.
+	header('X-PHPBB-IS-BOT: yes');
+}
+
 echo '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
 echo '<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="' . $global_vars['FEED_LANG'] . '">' . "\n";
 echo '<link rel="self" type="application/atom+xml" href="' . $global_vars['SELF_LINK'] . '" />' . "\n\n";
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6b6679bde5..df49bdf637 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4641,6 +4641,12 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	header('Expires: 0');
 	header('Pragma: no-cache');
 
+	if (!empty($user->data['is_bot']))
+	{
+		// Let reverse proxies know we detected a bot.
+		header('X-PHPBB-IS-BOT: yes');
+	}
+
 	return;
 }
 
-- 
cgit v1.2.1


From 4491746c73700b45bc536c3a4cc90b84a07340f1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 16:58:58 +0200
Subject: [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user
 class.

PHPBB3-10320
---
 phpBB/feed.php             | 25 ++-----------------------
 phpBB/includes/session.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index d737b8e10c..4b1836497b 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -604,30 +604,9 @@ class phpbb_feed_base
 
 	function get_passworded_forums()
 	{
-		global $db, $user;
-
-		// Exclude passworded forums
-		$sql = 'SELECT f.forum_id, fa.user_id
-			FROM ' . FORUMS_TABLE . ' f
-			LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa
-				ON (fa.forum_id = f.forum_id
-					AND fa.session_id = '" . $db->sql_escape($user->session_id) . "')
-			WHERE f.forum_password <> ''";
-		$result = $db->sql_query($sql);
-
-		$forum_ids = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $row['forum_id'];
-
-			if ($row['user_id'] != $user->data['user_id'])
-			{
-				$forum_ids[$forum_id] = $forum_id;
-			}
-		}
-		$db->sql_freeresult($result);
+		global $user;
 
-		return $forum_ids;
+		return $user->get_passworded_forums();
 	}
 
 	function get_item()
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index e9e706e2b8..caadcbafaa 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2410,6 +2410,39 @@ class user extends session
 
 		return true;
 	}
+
+	/**
+	* Returns all password protected forum ids the user is currently NOT authenticated for.
+	*
+	* @return array		Array of forum ids
+	* @access public
+	*/
+	function get_passworded_forums()
+	{
+		global $db;
+
+		$sql = 'SELECT f.forum_id, fa.user_id
+			FROM ' . FORUMS_TABLE . ' f
+			LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa
+				ON (fa.forum_id = f.forum_id
+					AND fa.session_id = '" . $db->sql_escape($this->session_id) . "')
+			WHERE f.forum_password <> ''";
+		$result = $db->sql_query($sql);
+
+		$forum_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$forum_id = (int) $row['forum_id'];
+
+			if ($row['user_id'] != $this->data['user_id'])
+			{
+				$forum_ids[$forum_id] = $forum_id;
+			}
+		}
+		$db->sql_freeresult($result);
+
+		return $forum_ids;
+	}
 }
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1


From 4f8bb02a57dbc11a1c390abf7ca70fd08d8fd5c2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 17:33:39 +0200
Subject: [ticket/10320] Exclude passworded forums when determining "Most
 active topic".

PHPBB3-10320
---
 phpBB/includes/functions_display.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7982b9908d..4d66e17fe9 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -996,13 +996,17 @@ function display_user_activity(&$userdata)
 	}
 
 	// Obtain active topic
+	// We need to exclude passworded forums here so we do not leak the topic title
+	$forum_ary_topic = array_unique(array_merge($forum_ary, $user->get_passworded_forums()));
+	$forum_sql_topic = (!empty($forum_ary_topic)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary_topic, true) : '';
+
 	$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
 		FROM ' . POSTS_TABLE . '
 		WHERE poster_id = ' . $userdata['user_id'] . "
 			AND post_postcount = 1
 			AND (post_approved = 1
 				$sql_m_approve)
-			$forum_sql
+			$forum_sql_topic
 		GROUP BY topic_id
 		ORDER BY num_posts DESC";
 	$result = $db->sql_query_limit($sql, 1);
-- 
cgit v1.2.1


From 4499be5795d0c8d0de2b953e9fef8a098c9842a8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 17:44:45 +0200
Subject: [ticket/10341] Also show forum/topic name of "0" as most active
 forum/topic.

PHPBB3-10341
---
 phpBB/styles/prosilver/template/memberlist_view.html  | 4 ++--
 phpBB/styles/subsilver2/template/memberlist_view.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 3398bb5e9e..cfec07cff0 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -89,8 +89,8 @@
 					<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->
 				</dd>
 			<!-- IF S_SHOW_ACTIVITY and POSTS -->
-				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
-				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><!-- IF ACTIVE_FORUM != '' --><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
+				<dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><!-- IF ACTIVE_TOPIC != '' --><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})<!-- ELSE --> - <!-- ENDIF --></dd>
 			<!-- ENDIF -->
 		</dl>
 	</div>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 0afa750c79..434d795895 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -89,11 +89,11 @@
 			<!-- IF S_SHOW_ACTIVITY -->
 				<tr>
 					<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_FORUM}: </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 class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </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 -->
 			</table>
-- 
cgit v1.2.1


From d221d2f7e8183ec47da0e4ece09c76ded8598581 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 19:35:01 +0200
Subject: [ticket/10222] Also build language and styles changes in diff/patch
 format.

PHPBB3-10222
---
 build/build.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 7cfb5d0bf8..eb63bde034 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -119,6 +119,15 @@
 	<target name="create-package" depends="prepare-new-version,old-version-diffs">
 		<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
 		<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
+		<exec dir="build" escape="false"
+			command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
+				save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />
+		<exec dir="build" escape="false"
+			command="diff -crNEBwd old_versions/release-${prevversion}/styles/prosilver new_version/phpBB3/styles/prosilver >
+				save/save_${prevversion}_to_${newversion}/prosilver/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />
+		<exec dir="build" escape="false"
+			command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
+				save/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
 	</target>
 
 	<!--
-- 
cgit v1.2.1


From 2ffdf56bfe8ad35ac648a22a838b1ef01905b2d4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 20:14:49 +0200
Subject: [ticket/10278] Also set timeout on stream in get_remote_file().

From the PHP manual for fsockopen():
If you need to set a timeout for reading/writing data over the socket, use
stream_set_timeout(), as the timeout parameter to fsockopen() only applies
while connecting the socket.
http://www.php.net/manual/en/function.fsockopen.php

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

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index f7e19f3e7d..ee146ca214 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3140,6 +3140,8 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 		@fputs($fsock, "HOST: $host\r\n");
 		@fputs($fsock, "Connection: close\r\n\r\n");
 
+		stream_set_timeout($fsock, $timeout);
+
 		$file_info = '';
 		$get_info = false;
 
-- 
cgit v1.2.1


From 29a23ae217efed86e6b5afff4c9a0b1271eb20f4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 20:34:01 +0200
Subject: [ticket/10278] Return with a timeout error when fread() or fgets()
 time out.

PHPBB3-10278
---
 phpBB/includes/functions_admin.php | 8 ++++++++
 phpBB/language/en/common.php       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index ee146ca214..8b9b80b23d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3164,6 +3164,14 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 					return false;
 				}
 			}
+
+			$stream_meta_data = stream_get_meta_data($fsock);
+
+			if (!empty($stream_meta_data['timed_out']))
+			{
+				$errstr = $user->lang['FSOCK_TIMEOUT'];
+				return false;
+			}
 		}
 		@fclose($fsock);
 	}
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 1c96818346..2eca49d3e0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -200,6 +200,7 @@ $lang = array_merge($lang, array(
 	'FORUM_RULES_LINK'		=> 'Please click here to view the forum rules',
 	'FROM'					=> 'from',
 	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
+	'FSOCK_TIMEOUT'			=> 'A timeout occurred while reading from the network stream.',
 
 	'FTP_FSOCK_HOST'				=> 'FTP host',
 	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
-- 
cgit v1.2.1


From c0507c6a9e26ba250596530f501bf6843250ed36 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 25 Aug 2011 20:38:53 +0200
Subject: [ticket/10278] Decrease default timeout of get_remote_file() to 6
 seconds.

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

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 8b9b80b23d..bcd477d855 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3130,7 +3130,7 @@ function get_database_size()
 /**
 * Retrieve contents from remotely stored file
 */
-function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10)
+function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 6)
 {
 	global $user;
 
-- 
cgit v1.2.1


From e4e854863f872c37ef82d9f468408d7528850dae Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 26 Aug 2011 03:29:05 +0200
Subject: [ticket/9995] Remove useless statement from display_forums()

The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7982b9908d..0e62a0bb14 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -152,8 +152,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			continue;
 		}
 
-		$forum_ids[] = $forum_id;
-
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
 			$forum_tracking_info[$forum_id] = (!empty($row['mark_time'])) ? $row['mark_time'] : $user->data['user_lastmark'];
-- 
cgit v1.2.1


From afc35f610d6a93b8b753f7b8b0ce12f4ea0f8cd0 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 26 Aug 2011 03:32:36 +0200
Subject: [ticket/9995] Always continue when harvesting $forum_ids for
 markread().

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 0e62a0bb14..f5941fe75f 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -125,8 +125,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			if ($auth->acl_get('f_list', $forum_id))
 			{
 				$forum_ids[] = $forum_id;
-				continue;
 			}
+
+			continue;
 		}
 
 		// Category with no members
-- 
cgit v1.2.1


From 7ae871dfaefb00579ec9cc9eaf3e1d0bc7c82fed Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 26 Aug 2011 03:59:39 +0200
Subject: [ticket/9995] Do not run forum SQL query when marking the whole board
 read.

PHPBB3-9995
---
 phpBB/includes/functions_display.php | 41 ++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f5941fe75f..0dcfab8449 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -51,6 +51,27 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
 	}
 
+	// Handle marking everything read
+	if ($mark_read == 'all')
+	{
+		$redirect = build_url(array('mark', 'hash'));
+		meta_refresh(3, $redirect);
+
+		if (check_link_hash(request_var('hash', ''), 'global'))
+		{
+			markread('all');
+
+			trigger_error(
+				$user->lang['FORUMS_MARKED'] . '<br /><br />' .
+				sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
+			);
+		}
+		else
+		{
+			trigger_error(sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+		}
+	}
+
 	// Display list of active topics for this category?
 	$show_active = (isset($root_data['forum_flags']) && ($root_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false;
 
@@ -120,7 +141,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		$forum_id = $row['forum_id'];
 
 		// Mark forums read?
-		if ($mark_read == 'forums' || $mark_read == 'all')
+		if ($mark_read == 'forums')
 		{
 			if ($auth->acl_get('f_list', $forum_id))
 			{
@@ -254,24 +275,16 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	$db->sql_freeresult($result);
 
 	// Handle marking posts
-	if ($mark_read == 'forums' || $mark_read == 'all')
+	if ($mark_read == 'forums')
 	{
 		$redirect = build_url(array('mark', 'hash'));
 		$token = request_var('hash', '');
 		if (check_link_hash($token, 'global'))
 		{
-			if ($mark_read == 'all')
-			{
-				markread('all');
-				$message = sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>');
-			}
-			else
-			{
-				// Add 0 to forums array to mark global announcements correctly
-				$forum_ids[] = 0;
-				markread('topics', $forum_ids);
-				$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
-			}
+			// Add 0 to forums array to mark global announcements correctly
+			$forum_ids[] = 0;
+			markread('topics', $forum_ids);
+			$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
 			meta_refresh(3, $redirect);
 			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
 		}
-- 
cgit v1.2.1


From 0f2e45800e9e88c86bdf335cac6a9974ec8f0385 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 29 Aug 2011 14:24:50 -0400
Subject: [ticket/10346] Add drop_tables to perform_schema_changes and add
 tests

PHPBB3-10346
---
 phpBB/includes/db/db_tools.php | 17 ++++++++++++
 tests/dbal/db_tools_test.php   | 60 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index d23323a5b1..2cb0fcef68 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -649,6 +649,23 @@ class phpbb_db_tools
 			$sqlite = true;
 		}
 
+		// Drop tables?
+		if (!empty($schema_changes['drop_tables']))
+		{
+			foreach ($schema_changes['drop_tables'] as $table)
+			{
+				// only drop table if it exists
+				if ($this->sql_table_exists($table))
+				{
+					$result = $this->sql_table_drop($table);
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
 		// Add tables?
 		if (!empty($schema_changes['add_tables']))
 		{
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index ddea500f83..753cc08fc5 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -271,6 +271,66 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 				'foo' => array('UINT', 42)))
 		);
 
+		$this->assertTrue($this->tools->sql_table_exists('prefix_test_table'));
+
 		$this->tools->sql_table_drop('prefix_test_table');
+
+		$this->assertFalse($this->tools->sql_table_exists('prefix_test_table'));
+	}
+
+	public function test_peform_schema_changes_drop_tables()
+	{
+		$db_tools = $this->getMock('phpbb_db_tools', array(
+			'sql_table_exists',
+			'sql_table_drop',
+		), array(&$this->db));
+
+		// pretend all tables exist
+		$db_tools->expects($this->any())->method('sql_table_exists')
+			->will($this->returnValue(true));
+
+		// drop tables
+		$db_tools->expects($this->exactly(2))->method('sql_table_drop');
+		$db_tools->expects($this->at(1))->method('sql_table_drop')
+			->with($this->equalTo('dropped_table_1'));
+		$db_tools->expects($this->at(3))->method('sql_table_drop')
+			->with($this->equalTo('dropped_table_2'));
+
+		$db_tools->perform_schema_changes(array(
+			'drop_tables' => array(
+				'dropped_table_1',
+				'dropped_table_2',
+			),
+		));
+	}
+
+	public function test_peform_schema_changes_drop_columns()
+	{
+		$db_tools = $this->getMock('phpbb_db_tools', array(
+			'sql_column_exists',
+			'sql_column_remove',
+		), array(&$this->db));
+
+		// pretend all columns exist
+		$db_tools->expects($this->any())->method('sql_column_exists')
+			->will($this->returnValue(true));
+		$db_tools->expects($this->any())->method('sql_column_exists')
+			->will($this->returnValue(true));
+
+		// drop columns
+		$db_tools->expects($this->exactly(2))->method('sql_column_remove');
+		$db_tools->expects($this->at(1))->method('sql_column_remove')
+			->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_1'));
+		$db_tools->expects($this->at(3))->method('sql_column_remove')
+			->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_2'));
+
+		$db_tools->perform_schema_changes(array(
+			'drop_columns' => array(
+				'existing_table' => array(
+					'dropped_column_1',
+					'dropped_column_2',
+				),
+			),
+		));
 	}
 }
-- 
cgit v1.2.1


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: [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',
 			),
 		);
 
-- 
cgit v1.2.1


From d938d5d3994e5febd6a7530e740e24b5727d38c4 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 4 Sep 2011 20:22:36 -0500
Subject: [ticket/10351] Fix Oracle's sql_column_remove()

The correct syntax is DROP COLUMN.

PHPBB3-10351
---
 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 2cb0fcef68..265fe1bb25 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1805,7 +1805,7 @@ class phpbb_db_tools
 			break;
 
 			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
 			break;
 
 			case 'postgres':
-- 
cgit v1.2.1


From 5c7f5f05166aa5e493f2cbeddd2b5e36eb80d4df Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 4 Sep 2011 20:31:34 -0500
Subject: [ticket/10352] Add missing break for Oracle's sql_table_drop()

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

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 2cb0fcef68..48bbefa2dd 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1956,6 +1956,7 @@ class phpbb_db_tools
 					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
 				}
 				$this->db->sql_freeresult($result);
+			break;
 
 			case 'postgres':
 				// PGSQL does not "tightly" bind sequences and tables, we must guess...
-- 
cgit v1.2.1


From 1061e881bd21f0308ce33a395084d291cf2fd0e3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 5 Sep 2011 01:20:57 -0400
Subject: [ticket/10354] Include cache directory path in unwritable message.

When template tests are skipped because cache directory is not
writable, include path to the cache directory into the message
saying it is not writable.

PHPBB3-10354
---
 tests/template/template_test.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 33c82d53ad..5005710220 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -63,9 +63,10 @@ class phpbb_template_template_test extends phpbb_test_case
 		// Test the engine can be used
 		$this->setup_engine();
 
-		if (!is_writable(dirname($this->template->cachepath)))
+		$template_cache_dir = dirname($this->template->cachepath);
+		if (!is_writable($template_cache_dir))
 		{
-			$this->markTestSkipped("Template cache directory is not writable.");
+			$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
 		}
 
 		foreach (glob($this->template->cachepath . '*') as $file)
-- 
cgit v1.2.1


From 94a0b7ef2e4940081d09675cd02a8e10fb4a728a Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <vigge.swe@gmail.com>
Date: Sat, 17 Sep 2011 19:35:16 +0200
Subject: [ticket/10324] Fixed XHTML validity error in User Notes Prosilver
 theme

Replaced the deprecated align and width attributes with CSS.

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

diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index c7c089ecad..7e92445476 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -78,7 +78,7 @@
 		<td style="text-align: center">{usernotes.REPORT_AT}</td>
 		<td>{usernotes.ACTION}</td>
 
-		<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
+		<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%; text-align: center;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
 	</tr>
 	<!-- BEGINELSE -->
 	<tr>
-- 
cgit v1.2.1


From 05515e0510e3d1bdf497ed6b88309c56932d04de Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 26 Aug 2011 01:53:52 +0200
Subject: [ticket/10245] Use error_collector instead of ob_start() and
 ob_get_clean().

PHPBB3-10245
---
 phpBB/includes/functions_messenger.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index b5c87094c0..08c686d9e3 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -975,9 +975,16 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false)
 	$smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']);
 
 	// Ok we have error checked as much as we can to this point let's get on it already.
-	ob_start();
+	if (!class_exists('phpbb_error_collector'))
+	{
+		global $phpbb_root_path, $phpEx;
+		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
+	}
+	$collector = new phpbb_error_collector;
+	$collector->install();
 	$smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20);
-	$error_contents = ob_get_clean();
+	$collector->uninstall();
+	$error_contents = $collector->format_errors();
 
 	if (!$smtp->socket)
 	{
@@ -1608,18 +1615,27 @@ function mail_encode($str, $eol = "\r\n")
 */
 function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg)
 {
-	global $config;
+	global $config, $phpbb_root_path, $phpEx;
 
 	// We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used...
 	// Reference: http://bugs.php.net/bug.php?id=15841
 	$headers = implode($eol, $headers);
 
-	ob_start();
+	if (!class_exists('phpbb_error_collector'))
+	{
+		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
+	}
+
+	$collector = new phpbb_error_collector;
+	$collector->install();
+
 	// On some PHP Versions mail() *may* fail if there are newlines within the subject.
 	// Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8.
 	// Because PHP can't decide what is wanted we revert back to the non-RFC-compliant way of separating by one space (Use '' as parameter to mail_encode() results in SPACE used)
 	$result = $config['email_function_name']($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers);
-	$err_msg = ob_get_clean();
+
+	$collector->uninstall();
+	$err_msg = $collector->format_errors();
 
 	return $result;
 }
-- 
cgit v1.2.1


From 7b3f6cb219cac448ba470f016ed5068bdc7ffc56 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 00:55:24 +0200
Subject: [ticket/10369] Always include errfile and errline in format_errors().

We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
---
 phpBB/includes/error_collector.php | 14 +++++++++-----
 tests/error_collector_test.php     | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 tests/error_collector_test.php

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 55834f354c..534df27ece 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -42,6 +42,8 @@ class phpbb_error_collector
 
 	function format_errors()
 	{
+		$phpbb_root_path = phpbb_realpath(dirname(__FILE__) . '/../');
+
 		$text = '';
 		foreach ($this->errors as $error)
 		{
@@ -49,13 +51,15 @@ class phpbb_error_collector
 			{
 				$text .= "<br />\n";
 			}
+
 			list($errno, $msg_text, $errfile, $errline) = $error;
-			$text .= "Errno $errno: $msg_text";
-			if (defined('DEBUG_EXTRA') || defined('IN_INSTALL'))
-			{
-				$text .= " at $errfile line $errline";
-			}
+
+			// Prevent leakage of local path to phpBB install
+			$errfile = str_replace(array($phpbb_root_path, '\\'), array('', '/'), $errfile);
+
+			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
+
 		return $text;
 	}
 }
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
new file mode 100644
index 0000000000..e1ac32f5ac
--- /dev/null
+++ b/tests/error_collector_test.php
@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
+
+class phpbb_error_collector_test extends phpbb_test_case
+{
+	public function test_collection()
+	{
+		$collector = new phpbb_error_collector;
+		$collector->install();
+
+		// Cause a warning
+		1/0; $line = __LINE__;
+
+		$collector->uninstall();
+
+		list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
+		$error_contents = $collector->format_errors();
+
+		$this->assertEquals($errno, 2);
+
+		// Unfortunately $error_contents will contain the full path here,
+		// because the tests directory is outside of phpbb root path.
+		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
+		$this->assertStringEndsWith(" line $line", $error_contents);
+	}
+}
-- 
cgit v1.2.1


From 9006984d5ab7478e9187d14c5ab331057b1af9a4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 22:20:20 +0200
Subject: [ticket/10369] DRY code to remove phpbb path from errfile.

PHPBB3-10369
---
 phpBB/includes/error_collector.php |  4 +---
 phpBB/includes/functions.php       | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 534df27ece..040be4dd13 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -42,8 +42,6 @@ class phpbb_error_collector
 
 	function format_errors()
 	{
-		$phpbb_root_path = phpbb_realpath(dirname(__FILE__) . '/../');
-
 		$text = '';
 		foreach ($this->errors as $error)
 		{
@@ -55,7 +53,7 @@ class phpbb_error_collector
 			list($errno, $msg_text, $errfile, $errline) = $error;
 
 			// Prevent leakage of local path to phpBB install
-			$errfile = str_replace(array($phpbb_root_path, '\\'), array('', '/'), $errfile);
+			$errfile = phpbb_filter_errfile($errfile);
 
 			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 628f8ee123..4c1bfb4360 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3816,9 +3816,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 			{
-				// remove complete path to installation, with the risk of changing backslashes meant to be there
-				$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
-				$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
+				$errfile = phpbb_filter_errfile($errfile);
+				$msg_text = phpbb_filter_errfile($msg_text);
 				$error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice';
 				echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
 
@@ -3996,6 +3995,27 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 	return false;
 }
 
+/**
+* Removes absolute path to phpBB root directory from error messages
+* and converts backslashes to forward slashes.
+*
+* @param string $errfile	Absolute file path
+*							(e.g. /var/www/phpbb3/phpBB/includes/functions.php)
+* @return string			Relative file path
+*							(e.g. /includes/functions.php)
+*/
+function phpbb_filter_errfile($errfile)
+{
+	static $root_path;
+
+	if (empty($root_path))
+	{
+		$root_path = phpbb_realpath(dirname(__FILE__) . '/../');
+	}
+
+	return str_replace(array($root_path, '\\'), array('', '/'), $errfile);
+}
+
 /**
 * Queries the session table to get information about online guests
 * @param int $item_id Limits the search to the item with this id
-- 
cgit v1.2.1


From 1ad97424a469fe2e36a3c3a616b5e49def292779 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 22:32:25 +0200
Subject: [ticket/10369] Rename filter_errfile() to filter_root_path().

PHPBB3-10369
---
 phpBB/includes/error_collector.php | 2 +-
 phpBB/includes/functions.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 040be4dd13..3c0a89a1f3 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -53,7 +53,7 @@ class phpbb_error_collector
 			list($errno, $msg_text, $errfile, $errline) = $error;
 
 			// Prevent leakage of local path to phpBB install
-			$errfile = phpbb_filter_errfile($errfile);
+			$errfile = phpbb_filter_root_path($errfile);
 
 			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4c1bfb4360..cd856f55a7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3816,8 +3816,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 			{
-				$errfile = phpbb_filter_errfile($errfile);
-				$msg_text = phpbb_filter_errfile($msg_text);
+				$errfile = phpbb_filter_root_path($errfile);
+				$msg_text = phpbb_filter_root_path($msg_text);
 				$error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice';
 				echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
 
@@ -4004,7 +4004,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 * @return string			Relative file path
 *							(e.g. /includes/functions.php)
 */
-function phpbb_filter_errfile($errfile)
+function phpbb_filter_root_path($errfile)
 {
 	static $root_path;
 
-- 
cgit v1.2.1


From c8564e6ce98980143c42a67b51b0c8327cfc12b5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 22:41:02 +0200
Subject: [ticket/10369] Add warning about paths outside of phpBB root not
 being filtered

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index cd856f55a7..2e445192ae 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4001,6 +4001,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 *
 * @param string $errfile	Absolute file path
 *							(e.g. /var/www/phpbb3/phpBB/includes/functions.php)
+*							Please note that if $errfile is outside of the phpBB root,
+*							the root path will not be found and can not be filtered.
 * @return string			Relative file path
 *							(e.g. /includes/functions.php)
 */
-- 
cgit v1.2.1


From 1b390f0b498f1eb977dd62dc06dd5753b0c7ea65 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 23:03:28 +0200
Subject: [ticket/10369] Replace root path with "[ROOT]" as per IRC.

PHPBB3-10369
---
 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 2e445192ae..e01bbe36d1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4015,7 +4015,7 @@ function phpbb_filter_root_path($errfile)
 		$root_path = phpbb_realpath(dirname(__FILE__) . '/../');
 	}
 
-	return str_replace(array($root_path, '\\'), array('', '/'), $errfile);
+	return str_replace(array($root_path, '\\'), array('[ROOT]', '/'), $errfile);
 }
 
 /**
-- 
cgit v1.2.1


From 9c0f75fd65e51212f5ef61e901420ea2f14a7a38 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 16:57:09 +0200
Subject: [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().

PHPBB3-10370
---
 phpBB/includes/functions.php | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e01bbe36d1..c2c8e489df 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3391,11 +3391,8 @@ function add_log()
 */
 function get_backtrace()
 {
-	global $phpbb_root_path;
-
 	$output = '<div style="font-family: monospace;">';
 	$backtrace = debug_backtrace();
-	$path = phpbb_realpath($phpbb_root_path);
 
 	foreach ($backtrace as $number => $trace)
 	{
@@ -3406,15 +3403,7 @@ function get_backtrace()
 		}
 
 		// Strip the current directory from path
-		if (empty($trace['file']))
-		{
-			$trace['file'] = '';
-		}
-		else
-		{
-			$trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']);
-			$trace['file'] = substr($trace['file'], 1);
-		}
+		$trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']);
 		$args = array();
 
 		// If include/require/include_once is not called, do not show arguments - they may contain sensible information
@@ -3428,8 +3417,7 @@ function get_backtrace()
 			if (!empty($trace['args'][0]))
 			{
 				$argument = htmlspecialchars($trace['args'][0]);
-				$argument = str_replace(array($path, '\\'), array('', '/'), $argument);
-				$argument = substr($argument, 1);
+				$argument = phpbb_filter_root_path($argument);
 				$args[] = "'{$argument}'";
 			}
 		}
-- 
cgit v1.2.1


From 12530a763b436c3d01d2668999dc343a95926389 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 16:58:25 +0200
Subject: [ticket/10370] Use unset() on the first backtrace instead of checking
 in loop.

PHPBB3-10370
---
 phpBB/includes/functions.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c2c8e489df..b203dcbea3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3394,14 +3394,11 @@ function get_backtrace()
 	$output = '<div style="font-family: monospace;">';
 	$backtrace = debug_backtrace();
 
-	foreach ($backtrace as $number => $trace)
-	{
-		// We skip the first one, because it only shows this file/function
-		if ($number == 0)
-		{
-			continue;
-		}
+	// We skip the first one, because it only shows this file/function
+	unset($backtrace[0]);
 
+	foreach ($backtrace as $trace)
+	{
 		// Strip the current directory from path
 		$trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']);
 		$args = array();
-- 
cgit v1.2.1


From 0df7e5eefa245559d3a1e1c0318fba0011513a9c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:07:06 +0200
Subject: [ticket/10370] Ease up code checking for arguments of include etc.

PHPBB3-10370
---
 phpBB/includes/functions.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b203dcbea3..5f90093bd0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3401,22 +3401,15 @@ function get_backtrace()
 	{
 		// Strip the current directory from path
 		$trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']);
-		$args = array();
 
-		// If include/require/include_once is not called, do not show arguments - they may contain sensible information
-		if (!in_array($trace['function'], array('include', 'require', 'include_once')))
-		{
-			unset($trace['args']);
-		}
-		else
+		// Only show function arguments for include etc.
+		// Other parameters may contain sensible information
+		$args = array();
+		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once')))
 		{
-			// Path...
-			if (!empty($trace['args'][0]))
-			{
-				$argument = htmlspecialchars($trace['args'][0]);
-				$argument = phpbb_filter_root_path($argument);
-				$args[] = "'{$argument}'";
-			}
+			$argument = htmlspecialchars($trace['args'][0]);
+			$argument = phpbb_filter_root_path($argument);
+			$args[] = "'{$argument}'";
 		}
 
 		$trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
-- 
cgit v1.2.1


From 7965387201c86a7d56ae8974ca1eaaba68d4e30d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:15:31 +0200
Subject: [ticket/10370] Use single string instead of an array for arguments.

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5f90093bd0..df5a05f53b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3404,12 +3404,11 @@ function get_backtrace()
 
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
-		$args = array();
+		$argument = '';
 		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once')))
 		{
 			$argument = htmlspecialchars($trace['args'][0]);
 			$argument = phpbb_filter_root_path($argument);
-			$args[] = "'{$argument}'";
 		}
 
 		$trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
@@ -3419,7 +3418,8 @@ function get_backtrace()
 		$output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />';
 		$output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br />';
 
-		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')<br />';
+		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']);
+		$output .= '(' . (($argument !== '') ? "'$argument'" : '') . ')<br />';
 	}
 	$output .= '</div>';
 	return $output;
-- 
cgit v1.2.1


From 8a84f42f7df73f579ad28272c116efc1de3b1651 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:15:58 +0200
Subject: [ticket/10370] Add require_once to whitelisted functions.

PHPBB3-10370
---
 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 df5a05f53b..105f2d5fa0 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3405,7 +3405,7 @@ function get_backtrace()
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
 		$argument = '';
-		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once')))
+		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
 		{
 			$argument = htmlspecialchars($trace['args'][0]);
 			$argument = phpbb_filter_root_path($argument);
-- 
cgit v1.2.1


From 19ce73c88496ca76342c2a07c1b01dc25392c6ff Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:20:11 +0200
Subject: [ticket/10370] Call htmlspecialchars() after
 phpbb_filter_root_path().

PHPBB3-10370
---
 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 105f2d5fa0..ef13b74f0c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3407,8 +3407,7 @@ function get_backtrace()
 		$argument = '';
 		if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once', 'require_once')))
 		{
-			$argument = htmlspecialchars($trace['args'][0]);
-			$argument = phpbb_filter_root_path($argument);
+			$argument = htmlspecialchars(phpbb_filter_root_path($trace['args'][0]));
 		}
 
 		$trace['class'] = (!isset($trace['class'])) ? '' : $trace['class'];
-- 
cgit v1.2.1


From fc2af460ee2112ee5bcbd8076441ebcf8aea9513 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:33:18 +0200
Subject: [ticket/10370] Explain that we are not the ones hiding backtrace
 pieces.

Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d.

PHPBB3-10370
---
 phpBB/includes/functions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ef13b74f0c..d77517f2da 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3400,7 +3400,8 @@ function get_backtrace()
 	foreach ($backtrace as $trace)
 	{
 		// Strip the current directory from path
-		$trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']);
+		$trace['file'] = (empty($trace['file'])) ? '(not given by php)' : htmlspecialchars(phpbb_filter_root_path($trace['file']));
+		$trace['line'] = (empty($trace['line'])) ? '(not given by php)' : $trace['line'];
 
 		// Only show function arguments for include etc.
 		// Other parameters may contain sensible information
@@ -3414,7 +3415,7 @@ function get_backtrace()
 		$trace['type'] = (!isset($trace['type'])) ? '' : $trace['type'];
 
 		$output .= '<br />';
-		$output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />';
+		$output .= '<b>FILE:</b> ' . $trace['file'] . '<br />';
 		$output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br />';
 
 		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']);
-- 
cgit v1.2.1


From 79ad3a3f326f760fb2930b16533c46efc872dae2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 19 Sep 2011 17:45:32 +0200
Subject: [ticket/10370] Add function documentation for get_stacktrace().

PHPBB3-10370
---
 phpBB/includes/functions.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d77517f2da..c2b099d48a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3387,7 +3387,12 @@ function add_log()
 }
 
 /**
-* Return a nicely formatted backtrace (parts from the php manual by diz at ysagoon dot com)
+* Return a nicely formatted backtrace.
+*
+* Turns the array returned by debug_backtrace() into HTML markup.
+* Also filters out absolute paths to phpBB root.
+*
+* @return string	HTML markup
 */
 function get_backtrace()
 {
-- 
cgit v1.2.1


From 5b66413f69db8839a2553ef29f5b2cd947992916 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Aug 2011 20:46:01 +0200
Subject: [ticket/10315] Add top/bottom margin to the options in ACP to avoid
 overlapping

PHPBB3-10315
---
 phpBB/adm/style/admin.css | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 4c3fa51af3..666f4921ba 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -899,12 +899,15 @@ html>body dd label input { vertical-align: text-bottom;}	/* Tweak for Moz to ali
 dd input {
 	font-size: 1.00em;
 	max-width: 100%;
+	margin: 2px 0;
 }
 
 dd select {
 	font-size: 100%;
+	font-size: 1em;
 	width: auto;
 	max-width: 100%;
+	margin: 2px 0;
 }
 
 dd textarea {
@@ -912,11 +915,6 @@ dd textarea {
 	width: 90%;
 }
 
-dd select {
-	width: auto;
-	font-size: 1.00em;
-}
-
 fieldset dl {
 	margin-bottom: 10px;
 	font-size: 0.85em;
-- 
cgit v1.2.1


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: [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
-	*/
-	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....
+	* Removes comments from schema files
+	* 
+	* Note: This performs the functions of remove_remarks() and remove_comments() used during installation
 	*/
-	protected function remove_comments(&$output)
+	protected function remove_comments($sql)
 	{
-		$lines = explode("\n", $output);
-		$output = '';
-
-		// try to keep mem. use down
-		$linecount = sizeof($lines);
+		// Remove /* */ comments (http://ostermiller.org/findcomment.html)
+		$sql = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $sql);
 
-		$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;
-			}
-		}
+		// Remove # style comments
+		$sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
 
-		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',
 			),
 		);
 
-- 
cgit v1.2.1


From a1febdd4290cf2b5aabf5fe6b656da1b3ad4f4c9 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Wed, 21 Sep 2011 21:19:37 +0100
Subject: [ticket/10239] Add confirm box to backup restore.

PHPBB3-10239
---
 phpBB/includes/acp/acp_database.php | 6 +++++-
 phpBB/language/en/acp/database.php  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 193dd001c0..1bf10b0e57 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -247,7 +247,7 @@ class acp_database
 								confirm_box(false, $user->lang['DELETE_SELECTED_BACKUP'], build_hidden_fields(array('delete' => $delete, 'file' => $file)));
 							}
 						}
-						else
+						else if ($download || confirm_box(true))
 						{
 							$download = request_var('download', '');
 
@@ -411,6 +411,10 @@ class acp_database
 							trigger_error($user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action));
 							break;
 						}
+						else if (!$download)
+						{
+							confirm_box(false, $user->lang['RESTORE_SELECTED_BACKUP'], build_hidden_fields(array('file' => $file)));
+						}
 
 					default:
 						$methods = array('sql');
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index ae8f76d6b7..9c8ecbf13a 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -59,6 +59,7 @@ $lang = array_merge($lang, array(
 
 	'RESTORE_FAILURE'		=> 'The backup file may be corrupt.',
 	'RESTORE_OPTIONS'		=> 'Restore options',
+	'RESTORE_SELECTED_BACKUP'	=> 'Are you sure you want to restore the selected backup?',
 	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
 
 	'SELECT_ALL'			=> 'Select all',
-- 
cgit v1.2.1


From 138d1050fcfa910eb8819e91034741ed74baf4f3 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sat, 24 Sep 2011 22:05:40 +0100
Subject: [ticket/9307] Remove hardcoded chunk size of mass emails.

The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.

PHPBB3-9307
---
 phpBB/includes/acp/acp_email.php  | 5 +++--
 phpBB/install/database_update.php | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 133fe47e09..e98b7a19a5 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -136,8 +136,9 @@ class acp_email
 
 				$i = $j = 0;
 
-				// Send with BCC, no more than 50 recipients for one mail (to not exceed the limit)
-				$max_chunk_size = 50;
+				// Send with BCC
+				// Maximum number of bcc recipients
+				$max_chunk_size = (int) $config['email_max_chunk_size'];
 				$email_list = array();
 				$old_lang = $row['user_lang'];
 				$old_notify_type = $row['user_notify_type'];
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a167e79308..21246a215e 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1994,6 +1994,11 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.9-RC4 to 3.0.9
 		case '3.0.9-RC4':
 		break;
+
+		// Changes from 3.0.9 to 3.0.10-RC1
+		case '3.0.9':
+			set_config('email_max_chunk_size', '50');
+		break;
 	}
 }
 
-- 
cgit v1.2.1


From e0869b39a37a2db4ba88070d52e58307e721b336 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 25 Sep 2011 10:59:41 +0800
Subject: [ticket/9008] Incorrect unread topic tracking for unapproved topics

PHPBB3-9008
---
 phpBB/includes/functions.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 628f8ee123..c0581c1b1b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1880,7 +1880,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
 */
 function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
 {
-	global $db, $tracking_topics, $user, $config;
+	global $db, $tracking_topics, $user, $config, $auth;
 
 	// Determine the users last forum mark time if not given.
 	if ($mark_time_forum === false)
@@ -1903,6 +1903,10 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 		}
 	}
 
+	// Handle update of unapproved topics info.
+	// Only update for moderators having m_approve permission for the forum.
+	$sql_update_unapproved = ($auth->acl_get('m_approve', $forum_id)) ? '': 'AND t.topic_approved = 1';
+
 	// Check the forum for any left unread topics.
 	// If there are none, we mark the forum as read.
 	if ($config['load_db_lastread'] && $user->data['is_registered'])
@@ -1918,7 +1922,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 				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
+					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';
 			$result = $db->sql_query_limit($sql, 1);
@@ -1942,7 +1947,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 				FROM ' . TOPICS_TABLE . '
 				WHERE forum_id = ' . $forum_id . '
 					AND topic_last_post_time > ' . $mark_time_forum . '
-					AND topic_moved_id = 0';
+					AND topic_moved_id = 0 ' .
+					$sql_update_unapproved;
 			$result = $db->sql_query($sql);
 
 			$check_forum = $tracking_topics['tf'][$forum_id];
-- 
cgit v1.2.1


From 81f9385477e1a6b050f447c9659faaf0bc7e871a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sun, 25 Sep 2011 22:13:43 +0100
Subject: [ticket/9307] Add config variable to installation schema.

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

diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 153ac61157..84b25d676e 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -94,6 +94,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('delete_time', '0')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_max_chunk_size', '50');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '20');
 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');
-- 
cgit v1.2.1


From b571b3e0326cc6fe987ceb317ee803d4921cc133 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 27 Sep 2011 17:31:24 +0200
Subject: [ticket/10394] Remove call-time pass by reference from tests for PHP
 5.4

PHPBB3-10394
---
 tests/profile/custom_test.php | 2 +-
 tests/utf/normalizer_test.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
index 0e0a851243..585182e583 100644
--- a/tests/profile/custom_test.php
+++ b/tests/profile/custom_test.php
@@ -48,7 +48,7 @@ class phpbb_profile_custom_test extends phpbb_database_test_case
 		);
 
 		$cp = new custom_profile;
-		$result = $cp->validate_profile_field(FIELD_DROPDOWN, &$field_value, $field_data);
+		$result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data);
 
 		$this->assertEquals($expected, $result, $description);
 	}
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index a0ba470416..f8f2467082 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -102,7 +102,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 					foreach ($tests as $test)
 					{
 						$utf_result = $utf_expected;
-						call_user_func(array('utf_normalizer', $form), &$utf_result);
+						call_user_func(array('utf_normalizer', $form), $utf_result);
 
 						$hex_result = $this->utf_to_hexseq($utf_result);
 						$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
@@ -154,7 +154,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 			foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
 			{
 				$utf_result = $utf_expected;
-				call_user_func(array('utf_normalizer', $form), &$utf_result);
+				call_user_func(array('utf_normalizer', $form), $utf_result);
 				$hex_result = $this->utf_to_hexseq($utf_result);
 
 				$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
-- 
cgit v1.2.1


From b197ea56c23188f4fd160c736c2d1840e987180a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 27 Sep 2011 22:32:20 +0200
Subject: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic
 function

PHPBB3-10394
---
 tests/utf/normalizer_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index f8f2467082..1dc69e283e 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -102,7 +102,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 					foreach ($tests as $test)
 					{
 						$utf_result = $utf_expected;
-						call_user_func(array('utf_normalizer', $form), $utf_result);
+						call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
 
 						$hex_result = $this->utf_to_hexseq($utf_result);
 						$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
@@ -154,7 +154,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 			foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
 			{
 				$utf_result = $utf_expected;
-				call_user_func(array('utf_normalizer', $form), $utf_result);
+				call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
 				$hex_result = $this->utf_to_hexseq($utf_result);
 
 				$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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)
 	{
-- 
cgit v1.2.1


From 12882084d4ce686fe43f3935f16078c4e818cde3 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 4 Oct 2011 11:55:25 +0300
Subject: [ticket/10397] Pagination inconsistency fix

Fixing inconsistency in code generated by generate_pagination()

PHPBB3-10397
---
 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 c2b099d48a..8017c379f3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2127,7 +2127,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 		$start_cnt = min(max(1, $on_page - 4), $total_pages - 5);
 		$end_cnt = max(min($total_pages, $on_page + 4), 6);
 
-		$page_string .= ($start_cnt > 1) ? ' ... ' : $seperator;
+		$page_string .= ($start_cnt > 1) ? '<span class="page-dots"> ... </span>' : $seperator;
 
 		for ($i = $start_cnt + 1; $i < $end_cnt; $i++)
 		{
@@ -2138,7 +2138,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
 			}
 		}
 
-		$page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator;
+		$page_string .= ($end_cnt < $total_pages) ? '<span class="page-dots"> ... </span>' : $seperator;
 	}
 	else
 	{
-- 
cgit v1.2.1


From b38fbc6d25d1f76683acec83627238ed5b5dbf8c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 4 Oct 2011 12:24:42 +0300
Subject: [ticket/10397] Pagination inconsistency fix

Fixing topic_generate_pagination()

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 14d0c44dcf..86eabc419c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -674,7 +674,7 @@ function topic_generate_pagination($replies, $url)
 			$pagination .= '<a href="' . $url . ($j == 0 ? '' : '&amp;start=' . $j) . '">' . $times . '</a>';
 			if ($times == 1 && $total_pages > 5)
 			{
-				$pagination .= ' ... ';
+				$pagination .= '<span class="page-dots"> ... </span>';
 
 				// Display the last three pages
 				$times = $total_pages - 3;
-- 
cgit v1.2.1


From cacb9f2ec514f028ef7ccf35a3fa04b38bdac7ac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Oct 2011 09:44:31 +0200
Subject: [ticket/10400] Allow forum name to be '0'

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

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 4d9b9f01e0..27bec3f1ea 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -875,7 +875,7 @@ class acp_forums
 
 		$errors = array();
 
-		if (!$forum_data['forum_name'])
+		if ($forum_data['forum_name'] == '')
 		{
 			$errors[] = $user->lang['FORUM_NAME_EMPTY'];
 		}
-- 
cgit v1.2.1


From d4bbfae0d54a3726ac6080dcf399aee8187af19f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 11:52:35 +0200
Subject: [ticket/9898] Encourage patches in README

PHPBB3-9898
---
 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 7a0a42b34f..7ceb698ac4 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -263,7 +263,7 @@
 
 	<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 fix which you are <strong>VERY SURE</strong> works (and is consistent with our <a href="coding-guidelines.html">coding guidelines</a>) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.</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>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>
 
-- 
cgit v1.2.1


From f94f872624bd0a4987bef17cd5ac4d26d6bceee4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 13 Oct 2011 13:59:39 +0200
Subject: [ticket/10304] Fix URL for ICQ while view private messages

PHPBB3-10304
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index d0cfa1ffd2..82a095dd9c 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -208,7 +208,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
 		'U_WWW'			=> (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
-		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people' . urlencode($user_info['user_icq']) . '/' : '',
+		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/' . urlencode($user_info['user_icq']) . '/' : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
 		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
 		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
-- 
cgit v1.2.1


From 88aacd0f2cffdf75af71d749c6ea602ed3912651 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 13 Oct 2011 15:52:12 +0200
Subject: [ticket/10408] Layout of topics/attachments list is broken in UCP and
 MCP

PHPBB3-10408
---
 phpBB/styles/prosilver/template/ucp_attachments.html | 4 ++--
 phpBB/styles/prosilver/theme/content.css             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 8052fdc435..c76316d93e 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -20,7 +20,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl>
-					<dt style="width: 40%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
+					<dt><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
 					<dd class="extra"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></dd>
 					<dd class="time"><span><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></span></dd>
 					<dd class="mark">{L_MARK}</dd>
@@ -32,7 +32,7 @@
 		<!-- BEGIN attachrow -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
+				<dt><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
 					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt>
 				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>
 				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 2dad706bf5..58247883e5 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -184,7 +184,7 @@ dd.extra {
 
 dd.mark {
 	float: right !important;
-	width: 9%;
+	width: 90px;
 	text-align: center;
 	line-height: 200%;
 	font-size: 1.2em;
-- 
cgit v1.2.1


From 6698a9cbd62be1e77f329a7e8843fafbc18a1025 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 16:25:41 +0200
Subject: [ticket/8094] Remove ambiguity of "phpBB has no categories"

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

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index eab027f295..b99a0724be 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
 	'ENABLE_TOPIC_ICONS'			=> 'Enable topic icons',
 
 	'FORUM_ADMIN'						=> 'Forum administration',
-	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
+	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 everything is forum based. A category is just a special type of forum. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
 	'FORUM_AUTO_PRUNE'					=> 'Enable auto-pruning',
 	'FORUM_AUTO_PRUNE_EXPLAIN'			=> 'Prunes the forum of topics, set the frequency/age parameters below.',
 	'FORUM_CREATED'						=> 'Forum created successfully.',
-- 
cgit v1.2.1


From 3cd8c2507d4181a32484e47d6eef6601485bfb25 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 16:43:11 +0200
Subject: [ticket/10307] Return false in mysqli sql_fetchrow on empty result

PHPBB3-10307
---
 phpBB/includes/db/mysqli.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 46c2f9210b..456ce906d0 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -249,7 +249,13 @@ class dbal_mysqli extends dbal
 			return $cache->sql_fetchrow($query_id);
 		}
 
-		return ($query_id !== false) ? @mysqli_fetch_assoc($query_id) : false;
+		if ($query_id !== false)
+		{
+			$result = @mysqli_fetch_assoc($query_id);
+			return $result !== null ? $result : false;
+		}
+
+		return false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 6d9e9d190179a33ec8873f206f75db0978992bf6 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 16:56:55 +0200
Subject: [ticket/10307] Add a test for PHPBB3-10307

PHPBB3-10307
---
 tests/dbal/select_test.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index e0d08d9306..8ddd27465d 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -319,7 +319,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	function test_nested_transactions()
+	public function test_nested_transactions()
 	{
 		$db = $this->new_dbal();
 
@@ -341,4 +341,20 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		$this->assertEquals('1', $row['user_id']);
 	}
+
+	/**
+	 * fix for PHPBB3-10307
+	 */
+	public function test_sql_fetchrow_returns_false_when_empty()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT * FROM (SELECT 1) AS TBL WHERE 1 = 0';
+		$result = $db->sql_query($sql);
+
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		$this->assertSame(false, $row);
+	}
 }
-- 
cgit v1.2.1


From ee91656968aa362aa702821de2e0c0cb0457cc0f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 17:09:34 +0200
Subject: [ticket/10275] Remove incorrect password information from FAQ

FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
---
 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 3b7dc02d3f..b915a3da19 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -60,7 +60,7 @@ $help = array(
 	),
 	array(
 		0 => 'I registered in the past but cannot login any more?!',
-		1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
+		1 => 'It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
 	),
 	array(
 		0 => 'What is COPPA?',
-- 
cgit v1.2.1


From 75ef0fde825b89a6c2fa41a723b600552921e214 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 17:43:59 +0200
Subject: [ticket/10246] Move coding guidelines VCS section to wiki

The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches

PHPBB3-10246
---
 phpBB/docs/coding-guidelines.html | 52 +--------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index cd3c09f6fb..da7a3bf582 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -87,12 +87,6 @@
 		<li><a href="#writingstyle">Writing Style</a></li>
 	</ol>
 	</li>
-	<li><a href="#vcs">VCS Guidelines</a>
-	<ol style="list-style-type: lower-roman;">
-		<li><a href="#repostruct">Repository structure</a></li>
-		<li><a href="#commitmessage">Commit Messages and Repository Rules</a></li>
-	</ol>
-	</li>
 	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
 
@@ -2323,51 +2317,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 	<hr />
 
-<a name="vcs"></a><h2>7. VCS Guidelines</h2>
-
-	<div class="paragraph">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-		<div class="content">
-
-	<p>The version control system for phpBB3 is git. The repository is available at <a href="http://github.com/phpbb/phpbb3" title="repository">http://github.com/phpbb/phpbb3</a>.</p>
-
-	<a name="repostruct"></a><h3>7.i. Repository Structure</h3>
-
-	<ul>
-		<li><strong>develop</strong><br />The latest unstable development version with new features etc.</li>
-		<li><strong>develop-*</strong><br />Development branches of stable phpBB releases. Branched off of <code>develop</code> at the time of feature freeze.
-			<ul>
-				<li><strong>phpBB3.0</strong><code>develop-olympus</code><br />Development branch of the stable 3.0 line. Bug fixes are applied here.</li>
-				<li><strong>phpBB3.1</strong><code>develop-ascraeus</code><br />Development branch of the stable 3.1 line. Bug fixes are applied here.</li>
-			</ul>
-		</li>
-		<li><strong>master</strong><br />A branch containing all stable phpBB3 release points</li>
-		<li><strong>tags</strong><br />Released versions. Stable ones get merged into the master branch.
-			<ul>
-				<li><code>release-3.Y-BX</code><br />Beta release X of the 3.Y line.</li>
-				<li><code>release-3.Y-RCX</code><br />Release candidate X of the 3.Y line.</li>
-				<li><code>release-3.Y.Z-RCX</code><br />Release candidate X of the stable 3.Y.Z release.</li>
-				<li><code>release-3.0.X</code><br />Stable <strong>3.0.X</strong> release.</li>
-				<li><code>release-2.0.X</code><br />Old stable 2.0.X release.</li>
-			</ul>
-		</li>
-	</ul>
-
-	<a name="commitmessage"></a><h3>7.ii. Commit Messages and Repository Rules</h3>
-
-	<p>Information on repository rules, such as commit messages can be found at <a href="http://wiki.phpbb.com/display/DEV/Git" title="phpBB Git Information">http://wiki.phpbb.com/display/DEV/Git</a>.</p>
-
-		</div>
-
-		<div class="back2top"><a href="#wrap" class="top">Back to Top</a></div>
-
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
-	<hr />
-
-<a name="disclaimer"></a><h2>9. Copyright and disclaimer</h2>
+<a name="disclaimer"></a><h2>8. Copyright and disclaimer</h2>
 
 	<div class="paragraph">
 		<div class="inner"><span class="corners-top"><span></span></span>
-- 
cgit v1.2.1


From 091119605abe794aa508c76b7e5199517fc256e3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 13 Oct 2011 18:03:02 +0200
Subject: [ticket/10278] Also timeout when receiving data over a slow
 connection.

PHPBB3-10278
---
 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 bcd477d855..513b7a68b2 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3140,6 +3140,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 		@fputs($fsock, "HOST: $host\r\n");
 		@fputs($fsock, "Connection: close\r\n\r\n");
 
+		$timer_stop = time() + $timeout;
 		stream_set_timeout($fsock, $timeout);
 
 		$file_info = '';
@@ -3167,7 +3168,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 
 			$stream_meta_data = stream_get_meta_data($fsock);
 
-			if (!empty($stream_meta_data['timed_out']))
+			if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
 			{
 				$errstr = $user->lang['FSOCK_TIMEOUT'];
 				return false;
-- 
cgit v1.2.1


From 1dc1583b92daa666193d766e3728ce9723f4d20f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 13 Oct 2011 18:23:33 +0200
Subject: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.

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

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index 931fa53165..7e3d1a1024 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -37,7 +37,7 @@ class acp_update
 		$errstr = '';
 		$errno = 0;
 
-		$info = obtain_latest_version_info(request_var('versioncheck_force', false), true);
+		$info = obtain_latest_version_info(request_var('versioncheck_force', false));
 
 		if ($info === false)
 		{
-- 
cgit v1.2.1


From f7c1341402ea47cc33ac183421485db3efd7ea15 Mon Sep 17 00:00:00 2001
From: Alan <asinshesq@code.phpbb.com>
Date: Thu, 13 Oct 2011 19:17:56 +0200
Subject: [ticket/8616] Direct links in pm notification emails

Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
---
 phpBB/includes/functions_privmsgs.php | 6 +++---
 phpBB/includes/ucp/ucp_pm.php         | 2 +-
 phpBB/ucp.php                         | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4c34bc92ca..a857109466 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1607,7 +1607,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	// Send Notifications
 	if ($mode != 'edit')
 	{
-		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']);
+		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
 	}
 
 	return $data['msg_id'];
@@ -1616,7 +1616,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 /**
 * PM Notification
 */
-function pm_notification($mode, $author, $recipients, $subject, $message)
+function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
 {
 	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
 
@@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message)
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox")
+			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
 		);
 
 		$messenger->send($addr['method']);
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index c675928a5b..447b6ebe87 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -243,7 +243,7 @@ class ucp_pm
 				$num_not_moved = $num_removed = 0;
 				$release = request_var('release', 0);
 
-				if ($user->data['user_new_privmsg'] && $action == 'view_folder')
+				if ($user->data['user_new_privmsg'] && ($action == 'view_folder' || $action == 'view_message'))
 				{
 					$return = place_pm_into_folder($global_privmsgs_rules, $release);
 					$num_not_moved = $return['not_moved'];
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 8fa022668b..45caeb12ea 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -254,6 +254,12 @@ if (!$user->data['is_registered'])
 		redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
 	}
 
+	if ($id == 'pm' && $mode == 'view' && isset($_GET['p']))
+	{
+		$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx?i=pm&p=" . request_var('p', 0));
+		login_box($redirect_url, $user->lang['LOGIN_EXPLAIN_UCP']);
+	}
+
 	login_box('', $user->lang['LOGIN_EXPLAIN_UCP']);
 }
 
-- 
cgit v1.2.1


From 39f6d583150bcd25ff7a780686ebd9c5d933b99e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 13 Oct 2011 19:28:46 +0200
Subject: [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE

PHPBB3-8616
---
 phpBB/includes/functions_privmsgs.php      | 2 +-
 phpBB/language/en/email/privmsg_notify.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index a857109466..b34b742d57 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1688,7 +1688,7 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_INBOX'		=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
+			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
 		);
 
 		$messenger->send($addr['method']);
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index d363df7973..d3a86cc73c 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -8,7 +8,7 @@ You have received a new private message from "{AUTHOR_NAME}" to your account on
 
 You can view your new message by clicking on the following link:
 
-{U_INBOX}
+{U_VIEW_MESSAGE}
 
 You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
 
-- 
cgit v1.2.1


From 3ad5c45097d23056d4eb21ba63cb70f595839b44 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 13 Oct 2011 21:11:58 +0200
Subject: [ticket/10187] XHTML fix for empty groups in UCP.

PHPBB3-10187
---
 phpBB/styles/prosilver/template/ucp_groups_manage.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index bce31431cb..87b548c23b 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -143,8 +143,15 @@
 			</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
+		<table class="table1" cellspacing="1">
+		<thead>
 		<tr>
-			<td class="bg1" colspan="5">{L_GROUPS_NO_MEMBERS}</td>
+			<th class="name">{L_MEMBERS}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<tr>
+			<td class="bg1">{L_GROUPS_NO_MEMBERS}</td>
 		</tr>
 	<!-- END member -->
 	</tbody>
-- 
cgit v1.2.1


From 1f677d5de37d7d4e47edf040130424f73b7c86d4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 02:41:37 +0200
Subject: [ticket/10074] Change default value of 'Set as special rank' to No

PHPBB3-10074
---
 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 fcfef2a61e..dfd7511427 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -199,7 +199,7 @@ class acp_ranks
 					'RANK_TITLE'		=> (isset($ranks['rank_title'])) ? $ranks['rank_title'] : '',
 					'S_FILENAME_LIST'	=> $filename_list,
 					'RANK_IMAGE'		=> ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : $phpbb_admin_path . 'images/spacer.gif',
-					'S_SPECIAL_RANK'	=> (!isset($ranks['rank_special']) || $ranks['rank_special']) ? true : false,
+					'S_SPECIAL_RANK'	=> (isset($ranks['rank_special']) && $ranks['rank_special']) ? true : false,
 					'MIN_POSTS'			=> (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0)
 				);
 						
-- 
cgit v1.2.1


From 7fa14e654ad8880613897b45f5effb287d3bfd2d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 03:12:44 +0200
Subject: [ticket/10413] Make create_schema_files usable

PHPBB3-10413
---
 phpBB/develop/create_schema_files.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index efe8837b26..9649997412 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -12,11 +12,7 @@
 * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
 */
 
-die("Please read the first lines of this script for instructions on how to enable it");
-
-@set_time_limit(0);
-
-$schema_path = './../install/schemas/';
+$schema_path = dirname(__FILE__).'/../install/schemas/';
 
 if (!is_writable($schema_path))
 {
@@ -242,7 +238,7 @@ $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', '
 
 foreach ($supported_dbms as $dbms)
 {
-	$fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt');
+	$fp = fopen($schema_path . '' . $dbms . '_schema.sql', 'wt');
 
 	$line = '';
 
-- 
cgit v1.2.1


From 8cf22f552935417911306cb2830d7522791c9098 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 03:41:02 +0200
Subject: [ticket/10189] Add "automatically generated" comment into
 schema-files

PHPBB3-10189
---
 phpBB/develop/create_schema_files.php     | 26 ++++++++++++++++++++++++++
 phpBB/install/schemas/firebird_schema.sql |  5 +++++
 phpBB/install/schemas/mssql_schema.sql    |  8 ++++++++
 phpBB/install/schemas/mysql_40_schema.sql |  5 +++++
 phpBB/install/schemas/mysql_41_schema.sql |  5 +++++
 phpBB/install/schemas/oracle_schema.sql   |  8 ++++++++
 phpBB/install/schemas/postgres_schema.sql |  8 ++++++++
 phpBB/install/schemas/sqlite_schema.sql   |  5 +++++
 8 files changed, 70 insertions(+)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index efe8837b26..05acf7177d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -246,6 +246,32 @@ foreach ($supported_dbms as $dbms)
 
 	$line = '';
 
+	switch ($dbms)
+	{
+		case 'mysql_40':
+		case 'mysql_41':
+		case 'firebird':
+		case 'sqlite':
+			fwrite($fp, "# DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+			fwrite($fp, "#\n");
+			fwrite($fp, "# To change the contents of this file, edit\n");
+			fwrite($fp, "# phpBB/develop/create_schema_files.php and\n");
+			fwrite($fp, "# run it.\n");
+		break;
+
+		case 'mssql':
+		case 'oracle':
+		case 'postgres':
+			fwrite($fp, "/*\n");
+			fwrite($fp, " * DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+			fwrite($fp, " *\n");
+			fwrite($fp, " * To change the contents of this file, edit\n");
+			fwrite($fp, " * phpBB/develop/create_schema_files.php and\n");
+			fwrite($fp, " * run it.\n");
+			fwrite($fp, " */\n\n");
+		break;
+	}
+
 	// Write Header
 	switch ($dbms)
 	{
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 40041b13cb..852c62705e 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index c4fc2d4eec..bcdb0dc236 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 06d32166f3..f0357afc23 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 1db2790ec7..97fe33dbdd 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 783261e365..d879da4048 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index cf655cb1c7..f532492c2c 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -1,3 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE, IT IS GENERATED
+ *
+ * To change the contents of this file, edit
+ * phpBB/develop/create_schema_files.php and
+ * run it.
+ */
+
 /*
 
  $Id: $
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index dae1eb839c..5557e0a0b2 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -1,3 +1,8 @@
+# DO NOT EDIT THIS FILE, IT IS GENERATED
+#
+# To change the contents of this file, edit
+# phpBB/develop/create_schema_files.php and
+# run it.
 #
 # $Id: $
 #
-- 
cgit v1.2.1


From 768932a3f2c3218925d564ebfdfca902fc2922e1 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 14 Oct 2011 03:41:52 +0200
Subject: [ticket/10212] Return a CAPTCHA on incorrect username for ip limited
 users too

PHPBB3-10212
---
 phpBB/includes/auth/auth_db.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index 6ca69d9174..c20196d019 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -107,6 +107,15 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 
 	if (!$row)
 	{
+		if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max'])
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_ATTEMPTS,
+				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
 		return array(
 			'status'	=> LOGIN_ERROR_USERNAME,
 			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
@@ -264,4 +273,4 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
 	);
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From ab8ecf5b92e5e2ac5bcc63e5c576a04948dd19b5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 04:18:44 +0200
Subject: [ticket/9956] Display error message if no disapprove reason given

PHPBB3-9956
---
 phpBB/includes/mcp/mcp_queue.php                 | 3 +++
 phpBB/styles/prosilver/template/mcp_approve.html | 2 +-
 phpBB/styles/prosilver/template/mcp_post.html    | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index c419da5574..764461fa53 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -216,6 +216,7 @@ class mcp_queue
 					'POST_IP'				=> $post_info['poster_ip'],
 					'POST_IPADDR'			=> ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '',
 					'POST_ID'				=> $post_info['post_id'],
+					'S_FIRST_POST'			=> ($post_info['topic_first_post_id'] == $post_id),
 
 					'U_LOOKUP_IP'			=> ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id . '&amp;lookup=' . $post_info['poster_ip']) . '#ip' : '',
 				));
@@ -778,6 +779,8 @@ function disapprove_post($post_id_list, $id, $mode)
 		if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
 		{
 			$additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
+			unset($_REQUEST['confirm_key']);
+			unset($_POST['confirm_key']);
 			unset($_POST['confirm']);
 		}
 		else
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
index 329205e2a2..185dd49c1b 100644
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ b/phpBB/styles/prosilver/template/mcp_approve.html
@@ -8,7 +8,7 @@
 	<div class="content">
 
 		<h2>{MESSAGE_TITLE}</h2>
-		<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
+		<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
 
 		<fieldset>
 		<!-- IF S_NOTIFY_POSTER -->
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 9d4997e576..f8403ffccd 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -74,6 +74,7 @@
 			<p class="rules">
 				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
 				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 				{S_FORM_TOKEN}
 			</p>
-- 
cgit v1.2.1


From c3f3435228accc44e2fd8d358c21b81f8ec66d87 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 04:29:28 +0200
Subject: [ticket/10189] Get rid of $id$ from schema files

PHPBB3-10189
---
 phpBB/develop/create_schema_files.php     | 17 +----------------
 phpBB/install/schemas/firebird_schema.sql |  4 ----
 phpBB/install/schemas/mssql_schema.sql    |  6 ------
 phpBB/install/schemas/mysql_40_schema.sql |  4 ----
 phpBB/install/schemas/mysql_41_schema.sql |  4 ----
 phpBB/install/schemas/oracle_schema.sql   |  6 ------
 phpBB/install/schemas/postgres_schema.sql |  6 ------
 phpBB/install/schemas/sqlite_schema.sql   |  4 ----
 8 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 05acf7177d..9ce5f72922 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -246,6 +246,7 @@ foreach ($supported_dbms as $dbms)
 
 	$line = '';
 
+	// Write Header
 	switch ($dbms)
 	{
 		case 'mysql_40':
@@ -272,37 +273,21 @@ foreach ($supported_dbms as $dbms)
 		break;
 	}
 
-	// Write Header
 	switch ($dbms)
 	{
-		case 'mysql_40':
-		case 'mysql_41':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
-		break;
-
 		case 'firebird':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= custom_data('firebird') . "\n";
 		break;
 
 		case 'sqlite':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= "BEGIN TRANSACTION;\n\n";
 		break;
 
-		case 'mssql':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
-			// no need to do this, no transaction support for schema changes
-			//$line .= "BEGIN TRANSACTION\nGO\n\n";
-		break;
-
 		case 'oracle':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= custom_data('oracle') . "\n";
 		break;
 
 		case 'postgres':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= "BEGIN;\n\n";
 			$line .= custom_data('postgres') . "\n";
 		break;
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 852c62705e..73052f0a22 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index bcdb0dc236..8ed3ba7e12 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 /*
 	Table: 'phpbb_attachments'
 */
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index f0357afc23..42b7291d9d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
 	attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 97fe33dbdd..7a6d0ae188 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 # Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
 	attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index d879da4048..6e7ec31efc 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 /*
   This first section is optional, however its probably the best method
   of running phpBB on Oracle. If you already have a tablespace and user created
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index f532492c2c..38f167bc7b 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -6,12 +6,6 @@
  * run it.
  */
 
-/*
-
- $Id: $
-
-*/
-
 BEGIN;
 
 /*
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 5557e0a0b2..c0574244ca 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -3,10 +3,6 @@
 # To change the contents of this file, edit
 # phpBB/develop/create_schema_files.php and
 # run it.
-#
-# $Id: $
-#
-
 BEGIN TRANSACTION;
 
 # Table: 'phpbb_attachments'
-- 
cgit v1.2.1


From d86fccf9c909602c37ec97577a19dc442e22206b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Oct 2011 04:29:53 +0200
Subject: [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for
 MySQL.

* CREATE INDEX is internally mapped to an ALTER INDEX statement.
* CREATE INDEX requires the INDEX permission.
* ALTER TABLE requires the (more powerful) ALTER permission.
* We require the ALTER permission anyway for operation.
* Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX
  permission which is good because some management software does not give
  out the INDEX permission by default.

http://dev.mysql.com/doc/refman/5.0/en/create-index.html

PHPBB3-10327
---
 phpBB/includes/db/db_tools.php |  2 +-
 tests/dbal/db_tools_test.php   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 10ca6c0a1f..0d8cf7fdab 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2145,7 +2145,7 @@ class phpbb_db_tools
 				}
 			// no break
 			case 'mysql_41':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
 			break;
 
 			case 'mssql':
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 753cc08fc5..927bce4597 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -333,4 +333,22 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			),
 		));
 	}
+
+	public function test_index_exists()
+	{
+		$db_tools = new phpbb_db_tools($this->db);
+
+		$this->assertTrue($db_tools->sql_index_exists('prefix_table_name', 'i_simple'));
+	}
+
+	public function test_create_index_against_index_exists()
+	{
+		$db_tools = new phpbb_db_tools($this->db);
+
+		$table_name = 'prefix_table_name';
+		$index_name = 'fookey';
+
+		$db_tools->sql_create_index($table_name, $index_name, array('c_timestamp', 'c_decimal'));
+		$this->assertTrue($db_tools->sql_index_exists($table_name, $index_name));
+	}
 }
-- 
cgit v1.2.1


From e40abfbde9f83c3c2c24a456fc7fe4765766859f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 15:19:47 +0200
Subject: [ticket/9525] Minimum post length 0 is accepted but not working.

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

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index d8ab42ed2d..3ed5f40368 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -188,7 +188,7 @@ class acp_board
 						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'text:3:4', 'explain' => true),
 						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'text:4:4', 'explain' => false),
 						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:6', 'explain' => true),
-						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:0',		'type' => 'text:4:6', 'explain' => true),
+						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'text:4:6', 'explain' => true),
 						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:4', 'explain' => true),
 						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true),
 						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5a9ca6231d..6e6d4302cd 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -174,7 +174,7 @@ $lang = array_merge($lang, array(
 	'MAX_POST_URLS'					=> 'Maximum links per post',
 	'MAX_POST_URLS_EXPLAIN'			=> 'Maximum number of URLs in a post. Set to 0 for unlimited links.',
 	'MIN_CHAR_LIMIT'				=> 'Minimum characters per post/message',
-	'MIN_CHAR_LIMIT_EXPLAIN'		=> 'The minimum number of characters the user need to enter within a post/private message.',
+	'MIN_CHAR_LIMIT_EXPLAIN'		=> 'The minimum number of characters the user need to enter within a post/private message. The minimum for this setting is 1.',
 	'POSTING'						=> 'Posting',
 	'POSTS_PER_PAGE'				=> 'Posts per page',
 	'QUOTE_DEPTH_LIMIT'				=> 'Maximum nesting depth for quotes',
-- 
cgit v1.2.1


From 234edf674cd1c2ed3611f69cd925c4d5e29fdc20 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Oct 2011 15:25:15 +0200
Subject: [ticket/8240] Add ability to get a list of tables to db_tools.

PHPBB3-8240
---
 phpBB/includes/db/db_tools.php       | 60 ++++++++++++++++++++++++++++++++++++
 phpBB/includes/functions_install.php | 57 +++++-----------------------------
 tests/dbal/db_tools_test.php         |  7 +++++
 3 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 0d8cf7fdab..7c3d673869 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -347,6 +347,66 @@ class phpbb_db_tools
 		}
 	}
 
+	/**
+	* Gets a list of tables in the database.
+	*
+	* @return array		Array of table names  (all lower case)
+	*/
+	function sql_list_tables()
+	{
+		switch ($this->db->sql_layer)
+		{
+			case 'mysql':
+			case 'mysql4':
+			case 'mysqli':
+				$sql = 'SHOW TABLES';
+			break;
+
+			case 'sqlite':
+				$sql = 'SELECT name
+					FROM sqlite_master
+					WHERE type = "table"';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+			case 'mssqlnative':
+				$sql = "SELECT name
+					FROM sysobjects
+					WHERE type='U'";
+			break;
+
+			case 'postgres':
+				$sql = 'SELECT relname
+					FROM pg_stat_user_tables';
+			break;
+
+			case 'firebird':
+				$sql = 'SELECT rdb$relation_name
+					FROM rdb$relations
+					WHERE rdb$view_source is null
+						AND rdb$system_flag = 0';
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT table_name
+					FROM USER_TABLES';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+
+		$tables = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$name = current($row);
+			$tables[$name] = $name;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $tables;
+	}
+
 	/**
 	* Check if table exists
 	*
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 992e8d6bb0..2c640e0999 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -211,61 +211,20 @@ function dbms_select($default = '', $only_20x_options = false)
 
 /**
 * Get tables of a database
+*
+* @deprecated
 */
-function get_tables($db)
+function get_tables(&$db)
 {
-	switch ($db->sql_layer)
-	{
-		case 'mysql':
-		case 'mysql4':
-		case 'mysqli':
-			$sql = 'SHOW TABLES';
-		break;
-
-		case 'sqlite':
-			$sql = 'SELECT name
-				FROM sqlite_master
-				WHERE type = "table"';
-		break;
-
-		case 'mssql':
-		case 'mssql_odbc':
-		case 'mssqlnative':
-			$sql = "SELECT name
-				FROM sysobjects
-				WHERE type='U'";
-		break;
-
-		case 'postgres':
-			$sql = 'SELECT relname
-				FROM pg_stat_user_tables';
-		break;
-
-		case 'firebird':
-			$sql = 'SELECT rdb$relation_name
-				FROM rdb$relations
-				WHERE rdb$view_source is null
-					AND rdb$system_flag = 0';
-		break;
-
-		case 'oracle':
-			$sql = 'SELECT table_name
-				FROM USER_TABLES';
-		break;
-	}
-
-	$result = $db->sql_query($sql);
-
-	$tables = array();
-
-	while ($row = $db->sql_fetchrow($result))
+	if (!class_exists('phpbb_db_tools'))
 	{
-		$tables[] = current($row);
+		global $phpbb_root_path, $phpEx;
+		require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
 	}
 
-	$db->sql_freeresult($result);
+	$db_tools = new phpbb_db_tools($db);
 
-	return $tables;
+	return $db_tools->sql_list_tables();
 }
 
 /**
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 927bce4597..130fc451f9 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -258,6 +258,13 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
 	}
 
+	public function test_list_tables()
+	{
+		$tables = $this->tools->sql_list_tables();
+		$this->assertTrue(isset($tables['prefix_table_name']));
+		$this->assertFalse(isset($tables['prefix_does_not_exist']));
+	}
+
 	public function test_table_exists()
 	{
 		$this->assertTrue($this->tools->sql_table_exists('prefix_table_name'));
-- 
cgit v1.2.1


From 4effe8fb8bdf493e539b7bf883fbf1e290bf7ab2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Oct 2011 16:29:33 +0200
Subject: [ticket/8240] Add ability to get a list of columns of a tables to
 db_tools.

PHPBB3-8240
---
 phpBB/includes/db/db_tools.php | 111 ++++++++++++++---------------------------
 tests/dbal/db_tools_test.php   |   8 +++
 2 files changed, 45 insertions(+), 74 deletions(-)

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 7c3d673869..317b8c6083 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1071,34 +1071,21 @@ class phpbb_db_tools
 	}
 
 	/**
-	* Check if a specified column exist
+	* Gets a list of columns of a table.
 	*
-	* @param string	$table			Table to check the column at
-	* @param string	$column_name	The column to check
+	* @param string $table		Table name
 	*
-	* @return bool True if column exists, else false
+	* @return array				Array of column names (all lower case)
 	*/
-	function sql_column_exists($table, $column_name)
+	function sql_list_columns($table)
 	{
+		$columns = array();
+
 		switch ($this->sql_layer)
 		{
 			case 'mysql_40':
 			case 'mysql_41':
-
 				$sql = "SHOW COLUMNS FROM $table";
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['Field']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
 			break;
 
 			// PostgreSQL has a way of doing this in a much simpler way but would
@@ -1109,19 +1096,6 @@ class phpbb_db_tools
 					WHERE c.relname = '{$table}'
 						AND a.attnum > 0
 						AND a.attrelid = c.oid";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['attname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-
-				return false;
 			break;
 
 			// same deal with PostgreSQL, we must perform more complex operations than
@@ -1132,62 +1106,26 @@ class phpbb_db_tools
 					FROM syscolumns c
 					LEFT JOIN sysobjects o ON c.id = o.id
 					WHERE o.name = '{$table}'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
 			break;
 
 			case 'oracle':
 				$sql = "SELECT column_name
 					FROM user_tab_columns
 					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['column_name']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
 			break;
 
 			case 'firebird':
 				$sql = "SELECT RDB\$FIELD_NAME as FNAME
 					FROM RDB\$RELATION_FIELDS
 					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// lower case just in case
-					if (strtolower($row['fname']) == $column_name)
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-				$this->db->sql_freeresult($result);
-				return false;
 			break;
 
-			// ugh, SQLite
 			case 'sqlite':
 				$sql = "SELECT sql
 					FROM sqlite_master
 					WHERE type = 'table'
 						AND name = '{$table}'";
+
 				$result = $this->db->sql_query($sql);
 
 				if (!$result)
@@ -1211,14 +1149,39 @@ class phpbb_db_tools
 						continue;
 					}
 
-					if (strtolower($entities[0]) == $column_name)
-					{
-						return true;
-					}
+					$column = strtolower($entities[0]);
+					$columns[$column] = $column;
 				}
-				return false;
+
+				return $columns;
 			break;
 		}
+
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$column = strtolower(current($row));
+			$columns[$column] = $column;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $columns;
+	}
+
+	/**
+	* Check whether a specified column exist in a table
+	*
+	* @param string	$table			Table to check
+	* @param string	$column_name	Column to check
+	*
+	* @return bool		True if column exists, false otherwise
+	*/
+	function sql_column_exists($table, $column_name)
+	{
+		$columns = $this->sql_list_columns($table);
+
+		return isset($columns[$column_name]);
 	}
 
 	/**
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 130fc451f9..b34b471e5c 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -234,6 +234,14 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertEquals($row2, $row_actual);
 	}
 
+	public function test_list_columns()
+	{
+		$this->assertEquals(
+			array_keys($this->table_data['COLUMNS']),
+			array_values($this->tools->sql_list_columns('prefix_table_name'))
+		);
+	}
+
 	public function test_column_exists()
 	{
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
-- 
cgit v1.2.1


From 7e18d2b861826f399805656143fbdb940f302221 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Oct 2011 17:18:25 +0200
Subject: [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.

PHPBB3-10327
---
 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 0d8cf7fdab..392a827cb7 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -2092,7 +2092,7 @@ class phpbb_db_tools
 
 			case 'mysql_40':
 			case 'mysql_41':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX (' . implode(', ', $column) . ')';
 			break;
 
 			case 'mssql':
-- 
cgit v1.2.1


From 607761e8303f456929e4755d8fabb69d9d16561a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Oct 2011 17:20:51 +0200
Subject: [ticket/10327] Use $this->tools instead of creating a new instance of
 db_tools.

PHPBB3-10327
---
 tests/dbal/db_tools_test.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 927bce4597..daf464d600 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -336,19 +336,12 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_index_exists()
 	{
-		$db_tools = new phpbb_db_tools($this->db);
-
-		$this->assertTrue($db_tools->sql_index_exists('prefix_table_name', 'i_simple'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
 	}
 
 	public function test_create_index_against_index_exists()
 	{
-		$db_tools = new phpbb_db_tools($this->db);
-
-		$table_name = 'prefix_table_name';
-		$index_name = 'fookey';
-
-		$db_tools->sql_create_index($table_name, $index_name, array('c_timestamp', 'c_decimal'));
-		$this->assertTrue($db_tools->sql_index_exists($table_name, $index_name));
+		$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'));
 	}
 }
-- 
cgit v1.2.1


From 27279afa1ed75457e6e0d32c982bf9458f048f30 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 17:30:54 +0200
Subject: [ticket/10377] Do not allow all moderators to sticky posts

In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
---
 phpBB/includes/mcp/mcp_main.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index ad10a52705..ffede11d37 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -286,14 +286,6 @@ function change_topic_type($action, $topic_ids)
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path;
 
-	// For changing topic types, we only allow operations in one forum.
-	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('f_announce', 'f_sticky', 'm_'), true);
-
-	if ($forum_id === false)
-	{
-		return;
-	}
-
 	switch ($action)
 	{
 		case 'make_announce':
@@ -316,11 +308,18 @@ function change_topic_type($action, $topic_ids)
 
 		default:
 			$new_topic_type = POST_NORMAL;
-			$check_acl = '';
+			$check_acl = false;
 			$l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_NORMAL' : 'MCP_MAKE_NORMALS';
 		break;
 	}
 
+	$forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', $check_acl, true);
+
+	if ($forum_id === false)
+	{
+		return;
+	}
+
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
 
 	$s_hidden_fields = array(
-- 
cgit v1.2.1


From 8d33dea2cdc68473fbcf3c45ac8bdbe8fd185054 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 16 Oct 2011 19:30:33 +0200
Subject: [ticket/10413] Fix CS

PHPBB3-10413
---
 phpBB/develop/create_schema_files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 9649997412..1ba03707d0 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -12,7 +12,7 @@
 * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
 */
 
-$schema_path = dirname(__FILE__).'/../install/schemas/';
+$schema_path = dirname(__FILE__) . '/../install/schemas/';
 
 if (!is_writable($schema_path))
 {
@@ -238,7 +238,7 @@ $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', '
 
 foreach ($supported_dbms as $dbms)
 {
-	$fp = fopen($schema_path . '' . $dbms . '_schema.sql', 'wt');
+	$fp = fopen($schema_path . $dbms . '_schema.sql', 'wt');
 
 	$line = '';
 
-- 
cgit v1.2.1


From fa1d9a4571ac208bbc9379b9e4e3a9a5ae07f0f1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 16 Oct 2011 20:06:08 +0200
Subject: [ticket/10416] Pass dbport to PDO object in
 ...connection_manager::connect().

PHPBB3-10416
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index a7559e2183..68e09add94 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -69,6 +69,11 @@ class phpbb_database_test_connection_manager
 			default:
 				$dsn .= 'host=' . $this->config['dbhost'];
 
+				if ($this->config['dbport'])
+				{
+					$dsn .= ';port=' . $this->config['dbport'];
+				}
+
 				if ($use_db)
 				{
 					$dsn .= ';dbname=' . $this->config['dbname'];
-- 
cgit v1.2.1


From 8f6cfc77d21313c05cf1f7a5c94caee4bd861628 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 17 Oct 2011 19:10:41 +0200
Subject: [ticket/10259] Do not send notifications to user accounts joining
 free groups.

It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
---
 phpBB/includes/ucp/ucp_groups.php | 52 ++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 1c055a4823..d62dbb1866 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -193,47 +193,43 @@ class ucp_groups
 								if ($group_row[$group_id]['group_type'] == GROUP_FREE)
 								{
 									group_user_add($group_id, $user->data['user_id']);
-
-									$email_template = 'group_added';
 								}
 								else
 								{
 									group_user_add($group_id, $user->data['user_id'], false, false, false, 0, 1);
 
-									$email_template = 'group_request';
-								}
+									include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+									$messenger = new messenger();
 
-								include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-								$messenger = new messenger();
+									$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang
+										FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . " u
+										WHERE ug.user_id = u.user_id
+											AND ug.group_leader = 1
+											AND ug.group_id = $group_id";
+									$result = $db->sql_query($sql);
 
-								$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang
-									FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
-									WHERE ug.user_id = u.user_id
-										AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? "ug.user_id = {$user->data['user_id']}" : 'ug.group_leader = 1') . "
-										AND ug.group_id = $group_id";
-								$result = $db->sql_query($sql);
+									while ($row = $db->sql_fetchrow($result))
+									{
+										$messenger->template('group_request', $row['user_lang']);
 
-								while ($row = $db->sql_fetchrow($result))
-								{
-									$messenger->template($email_template, $row['user_lang']);
+										$messenger->to($row['user_email'], $row['username']);
+										$messenger->im($row['user_jabber'], $row['username']);
 
-									$messenger->to($row['user_email'], $row['username']);
-									$messenger->im($row['user_jabber'], $row['username']);
+										$messenger->assign_vars(array(
+											'USERNAME'			=> htmlspecialchars_decode($row['username']),
+											'GROUP_NAME'		=> htmlspecialchars_decode($group_row[$group_id]['group_name']),
+											'REQUEST_USERNAME'	=> $user->data['username'],
 
-									$messenger->assign_vars(array(
-										'USERNAME'			=> htmlspecialchars_decode($row['username']),
-										'GROUP_NAME'		=> htmlspecialchars_decode($group_row[$group_id]['group_name']),
-										'REQUEST_USERNAME'	=> $user->data['username'],
+											'U_PENDING'		=> generate_board_url() . "/ucp.$phpEx?i=groups&mode=manage&action=list&g=$group_id",
+											'U_GROUP'		=> generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id")
+										);
 
-										'U_PENDING'		=> generate_board_url() . "/ucp.$phpEx?i=groups&mode=manage&action=list&g=$group_id",
-										'U_GROUP'		=> generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id")
-									);
+										$messenger->send($row['user_notify_type']);
+									}
+									$db->sql_freeresult($result);
 
-									$messenger->send($row['user_notify_type']);
+									$messenger->save_queue();
 								}
-								$db->sql_freeresult($result);
-
-								$messenger->save_queue();
 
 								add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']);
 
-- 
cgit v1.2.1


From 88b31c2ab3f2fe1e88920b3d3b022ee1355321f7 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 18 Oct 2011 01:54:17 +0800
Subject: [ticket/10419] Add mbstring PHP ini parameters checks to ACP

PHPBB3-10419
---
 phpBB/adm/style/acp_main.html    | 30 ++++++++++++++++++++++++++++++
 phpBB/includes/acp/acp_main.php  | 11 +++++++++++
 phpBB/language/en/acp/common.php | 10 ++++++++++
 3 files changed, 51 insertions(+)

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 7d3b6945ac..c665c9d893 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -34,6 +34,36 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- IF S_MBSTRING_LOADED -->
+		<!-- IF S_MBSTRING_FUNC_OVERLOAD_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_FUNC_OVERLOAD}</h3>
+				<p>{L_ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_ENCODING_TRANSLATION_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_ENCODING_TRANSLATION}</h3>
+				<p>{L_ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_HTTP_INPUT_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_HTTP_INPUT}</h3>
+				<p>{L_ERROR_MBSTRING_HTTP_INPUT_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+
+		<!-- IF S_MBSTRING_HTTP_OUTPUT_FAIL -->
+			<div class="errorbox">
+				<h3>{L_ERROR_MBSTRING_HTTP_OUTPUT}</h3>
+				<p>{L_ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN}</p>
+			</div>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+
 	<!-- IF S_WRITABLE_CONFIG -->
 		<div class="errorbox notice">
 			<p>{L_WRITABLE_CONFIG}</p>
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 6d1c02248a..e31acfb7d1 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -600,6 +600,17 @@ class acp_main
 			$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002));
 		}
 
+		if (@extension_loaded('mbstring'))
+		{
+			$template->assign_vars(array(
+				'S_MBSTRING_LOADED'						=> true,
+				'S_MBSTRING_FUNC_OVERLOAD_FAIL'			=> (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING)),
+				'S_MBSTRING_ENCODING_TRANSLATION_FAIL'	=> (@ini_get('mbstring.encoding_translation') != 0),
+				'S_MBSTRING_HTTP_INPUT_FAIL'			=> (@ini_get('mbstring.http_input') != 'pass'),
+				'S_MBSTRING_HTTP_OUTPUT_FAIL'			=> (@ini_get('mbstring.http_output') != 'pass'))
+			);
+		}
+
 		// Fill dbms version if not yet filled
 		if (empty($config['dbms_version']))
 		{
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 8c71e936b3..a8cfaf8aa8 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -327,6 +327,16 @@ $lang = array_merge($lang, array(
 	'DATABASE_SERVER_INFO'	=> 'Database server',
 	'DATABASE_SIZE'			=> 'Database size',
 
+	// Enviroment configuration checks, mbstring related
+	'ERROR_MBSTRING_FUNC_OVERLOAD'					=> 'Functions overloading setting failed',
+	'ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN'			=> '<var>mbstring.func_overload</var> must be set to either 0 or 4. You can check current value on <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding setting failed',
+	'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.  You can check current value on <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_HTTP_INPUT'						=> 'HTTP input character conversion setting failed',
+	'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN'				=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion setting failed',
+	'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
+
 	'FILES_PER_DAY'		=> 'Attachments per day',
 	'FORUM_STATS'		=> 'Board statistics',
 
-- 
cgit v1.2.1


From c8399b8e30769bcc34feaee4df8f4dfddaa9576f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 18 Oct 2011 21:37:51 +0300
Subject: [ticket/10422] Invalid "if" in viewtopic_body.html

Fixing incorrect "IF" in viewtopic_body.html

PHPBB3-10422
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 32292f89ef..57de96d853 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -4,13 +4,10 @@
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
 
-<!-- IF MODERATORS or U_MCP -->
-	<p>
-		<!-- IF MODERATORS -->
-			<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}
-		<!-- ENDIF -->
-
-	</p>
+<!-- IF MODERATORS -->
+<p>
+	<strong><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->:</strong> {MODERATORS}
+</p>
 <!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
-- 
cgit v1.2.1


From cd184e49125e70fbce40897ef3e4eec8665de12f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 18 Oct 2011 21:16:42 +0200
Subject: [ticket/10420] Update includes/startup.php for PHP 5.4.

PHP 5.4 dropped support for register globals and magic quotes.

Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an
E_CORE_ERROR error.

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

diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index ca9665da29..bbe2f127f1 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -97,8 +97,8 @@ function deregister_globals()
 	unset($input);
 }
 
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
+// Register globals and magic quotes have been dropped in PHP 5.4
+if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
 {
 	/**
 	* @ignore
-- 
cgit v1.2.1


From ba1464b6e039f558b751c0631f8b5fd2c6c23a3e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 18 Oct 2011 21:25:27 +0200
Subject: [ticket/10421] Correct parameter order for phpbb_check_hash() in
 acp_users.php

PHPBB3-10421
---
 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 789003e31b..abf1481000 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -818,7 +818,7 @@ class acp_users
 
 					// Which updates do we need to do?
 					$update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false;
-					$update_password = ($data['new_password'] && !phpbb_check_hash($user_row['user_password'], $data['new_password'])) ? true : false;
+					$update_password = ($data['new_password'] && !phpbb_check_hash($data['new_password'], $user_row['user_password'])) ? true : false;
 					$update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false;
 
 					if (!sizeof($error))
-- 
cgit v1.2.1


From 87953628798c819c1436228f213d8528b89586cd Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 22 Oct 2011 23:00:59 +0100
Subject: [ticket/10402] Fixed a formatting issue with report details.

Line returns were being removed and links weren't being made clickable.
This commit adds a line (contributed by AmigoJack) to retain the link
breaks and make links clickable.

PHPBB3-10402
---
 phpBB/includes/mcp/mcp_reports.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 39d9fbd4af..def5422be2 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -148,6 +148,7 @@ class mcp_reports
 
 				$message = bbcode_nl2br($message);
 				$message = smiley_text($message);
+				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 				{
-- 
cgit v1.2.1


From 8b99f04943673805a53fbea02d40faa98b0766d6 Mon Sep 17 00:00:00 2001
From: dellsystem <ilostwaldo@gmail.com>
Date: Thu, 27 Oct 2011 21:43:01 -0400
Subject: [ticket/10430] Fix typos/etc in coding guidelines

Mainly minor changes to correct errors and improve readability.

* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all

PHPBB3-10430
---
 phpBB/docs/coding-guidelines.html | 42 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index da7a3bf582..7d51b26dca 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -462,12 +462,12 @@ do_stuff($str);
 $post_url = $phpbb_root_path . 'posting.' . $phpEx . '?mode=' . $mode . '&amp;amp;start=' . $start;
 	</pre></div>
 
-	<p class="good">// Double quotes are sometimes needed to not overcroud the line with concentinations</p>
+	<p class="good">// Double quotes are sometimes needed to not overcrowd the line with concatenations.</p>
 	<div class="codebox"><pre>
 $post_url = "{$phpbb_root_path}posting.$phpEx?mode=$mode&amp;amp;start=$start";
 	</pre></div>
 
-	<p>In SQL Statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL Formatting), else it should be tryed to only use one method - mostly single quotes.</p>
+	<p>In SQL statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL formatting), else one should try to only use one method - mostly single quotes.</p>
 
 	<h4>Associative array keys:</h4>
 	<p>In PHP, it's legal to use a literal string as a key to an associative array without quoting that string. We don't want to do this -- the string should always be quoted to avoid confusion. Note that this is only when we're using a literal, not when we're using a variable, examples:</p>
@@ -496,7 +496,7 @@ $foo = $assoc_array[$var];
 	<p>Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.<br /><br />Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.<br /><br />Avoid using <code>/* */</code> comment blocks for one-line comments, <code>//</code> should be used for one/two-liners.</p>
 
 	<h4>Magic numbers:</h4>
-	<p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not have a very close eye to it).</p>
+	<p>Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants <code>true</code> and <code>false</code> should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not keep a very close eye on it).</p>
 
 	<h4>Shortcut operators:</h4>
 	<p>The only shortcut operators that cause readability problems are the shortcut increment <code>$i++</code> and decrement <code>$j--</code> operators. These operators should not be used as part of an expression. They can, however, be used on their own line. Using them in expressions is just not worth the headaches when debugging, examples:</p>
@@ -665,7 +665,7 @@ $sql = 'SELECT *
 	</pre></div>
 
 	<h4>SQL Quotes: </h4>
-	<p>Double quotes where applicable (The variables in these examples are typecasted to integers before) ... examples: </p>
+	<p>Use double quotes where applicable. (The variables in these examples are typecasted to integers beforehand.) Examples: </p>
 
 	<p class="bad">// These are wrong.</p>
 	<div class="codebox"><pre>
@@ -826,7 +826,7 @@ SELECT FROM phpbb_forums WHERE forum_id <strong>&lt;&gt;</strong> 1
 
 	<h4>sql_build_query():</h4>
 
-	<p>The <code>$db-&gt;sql_build_query()</code> function is responsible for building sql statements for select and select distinct queries if you need to JOIN on more than one table or retrieving data from more than one table while doing a JOIN. This needs to be used to make sure the resulting statement is working on all supported db's. Instead of explaining every possible combination, i will give a short example:</p>
+	<p>The <code>$db-&gt;sql_build_query()</code> function is responsible for building sql statements for SELECT and SELECT DISTINCT queries if you need to JOIN on more than one table or retrieve data from more than one table while doing a JOIN. This needs to be used to make sure the resulting statement is working on all supported db's. Instead of explaining every possible combination, I will give a short example:</p>
 
 	<div class="codebox"><pre>
 $sql_array = array(
@@ -911,7 +911,7 @@ for ($i = 0, $size = sizeof($post_data); $i &lt; $size; $i++)
 	</pre></div>
 
 	<h4>Use of in_array(): </h4>
-	<p>Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticable, but if checked against a huge array within a loop those checks alone can be a bunch of seconds. If you need this functionality, try using isset() on the arrays keys instead, actually shifting the values into keys and vice versa. A call to <code>isset($array[$var])</code> is a lot faster than <code>in_array($var, array_keys($array))</code> for example.</p>
+	<p>Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticeable, but if checked against a huge array within a loop those checks alone can take several seconds. If you need this functionality, try using isset() on the arrays keys instead, actually shifting the values into keys and vice versa. A call to <code>isset($array[$var])</code> is a lot faster than <code>in_array($var, array_keys($array))</code> for example.</p>
 
 
 	<a name="general"></a><h3>2.v. General Guidelines</h3>
@@ -924,7 +924,7 @@ for ($i = 0, $size = sizeof($post_data); $i &lt; $size; $i++)
 	<p>No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to).</p>
 
 	<h4>Variables: </h4>
-	<p>Make use of the <code>request_var()</code> function for anything except for submit or single checking params. </p>
+	<p>Make use of the <code>request_var()</code> function for anything except for submit or single checking params.</p>
 	<p>The request_var function determines the type to set from the second parameter (which determines the default value too). If you need to get a scalar variable type, you need to tell this the request_var function explicitly. Examples:</p>
 
 	<p class="bad">// Old method, do not use it</p>
@@ -991,7 +991,7 @@ $user-&gt;setup();
 	<p>The <code>$user-&gt;setup()</code> call can be used to pass on additional language definition and a custom style (used in viewforum).</p>
 
 	<h4>Errors and messages: </h4>
-	<p>All messages/errors should be outputed by calling <code>trigger_error()</code> using the appropriate message type and language string. Example:</p>
+	<p>All messages/errors should be outputted by calling <code>trigger_error()</code> using the appropriate message type and language string. Example:</p>
 
 	<div class="codebox"><pre>
 trigger_error('NO_FORUM');
@@ -1009,7 +1009,7 @@ trigger_error('NO_MODE', E_USER_ERROR);
 
 	<p>All urls pointing to internal files need to be prepended by the <code>$phpbb_root_path</code> variable. Within the administration control panel all urls pointing to internal files need to be prepended by the <code>$phpbb_admin_path</code> variable. This makes sure the path is always correct and users being able to just rename the admin folder and the acp still working as intended (though some links will fail and the code need to be slightly adjusted).</p>
 
-	<p>The <code>append_sid()</code> function from 2.0.x is available too, though does not handle url alterations automatically. Please have a look at the code documentation if you want to get more details on how to use append_sid(). A sample call to append_sid() can look like this:</p>
+	<p>The <code>append_sid()</code> function from 2.0.x is available too, though it does not handle url alterations automatically. Please have a look at the code documentation if you want to get more details on how to use append_sid(). A sample call to append_sid() can look like this:</p>
 
 	<div class="codebox"><pre>
 append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;g=' . $row['group_id'])
@@ -1017,7 +1017,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 
 	<h4>General function usage: </h4>
 
-	<p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistent over the code.</p>
+	<p>Some of these functions are only chosen over others because of personal preference and have no benefit other than maintaining consistency throughout the code.</p>
 
 	<ul>
 		<li>
@@ -1067,7 +1067,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
         required_imageset = prosilver
 	</pre></div>
 	<a name="genstyling"></a><h3>3.2. General Styling Rules</h3>
-<p>Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the intendation and coding guidelines also apply to templates where possible.</p>
+<p>Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the indentation and coding guidelines also apply to templates where possible.</p>
 
 <p>The outer table class <code>forumline</code> has gone and is replaced with <code>tablebg</code>.</p>
 <p>When writing <code>&lt;table&gt;</code> the order <code>&lt;table class="" cellspacing="" cellpadding="" border="" align=""&gt;</code> creates consistency and allows everyone to easily see which table produces which "look". The same applies to most other tags for which additional parameters can be set, consistency is the major aim here.</p>
@@ -1087,7 +1087,7 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 
 <p>Row colours/classes are now defined by the template, use an <code>IF S_ROW_COUNT</code> switch, see viewtopic or viewforum for an example.</p>
 
-<p>Remember block level ordering is important ... while not all pages validate as XHTML 1.0 Strict compliant it is something we're trying to work too.</p>
+<p>Remember block level ordering is important ... while not all pages validate as XHTML 1.0 Strict compliant it is something we're trying to work on.</p>
 
 <p>Use a standard cellpadding of 2 and cellspacing of 0 on outer tables. Inner tables can vary from 0 to 3 or even 4 depending on the need.</p>
 
@@ -1136,12 +1136,12 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 	<a name="templates"></a><h3>4.i. General Templating</h3>
 
 <h4>File naming</h4>
-<p>Firstly templates now take the suffix &quot;.html&quot; rather than &quot;.tpl&quot;. This was done simply to make the lifes of some people easier wrt syntax highlighting, etc.</p>
+<p>Firstly templates now take the suffix &quot;.html&quot; rather than &quot;.tpl&quot;. This was done simply to make the lives of some people easier wrt syntax highlighting, etc.</p>
 
 <h4>Variables</h4>
 <p>All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, javascript urls with UA_, language to be put in javascript statements with LA_, all other variables should be presented 'as is'.</p>
 
-<p>L_* template variables are automatically tried to be mapped to the corresponding language entry if the code does not set (and therefore overwrite) this variable specifically. For example <code>{L_USERNAME}</code> maps to <code>$user-&gt;lang['USERNAME']</code>. The LA_* template variables are handled within the same way, but properly escaped to be put in javascript code. This should reduce the need to assign loads of new lang vars in Modifications.
+<p>L_* template variables are automatically mapped to the corresponding language entry if the code does not set (and therefore overwrite) this variable specifically and if the language entry exists. For example <code>{L_USERNAME}</code> maps to <code>$user-&gt;lang['USERNAME']</code>. The LA_* template variables are handled within the same way, but properly escaped so they can be put in javascript code. This should reduce the need to assign loads of new language variables in MODifications.
 </p>
 
 <h4>Blocks/Loops</h4>
@@ -1424,9 +1424,9 @@ div
 <span class="comment">&lt;!-- END l_block1 --&gt;</span>
 </pre></div>
 
-<p>Here we open the loop l_block1 and doing some things if the value S_SELECTED within the current loop iteration is true, else we write the blocks link and title. Here, you see <code>{l_block1.L_TITLE}</code> referenced - you remember that L_* variables get automatically assigned the corresponding language entry? This is true, but not within loops. The L_TITLE variable within the loop l_block1 is assigned within the code itself.</p>
+<p>Here we open the loop l_block1 and do some things if the value S_SELECTED within the current loop iteration is true, else we write the blocks link and title. Here, you see <code>{l_block1.L_TITLE}</code> referenced - you remember that L_* variables get automatically assigned the corresponding language entry? This is true, but not within loops. The L_TITLE variable within the loop l_block1 is assigned within the code itself.</p>
 
-<p>Let's have a closer look to the markup:</p>
+<p>Let's have a closer look at the markup:</p>
 
 <div class="codebox"><pre>
 <span class="comment">&lt;!-- BEGIN l_block1 --&gt;</span>
@@ -1520,7 +1520,7 @@ div
 &lt;/ul&gt; <span class="comment">&lt;!-- written on third iteration --&gt;</span>
 </pre></div>
 
-<p>Just always remember that processing is taking place from up to down.</p>
+<p>Just always remember that processing is taking place from top to bottom.</p>
 
 	<h4>Forms</h4>
 		<p>If a form is used for a non-trivial operation (i.e. more than a jumpbox), then it should include the <code>{S_FORM_TOKEN}</code> template variable.</p>
@@ -1536,11 +1536,9 @@ div
 		</pre></div><br />
 
 	<a name="inheritance"></a><h3>4.ii. Template Inheritance</h3>
-		<p>When basing a new template on an existing one, it is not necessary to provide all template files. By declaring the template  to be &quot;<strong>inheriting</strong>&quot; in the template configuration file.</p>
+		<p>When basing a new style on an existing one, it is not necessary to provide all the template files. By declaring the base style name in the <strong>inherit_from</strong> field in the template configuration file, the style can be set to inherit template files from the base style. The limitation on this is that the base style has to be installed and complete, meaning that it is not itself inheriting.</p>
 
-		<p>The limitation on this is that the base style has to be installed and complete, meaning that it is not itself inheriting.</p>
-
-		<p>The effect of doing so is that the template engine will use the files in the new template where they exist, but fall back to files in the base template otherwise. Declaring a style to be inheriting also causes it to use some of the configuration settings of the base style, notably database storage.</p>
+		<p>The effect of doing so is that the template engine will use the template files in the new style where they exist, but fall back to files in the base style otherwise. Declaring a style to inherit from another also causes it to use some of the configuration settings of the base style, notably database storage.</p>
 
 		<p>We strongly encourage the use of inheritance for styles based on the bundled styles, as it will ease the update procedure.</p>
 
@@ -1667,7 +1665,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 	<h4>Encoding:</h4>
 
-	<p>With phpBB3, the output encoding for the forum in now UTF-8, a Universal Character Encoding by the Unicode Consortium that is by design a superset to US-ASCII and ISO-8859-1. By using one character set which simultaenously supports all scripts which previously would have required different encodings (eg: ISO-8859-1 to ISO-8859-15 (Latin, Greek, Cyrillic, Thai, Hebrew, Arabic); GB2312 (Simplified Chinese); Big5 (Traditional Chinese), EUC-JP (Japanese), EUC-KR (Korean), VISCII (Vietnamese); et cetera), this removes the need to convert between encodings and improves the accessibility of multilingual forums.</p>
+	<p>With phpBB3, the output encoding for the forum in now UTF-8, a Universal Character Encoding by the Unicode Consortium that is by design a superset to US-ASCII and ISO-8859-1. By using one character set which simultaenously supports all scripts which previously would have required different encodings (eg: ISO-8859-1 to ISO-8859-15 (Latin, Greek, Cyrillic, Thai, Hebrew, Arabic); GB2312 (Simplified Chinese); Big5 (Traditional Chinese), EUC-JP (Japanese), EUC-KR (Korean), VISCII (Vietnamese); et cetera), we remove the need to convert between encodings and improves the accessibility of multilingual forums.</p>
 
 	<p>The impact is that the language files for phpBB must now also be encoded as UTF-8, with a caveat that the files must <strong>not contain</strong> a <acronym title="Byte-Order-Mark">BOM</acronym> for compatibility reasons with non-Unicode aware versions of PHP. For those with forums using the Latin character set (ie: most European languages), this change is transparent since UTF-8 is superset to US-ASCII and ISO-8859-1.</p>
 
-- 
cgit v1.2.1


From fa23def7742b66b25a8c71e68d334f999624a84d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Oct 2011 00:16:30 +0200
Subject: [ticket/10190] Do not show hint about permissions when editing forum
 settings.

PHPBB3-10190
---
 phpBB/includes/acp/acp_forums.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 27bec3f1ea..50e12a0f15 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -212,15 +212,11 @@ class acp_forums
 
 						$message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED'];
 
-						// Redirect to permissions
-						if ($auth->acl_get('a_fauth') && !$copied_permissions)
-						{
-							$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
-						}
-
 						// redirect directly to permission settings screen if authed
 						if ($action == 'add' && !$copied_permissions && $auth->acl_get('a_fauth'))
 						{
+							$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
+
 							meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url));
 						}
 
-- 
cgit v1.2.1


From 2e9e0a7d78bf5aaaac4b36960eb45cf014a5ccc6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 29 Oct 2011 00:32:38 +0200
Subject: [ticket/10166] No longer refer to previous mail in
 admin_welcome_activated.txt

It does not make much sense to say "the username you received in a previous
e-mail" when the message itself contains the username.

PHPBB3-10166
---
 phpBB/language/en/email/admin_welcome_activated.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
index 2397868323..cfdb69bdcb 100644
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -2,7 +2,7 @@ Subject: Account activated
 
 Hello {USERNAME},
 
-Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail.
+Your account on "{SITENAME}" has been activated by an administrator, you may login now.
 
 Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
-- 
cgit v1.2.1


From 219bdbaf7044bd203755ed138d109cf39ccdb837 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Oct 2011 01:24:09 +0200
Subject: [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with
 accesskey

PHPBB3-8996
---
 phpBB/styles/prosilver/template/editor.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index cfdb54f54b..957c39b568 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -86,14 +86,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
+		textarea = document.forms[form_name].elements[text_name];
+		if (textarea.createTextRange && textarea.caretPos)
 		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
+			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
 			return;
 		}
 	}
@@ -107,7 +103,7 @@ function bbfontstyle(bbopen, bbclose)
 	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
+	var new_pos = caret_pos + bbopen.length;
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -347,7 +343,15 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	if (textEl.createTextRange)
+	var keyCode = false;
+	if (is_ie)
+	{
+		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
+	}
+
+	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
+	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
+	if ((!is_ie || (keyCode != 16 && keyCode != 17 && keyCode != 18)) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -425,7 +429,7 @@ function getCaretPosition(txtarea)
 	var caretPos = new caretPosition();
 	
 	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
+	if(!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -452,7 +456,7 @@ function getCaretPosition(txtarea)
 	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
+		caretPos.end = txtarea.sel_start;
 	}
 
 	return caretPos;
-- 
cgit v1.2.1


From da8cac280c0d7067291ee173a06a92e24a906d6e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Oct 2011 16:26:17 +0200
Subject: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist

PHPBB3-9036
---
 phpBB/includes/functions_display.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 14d0c44dcf..88be332eff 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -465,6 +465,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'S_NO_CAT'			=> $catless && !$last_catless,
 			'S_IS_LINK'			=> ($row['forum_type'] == FORUM_LINK) ? true : false,
 			'S_UNREAD_FORUM'	=> $forum_unread,
+			'S_AUTH_READ'		=> $auth->acl_get('f_read', $row['forum_id']),
 			'S_LOCKED_FORUM'	=> ($row['forum_status'] == ITEM_LOCKED) ? true : false,
 			'S_LIST_SUBFORUMS'	=> ($row['display_subforum_list']) ? true : false,
 			'S_SUBFORUMS'		=> (sizeof($subforums_list)) ? true : false,
-- 
cgit v1.2.1


From cf49b5f46fe4035a54809d4c615cbdc1456964e1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Oct 2011 23:32:47 +0200
Subject: [ticket/7932] Fix font size in select boxes

PHPBB3-7932
---
 phpBB/styles/prosilver/theme/forms.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 803c608bcf..ebc8059474 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -26,6 +26,7 @@ select {
 	border: 1px solid #666666;
 	padding: 1px;
 	background-color: #FAFAFA;
+	font-size: 1em;
 }
 
 option {
-- 
cgit v1.2.1


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: [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
 	*/
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


From 75a44a6970136122c17756522e25814d4015035b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 10 Sep 2010 07:23:55 -0700
Subject: [ticket/9778] Replaced "Find a member" with "Enter username"

When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

PHPBB3-9778
---
 phpBB/adm/style/acp_users.html | 2 +-
 phpBB/language/en/common.php   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index e266654649..d5a29a21cc 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
-		<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
+		<dt><label for="username">{L_ENTER_USERNAME}:</label></dt>
 		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bc38c1563d..d686d51c89 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -165,6 +165,7 @@ $lang = array_merge($lang, array(
 	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
 	'ENABLED'							=> 'Enabled',
 	'ENCLOSURE'							=> 'Enclosure',
+	'ENTER_USERNAME'					=> 'Enter username',
 	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
-- 
cgit v1.2.1


From d6c3e7785d98190436acdd8468a1d343b673c55b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 30 Oct 2011 18:45:41 +0100
Subject: [ticket/10365] Make sure moderators only get mcp_reports link when
 allowed

The m_report permission is not not being checked when displaying the link to
mcp_reports.

PHPBB3-10365
---
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 76cd9beb92..9cdb69ed99 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -239,8 +239,8 @@ function mcp_topic_view($id, $mode, $action)
 
 			'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
-			'S_POST_REPORTED'	=> ($row['post_reported']) ? true : false,
-			'S_POST_UNAPPROVED'	=> ($row['post_approved']) ? false : true,
+			'S_POST_REPORTED'	=> ($auth->acl_get('m_report', $topic_info['forum_id']) && $row['post_reported']) ? true : false,
+			'S_POST_UNAPPROVED'	=> ($auth->acl_get('m_approve', $topic_info['forum_id']) && $row['post_approved']) ? false : true,
 			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
 			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
 
-- 
cgit v1.2.1


From 18ca3a32bc9f5ec84b6abba3c79920d23df8c778 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 30 Oct 2011 19:06:34 +0100
Subject: [ticket/10365] Require m_report permission to see reports in mcp_post

This was exposed to anyone with m_ perms in mcp_post_details.

PHPBB3-10365
---
 phpBB/includes/mcp/mcp_post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index de7f3e63ee..ba45037a18 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -246,7 +246,7 @@ function mcp_post_details($id, $mode, $action)
 	}
 
 	// Get Reports
-	if ($auth->acl_get('m_', $post_info['forum_id']))
+	if ($auth->acl_get('m_report', $post_info['forum_id']))
 	{
 		$sql = 'SELECT r.*, re.*, u.user_id, u.username
 			FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REPORTS_REASONS_TABLE . " re
-- 
cgit v1.2.1


From 2918fbc9709fd1cd698eb3ba5b9459f1301ae898 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 5 Nov 2011 01:02:40 +0800
Subject: [ticket/10419] Reword some language strings, minor code changes

PHPBB3-10419
---
 phpBB/includes/acp/acp_main.php  | 8 ++++----
 phpBB/language/en/acp/common.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index e31acfb7d1..c8df21f5a9 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -600,15 +600,15 @@ class acp_main
 			$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002));
 		}
 
-		if (@extension_loaded('mbstring'))
+		if (extension_loaded('mbstring'))
 		{
 			$template->assign_vars(array(
 				'S_MBSTRING_LOADED'						=> true,
-				'S_MBSTRING_FUNC_OVERLOAD_FAIL'			=> (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING)),
+				'S_MBSTRING_FUNC_OVERLOAD_FAIL'			=> (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL | MB_OVERLOAD_STRING)),
 				'S_MBSTRING_ENCODING_TRANSLATION_FAIL'	=> (@ini_get('mbstring.encoding_translation') != 0),
 				'S_MBSTRING_HTTP_INPUT_FAIL'			=> (@ini_get('mbstring.http_input') != 'pass'),
-				'S_MBSTRING_HTTP_OUTPUT_FAIL'			=> (@ini_get('mbstring.http_output') != 'pass'))
-			);
+				'S_MBSTRING_HTTP_OUTPUT_FAIL'			=> (@ini_get('mbstring.http_output') != 'pass'),
+			));
 		}
 
 		// Fill dbms version if not yet filled
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a8cfaf8aa8..85da6fbd79 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -328,13 +328,13 @@ $lang = array_merge($lang, array(
 	'DATABASE_SIZE'			=> 'Database size',
 
 	// Enviroment configuration checks, mbstring related
-	'ERROR_MBSTRING_FUNC_OVERLOAD'					=> 'Functions overloading setting failed',
+	'ERROR_MBSTRING_FUNC_OVERLOAD'					=> 'Function overloading setting is invalid',
 	'ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN'			=> '<var>mbstring.func_overload</var> must be set to either 0 or 4. You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding setting failed',
+	'ERROR_MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding setting is invalid',
 	'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.  You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_HTTP_INPUT'						=> 'HTTP input character conversion setting failed',
+	'ERROR_MBSTRING_HTTP_INPUT'						=> 'HTTP input character conversion setting is invalid',
 	'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN'				=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion setting failed',
+	'ERROR_MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion setting is invalid',
 	'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
 
 	'FILES_PER_DAY'		=> 'Attachments per day',
-- 
cgit v1.2.1


From 1a19388aa38113262db648caedd4a745f5691ed1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 20 Jul 2011 00:55:49 +0200
Subject: [ticket/10237] Display login-box for guests, when (un)subscribing

Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
---
 phpBB/includes/functions_display.php | 21 +++++++++++++++------
 phpBB/viewforum.php                  |  2 +-
 phpBB/viewtopic.php                  |  5 +++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7982b9908d..ffc9fecb5e 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1067,6 +1067,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 	$match_id = ($mode == 'forum') ? $forum_id : $topic_id;
 	$u_url = "uid={$user->data['user_id']}";
 	$u_url .= ($mode == 'forum') ? '&amp;f' : '&amp;f=' . $forum_id . '&amp;t';
+	$is_watching = 0;
 
 	// Is user watching this thread?
 	if ($user_id != ANONYMOUS)
@@ -1093,9 +1094,9 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 				$uid = request_var('uid', 0);
 				$token = request_var('hash', '');
 
-				if (($token && check_link_hash($token, "{$mode}_$match_id")) || confirm_box(true))
+				if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))
 				{
-					if (($uid != $user_id) || ($_GET['unwatch'] != $mode))
+					if ($uid != $user_id || $_GET['unwatch'] != $mode)
 					{
 						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
 						$message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
@@ -1108,7 +1109,8 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 					$db->sql_query($sql);
 
 					$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
-					$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
+					$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '<br /><br />';
+					$message .= sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
 				}
@@ -1125,7 +1127,14 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 						$s_hidden_fields['t'] = $topic_id;
 					}
 
-					$confirm_box_message = (($item_title == '') ? 'UNWATCH_' . strtoupper($mode) : $user->lang('UNWATCH_' . strtoupper($mode) . '_DETAILED', $item_title));
+					if ($item_title == '')
+					{
+						$confirm_box_message = 'UNWATCH_' . strtoupper($mode);
+					}
+					else
+					{
+						$confirm_box_message = $user->lang('UNWATCH_' . strtoupper($mode) . '_DETAILED', $item_title);
+					}
 					confirm_box(false, $confirm_box_message, build_hidden_fields($s_hidden_fields));
 				}
 			}
@@ -1150,9 +1159,9 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
 				$uid = request_var('uid', 0);
 				$token = request_var('hash', '');
 
-				if (($token && check_link_hash($token, "{$mode}_$match_id")) || confirm_box(true))
+				if ($token && check_link_hash($token, "{$mode}_$match_id") || confirm_box(true))
 				{
-					if (($uid != $user_id) || ($_GET['watch'] != $mode))
+					if ($uid != $user_id || $_GET['watch'] != $mode)
 					{
 						$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&amp;start=$start");
 						$message = $user->lang['ERR_WATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>');
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e0b51bf782..2eacbb500a 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -205,7 +205,7 @@ $s_watching_forum = array(
 	'is_watching'	=> false,
 );
 
-if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && $auth->acl_get('f_subscribe', $forum_id))
+if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_subscribe', $forum_id) || $user->data['user_id'] == ANONYMOUS))
 {
 	$notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL;
 	watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status, $start, $forum_data['forum_name']);
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 8b081b4aec..bb88241481 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -486,9 +486,10 @@ $s_watching_topic = array(
 	'is_watching'	=> false,
 );
 
-if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'] && $user->data['is_registered'])
+if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'])
 {
-	watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start, $topic_data['topic_title']);
+	$notify_status = (isset($topic_data['notify_status'])) ? $topic_data['notify_status'] : null;
+	watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $notify_status, $start, $topic_data['topic_title']);
 
 	// Reset forum notification if forum notify is set
 	if ($config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id))
-- 
cgit v1.2.1


From 0d3e9bf446f93afcb4537d561de665c678a44c2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Nov 2011 14:06:02 +0100
Subject: [ticket/10435] Readd local announcements to total topic count in
 viewforum

We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.

PHPBB3-10435
---
 phpBB/viewforum.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e0b51bf782..31096d42f5 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -533,10 +533,13 @@ if ($s_display_active)
 	$topics_count = 1;
 }
 
+// We need to readd the local announcements to the forums total topic count, otherwise the number is different from the one on the forum list
+$total_topic_count = $topics_count + sizeof($announcement_list) - sizeof($global_announce_list);
+
 $template->assign_vars(array(
 	'PAGINATION'	=> generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '')), $topics_count, $config['topics_per_page'], $start),
 	'PAGE_NUMBER'	=> on_page($topics_count, $config['topics_per_page'], $start),
-	'TOTAL_TOPICS'	=> ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count)))
+	'TOTAL_TOPICS'	=> ($s_display_active) ? false : (($total_topic_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_topic_count)))
 );
 
 $topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list);
-- 
cgit v1.2.1


From 2b3effb13c0f1d8322653147e5dcbc20ae36b418 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 11 Nov 2011 22:32:59 +0100
Subject: [ticket/8616] Include old U_INBOX var for BC

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

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index b34b742d57..c40ceb088f 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1688,8 +1688,9 @@ function pm_notification($mode, $author, $recipients, $subject, $message, $msg_i
 			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
 			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
 
-			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id")
-		);
+			'U_INBOX'			=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox",
+			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id",
+		));
 
 		$messenger->send($addr['method']);
 	}
-- 
cgit v1.2.1


From edd5866a6ed4325a6d1df728842c310d7da407fd Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 11 Nov 2011 23:05:57 +0100
Subject: [ticket/10087] Organize bans in acp_baninto optgroups

PHPBB3-10087
---
 phpBB/includes/acp/acp_ban.php | 34 +++++++++++++++++++++++++++++-----
 phpBB/language/en/acp/ban.php  |  3 +++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index a7ea57b753..f8af1b86e1 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -175,12 +175,21 @@ class acp_ban
 		}
 		$result = $db->sql_query($sql);
 
-		$banned_options = '';
+		$banned_options = $excluded_options = array();
 		$ban_length = $ban_reasons = $ban_give_reasons = array();
 
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$banned_options .= '<option' . (($row['ban_exclude']) ? ' class="sep"' : '') . ' value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
+			$option = '<option value="' . $row['ban_id'] . '">' . $row[$field] . '</option>';
+
+			if ($row['ban_exclude'])
+			{
+				$excluded_options[] = $option;
+			}
+			else
+			{
+				$banned_options[] = $option;
+			}
 
 			$time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0;
 
@@ -241,11 +250,26 @@ class acp_ban
 			}
 		}
 
+		$options = '';
+		if ($excluded_options)
+		{
+			$options .= '<optgroup label="' . $user->lang['OPTIONS_EXCLUDED'] . '">';
+			$options .= implode('', $excluded_options);
+			$options .= '</optgroup>';
+		}
+
+		if ($banned_options)
+		{
+			$options .= '<optgroup label="' . $user->lang['OPTIONS_BANNED'] . '">';
+			$options .= implode('', $banned_options);
+			$options .= '</optgroup>';
+		}
+
 		$template->assign_vars(array(
 			'S_BAN_END_OPTIONS'	=> $ban_end_options,
-			'S_BANNED_OPTIONS'	=> ($banned_options) ? true : false,
-			'BANNED_OPTIONS'	=> $banned_options)
-		);
+			'S_BANNED_OPTIONS'	=> ($banned_options || $excluded_options) ? true : false,
+			'BANNED_OPTIONS'	=> $options,
+		));
 	}
 }
 
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 099834d1e4..7b2ef59a7a 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -68,6 +68,9 @@ $lang = array_merge($lang, array(
 
 	'LENGTH_BAN_INVALID'		=> 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
 
+	'OPTIONS_BANNED'			=> 'Banned',
+	'OPTIONS_EXCLUDED'			=> 'Excluded',
+
 	'PERMANENT'		=> 'Permanent',
 
 	'UNTIL'						=> 'Until',
-- 
cgit v1.2.1


From 91155d1330f04b9be1a7722ef0335ba87fd11cbc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 1 Nov 2011 18:43:24 +0100
Subject: [ticket/10437] Do not display announcements that are waiting for
 approval

PHPBB3-10437
---
 phpBB/viewforum.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e0b51bf782..215911c8cb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -376,6 +376,12 @@ if ($forum_data['forum_type'] == FORUM_POST)
 
 	while ($row = $db->sql_fetchrow($result))
 	{
+		if (!$row['topic_approved'] && !$auth->acl_get('m_approve', $row['forum_id']))
+		{
+			// Do not display announcements that are waiting for approval.
+			continue;
+		}
+
 		$rowset[$row['topic_id']] = $row;
 		$announcement_list[] = $row['topic_id'];
 
-- 
cgit v1.2.1


From 52bd8c307f388ac95d4bdd1bcdc52fdaa83ef4df Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 13 Nov 2011 15:37:26 +0100
Subject: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read

PHPBB3-10365
---
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 9cdb69ed99..d7cc1e795a 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -239,8 +239,8 @@ function mcp_topic_view($id, $mode, $action)
 
 			'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
-			'S_POST_REPORTED'	=> ($auth->acl_get('m_report', $topic_info['forum_id']) && $row['post_reported']) ? true : false,
-			'S_POST_UNAPPROVED'	=> ($auth->acl_get('m_approve', $topic_info['forum_id']) && $row['post_approved']) ? false : true,
+			'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_report', $topic_info['forum_id'])),
+			'S_POST_UNAPPROVED'	=> (!$row['post_approved'] && $auth->acl_get('m_approve', $topic_info['forum_id'])),
 			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
 			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
 
-- 
cgit v1.2.1


From 6370ef27057643ee7fe0a6fbf2341c2ebdb57d4c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 17 Oct 2011 23:22:36 +0200
Subject: [ticket/9066] Disallow some database prefix to prevent same errors
 and problems

With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
---
 phpBB/install/install_install.php | 7 ++++++-
 phpBB/language/en/install.php     | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9fe0c8aed5..bb1d858cfc 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -546,6 +546,11 @@ class install_install extends module
 				$error[] = $lang['INST_ERR_NO_DB'];
 				$connect_test = false;
 			}
+			else if (!preg_match('#^[a-zA-Z][a-zA-Z0-9_]*$#', $data['table_prefix'], $result))
+			{
+				$error[] = $lang['INST_ERR_DB_INVALID_PREFIX'];
+				$connect_test = false;
+			}
 			else
 			{
 				$connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport']);
@@ -2032,7 +2037,7 @@ class install_install extends module
 		'dbname'				=> array('lang' => 'DB_NAME',		'type' => 'text:25:100', 'explain' => false),
 		'dbuser'				=> array('lang' => 'DB_USERNAME',	'type' => 'text:25:100', 'explain' => false),
 		'dbpasswd'				=> array('lang' => 'DB_PASSWORD',	'type' => 'password:25:100', 'explain' => false),
-		'table_prefix'			=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => false),
+		'table_prefix'			=> array('lang' => 'TABLE_PREFIX',	'type' => 'text:25:100', 'explain' => true),
 	);
 	var $admin_config_options = array(
 		'legend1'				=> 'ADMIN_CONFIG',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index befa7c6f40..f038177df4 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -232,6 +232,7 @@ $lang = array_merge($lang, array(
 	'INST_ERR'					=> 'Installation error',
 	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
+	'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
 	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
@@ -352,6 +353,7 @@ $lang = array_merge($lang, array(
 
 	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
 	'TABLE_PREFIX'				=> 'Prefix for tables in database',
+	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
 	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
 	'TESTS_PASSED'				=> 'Tests passed',
 	'TESTS_FAILED'				=> 'Tests failed',
-- 
cgit v1.2.1


From b371d62dd3e8f7a207b7398fb0fe3150799d350b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 13 Nov 2011 16:30:11 +0100
Subject: [ticket/7138] Allow simple header and footer for trigger_error()
 messages

Adds a template condition using S_SIMPLE_MESSAGE that must be set to true
before calling trigger_error() which will automatically use the simple
header and footer files in the template directory instead of the overall
header and footer files.

PHPBB3-7138
---
 phpBB/styles/prosilver/template/message_body.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
index 896f0b826e..3a970769b7 100644
--- a/phpBB/styles/prosilver/template/message_body.html
+++ b/phpBB/styles/prosilver/template/message_body.html
@@ -1,4 +1,8 @@
-<!-- INCLUDE overall_header.html -->
+<!-- IF S_SIMPLE_MESSAGE -->
+	<!-- INCLUDE simple_header.html -->
+<!-- ELSE -->
+	<!-- INCLUDE overall_header.html -->
+<!-- ENDIF -->
 
 <div class="panel" id="message">
 	<div class="inner"><span class="corners-top"><span></span></span>
@@ -8,4 +12,8 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
-<!-- INCLUDE overall_footer.html -->
\ No newline at end of file
+<!-- IF S_SIMPLE_MESSAGE -->
+	<!-- INCLUDE simple_footer.html -->
+<!-- ELSE -->
+	<!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->
-- 
cgit v1.2.1


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

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
---
 .../prosilver/template/ucp_pm_message_header.html  | 29 +++++++++++-----------
 .../prosilver/template/ucp_pm_viewfolder.html      |  1 -
 .../prosilver/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 */
-- 
cgit v1.2.1


From dee836315ca0d449d252929313e30fb64e452fe4 Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Sat, 29 Oct 2011 17:20:36 +0200
Subject: [ticket/10254] Remove style names from themes and fix some
 informations on it.

PHPBB3-10254
---
 phpBB/styles/prosilver/theme/bidi.css        |  4 ++--
 phpBB/styles/prosilver/theme/buttons.css     |  2 +-
 phpBB/styles/prosilver/theme/common.css      |  2 +-
 phpBB/styles/prosilver/theme/content.css     |  2 +-
 phpBB/styles/prosilver/theme/cp.css          |  2 +-
 phpBB/styles/prosilver/theme/forms.css       |  2 +-
 phpBB/styles/prosilver/theme/links.css       |  2 +-
 phpBB/styles/prosilver/theme/print.css       |  9 ++-------
 phpBB/styles/prosilver/theme/stylesheet.css  | 12 +++++++-----
 phpBB/styles/prosilver/theme/tweaks.css      |  2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css | 17 ++++++++---------
 11 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f441784d85..d1cff9c8be 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -1,4 +1,4 @@
-/* proSilver RTL definitions
+/* RTL definitions
 ---------------------------------------- */
 
 /**
@@ -519,7 +519,7 @@
 /**
 * cp.css
 */
-/* proSilver Control Panel Styles
+/* Control Panel Styles
 ---------------------------------------- */
 
 
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 6cffdc5930..a9ded9cf98 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -1,4 +1,4 @@
-/* proSilver Button Styles
+/* Button Styles
 ---------------------------------------- */
 
 /* Rollover buttons
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index a86f723f81..8b5e09297e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -1,4 +1,4 @@
-/* General proSilver Markup Styles
+/* General Markup Styles
 ---------------------------------------- */
 
 * {
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 58247883e5..c278a16dc5 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -1,4 +1,4 @@
-/* proSilver Content Styles
+/* Content Styles
 ---------------------------------------- */
 
 ul.topiclist {
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index b574b0ae1f..708bfbaf83 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -1,4 +1,4 @@
-/* proSilver Control Panel Styles
+/* Control Panel Styles
 ---------------------------------------- */
 
 
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 803c608bcf..2b54e17290 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -1,4 +1,4 @@
-/* proSilver Form Styles
+/* Form Styles
 ---------------------------------------- */
 
 /* General form styles
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 1f6c2af550..05662b9b44 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -1,4 +1,4 @@
-/* proSilver Link Styles
+/* Link Styles
 ---------------------------------------- */
 
 /* Links adjustment to correctly display an order of rtl/ltr mixed content */
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
index 2cfcd4da20..bc3ca80fdc 100644
--- a/phpBB/styles/prosilver/theme/print.css
+++ b/phpBB/styles/prosilver/theme/print.css
@@ -1,10 +1,5 @@
-/* proSilver Print Style Sheet
--------------------------------------------------
-	Author: subBlue  ( http://www.subBlue.com/ )
-	Version: 25 August 2004
-
-	Copyright 2004 phpBB Group
--------------------------------------------------*/
+/* Print Style Sheet
+---------------------------------------- */
 
 
 /* Lots still TODO here! */
diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index c7db605bbb..d771a321ca 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -1,11 +1,13 @@
-/*  phpBB 3.0 Style Sheet
+/*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:		proSilver
-	Based on style:	proSilver (this is the default phpBB 3 style)
-	Original author:	subBlue ( http://www.subBlue.com/ )
+	Style name:			prosilver (the default phpBB 3.0.x style)
+	Based on style:		
+	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		
 	
-	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
+	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/
     --------------------------------------------------------------
 */
 
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 30fe5fb986..f7322c2cce 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -1,4 +1,4 @@
-/* proSilver Style Sheet Tweaks
+/* Style Sheet Tweaks
 
 These style definitions are mainly IE specific 
 tweaks required due to its poor CSS support.
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index c2b6718d87..b497620573 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1,14 +1,13 @@
-/*  phpBB 3.0 Style Sheet
+/*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:		subsilver2
-	Based on style:	subSilver (the default phpBB 2 style)
-	Original author:	subBlue ( http://www.subBlue.com/ )
-	Modified by:		psoTFX and the phpBB team ( http://www.phpbb.com )
+	Style name:			subsilver2 (the default phpBB 3.0.x style)
+	Based on style:		subSilver (the default phpBB 2.0.x style)
+	Original author:	Tom Beddard ( http://www.subblue.com/ )
+	Modified by:		phpBB Group ( http://www.phpbb.com/ )
 	
-	This is an alternative style for phpBB3 for those wishing to stay with
-	the familiar subSilver style of phpBB version 2.x
-	
-	Copyright 2006 phpBB Group ( http://www.phpbb.com/ )
+	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/
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From c79992d1cc06a6133b67117262685d8b4b7ae51b Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Sat, 29 Oct 2011 19:09:54 +0200
Subject: [ticket/10254] Remove subsilver2 as default style on theme.

PHPBB3-10254
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index b497620573..e658994de4 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1,6 +1,6 @@
 /*  phpBB3 Style Sheet
     --------------------------------------------------------------
-	Style name:			subsilver2 (the default phpBB 3.0.x style)
+	Style name:			subsilver2
 	Based on style:		subSilver (the default phpBB 2.0.x style)
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Group ( http://www.phpbb.com/ )
-- 
cgit v1.2.1


From 4d760630c362b69150e7a5089593f9a610b97ff1 Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Thu, 10 Nov 2011 00:19:30 +0100
Subject: [ticket/10254] Removing the NOTE as it is incompatible with
 phpBB.com.

PHPBB3-10254
---
 phpBB/styles/prosilver/theme/stylesheet.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index d771a321ca..312e8497b8 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -4,10 +4,6 @@
 	Based on 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/
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From cf044c363b788ab77cf1539af13c4c035ba0b970 Mon Sep 17 00:00:00 2001
From: maelsoucaze <maelsoucaze@phpbb.com>
Date: Thu, 10 Nov 2011 16:31:47 +0100
Subject: [ticket/10254] Removing the subsilver2 NOTE, incompatible with
 phpBB.com.

PHPBB3-10254
---
 phpBB/styles/subsilver2/theme/stylesheet.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index e658994de4..444104ae3c 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -4,10 +4,6 @@
 	Based on style:		subSilver (the default phpBB 2.0.x style)
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
 	Modified by:		phpBB Group ( http://www.phpbb.com/ )
-	
-	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/
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From e543effc64d6a1b615166826a5a65dd8c7e34316 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 14 Nov 2011 13:32:54 +0100
Subject: [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver
 stylesheet.css

PHPBB3-10254
---
 phpBB/styles/prosilver/theme/stylesheet.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css
index 312e8497b8..4a7356fbaa 100644
--- a/phpBB/styles/prosilver/theme/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/stylesheet.css
@@ -3,7 +3,7 @@
 	Style name:			prosilver (the default phpBB 3.0.x style)
 	Based on style:		
 	Original author:	Tom Beddard ( http://www.subblue.com/ )
-	Modified by:		
+	Modified by:		phpBB Group ( http://www.phpbb.com/ )
     --------------------------------------------------------------
 */
 
-- 
cgit v1.2.1


From 3302305cd4a499603784aa87a40f5170d62a4f26 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Nov 2011 16:11:32 +0100
Subject: [ticket/9066] Move regex into get_preg_expression function and add
 tests

PHPBB3-9066
---
 phpBB/includes/functions.php      |  4 ++++
 phpBB/install/install_install.php |  2 +-
 tests/regex/table_prefix_test.php | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/regex/table_prefix_test.php

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c2b099d48a..e477b0454e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3486,6 +3486,10 @@ function get_preg_expression($mode)
 			$inline = ($mode == 'relative_url') ? ')' : '';
 			return "(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*(?:/(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*)*(?:\?(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?(?:\#(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?";
 		break;
+
+		case 'table_prefix':
+			return '#^[a-zA-Z][a-zA-Z0-9_]*$#';
+		break;
 	}
 
 	return '';
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index bb1d858cfc..ccdcf211f1 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -546,7 +546,7 @@ class install_install extends module
 				$error[] = $lang['INST_ERR_NO_DB'];
 				$connect_test = false;
 			}
-			else if (!preg_match('#^[a-zA-Z][a-zA-Z0-9_]*$#', $data['table_prefix'], $result))
+			else if (!preg_match(get_preg_expression('table_prefix'), $data['table_prefix']))
 			{
 				$error[] = $lang['INST_ERR_DB_INVALID_PREFIX'];
 				$connect_test = false;
diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php
new file mode 100644
index 0000000000..67a18b4fbc
--- /dev/null
+++ b/tests/regex/table_prefix_test.php
@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_regex_table_prefix_test extends phpbb_test_case
+{
+	public function table_prefix_test_data()
+	{
+		return array(
+			array('phpbb_', 1),
+			array('phpBB3', 1),
+			array('a', 1),
+
+			array('', 0),
+			array('_', 0),
+			array('a-', 0),
+			array("'", 0),
+		);
+	}
+
+	/**
+	* @dataProvider table_prefix_test_data
+	*/
+	public function test_table_prefix($prefix, $expected)
+	{
+		$this->assertEquals($expected, preg_match(get_preg_expression('table_prefix'), $prefix));
+	}
+}
-- 
cgit v1.2.1


From 983045348743d0205dd3a053df95e3ea993f9830 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 14 Nov 2011 18:41:19 +0100
Subject: [ticket/10452] Fix xHTML errors when print-viewing PMs

Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.

PHPBB3-10452
---
 .../template/ucp_pm_viewmessage_print.html         | 155 ++++++---------------
 .../template/ucp_pm_viewmessage_print.html         |   2 +-
 2 files changed, 47 insertions(+), 110 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index b1a93296bd..ce2a376768 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -1,120 +1,57 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
 <head>
+
 <meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" />
 <meta http-equiv="content-style-type" content="text/css" />
 <meta http-equiv="content-language" content="{S_USER_LANG}" />
-<title>{SITENAME} :: {PAGE_TITLE}</title>
-
-<style type="text/css">
-/* <![CDATA[ */
-body {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-}
-
-td {
-	font-family: Verdana,serif;
-	font-size: 10pt;
-	line-height: 150%;
-}
-
-.code, .quote {
-	font-size: smaller;
-	border: black solid 1px;
-}
-
-.forum {
-	font-family: Arial,Helvetica,sans-serif;
-	font-weight: bold;
-	font-size: 18pt;
-}
-
-.topic {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-}
-
-.gensmall {
-	font-size: 8pt;
-}
-
-hr {
-	color: #888888;
-	height: 3px;
-	border-style: solid;
-}
-
-hr.sep	{
-	color: #AAAAAA;
-	height: 1px;
-	border-style: dashed;
-}
-/* ]]> */
-</style>
-
+<meta http-equiv="imagetoolbar" content="no" />
+<meta name="resource-type" content="document" />
+<meta name="distribution" content="global" />
+<meta name="keywords" content="" />
+<meta name="description" content="" />
+<meta name="robots" content="noindex" />
+{META}
+<title>{SITENAME} &bull; {PAGE_TITLE}</title>
+
+<link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<body>
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td colspan="2" align="center"><span class="forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td>
-</tr>
-<tr>
-	<td colspan="2"><br /></td>
-</tr>
-<tr>
-	<td><span class="topic">{SUBJECT}</span><br /></td>
-	<td align="right" valign="bottom"><span class="gensmall">{PAGE_NUMBER}</span></td>
-</tr>
-</table>
-
-<hr width="85%" />
-
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td width="10%" nowrap="nowrap">{L_PM_FROM}:&nbsp;</td>
-	<td><strong>{MESSAGE_AUTHOR}</strong> [ {SENT_DATE} ]</td>
-</tr>
-
-<!-- IF S_TO_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_TO}:</td>
-		<td>
-		<!-- BEGIN to_recipient -->
-			<span<!-- IF to_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->>{to_recipient.NAME}</span>&nbsp;
-		<!-- END to_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-
-<!-- IF S_BCC_RECIPIENT -->
-	<tr>
-		<td width="10%" nowrap="nowrap">{L_BCC}:</td>
-		<td>
-		<!-- BEGIN bcc_recipient -->
-			<!-- IF bcc_recipient.COLOUR --><span style="color:{bcc_recipient.COLOUR}"><!-- ELSE --><span<!-- IF bcc_recipient.IS_GROUP --> class="sep"<!-- ENDIF -->><!-- ENDIF -->{bcc_recipient.NAME}</span>&nbsp;
-		<!-- END bcc_recipient -->
-		</td>
-	</tr>
-<!-- ENDIF -->
-<tr>
-	<td colspan="2"><hr class="sep" />{MESSAGE}</td>
-</tr>
-</table>
-
-<hr width="85%" />
 
-<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-<tr>
-	<td><span class="gensmall">{PAGE_NUMBER}</span></td>
-	<td align="{S_CONTENT_FLOW_END}"><span class="gensmall">{S_TIMEZONE}</span></td>
-</tr>
-<tr>
-	<td colspan="2" align="center"><span class="gensmall">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</span></td>
-</tr>
-</table>
+<body id="phpbb">
+<div id="wrap">
+	<a id="top" name="top" accesskey="t"></a>
+
+	<div id="page-header">
+		<h1>{SITENAME}</h1>
+		<p>{SITE_DESCRIPTION}<br /><a href="{U_FORUM}">{U_FORUM}</a></p>
+
+		<h2>{TOPIC_TITLE}</h2>
+		<p><a href="{U_TOPIC}">{U_TOPIC}</a></p>
+	</div>
+
+	<div id="page-body">
+		<div class="page-number">{PAGE_NUMBER}</div>
+			<div class="post">
+				<h3>{SUBJECT}</h3>
+				<div class="date">{L_SENT_AT} <strong>{SENT_DATE}</strong></div>
+				<div class="author">{L_PM_FROM} <strong>{MESSAGE_AUTHOR}</strong></div>
+				<!-- IF S_TO_RECIPIENT -->
+					<div class="author">{L_TO} <strong><!-- BEGIN to_recipient -->{to_recipient.NAME}&nbsp;<!-- END to_recipient --></strong></div>
+				<!-- ENDIF -->
+				<!-- IF S_BCC_RECIPIENT -->
+					<div class="author">{L_BCC} <strong><!-- BEGIN bcc_recipient -->{bcc_recipient.NAME}&nbsp;<!-- END bcc_recipient --></strong></div>
+				<!-- ENDIF -->
+				<hr />
+				<div class="content">{MESSAGE}</div>
+			</div>
+			<hr />
+	</div>
+
+	<div id="page-footer">
+		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
+		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Group<br />http://www.phpbb.com/</div>
+	</div>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 6753a5bc33..24194e4c26 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -61,7 +61,7 @@ hr.sep {
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
 <tr>
-	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</a></span></td>
+	<td colspan="2" align="center"><span class="Forum">{SITENAME}</span><br /><span class="gensmall">{L_PRIVATE_MESSAGING}</span></td>
 </tr>
 <tr>
 	<td colspan="2"><br /></td>
-- 
cgit v1.2.1


From 14af18cb1b81e5dcee70c9eccb35d19f17af6948 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 16:23:16 +0200
Subject: [ticket/9361] View correct error messages when editing account
 information

Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.

PHPBB3-9361
---
 phpBB/includes/ucp/ucp_profile.php | 12 ++++++------
 phpBB/language/en/ucp.php          |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index c099e3b3fa..65b32bd0c4 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -78,14 +78,14 @@ class ucp_profile
 
 					$error = validate_data($data, $check_ary);
 
-					if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
+					if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
 					{
-						$error[] = 'NEW_PASSWORD_ERROR';
+						$error[] = ($data['email_confirm']) ? 'NEW_EMAIL_ERROR' : 'NEW_EMAIL_CONFIRM_EMPTY';
 					}
 
-					if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password']))
+					if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
 					{
-						$error[] = 'CUR_PASSWORD_ERROR';
+						$error[] = ($data['password_confirm']) ? 'NEW_PASSWORD_ERROR' : 'NEW_PASSWORD_CONFIRM_EMPTY';
 					}
 
 					// Only check the new password against the previous password if there have been no errors
@@ -94,9 +94,9 @@ class ucp_profile
 						$error[] = 'SAME_PASSWORD_ERROR';
 					}
 
-					if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
+					if (!phpbb_check_hash($data['cur_password'], $user->data['user_password']))
 					{
-						$error[] = 'NEW_EMAIL_ERROR';
+						$error[] = ($data['cur_password']) ? 'CUR_PASSWORD_ERROR' : 'CUR_PASSWORD_EMPTY';
 					}
 
 					if (!check_form_key('ucp_reg_details'))
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c1e3c06c43..3ebc863447 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -138,6 +138,7 @@ $lang = array_merge($lang, array(
 	'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.',
+	'CUR_PASSWORD_EMPTY'		=> 'You did not enter your current password.',
 	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
 	'CUSTOM_DATEFORMAT'			=> 'Custom…',
 
@@ -268,9 +269,11 @@ $lang = array_merge($lang, array(
 	'MOVE_TO_FOLDER'				=> 'Move to folder',
 	'MOVE_UP'						=> 'Move up',
 
+	'NEW_EMAIL_CONFIRM_EMPTY'		=> 'You did not enter a confirm e-mail address.',
 	'NEW_EMAIL_ERROR'				=> 'The e-mail addresses you entered do not match.',
 	'NEW_FOLDER_NAME'				=> 'New folder name',
 	'NEW_PASSWORD'					=> 'New password',
+	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From c0ffc8386ccad6a6a3070faed1ae748f61ac9858 Mon Sep 17 00:00:00 2001
From: Raimon <Raimon@phpBB.com>
Date: Mon, 14 Nov 2011 21:38:10 +0100
Subject: [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
---
 phpBB/styles/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 */
-- 
cgit v1.2.1


From f1a53659bdacdc045943b8a09240e6ecadcc5360 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 15 Nov 2011 22:33:11 +0800
Subject: [ticket/10419] Reword the language strings

PHPBB3-10419
---
 phpBB/language/en/acp/common.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 85da6fbd79..ef8d6f1cb3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -328,14 +328,14 @@ $lang = array_merge($lang, array(
 	'DATABASE_SIZE'			=> 'Database size',
 
 	// Enviroment configuration checks, mbstring related
-	'ERROR_MBSTRING_FUNC_OVERLOAD'					=> 'Function overloading setting is invalid',
-	'ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN'			=> '<var>mbstring.func_overload</var> must be set to either 0 or 4. You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding setting is invalid',
-	'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.  You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_HTTP_INPUT'						=> 'HTTP input character conversion setting is invalid',
-	'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN'				=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
-	'ERROR_MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion setting is invalid',
-	'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.  You can check current value on <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_FUNC_OVERLOAD'					=> 'Function overloading is improperly configured',
+	'ERROR_MBSTRING_FUNC_OVERLOAD_EXPLAIN'			=> '<var>mbstring.func_overload</var> must be set to either 0 or 4. You can check the current value on the <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding is improperly configured',
+	'ERROR_MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0. You can check the current value on the <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_HTTP_INPUT'						=> 'HTTP input character conversion is improperly configured',
+	'ERROR_MBSTRING_HTTP_INPUT_EXPLAIN'				=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>. You can check the current value on the <samp>PHP information</samp> page.',
+	'ERROR_MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion is improperly configured',
+	'ERROR_MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>. You can check the current value on the <samp>PHP information</samp> page.',
 
 	'FILES_PER_DAY'		=> 'Attachments per day',
 	'FORUM_STATS'		=> 'Board statistics',
-- 
cgit v1.2.1


From 815dd3591b2618f072791aeb7bf6d87492e690b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 15 Nov 2011 17:23:55 +0100
Subject: [ticket/10185] Always set board startdate on conversion

The board startdate should always be set to first user registration date.
The current code did not do anything at all, as the board_startdate was always
set on installation before running the convertor.

PHPBB3-10185
---
 phpBB/install/install_convert.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 814b50cf68..62efc3e46b 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1716,19 +1716,16 @@ class install_convert extends module
 
 			fix_empty_primary_groups();
 
-			if (!isset($config['board_startdate']))
-			{
-				$sql = 'SELECT MIN(user_regdate) AS board_startdate
-					FROM ' . USERS_TABLE;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
+			$sql = 'SELECT MIN(user_regdate) AS board_startdate
+				FROM ' . USERS_TABLE;
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-				if (($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0) || !isset($config['board_startdate']))
-				{
-					set_config('board_startdate', $row['board_startdate']);
-					$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS);
-				}
+			if (!isset($config['board_startdate']) || ($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0))
+			{
+				set_config('board_startdate', $row['board_startdate']);
+				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS);
 			}
 
 			update_dynamic_config();
-- 
cgit v1.2.1


From e8686d9dad6522b30c2aeafb0e6e8dbe91cfb8db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 15 Nov 2011 22:14:28 +0100
Subject: [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN

PHPBB3-10296
---
 tests/dbal/cross_join_test.php             | 55 ++++++++++++++++++++++++++++++
 tests/dbal/fixtures/massmail_crossjoin.xml | 43 +++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 tests/dbal/cross_join_test.php
 create mode 100644 tests/dbal/fixtures/massmail_crossjoin.xml

diff --git a/tests/dbal/cross_join_test.php b/tests/dbal/cross_join_test.php
new file mode 100644
index 0000000000..7110c7a2ea
--- /dev/null
+++ b/tests/dbal/cross_join_test.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
+
+class phpbb_dbal_cross_join_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/massmail_crossjoin.xml');
+	}
+
+	public function test_cross_join()
+	{
+		$db = $this->new_dbal();
+
+		// http://tracker.phpbb.com/browse/PHPBB3-10296
+		// Test CROSS JOIN with INNER JOIN
+		// Failed on Postgres, MSSQL and Oracle
+		$db->sql_return_on_error(true);
+
+		$sql_ary = array(
+			'SELECT'	=> 'u.username',
+			'FROM'		=> array(
+				'phpbb_users'		=> 'u',
+				'phpbb_user_group'	=> 'ug',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(
+						'phpbb_banlist'	=> 'b',
+					),
+					'ON'	=> 'u.user_id = b.ban_userid',
+				),
+			),
+			'WHERE'		=> 'ug.group_id = 1
+				AND u.user_id = ug.user_id
+				AND b.ban_id IS NULL',
+			'ORDER_BY'	=> 'u.username',
+		);
+		$sql = $db->sql_build_query('SELECT', $sql_ary);
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(array('username' => 'mass email')), $db->sql_fetchrowset($result));
+	}
+}
diff --git a/tests/dbal/fixtures/massmail_crossjoin.xml b/tests/dbal/fixtures/massmail_crossjoin.xml
new file mode 100644
index 0000000000..801205eb81
--- /dev/null
+++ b/tests/dbal/fixtures/massmail_crossjoin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_banlist">
+		<column>ban_id</column>
+		<column>ban_userid</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<row>
+			<value>1</value>
+			<value>mass email</value>
+			<value>mass email</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>banned</value>
+			<value>banned</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>not in group</value>
+			<value>not in group</value>
+		</row>
+	</table>
+	<table name="phpbb_user_group">
+		<column>user_id</column>
+		<column>group_id</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
-- 
cgit v1.2.1


From 3d893c8222646e95aeae0301d954cfe62aa8486a Mon Sep 17 00:00:00 2001
From: dmauri <dmauri@code.phpbb.com>
Date: Tue, 15 Nov 2011 22:19:45 +0100
Subject: [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and
 Oracle

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

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 9b45c085a2..b4c1a72e1c 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -609,7 +609,7 @@ class dbal
 					}
 				}
 
-				$sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array));
+				$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
 
 				if (!empty($array['LEFT_JOIN']))
 				{
-- 
cgit v1.2.1


From b2b057910e57961b3d31432267fadb4ddc922783 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 29 Oct 2011 23:04:18 +0200
Subject: [ticket/10157] Add notification to update cpfs when installing a
 language.

We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.

PHPBB3-10157
---
 phpBB/includes/acp/acp_language.php | 9 ++++++++-
 phpBB/language/en/acp/language.php  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 598b390302..d560cdd0c5 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -919,6 +919,9 @@ class acp_language
 				$default_lang_id = (int) $db->sql_fetchfield('lang_id');
 				$db->sql_freeresult($result);
 
+				// We want to notify the admin that custom profile fields need to be updated for the new language.
+				$notify_cpf_update = false;
+
 				// From the mysql documentation:
 				// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
 				// Due to this we stay on the safe side if we do the insertion "the manual way"
@@ -932,6 +935,7 @@ class acp_language
 				{
 					$row['lang_id'] = $lang_id;
 					$db->sql_query('INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+					$notify_cpf_update = true;
 				}
 				$db->sql_freeresult($result);
 
@@ -944,12 +948,15 @@ class acp_language
 				{
 					$row['lang_id'] = $lang_id;
 					$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row));
+					$notify_cpf_update = true;
 				}
 				$db->sql_freeresult($result);
 
 				add_log('admin', 'LOG_LANGUAGE_PACK_INSTALLED', $lang_pack['name']);
 
-				trigger_error(sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']) . adm_back_link($this->u_action));
+				$message = sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']);
+				$message .= ($notify_cpf_update) ? '<br /><br />' . $user->lang['LANGUAGE_PACK_CPF_UPDATE'] : '';
+				trigger_error($message . adm_back_link($this->u_action));
 
 			break;
 
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 4d11309ebb..dde4e3d722 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -59,6 +59,7 @@ $lang = array_merge($lang, array(
 	'LANGUAGE_PACK_DELETED'				=> 'The language pack <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
 	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
 	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <strong>%s</strong> has been successfully installed.',
+	'LANGUAGE_PACK_CPF_UPDATE'			=> 'The custom profile fields’ language strings were copied from the default language. Please change them if necessary.',
 	'LANGUAGE_PACK_ISO'					=> 'ISO',
 	'LANGUAGE_PACK_LOCALNAME'			=> 'Local name',
 	'LANGUAGE_PACK_NAME'				=> 'Name',
-- 
cgit v1.2.1


From 3091efc501c7e0d5d0a49cb496364f373a4d0184 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 17 Nov 2011 00:56:38 +0800
Subject: [ticket/9416] HTML entities in poll titles and options incorrectly
 re-encoded

PHPBB3-9416
---
 phpBB/install/convertors/convert_phpbb20.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 7f6e3c0250..789773e349 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -504,7 +504,7 @@ if (!$get_info)
 				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
 				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
 				array('topic_last_view_time',	'posts.post_time',					'intval'),
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
+				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
 				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
 				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
 				array('poll_max_options',		1,									''),
@@ -537,7 +537,7 @@ if (!$get_info)
 				array('topic_type',				'topics.topic_type',				'phpbb_convert_topic_type'),
 				array('topic_first_post_id',	'topics.topic_first_post_id',		''),
 
-				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
+				array('poll_title',				'vote_desc.vote_text',				array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')),
 				array('poll_start',				'vote_desc.vote_start',				'null_to_zero'),
 				array('poll_length',			'vote_desc.vote_length',			'null_to_zero'),
 				array('poll_max_options',		1,									''),
@@ -582,7 +582,7 @@ if (!$get_info)
 				array('poll_option_id',			'vote_results.vote_option_id',		''),
 				array('topic_id',				'vote_desc.topic_id',				''),
 				array('',						'topics.topic_poster AS poster_id',	'phpbb_user_id'),
-				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
+				array('poll_option_text',		'vote_results.vote_option_text',	array('function1' => 'phpbb_set_encoding', 'function2' => 'htmlspecialchars_decode', 'function3' => 'utf8_htmlspecialchars')),
 				array('poll_option_total',		'vote_results.vote_result',			''),
 
 				'where'			=> 'vote_results.vote_id = vote_desc.vote_id',
-- 
cgit v1.2.1


From 4fae5eef6829b997e39099e561cb88cb5d248ff8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 13 Oct 2011 19:25:15 +0200
Subject: [ticket/9776] Delete poll if no poll options were submitted.

PHPBB3-9776
---
 phpBB/includes/functions_posting.php |  8 ++++----
 phpBB/posting.php                    | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a641afbaed..77d92e26e2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1870,9 +1870,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 		case 'edit_topic':
 		case 'edit_first_post':
-			if (isset($poll['poll_options']) && !empty($poll['poll_options']))
+			if (isset($poll['poll_options']))
 			{
-				$poll_start = ($poll['poll_start']) ? $poll['poll_start'] : $current_time;
+				$poll_start = ($poll['poll_start'] || empty($poll['poll_options'])) ? $poll['poll_start'] : $current_time;
 				$poll_length = $poll['poll_length'] * 86400;
 				if ($poll_length < 0)
 				{
@@ -2075,11 +2075,11 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Update Poll Tables
-	if (isset($poll['poll_options']) && !empty($poll['poll_options']))
+	if (isset($poll['poll_options']))
 	{
 		$cur_poll_options = array();
 
-		if ($poll['poll_start'] && $mode == 'edit')
+		if ($mode == 'edit')
 		{
 			$sql = 'SELECT *
 				FROM ' . POLL_OPTIONS_TABLE . '
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 1bc498efe7..ea3b53e939 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -904,6 +904,23 @@ if ($submit || $preview || $refresh)
 			$message_parser->warn_msg[] = $user->lang['NO_DELETE_POLL_OPTIONS'];
 		}*/
 	}
+	else if ($mode == 'edit' && $post_id == $post_data['topic_first_post_id'] && $auth->acl_get('f_poll', $forum_id))
+	{
+		// The user removed all poll options, this is equal to deleting the poll.
+		$poll = array(
+			'poll_title'		=> '',
+			'poll_length'		=> 0,
+			'poll_max_options'	=> 0,
+			'poll_option_text'	=> '',
+			'poll_start'		=> 0,
+			'poll_last_vote'	=> 0,
+			'poll_vote_change'	=> 0,
+			'poll_options'		=> array(),
+		);
+
+		$post_data['poll_options'] = $post_data['poll_title'] = '';
+		$post_data['poll_start'] = $post_data['poll_length'] = $post_data['poll_max_options'] = $post_data['poll_last_vote'] = $post_data['poll_vote_change'] = 0;
+	}
 	else if (!$auth->acl_get('f_poll', $forum_id) && ($mode == 'edit') && ($post_id == $post_data['topic_first_post_id']) && ($original_poll_data['poll_title'] != ''))
 	{
 		// We have a poll but the editing user is not permitted to create/edit it.
-- 
cgit v1.2.1


From 810016ce944a0fbec70187c9d87c9124ecdccb3a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 18 Nov 2011 21:29:02 +0000
Subject: [ticket/10239] Correct undefined variable error.

PHPBB3-10239
---
 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 1bf10b0e57..62bcd43a47 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -221,6 +221,7 @@ class acp_database
 					case 'submit':
 						$delete = request_var('delete', '');
 						$file = request_var('file', '');
+						$download = request_var('download', '');
 
 						if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches))
 						{
@@ -249,8 +250,6 @@ class acp_database
 						}
 						else if ($download || confirm_box(true))
 						{
-							$download = request_var('download', '');
-
 							if ($download)
 							{
 								$name = $matches[0];
-- 
cgit v1.2.1


From eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 12 Nov 2011 14:59:11 +0100
Subject: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp

---
 phpBB/adm/style/editor.js                  | 68 +++++++++++----------
 phpBB/styles/prosilver/template/editor.js  | 61 +++++++++----------
 phpBB/styles/subsilver2/template/editor.js | 96 +++++++++++++++---------------
 3 files changed, 117 insertions(+), 108 deletions(-)

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 217aa699e2..600fa254cf 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -28,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
+*/
+function initInsertions()
 {
 	var doc;
 	if(document.forms[form_name])
@@ -66,7 +66,7 @@ function bbstyle(bbnumber)
 	else
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();		
+		document.forms[form_name].elements[text_name].focus();
 	}
 }
 
@@ -76,7 +76,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -84,14 +84,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
+		if (textarea.createTextRange && textarea.caretPos)
 		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
+			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			textarea.focus();
 			return;
 		}
 	}
@@ -102,10 +98,10 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;		
+	var new_pos = caret_pos + bbopen.length;
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -116,12 +112,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
+		var range = textarea.createTextRange();
+		range.move("character", bbopen.length);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -136,7 +132,7 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-	
+
 	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
@@ -159,18 +155,18 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
+	}
+
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
+		if (baseHeight != textarea.caretPos.boundingHeight)
 		{
 			textarea.focus();
 			storeCaret(textarea);
 		}
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
+
 	}
 	else
 	{
@@ -233,7 +229,7 @@ function addquote(post_id, username)
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');			
+			theSelection = theSelection.replace(/&amp\;/ig, '&');
 			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
 		}
 		else if (document.all)
@@ -268,7 +264,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd == 1 || selEnd == 2)
 	{
 		selEnd = selLength;
 	}
@@ -292,7 +288,17 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	if (textEl.createTextRange)
+	var keyCode = false;
+	if (is_ie)
+	{
+		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
+	}
+
+	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
+	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
+	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
+
+	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -328,7 +334,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -368,9 +374,9 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart == 0)
+	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -384,19 +390,19 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
 		{
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;			
+		caretPos.end = txtarea.sel_start;
 	}
 
 	return caretPos;
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 957c39b568..5aa486d320 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -28,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
+*/
+function initInsertions()
 {
 	var doc;
 
@@ -37,7 +37,7 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else 
+	else
 	{
 		doc = opener.document;
 	}
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{	
+{
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
+	}
+	else
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -86,10 +86,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		textarea = document.forms[form_name].elements[text_name];
 		if (textarea.createTextRange && textarea.caretPos)
 		{
 			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			textarea.focus();
 			return;
 		}
 	}
@@ -100,7 +100,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -114,12 +114,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
+		var range = textarea.createTextRange();
+		range.move("character", new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -134,16 +134,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-	
-	if (!popup) 
+
+	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
+	}
+	else
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces) 
+	if (spaces)
 	{
 		text = ' ' + text + ' ';
 	}
@@ -161,7 +161,7 @@ function insert_text(text, spaces, popup)
 	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
+		if (baseHeight != textarea.caretPos.boundingHeight)
 		{
 			textarea.focus();
 			storeCaret(textarea);
@@ -174,7 +174,7 @@ function insert_text(text, spaces, popup)
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup) 
+	if (!popup)
 	{
 		textarea.focus();
 	}
@@ -291,7 +291,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-				
+
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -319,7 +319,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd == 1 || selEnd == 2)
 	{
 		selEnd = selLength;
 	}
@@ -351,7 +351,9 @@ function storeCaret(textEl)
 
 	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
 	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	if ((!is_ie || (keyCode != 16 && keyCode != 17 && keyCode != 18)) && (textEl.createTextRange))
+	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
+
+	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -387,7 +389,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -427,33 +429,32 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if(!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if(document.selection)
+	else if (document.selection)
 	{
-	
 		// get current selection
 		var range = document.selection.createRange();
 
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
+		{
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 7cc5de9034..5aa486d320 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -6,8 +6,8 @@
 // Startup variables
 var imageTag = false;
 var theSelection = false;
-var bbcodeEnabled = true;
 
+var bbcodeEnabled = true;
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@@ -15,7 +15,6 @@ var clientVer = parseInt(navigator.appVersion); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
 var baseHeight;
 
 /**
@@ -29,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() 
+*/
+function initInsertions()
 {
 	var doc;
 
@@ -38,14 +37,15 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else 
+	else
 	{
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
+
 	if (is_ie && typeof(baseHeight) != 'number')
-	{	
+	{
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{	
+{
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} 
-	else 
+	}
+	else
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -78,7 +78,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-		
+
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -86,14 +86,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection)
+		if (textarea.createTextRange && textarea.caretPos)
 		{
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
+			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			textarea.focus();
 			return;
 		}
 	}
@@ -104,7 +100,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-	
+
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -118,12 +114,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}	
+	}
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
+		var range = textarea.createTextRange();
+		range.move("character", new_pos);
 		range.select();
 		storeCaret(textarea);
 	}
@@ -138,16 +134,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-	
-	if (!popup) 
+
+	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	} 
-	else 
+	}
+	else
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces) 
+	if (spaces)
 	{
 		text = ' ' + text + ' ';
 	}
@@ -162,28 +158,26 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}	
-	
+	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight) 
+		if (baseHeight != textarea.caretPos.boundingHeight)
 		{
 			textarea.focus();
 			storeCaret(textarea);
-		}		
+		}
+
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-		
 	}
 	else
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup) 
+	if (!popup)
 	{
 		textarea.focus();
-	} 	
-
+	}
 }
 
 /**
@@ -279,7 +273,6 @@ function addquote(post_id, username, l_wrote)
 	return;
 }
 
-
 function split_lines(text)
 {
 	var lines = text.split('\n');
@@ -298,7 +291,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-				
+
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -316,7 +309,6 @@ function split_lines(text)
 	}
 	return splitLines;
 }
-
 /**
 * From http://www.massless.org/mozedit/
 */
@@ -327,7 +319,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2) 
+	if (selEnd == 1 || selEnd == 2)
 	{
 		selEnd = selLength;
 	}
@@ -351,7 +343,17 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	if (textEl.createTextRange)
+	var keyCode = false;
+	if (is_ie)
+	{
+		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
+	}
+
+	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
+	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
+	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
+
+	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -387,7 +389,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-			
+
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -427,15 +429,15 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-	
+
 	// simple Gecko/Opera way
-	if(txtarea.selectionStart || txtarea.selectionStart == 0)
+	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if(document.selection)
+	else if (document.selection)
 	{
 		// get current selection
 		var range = document.selection.createRange();
@@ -443,16 +445,16 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-		
+
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{		
+		{
 			range_all.moveStart('character', 1);
 		}
-	
+
 		txtarea.sel_start = sel_start;
-	
+
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
-- 
cgit v1.2.1


From 64d62038cd8e2e69eb101c5256ea458cff98ae10 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 20 Nov 2011 04:15:44 -0500
Subject: [ticket/10446] DRY X-AntiAbuse header addition.

PHPBB3-10446
---
 phpBB/includes/acp/acp_email.php       |  5 +----
 phpBB/includes/acp/acp_inactive.php    | 10 ++--------
 phpBB/includes/acp/acp_users.php       | 10 ++--------
 phpBB/includes/functions_messenger.php | 12 ++++++++++++
 phpBB/includes/ucp/ucp_activate.php    |  5 +----
 phpBB/includes/ucp/ucp_profile.php     |  5 +----
 phpBB/includes/ucp/ucp_register.php    |  9 +++------
 phpBB/includes/ucp/ucp_resend.php      | 10 ++--------
 phpBB/install/install_install.php      |  5 +----
 phpBB/memberlist.php                   |  5 +----
 10 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index e98b7a19a5..29d6903691 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -195,10 +195,7 @@ class acp_email
 
 					$messenger->template('admin_send_email', $used_lang);
 
-					$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+					$messenger->anti_abuse_headers();
 
 					$messenger->subject(htmlspecialchars_decode($subject));
 					$messenger->set_mail_priority($priority);
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index c93cbc457f..a4b2a3ca2f 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -118,10 +118,7 @@ class acp_inactive
 
 								$messenger->to($row['user_email'], $row['username']);
 
-								$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-								$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-								$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-								$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+								$messenger->anti_abuse_headers();
 
 								$messenger->assign_vars(array(
 									'USERNAME'	=> htmlspecialchars_decode($row['username']))
@@ -209,10 +206,7 @@ class acp_inactive
 							$messenger->to($row['user_email'], $row['username']);
 							$messenger->im($row['user_jabber'], $row['username']);
 
-							$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-							$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-							$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-							$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+							$messenger->anti_abuse_headers();
 
 							$messenger->assign_vars(array(
 								'USERNAME'		=> htmlspecialchars_decode($row['username']),
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index abf1481000..590103d519 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -348,10 +348,7 @@ class acp_users
 
 								$messenger->to($user_row['user_email'], $user_row['username']);
 
-								$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-								$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-								$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-								$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+								$messenger->anti_abuse_headers();
 
 								$messenger->assign_vars(array(
 									'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@@ -406,10 +403,7 @@ class acp_users
 
 									$messenger->to($user_row['user_email'], $user_row['username']);
 
-									$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-									$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-									$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-									$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+									$messenger->anti_abuse_headers();
 
 									$messenger->assign_vars(array(
 										'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 08c686d9e3..04b2502210 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -162,6 +162,18 @@ class messenger
 		$this->extra_headers[] = trim($headers);
 	}
 
+	/**
+	* Adds X-AntiAbuse headers
+	*/
+	function anti_abuse_headers($headers)
+	{
+		global $config, $user;
+		$this->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
+		$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
+		$this->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+		$this->headers('X-AntiAbuse: User IP - ' . $user->ip);
+	}
+
 	/**
 	* Set the email priority
 	*/
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index b00c1b9f52..a1468895a9 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -117,10 +117,7 @@ class ucp_activate
 
 			$messenger->to($user_row['user_email'], $user_row['username']);
 
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->anti_abuse_headers();
 
 			$messenger->assign_vars(array(
 				'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 65b32bd0c4..03a0e3d746 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -150,10 +150,7 @@ class ucp_profile
 
 							$messenger->to($data['email'], $data['username']);
 
-							$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-							$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-							$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-							$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+							$messenger->anti_abuse_headers();
 
 							$messenger->assign_vars(array(
 								'USERNAME'		=> htmlspecialchars_decode($data['username']),
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 13b9945851..e3e719d63c 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -155,8 +155,8 @@ class ucp_register
 			$this->tpl_name = 'ucp_agreement';
 			return;
 		}
-		
-		
+
+
 		// The CAPTCHA kicks in here. We can't help that the information gets lost on language change. 
 		if ($config['enable_confirm'])
 		{
@@ -366,10 +366,7 @@ class ucp_register
 
 					$messenger->to($data['email'], $data['username']);
 
-					$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+					$messenger->anti_abuse_headers();
 
 					$messenger->assign_vars(array(
 						'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 39e9be24a1..c1f9effb01 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -94,10 +94,7 @@ class ucp_resend
 				$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
 				$messenger->to($user_row['user_email'], $user_row['username']);
 
-				$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-				$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-				$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-				$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+				$messenger->anti_abuse_headers();
 
 				$messenger->assign_vars(array(
 					'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@@ -133,10 +130,7 @@ class ucp_resend
 					$messenger->to($row['user_email'], $row['username']);
 					$messenger->im($row['user_jabber'], $row['username']);
 
-					$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+					$messenger->anti_abuse_headers();
 
 					$messenger->assign_vars(array(
 						'USERNAME'			=> htmlspecialchars_decode($user_row['username']),
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index ccdcf211f1..4a988bb80a 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1945,10 +1945,7 @@ class install_install extends module
 
 			$messenger->to($data['board_email1'], $data['admin_name']);
 
-			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->anti_abuse_headers();
 
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($data['admin_name']),
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 8169ee7a3e..f3af8fd44c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -899,10 +899,7 @@ switch ($mode)
 						$notify_type = NOTIFY_EMAIL;
 					}
 
-					$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+					$messenger->anti_abuse_headers();
 
 					$messenger->assign_vars(array(
 						'BOARD_CONTACT'	=> $config['board_contact'],
-- 
cgit v1.2.1


From c68973a9e04c51e4a2eeec9c3276c9a89baa09e5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 20 Nov 2011 04:17:42 -0500
Subject: [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse
 headers.

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

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 04b2502210..a2ad51a42e 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -168,9 +168,9 @@ class messenger
 	function anti_abuse_headers($headers)
 	{
 		global $config, $user;
-		$this->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
+		$this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name']));
 		$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-		$this->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+		$this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username']));
 		$this->headers('X-AntiAbuse: User IP - ' . $user->ip);
 	}
 
-- 
cgit v1.2.1


From a7077c91495521a8015a2e1dbbe587b2d97a8edc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 14:02:22 +0100
Subject: [ticket/10446] Remove leftover $headers parameter from
 anti_abuse_headers().

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

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a2ad51a42e..9087b1c8aa 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -165,9 +165,10 @@ class messenger
 	/**
 	* Adds X-AntiAbuse headers
 	*/
-	function anti_abuse_headers($headers)
+	function anti_abuse_headers()
 	{
 		global $config, $user;
+
 		$this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name']));
 		$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
 		$this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username']));
-- 
cgit v1.2.1


From 37c766819346b830cf184fdfae9407006a621b17 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 16:35:31 +0100
Subject: [ticket/10446] Pass $config and $user via parameter to
 anti_abuse_headers().

PHPBB3-10446
---
 phpBB/includes/acp/acp_email.php       | 2 +-
 phpBB/includes/acp/acp_inactive.php    | 4 ++--
 phpBB/includes/acp/acp_users.php       | 4 ++--
 phpBB/includes/functions_messenger.php | 9 ++++++---
 phpBB/includes/ucp/ucp_activate.php    | 2 +-
 phpBB/includes/ucp/ucp_profile.php     | 2 +-
 phpBB/includes/ucp/ucp_register.php    | 2 +-
 phpBB/includes/ucp/ucp_resend.php      | 4 ++--
 phpBB/install/install_install.php      | 2 +-
 phpBB/memberlist.php                   | 2 +-
 10 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 29d6903691..df0d44c0c5 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -195,7 +195,7 @@ class acp_email
 
 					$messenger->template('admin_send_email', $used_lang);
 
-					$messenger->anti_abuse_headers();
+					$messenger->anti_abuse_headers($config, $user);
 
 					$messenger->subject(htmlspecialchars_decode($subject));
 					$messenger->set_mail_priority($priority);
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index a4b2a3ca2f..f3f332d707 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -118,7 +118,7 @@ class acp_inactive
 
 								$messenger->to($row['user_email'], $row['username']);
 
-								$messenger->anti_abuse_headers();
+								$messenger->anti_abuse_headers($config, $user);
 
 								$messenger->assign_vars(array(
 									'USERNAME'	=> htmlspecialchars_decode($row['username']))
@@ -206,7 +206,7 @@ class acp_inactive
 							$messenger->to($row['user_email'], $row['username']);
 							$messenger->im($row['user_jabber'], $row['username']);
 
-							$messenger->anti_abuse_headers();
+							$messenger->anti_abuse_headers($config, $user);
 
 							$messenger->assign_vars(array(
 								'USERNAME'		=> htmlspecialchars_decode($row['username']),
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 590103d519..4f58434a43 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -348,7 +348,7 @@ class acp_users
 
 								$messenger->to($user_row['user_email'], $user_row['username']);
 
-								$messenger->anti_abuse_headers();
+								$messenger->anti_abuse_headers($config, $user);
 
 								$messenger->assign_vars(array(
 									'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@@ -403,7 +403,7 @@ class acp_users
 
 									$messenger->to($user_row['user_email'], $user_row['username']);
 
-									$messenger->anti_abuse_headers();
+									$messenger->anti_abuse_headers($config, $user);
 
 									$messenger->assign_vars(array(
 										'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 9087b1c8aa..91b361183c 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -164,11 +164,14 @@ class messenger
 
 	/**
 	* Adds X-AntiAbuse headers
+	*
+	* @param array $config		Configuration array
+	* @param user $user			A user object
+	*
+	* @return null
 	*/
-	function anti_abuse_headers()
+	function anti_abuse_headers($config, $user)
 	{
-		global $config, $user;
-
 		$this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name']));
 		$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
 		$this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username']));
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index a1468895a9..82c1937919 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -117,7 +117,7 @@ class ucp_activate
 
 			$messenger->to($user_row['user_email'], $user_row['username']);
 
-			$messenger->anti_abuse_headers();
+			$messenger->anti_abuse_headers($config, $user);
 
 			$messenger->assign_vars(array(
 				'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 03a0e3d746..d35d13b6c1 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -150,7 +150,7 @@ class ucp_profile
 
 							$messenger->to($data['email'], $data['username']);
 
-							$messenger->anti_abuse_headers();
+							$messenger->anti_abuse_headers($config, $user);
 
 							$messenger->assign_vars(array(
 								'USERNAME'		=> htmlspecialchars_decode($data['username']),
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index e3e719d63c..4e8729db56 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -366,7 +366,7 @@ class ucp_register
 
 					$messenger->to($data['email'], $data['username']);
 
-					$messenger->anti_abuse_headers();
+					$messenger->anti_abuse_headers($config, $user);
 
 					$messenger->assign_vars(array(
 						'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index c1f9effb01..4d181dba49 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -94,7 +94,7 @@ class ucp_resend
 				$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
 				$messenger->to($user_row['user_email'], $user_row['username']);
 
-				$messenger->anti_abuse_headers();
+				$messenger->anti_abuse_headers($config, $user);
 
 				$messenger->assign_vars(array(
 					'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@@ -130,7 +130,7 @@ class ucp_resend
 					$messenger->to($row['user_email'], $row['username']);
 					$messenger->im($row['user_jabber'], $row['username']);
 
-					$messenger->anti_abuse_headers();
+					$messenger->anti_abuse_headers($config, $user);
 
 					$messenger->assign_vars(array(
 						'USERNAME'			=> htmlspecialchars_decode($user_row['username']),
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 4a988bb80a..8b073df44c 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1945,7 +1945,7 @@ class install_install extends module
 
 			$messenger->to($data['board_email1'], $data['admin_name']);
 
-			$messenger->anti_abuse_headers();
+			$messenger->anti_abuse_headers($config, $user);
 
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($data['admin_name']),
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index f3af8fd44c..b3c0bae16a 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -899,7 +899,7 @@ switch ($mode)
 						$notify_type = NOTIFY_EMAIL;
 					}
 
-					$messenger->anti_abuse_headers();
+					$messenger->anti_abuse_headers($config, $user);
 
 					$messenger->assign_vars(array(
 						'BOARD_CONTACT'	=> $config['board_contact'],
-- 
cgit v1.2.1


From 06ae98b1e557661528f53be08244f6fa7338d9b6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 21:41:24 +0100
Subject: [develop-olympus] Bumping version numbers to final for 3.0.10
 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 3c3ccf9f28..e5ba479d9e 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.8</samp> you should select the phpBB-3.0.8_to_3.0.9.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.9</samp> you should select the phpBB-3.0.9_to_3.0.10.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.8</samp> you need the phpBB-3.0.8_to_3.0.9.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.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>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 789773e349..81cc2f68f3 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.9',
+	'phpbb_version'	=> '3.0.10',
 	'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 72252079d6..5a703d9e47 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.9
+version = 3.0.10
 
 # Images
 img_site_logo = site_logo.gif*52*139
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 83e762f65b..95d8d287e4 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.9
\ No newline at end of file
+version = 3.0.10
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index 42383a022f..d31dcb7356 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.9
+version = 3.0.10
 
 # 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 4270094eab..e8698f7fe4 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.9
+version = 3.0.10
 
 # Some configuration options
 
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index d8cfabcb02..75a4aad038 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.9
+version = 3.0.10
 
 # Images
 img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 0cdb7204bb..13e44435c6 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.9
+version = 3.0.10
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index 92ccfef35a..4e5c36af99 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,5 +19,5 @@
 # General Information about this template
 name = subsilver2
 copyright = &copy; phpBB Group, 2003
-version = 3.0.9
+version = 3.0.10
 
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index 94e2f6d53d..d7837a3766 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.9
+version = 3.0.10
 
 # Some configuration options
 
-- 
cgit v1.2.1


From 3e43b53a63743a81b27b53c01d57e4b73d994ae9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 20 Nov 2011 21:50:29 +0100
Subject: [develop-olympus] Bump version numbers for 3.0.10-RC1 release.

---
 build/build.xml                       | 6 +++---
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 8 +++++---
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index eb63bde034..fbc1a91e1b 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.9" />
-	<property name="prevversion" value="3.0.8" />
-	<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3, 3.0.9-RC4" />
+	<property name="newversion" value="3.0.10-RC1" />
+	<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" />
 	<!-- 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 03b1102602..ec7b8c7123 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-dev');
+define('PHPBB_VERSION', '3.0.10-RC1');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 21246a215e..9ca011c8aa 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-dev');
+define('UPDATES_TO_VERSION', '3.0.10-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.10 after the db_tools class is capable of properly
+						// 3.0.11 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', ''),
@@ -985,8 +985,10 @@ function database_update_info()
 		'3.0.9-RC3'     => array(),
 		// No changes from 3.0.9-RC4 to 3.0.9
 		'3.0.9-RC4'     => array(),
+		// No changes from 3.0.9 to 3.0.10-RC1
+		'3.0.9'			=> array(),
 
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 84b25d676e..4f5bf23c58 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-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-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');
 
-- 
cgit v1.2.1


From f5633d281e04d93f5e4c0e0a01ffc82c9df12a8f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 21 Nov 2011 00:08:49 +0100
Subject: [develop-olympus] Add changelog for 3.0.10-RC1

---
 phpBB/docs/CHANGELOG.html | 162 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 144 insertions(+), 18 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6437fef1d5..a4ed1b5c86 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="#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>
 		<li><a href="#v307">Changes since 3.0.7</a></li>
@@ -90,7 +91,132 @@
 
 		<div class="content">
 
-	<a name="v308"></a><h3>1.i. Changes since 3.0.8</h3>
+	<a name="v309"></a><h3>1.i. Changes since 3.0.9</h3>
+
+<h4>Bug</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-5506">PHPBB3-5506</a>] -  Deleting all items from last page results in empty list display</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6458">PHPBB3-6458</a>] -  Width of Topics and Posts columns in Board Index is causing problems with language packs</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6632">PHPBB3-6632</a>] -  Better viewing of topics for wide screen displays</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7138">PHPBB3-7138</a>] -  Cannot display simple header/footer with trigger_error()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7291">PHPBB3-7291</a>] -  Broken links of char selection in memberlist</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7932">PHPBB3-7932</a>] -  Fix font size in select boxes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8094">PHPBB3-8094</a>] -  Text in the forums.php and install.php not matching</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8173">PHPBB3-8173</a>] -  Redundant BBCode helpline in JS</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8177">PHPBB3-8177</a>] -  February 29th birthdays not shown in non-leap year</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8571">PHPBB3-8571</a>] -  Users can make their age a negative number on memberlist</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8691">PHPBB3-8691</a>] -  Error creating log_time index</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8937">PHPBB3-8937</a>] -  Code tags - single space indent</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8996">PHPBB3-8996</a>] -  Wrong position when adding BBCodes with accesskey in IE</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9008">PHPBB3-9008</a>] -  Incorrect unread topic tracking for unapproved topics</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9066">PHPBB3-9066</a>] -  Invalid Prefix Names Allowed</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9416">PHPBB3-9416</a>] -  HTML entities in poll titles and options incorrectly re-encoded</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9525">PHPBB3-9525</a>] -  Minimum characters per post/message should never be '0'</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9645">PHPBB3-9645</a>] -  XHTML error on phpinfo page in ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9776">PHPBB3-9776</a>] -  When deleting and recreating a poll, old options aren't deleted and reappear with the new ones</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9956">PHPBB3-9956</a>] -  No error message displayed when disapprove reason is invalid or empty</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9976">PHPBB3-9976</a>] -  Direct post links open the wrong page of viewtopic when multiple posts are posted in the same second</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9978">PHPBB3-9978</a>] -  Missing semicolons in // &lt;![CDATA[ part of overall_header.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10087">PHPBB3-10087</a>] -  Limited browser support for ban exclusion emphasis</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10157">PHPBB3-10157</a>] -  Missing error handling when a custom profile field is not defined for current language</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10166">PHPBB3-10166</a>] -  Post-admin activation email confusingly refers to username</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10187">PHPBB3-10187</a>] -  XHTML error in ucp_groups_manage.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10190">PHPBB3-10190</a>] -  Misleading information about permissions displayed after editing forum settings</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10212">PHPBB3-10212</a>] -  Captcha not displayed when username not exists</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10216">PHPBB3-10216</a>] -  Updater's failed query language grammatically incorrect</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10226">PHPBB3-10226</a>] -  Mysqli dbal extension does not allow connection via pipes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10227">PHPBB3-10227</a>] -  Mysqli dbal extension does not allow persistent connection for PHP &gt;= 5.3.0</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10237">PHPBB3-10237</a>] -  Unwatching a forum/topic does not check for correct hash parameter</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10240">PHPBB3-10240</a>] -  Word filter evasion</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10253">PHPBB3-10253</a>] -  IE9 Quote problem</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10255">PHPBB3-10255</a>] -  gitignore ignores too much</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10257">PHPBB3-10257</a>] -  AAAA record parsing fails on older versions of Windows</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10259">PHPBB3-10259</a>] -  Incorrect email on joining Open group</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10265">PHPBB3-10265</a>] -  Unit test tests/random/mt_rand.php is not run because of missing _test suffix.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10266">PHPBB3-10266</a>] -  Poor navigation links after reporting a post</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10267">PHPBB3-10267</a>] -  Missing strlen() on $table_prefix in db tools index name length check</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10274">PHPBB3-10274</a>] -  Hardcoded module ID in &quot;Re-check version&quot; link on ACP front page</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10275">PHPBB3-10275</a>] -  Wrong information about sent passwords in FAQ</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10292">PHPBB3-10292</a>] -  Whitespace inconsistency in acp_ranks</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10293">PHPBB3-10293</a>] -  Jumpbox allows jumping to invalid forums in prosilver</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10294">PHPBB3-10294</a>] -  sqlsrv_rows_affected non-functional in MSSQLNative.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10296">PHPBB3-10296</a>] -  incorrect cross join in SQL Server</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10298">PHPBB3-10298</a>] -  EMBED Tag Not Closed Properly In subSilver2 attachment.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10299">PHPBB3-10299</a>] -  Typo in comment about $max_store_length in truncate_string() (in functions_content.php)</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10303">PHPBB3-10303</a>] -  send_status_line() doesn't validate user input</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10304">PHPBB3-10304</a>] -  Bad url in U_ICQ on /ucp_mp_viewmessage.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10307">PHPBB3-10307</a>] -  Return value of $db-&gt;sql_fetchrow() on empty tables is not consistent</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10309">PHPBB3-10309</a>] -  Utf tests download data into temporary locations deep in source tree</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10320">PHPBB3-10320</a>] -  &quot;Most active topic&quot; can leak topic title of topics in password-protected forums</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10321">PHPBB3-10321</a>] -  Link to page 1 of the Memberlist has a useless question mark at the end</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10324">PHPBB3-10324</a>] -  XHTML error in Prosilver - MCP - User Notes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10339">PHPBB3-10339</a>] -  Typo in prosilver's mcp_front.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10341">PHPBB3-10341</a>] -  Topic title of &quot;0&quot; does not show as &quot;Most active topic&quot;</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10351">PHPBB3-10351</a>] -  Invalid syntax for Oracle's sql_column_remove()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10352">PHPBB3-10352</a>] -  Missing break for Oracle's sql_table_drop()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10365">PHPBB3-10365</a>] -  Moderators can view forbidden information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10377">PHPBB3-10377</a>] -  All moderators can change topic type</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10394">PHPBB3-10394</a>] -  Tests use call-time pass by reference which results in Fatal error on PHP 5.4</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10397">PHPBB3-10397</a>] -  Pagination code inconsistency </li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10400">PHPBB3-10400</a>] -  '0' (zero) not allowed as forum name</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10408">PHPBB3-10408</a>] -  Layout of topics/attachments list is broken in UCP and MCP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10413">PHPBB3-10413</a>] -  Make create_schema_files usable</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10416">PHPBB3-10416</a>] -  Use dbport in phpbb_database_test_connection_manager::connect()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10420">PHPBB3-10420</a>] -  Update startup to account for PHP 5.4</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10421">PHPBB3-10421</a>] -  Interchanged parameters in includes/acp/acp_users.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10422">PHPBB3-10422</a>] -  Unnecessary &lt;!-- IF --&gt; statement in viewtopic_body.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10435">PHPBB3-10435</a>] -  Topic count mismatch on viewforum</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10437">PHPBB3-10437</a>] -  Announcements on moderation queue are not hidden</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10446">PHPBB3-10446</a>] -  Unencoded 8bit characters in email headers</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10452">PHPBB3-10452</a>] -  XHTML error when printing a PM</li>
+</ul>
+<h4>Improvement</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] -  Add direct link to PM to notification message</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not red expose forum information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] -  Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] -  Mass email $max_chunk_size</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] -  Edit account settings - Improved clarification needed</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9778">PHPBB3-9778</a>] -  Member Search from the Admin Control Panel is not Intuitive</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9898">PHPBB3-9898</a>] -  Readme needs updating to reflect more opening for patches</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9995">PHPBB3-9995</a>] -  Unnecessary coding in display_forums() in functions_display.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10032">PHPBB3-10032</a>] -  BBCode Add List Item Control Name Contains Typo</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10074">PHPBB3-10074</a>] -  Change default value of 'Set as special rank' to No for Add new rank</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10185">PHPBB3-10185</a>] -  Board startdate not being set</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10189">PHPBB3-10189</a>] -  Add &quot;automatically generated&quot; comment into schema-files.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10199">PHPBB3-10199</a>] -  Performance: viewtopic has a useless join</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10222">PHPBB3-10222</a>] -  Also build language and styles changes in diff/patch format</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10239">PHPBB3-10239</a>] -  Add &quot;Are you sure&quot; confirmation to backup restore in ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10243">PHPBB3-10243</a>] -  Add gmgetdate() wrapper for getdate() which returns dates in UTC.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10245">PHPBB3-10245</a>] -  Messenger uses output buffering for error collection, should use error collector instead</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10246">PHPBB3-10246</a>] -  Remove VCS section from docs/coding-guidelines.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10254">PHPBB3-10254</a>] -  Remove style names from themes and fix some information on it</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10263">PHPBB3-10263</a>] -  Add phpbb_version_compare() wrapper for version_compare()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10278">PHPBB3-10278</a>] -  Improve timeout handling in get_remote_file()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10315">PHPBB3-10315</a>] -  Radio Buttons in ACP are clipped in Safari - Fix suggested</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10327">PHPBB3-10327</a>] -  Use &quot;ALTER TABLE ... ADD INDEX&quot; instead of &quot;CREATE INDEX&quot;</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10334">PHPBB3-10334</a>] -  Birthday List display not dependent on user privileges</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10335">PHPBB3-10335</a>] -  Responses to bots should have extra header to be used by reverse proxies</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10346">PHPBB3-10346</a>] -  Add drop_tables key for database updater</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10354">PHPBB3-10354</a>] -  When template tests are skipped because cache is not writable, print cache directory path</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10369">PHPBB3-10369</a>] -  Change error collector to always report errfile and errline</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10370">PHPBB3-10370</a>] -  Various improvements for get_backtrace()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10402">PHPBB3-10402</a>] -  Displaying report texts with linebreaks and clickable links</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10419">PHPBB3-10419</a>] -  Add mbstring PHP ini parameters checks to ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10430">PHPBB3-10430</a>] -  Some typos and the like in docs/coding-guidelines.html</li>
+</ul>
+<h4>New Feature</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8240">PHPBB3-8240</a>] -  Request: db_tools to have two additional functions, table list and column list</li>
+</ul>
+<h4>Task</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9689">PHPBB3-9689</a>] -  Scripts and utilities</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10003">PHPBB3-10003</a>] -  Resolve db_tools proliferation</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10313">PHPBB3-10313</a>] -  Include slow unit tests when running build script</li>
+</ul>
+
+	<a name="v308"></a><h3>1.ii. Changes since 3.0.8</h3>
 
 <h4>        Bug
 </h4>
@@ -458,7 +584,7 @@
 </ul>
 
 
-	<a name="v307-PL1"></a><h3>1.ii. Changes since 3.0.7-PL1</h3>
+	<a name="v307-PL1"></a><h3>1.iii. Changes since 3.0.7-PL1</h3>
 <h4>        Security
 </h4>
 <ul>
@@ -916,13 +1042,13 @@
 </ul>
 
 
-	<a name="v307"></a><h3>1.iii. Changes since 3.0.7</h3>
+	<a name="v307"></a><h3>1.iiv. 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.iv. Changes since 3.0.6</h3>
+	<a name="v306"></a><h3>1.v. 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>
@@ -1026,7 +1152,7 @@
 
 	</ul>
 
-	<a name="v305"></a><h3>1.v. Changes since 3.0.5</h3>
+	<a name="v305"></a><h3>1.vi. Changes since 3.0.5</h3>
 
 	<ul>
 		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -1248,7 +1374,7 @@
 		<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
 	</ul>
 
-	<a name="v304"></a><h3>1.vi. Changes since 3.0.4</h3>
+	<a name="v304"></a><h3>1.vii. 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>
@@ -1337,7 +1463,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.vii. Changes since 3.0.3</h3>
+	<a name="v303"></a><h3>1.viii. Changes since 3.0.3</h3>
 
 	<ul>
 		<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -1369,7 +1495,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.viii. Changes since 3.0.2</h3>
+	<a name="v302"></a><h3>1.ix. 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>
@@ -1468,7 +1594,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.ix. Changes since 3.0.1</h3>
+	<a name="v301"></a><h3>1.x. Changes since 3.0.1</h3>
 
 	<ul>
 		<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -1516,7 +1642,7 @@
 		<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
 	</ul>
 
-	<a name="v300"></a><h3>1.x Changes since 3.0.0</h3>
+	<a name="v300"></a><h3>1.xi Changes since 3.0.0</h3>
 
 	<ul>
 		<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -1587,7 +1713,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.xi. Changes since 3.0.RC8</h3>
+	<a name="v30rc8"></a><h3>1.xii. 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>
@@ -1596,7 +1722,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.xii. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>1.xiii. Changes since 3.0.RC7</h3>
 
 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -1631,7 +1757,7 @@
 		<li>[Fix] No duplication of active topics (Bug #15474)</li>
 	</ul>
 
-	<a name="v30rc6"></a><h3>1.xiii. Changes since 3.0.RC6</h3>
+	<a name="v30rc6"></a><h3>1.xiv. Changes since 3.0.RC6</h3>
 
 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -1641,7 +1767,7 @@
 		<li>[Fix] Able to request new password (Bug #14743)</li>
 	</ul>
 
-	<a name="v30rc5"></a><h3>1.xiv. Changes since 3.0.RC5</h3>
+	<a name="v30rc5"></a><h3>1.xv. 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>
@@ -1704,7 +1830,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
-	<a name="v30rc4"></a><h3>1.xv. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>1.xvi. Changes since 3.0.RC4</h3>
 
 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -1755,7 +1881,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>
 
-	<a name="v30rc3"></a><h3>1.xvi. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>1.xvii. Changes since 3.0.RC3</h3>
 
 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -1864,7 +1990,7 @@
 
 	</ul>
 
-	<a name="v30rc2"></a><h3>1.xvii. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>1.xviii. Changes since 3.0.RC2</h3>
 
 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -1910,7 +2036,7 @@
 
 	</ul>
 
-	<a name="v30rc1"></a><h3>1.xviii. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>1.xix. Changes since 3.0.RC1</h3>
 
 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
-- 
cgit v1.2.1


From c4d3c5320e03f3adbbae90b4c04ff1a8783d51b6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 21 Nov 2011 00:12:44 +0100
Subject: [ticket/10479] Remove PostgreSQL version numbers from driver's
 language string

The versions should be removed like for all other DBMS so we don't have to add
each new version.

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f038177df4..c4b100187f 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -151,7 +151,7 @@ $lang = array_merge($lang, array(
 	'DLL_MYSQL'					=> 'MySQL',
 	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
 	'DLL_ORACLE'				=> 'Oracle',
-	'DLL_POSTGRES'				=> 'PostgreSQL 7.x/8.x',
+	'DLL_POSTGRES'				=> 'PostgreSQL',
 	'DLL_SQLITE'				=> 'SQLite',
 	'DLL_XML'					=> 'XML support [ Jabber ]',
 	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
-- 
cgit v1.2.1


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: [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');
 
-- 
cgit v1.2.1


From aef3652d7a11c956f0a16b3773fb59abc7b6d280 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 21 Nov 2011 13:09:27 +0100
Subject: [ticket/10483] Fix test suite when running with MySQL strict mode

PHPBB3-10483
---
 tests/dbal/fixtures/massmail_crossjoin.xml | 16 ++++++++++++++++
 tests/dbal/fixtures/three_users.xml        | 16 ++++++++++++++++
 tests/session/fixtures/sessions_empty.xml  | 16 ++++++++++++++++
 tests/session/fixtures/sessions_full.xml   | 16 ++++++++++++++++
 4 files changed, 64 insertions(+)

diff --git a/tests/dbal/fixtures/massmail_crossjoin.xml b/tests/dbal/fixtures/massmail_crossjoin.xml
index 801205eb81..ef0a2b7149 100644
--- a/tests/dbal/fixtures/massmail_crossjoin.xml
+++ b/tests/dbal/fixtures/massmail_crossjoin.xml
@@ -12,20 +12,36 @@
 		<column>user_id</column>
 		<column>username</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>mass email</value>
 			<value>mass email</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>banned</value>
 			<value>banned</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>not in group</value>
 			<value>not in group</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_user_group">
diff --git a/tests/dbal/fixtures/three_users.xml b/tests/dbal/fixtures/three_users.xml
index a6789f4a01..a50e3e8634 100644
--- a/tests/dbal/fixtures/three_users.xml
+++ b/tests/dbal/fixtures/three_users.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>barfoo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>foobar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>bertie</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml
index f94337314e..0e6ddccd88 100644
--- a/tests/session/fixtures/sessions_empty.xml
+++ b/tests/session/fixtures/sessions_empty.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>foo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>bar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
index bf6fc65997..509687f4d2 100644
--- a/tests/session/fixtures/sessions_full.xml
+++ b/tests/session/fixtures/sessions_full.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>foo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>bar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
-- 
cgit v1.2.1


From c67633577f276727e1d15106a87517b97c8a4d1a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 21 Nov 2011 23:23:02 +0100
Subject: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632

Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1

PHPBB3-6632
PHPBB3-10485
---
 phpBB/styles/prosilver/template/forumlist_body.html | 10 +++++-----
 phpBB/styles/prosilver/template/search_results.html | 10 +++++-----
 phpBB/styles/prosilver/template/viewforum_body.html | 10 +++++-----
 phpBB/styles/prosilver/theme/content.css            | 12 ++++++++++--
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 2c2a242a9f..bf672e16fc 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -11,9 +11,9 @@
 		<div class="forabg">
 			<div class="inner"><span class="corners-top"><span></span></span>
 			<ul class="topiclist">
-				<li class="header">
+				<li class="header widescreen-optimised">
 					<dl class="icon">
-						<dt><div class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
+						<dt><span class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></span></dt>
 						<dd class="topics">{L_TOPICS}</dd>
 						<dd class="posts">{L_POSTS}</dd>
 						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -25,8 +25,8 @@
 
 	<!-- IF not forumrow.S_IS_CAT -->
 		<li class="row">
-			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><div class="wrap-content">
+			<dl class="icon widescreen-optimised" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><span class="wrap-content">
 				<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
 
 					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
@@ -36,7 +36,7 @@
 						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
 					<!-- ENDIF -->
 					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
-				</div></dt>
+				</span></dt>
 				<!-- IF forumrow.CLICKS -->
 					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
 				<!-- ELSEIF not forumrow.S_IS_LINK -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index f2a4435103..014b39de87 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -39,8 +39,8 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon">
-					<dt>{L_TOPICS}</dt>
+				<dl class="icon widescreen-optimised">
+					<dt><span class="wrap-content">{L_TOPICS}</span></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -51,8 +51,8 @@
 
 		<!-- BEGIN searchresults -->
 			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
+				<dl class="icon widescreen-optimised" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->><span class="wrap-content">
 						<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
 						<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
 						<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
@@ -60,7 +60,7 @@
 						<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
 						{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME}
 						<!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF -->
-					</dt>
+					</span></dt>
 					<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>
 					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
 					<dd class="lastpost"><span>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 4ad0990d98..d2952bff2a 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -126,8 +126,8 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon">
-					<dt><div class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>
+				<dl class="icon widescreen-optimised">
+					<dt><span class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></span></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -138,13 +138,13 @@
 	<!-- ENDIF -->
 
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><div class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+			<dl class="icon widescreen-optimised" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><span class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
 					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
 					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</div></dt>
+				</span></dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index c278a16dc5..696d5e1cc0 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -29,14 +29,19 @@ ul.topiclist li.row dl {
 ul.topiclist dt {
 	display: block;
 	float: left;
-	width: 100%;
+	width: 50%;
 	font-size: 1.1em;
 	padding-left: 5px;
 	padding-right: 5px;
+}
+
+ul.topiclist .widescreen-optimised dt {
+	width: 100%;
 	margin-right: -465px;
 }
 
-ul.topiclist dt .wrap-content {
+ul.topiclist .widescreen-optimised dt .wrap-content {
+	display: block;
 	padding-right: 465px;
 }
 
@@ -101,6 +106,9 @@ li.header dt, li.header dd {
 
 li.header dt {
 	font-weight: bold;
+}
+
+li.header .widescreen-optimised dt {
 	margin-right: -465px;
 }
 
-- 
cgit v1.2.1


From 0d3697e40caadc07bf9165d8d2f2436efffd543a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 Nov 2011 20:59:51 +0100
Subject: [ticket/10486] Create git shortlog and git diff --stat in build
 script.

PHPBB3-10486
---
 build/build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index fbc1a91e1b..c942142b5e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -119,6 +119,7 @@
 	<target name="create-package" depends="prepare-new-version,old-version-diffs">
 		<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
 		<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
+
 		<exec dir="build" escape="false"
 			command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
 				save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />
@@ -128,6 +129,13 @@
 		<exec dir="build" escape="false"
 			command="diff -crNEBwd old_versions/release-${prevversion}/styles/subsilver2 new_version/phpBB3/styles/subsilver2 >
 				save/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />
+
+		<exec dir="build" escape="false"
+			command="git shortlog --summary --numbered release-${prevversion}...HEAD >
+				save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />
+		<exec dir="build" escape="false"
+			command="git diff --stat release-${prevversion}...HEAD >
+				save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
 	</target>
 
 	<!--
-- 
cgit v1.2.1


From 43818289fe91906bb5d095ea944f142fef8488b4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 23 Nov 2011 22:28:55 +0100
Subject: [ticket/10488] Only set $config['email_max_chunk_size'] when not
 already set.

PHPBB3-10488
---
 phpBB/install/database_update.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ca011c8aa..57e2ef73b8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1999,7 +1999,12 @@ function change_database_data(&$no_updates, $version)
 
 		// Changes from 3.0.9 to 3.0.10-RC1
 		case '3.0.9':
-			set_config('email_max_chunk_size', '50');
+			if (!isset($config['email_max_chunk_size']))
+			{
+				set_config('email_max_chunk_size', '50');
+			}
+
+			$no_updates = false;
 		break;
 	}
 }
-- 
cgit v1.2.1


From 6f40960071129aafc2218ec23264c90af75fbad4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 23 Nov 2011 22:56:24 +0100
Subject: [ticket/10461] Correct $log_count check in view_log() so we show logs
 again.

We pass $log_count as false now when we do not need to know how many log
entries there are. However when $log_count is false, $log_count == 0 will be
true as well and thus we will return early with 0.

PHPBB3-9874
PHPBB3-10461
---
 phpBB/includes/functions_admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 513b7a68b2..3916e769ac 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2609,7 +2609,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		$db->sql_freeresult($result);
 	}
 
-	if ($log_count == 0)
+	if ($log_count === 0)
 	{
 		// Save the queries, because there are no logs to display
 		return 0;
-- 
cgit v1.2.1


From a72ea2bc98bd75bf02414e6e5c7723c9ec47a97d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 23 Nov 2011 18:09:33 -0500
Subject: [ticket/10461] Add a comment explaining the logic here.

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

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 3916e769ac..526bc16ff0 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2609,6 +2609,10 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		$db->sql_freeresult($result);
 	}
 
+	// $log_count may be false here if false was passed in for it,
+	// because in this case we did not run the COUNT() query above.
+	// If we ran the COUNT() query and it returned zero rows, return;
+	// otherwise query for logs below.
 	if ($log_count === 0)
 	{
 		// Save the queries, because there are no logs to display
-- 
cgit v1.2.1


From 3ce5b1d3867b4276985dde78d5a3d021f26ca2a7 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Sat, 16 Jul 2011 08:22:29 -0400
Subject: [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 = '';
 
-		$radio_text = h_radio('config[require_activation]', $radio_ary, $value, 'require_activation', $key, '<br />');
+		foreach ($act_ary as $key => $value)
+		{
+			$selected = ($selected_value == $value) ? ' selected="selected"' : '';
+			$act_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$key] . '</option>';
+		}
 
-		return $radio_text;
+		return $act_options;
 	}
 
 	/**
-- 
cgit v1.2.1


From 007457f18295cd4019684e1470110dd4b50de8cf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 26 Nov 2011 22:17:43 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

---
 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 9 ++++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index c942142b5e..18b03243c2 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-RC1" />
+	<property name="newversion" value="3.0.10-RC2" />
 	<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" />
+	<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" />
 	<!-- 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 ec7b8c7123..2ade1ac95e 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.10-RC2');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 57e2ef73b8..bbc4261adc 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.10-RC2');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -987,6 +987,9 @@ function database_update_info()
 		'3.0.9-RC4'     => array(),
 		// No changes from 3.0.9 to 3.0.10-RC1
 		'3.0.9'			=> array(),
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		'3.0.10-RC1'	=> array(),
+
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2006,6 +2009,10 @@ function change_database_data(&$no_updates, $version)
 
 			$no_updates = false;
 		break;
+
+		// No changes from 3.0.10-RC1 to 3.0.10-RC2
+		case '3.0.10-RC1':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4f5bf23c58..5cbaba3d1f 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.10-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');
 
-- 
cgit v1.2.1


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: [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";
 
-- 
cgit v1.2.1


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: [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 ));
-- 
cgit v1.2.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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


From 77e00d14a196d14910bdf2275ab01380b7b7f18f Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 26 Nov 2011 01:30:03 +0800
Subject: [ticket/10497] Fix SQL error when guest visits forum with unread
 topic

Regression from the ticket PHPBB3-9008 fix.

When topic marking was enabled for guests, and a guest visited a forum with
a new topic which is marked unread, the built SQL missed an alias for a
TOPICS_TABLE which resulted in the following error:

Unknown column 't.topic_approved' in 'where clause' [1054]

The fix is to add an alias for the table.

PHPBB3-10497
PHPBB3-9008
---
 phpBB/includes/functions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 944e53052b..7ce83b871a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1943,11 +1943,11 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 		}
 		else
 		{
-			$sql = 'SELECT topic_id
-				FROM ' . TOPICS_TABLE . '
-				WHERE forum_id = ' . $forum_id . '
-					AND topic_last_post_time > ' . $mark_time_forum . '
-					AND topic_moved_id = 0 ' .
+			$sql = 'SELECT t.topic_id
+				FROM ' . TOPICS_TABLE . ' t
+				WHERE t.forum_id = ' . $forum_id . '
+					AND t.topic_last_post_time > ' . $mark_time_forum . '
+					AND t.topic_moved_id = 0 ' .
 					$sql_update_unapproved;
 			$result = $db->sql_query($sql);
 
-- 
cgit v1.2.1


From 799be4469a99176bc14cf602c16995c260b10162 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 27 Nov 2011 16:23:15 +0100
Subject: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.

---
 phpBB/docs/CHANGELOG.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a4ed1b5c86..a58c384f04 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -169,6 +169,12 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10437">PHPBB3-10437</a>] -  Announcements on moderation queue are not hidden</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10446">PHPBB3-10446</a>] -  Unencoded 8bit characters in email headers</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10452">PHPBB3-10452</a>] -  XHTML error when printing a PM</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10461'>PHPBB3-10461</a>] -  MCP&#39;s recent actions list is empty</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10479'>PHPBB3-10479</a>] -  Remove PostgreSQL version numbers from driver&#39;s language string</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10485'>PHPBB3-10485</a>] -  XHTML error in Prosilver - index and viewforum</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10488'>PHPBB3-10488</a>] -  Database updater for 3.0.10-RC1 overwrites config variable email_max_chunk_size without checking for custom value</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10490'>PHPBB3-10490</a>] -  MCP Layout broken in ProSilver when screen is resized to less 1200 pixels</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10497'>PHPBB3-10497</a>] -  SQL error when guest visits forum with unread topic</li>
 </ul>
 <h4>Improvement</h4>
 <ul>
@@ -214,6 +220,8 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9689">PHPBB3-9689</a>] -  Scripts and utilities</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10003">PHPBB3-10003</a>] -  Resolve db_tools proliferation</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10313">PHPBB3-10313</a>] -  Include slow unit tests when running build script</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10483'>PHPBB3-10483</a>] -  Test suite does not run with MySQL strict mode</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10486'>PHPBB3-10486</a>] -  Create git shortlog and git diff --stat in build script</li>
 </ul>
 
 	<a name="v308"></a><h3>1.ii. Changes since 3.0.8</h3>
-- 
cgit v1.2.1


From f88e89900f34f6165a9002c3a2cb3307310584ee Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 28 Nov 2011 10:35:43 +0100
Subject: [ticket/10503] Debug error "Invalid arguments" when previewing edits

Empty value of poll_options should be an empty array, so that sizeof() is 0.

PHPBB3-9776
PHPBB3-10503
---
 phpBB/posting.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index ea3b53e939..76c8100c78 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -895,7 +895,7 @@ if ($submit || $preview || $refresh)
 
 		$message_parser->parse_poll($poll);
 
-		$post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : '';
+		$post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : array();
 		$post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : '';
 
 		/* We reset votes, therefore also allow removing options
@@ -918,7 +918,8 @@ if ($submit || $preview || $refresh)
 			'poll_options'		=> array(),
 		);
 
-		$post_data['poll_options'] = $post_data['poll_title'] = '';
+		$post_data['poll_options'] = array();
+		$post_data['poll_title'] = '';
 		$post_data['poll_start'] = $post_data['poll_length'] = $post_data['poll_max_options'] = $post_data['poll_last_vote'] = $post_data['poll_vote_change'] = 0;
 	}
 	else if (!$auth->acl_get('f_poll', $forum_id) && ($mode == 'edit') && ($post_id == $post_data['topic_first_post_id']) && ($original_poll_data['poll_title'] != ''))
@@ -934,7 +935,7 @@ if ($submit || $preview || $refresh)
 
 		$message_parser->parse_poll($poll);
 
-		$post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : '';
+		$post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : array();
 		$post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : '';
 	}
 	else
-- 
cgit v1.2.1


From cb4e72298b58e6bbb8ced3cf05384239bf285773 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 28 Nov 2011 11:21:43 +0100
Subject: [ticket/10501] Fix description of table prefixes

They must start with a letter, not an alphanumeric character

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

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index c4b100187f..f69ca40613 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -232,7 +232,7 @@ $lang = array_merge($lang, array(
 	'INST_ERR'					=> 'Installation error',
 	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
-	'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
+	'INST_ERR_DB_INVALID_PREFIX'=> 'The prefix you entered is invalid. It must start with a letter and must only contain letters, numbers and underscores.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
 	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
@@ -353,7 +353,7 @@ $lang = array_merge($lang, array(
 
 	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
 	'TABLE_PREFIX'				=> 'Prefix for tables in database',
-	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with an alphanumeric character and must only contain alphanumeric characters, numbers and underscores.',
+	'TABLE_PREFIX_EXPLAIN'		=> 'The prefix must start with a letter and must only contain letters, numbers and underscores.',
 	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
 	'TESTS_PASSED'				=> 'Tests passed',
 	'TESTS_FAILED'				=> 'Tests failed',
-- 
cgit v1.2.1


From 593ac9ed4318c68e56bb2bdfa42adb2126aae994 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 28 Nov 2011 23:10:01 +0100
Subject: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from
 changelog.

---
 phpBB/docs/CHANGELOG.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a58c384f04..39d3e24b13 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -173,7 +173,6 @@
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10479'>PHPBB3-10479</a>] -  Remove PostgreSQL version numbers from driver&#39;s language string</li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10485'>PHPBB3-10485</a>] -  XHTML error in Prosilver - index and viewforum</li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10488'>PHPBB3-10488</a>] -  Database updater for 3.0.10-RC1 overwrites config variable email_max_chunk_size without checking for custom value</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10490'>PHPBB3-10490</a>] -  MCP Layout broken in ProSilver when screen is resized to less 1200 pixels</li>
 <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10497'>PHPBB3-10497</a>] -  SQL error when guest visits forum with unread topic</li>
 </ul>
 <h4>Improvement</h4>
-- 
cgit v1.2.1


From 8f1f42cc6cfeca5bf0f9b4f5ff963227fc090fd2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 29 Nov 2011 19:59:31 +0100
Subject: [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.

PHPBB3-10502
---
 phpBB/docs/CHANGELOG.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 39d3e24b13..a4bbfb7d7f 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -178,7 +178,7 @@
 <h4>Improvement</h4>
 <ul>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] -  Add direct link to PM to notification message</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not red expose forum information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not read expose forum information</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] -  Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] -  Mass email $max_chunk_size</li>
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] -  Edit account settings - Improved clarification needed</li>
-- 
cgit v1.2.1


From 4cf059e38f65330a553c2f5c8428c32ce17ab4d3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 28 Nov 2011 22:58:29 +0100
Subject: [ticket/10480] Add a build script for exporting the changelog from
 tracker.

PHPBB3-10480
---
 build/build_changelog.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 build/build_changelog.php

diff --git a/build/build_changelog.php b/build/build_changelog.php
new file mode 100755
index 0000000000..4eb5ebd83b
--- /dev/null
+++ b/build/build_changelog.php
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* @package build
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU General Public License
+*
+*/
+
+if ($_SERVER['argc'] != 2)
+{
+	echo "Please specify the new version as argument (e.g. build_changelog.php '1.0.2').\n";
+	exit(1);
+}
+
+$fixVersion = $_SERVER['argv'][1];
+
+$query = 'project = PHPBB3
+	AND resolution = Fixed
+	AND fixVersion = "' . $fixVersion . '"
+	AND status IN ("Unverified Fix", Closed)';
+
+$url = 'http://tracker.phpbb.com/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=' . urlencode($query) . '&tempMax=1000';
+$xml = simplexml_load_string(file_get_contents($url));
+
+foreach ($xml->xpath('//item') as $item)
+{
+	$key = (string) $item->key;
+
+	$keyUrl = 'http://tracker.phpbb.com/browse/' . $key;
+	$keyLink = '<a href="' . $keyUrl . '">' . $key . '</a>';
+
+	$value = str_replace($key, $keyLink, htmlspecialchars($item->title));
+	$value = str_replace(']', '] -', $value);
+
+	$types[(string) $item->type][$key] = $value;
+}
+
+ksort($types);
+foreach ($types as $type => $tickets)
+{
+	echo "<h4>$type</h4>\n";
+	echo "<ul>\n";
+
+	uksort($tickets, 'strnatcasecmp');
+
+	foreach ($tickets as $ticket)
+	{
+		echo "<li>$ticket</li>\n";
+	}
+	echo "</ul>\n";
+}
-- 
cgit v1.2.1


From f3519141379504a5c676fbb8026f71aa93d67da2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 28 Nov 2011 23:04:17 +0100
Subject: [ticket/10480] Add a build target for changelog building.

PHPBB3-10480
---
 build/build.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 18b03243c2..2c42e1e162 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -138,6 +138,12 @@
 				save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />
 	</target>
 
+	<target name="changelog" depends="prepare">
+		<exec dir="build" escape="false"
+			command="php -f build_changelog.php '${newversion}' >
+				save/changelog_${newversion}.html"  />
+	</target>
+
 	<!--
 		This target can be called using phingcall to retrieve a clean
 		checkout of a commit from git. It will only export the phpBB directory.
-- 
cgit v1.2.1


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: [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'],
-- 
cgit v1.2.1


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: [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()
-- 
cgit v1.2.1


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: [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 "$@"
-- 
cgit v1.2.1


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: [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',
 
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


From 69cbb4ac1de7887af8fe16a771ac30c762a7b24a Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 4 Dec 2011 00:22:10 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

---
 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 9 +++++++--
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 2c42e1e162..bf4c97297b 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-RC2" />
+	<property name="newversion" value="3.0.10-RC3" />
 	<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" />
+	<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" />
 	<!-- 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 2ade1ac95e..3a798fc1ce 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-RC2');
+define('PHPBB_VERSION', '3.0.10-RC3');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index bbc4261adc..eeadc9f862 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC2');
+define('UPDATES_TO_VERSION', '3.0.10-RC3');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -989,7 +989,8 @@ function database_update_info()
 		'3.0.9'			=> array(),
 		// No changes from 3.0.10-RC1 to 3.0.10-RC2
 		'3.0.10-RC1'	=> array(),
-
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		'3.0.10-RC2'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2013,6 +2014,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC1 to 3.0.10-RC2
 		case '3.0.10-RC1':
 		break;
+
+		// No changes from 3.0.10-RC2 to 3.0.10-RC3
+		case '3.0.10-RC2':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5cbaba3d1f..eb90d3a06d 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-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10-RC3');
 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');
 
-- 
cgit v1.2.1


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: [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'],
 				);
-- 
cgit v1.2.1


From 1a09f9005c7784dfbee641a41935a7973e761f45 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Dec 2011 11:14:06 +0100
Subject: [ticket/10504] Revert the changes for widescreen optimisation
 PHPBB3-10485

Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632"

This reverts commit c67633577f276727e1d15106a87517b97c8a4d1a.

PHPBB3-6632
PHPBB3-10485
PHPBB3-10504
---
 phpBB/styles/prosilver/template/forumlist_body.html | 10 +++++-----
 phpBB/styles/prosilver/template/search_results.html | 10 +++++-----
 phpBB/styles/prosilver/template/viewforum_body.html | 10 +++++-----
 phpBB/styles/prosilver/theme/content.css            | 12 ++----------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index bf672e16fc..2c2a242a9f 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -11,9 +11,9 @@
 		<div class="forabg">
 			<div class="inner"><span class="corners-top"><span></span></span>
 			<ul class="topiclist">
-				<li class="header widescreen-optimised">
+				<li class="header">
 					<dl class="icon">
-						<dt><span class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></span></dt>
+						<dt><div class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
 						<dd class="topics">{L_TOPICS}</dd>
 						<dd class="posts">{L_POSTS}</dd>
 						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -25,8 +25,8 @@
 
 	<!-- IF not forumrow.S_IS_CAT -->
 		<li class="row">
-			<dl class="icon widescreen-optimised" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><span class="wrap-content">
+			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><div class="wrap-content">
 				<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
 
 					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
@@ -36,7 +36,7 @@
 						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
 					<!-- ENDIF -->
 					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
-				</span></dt>
+				</div></dt>
 				<!-- IF forumrow.CLICKS -->
 					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
 				<!-- ELSEIF not forumrow.S_IS_LINK -->
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 014b39de87..f2a4435103 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -39,8 +39,8 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon widescreen-optimised">
-					<dt><span class="wrap-content">{L_TOPICS}</span></dt>
+				<dl class="icon">
+					<dt>{L_TOPICS}</dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -51,8 +51,8 @@
 
 		<!-- BEGIN searchresults -->
 			<li class="row<!-- IF searchresults.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
-				<dl class="icon widescreen-optimised" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->><span class="wrap-content">
+				<dl class="icon" style="background-image: url({searchresults.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
 						<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
 						<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
 						<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
@@ -60,7 +60,7 @@
 						<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
 						{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME}
 						<!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF -->
-					</span></dt>
+					</dt>
 					<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>
 					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
 					<dd class="lastpost"><span>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index d2952bff2a..4ad0990d98 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -126,8 +126,8 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 		<ul class="topiclist">
 			<li class="header">
-				<dl class="icon widescreen-optimised">
-					<dt><span class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></span></dt>
+				<dl class="icon">
+					<dt><div class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -138,13 +138,13 @@
 	<!-- ENDIF -->
 
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
-			<dl class="icon widescreen-optimised" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><span class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><div class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
 					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
 					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</span></dt>
+				</div></dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 696d5e1cc0..c278a16dc5 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -29,19 +29,14 @@ ul.topiclist li.row dl {
 ul.topiclist dt {
 	display: block;
 	float: left;
-	width: 50%;
+	width: 100%;
 	font-size: 1.1em;
 	padding-left: 5px;
 	padding-right: 5px;
-}
-
-ul.topiclist .widescreen-optimised dt {
-	width: 100%;
 	margin-right: -465px;
 }
 
-ul.topiclist .widescreen-optimised dt .wrap-content {
-	display: block;
+ul.topiclist dt .wrap-content {
 	padding-right: 465px;
 }
 
@@ -106,9 +101,6 @@ li.header dt, li.header dd {
 
 li.header dt {
 	font-weight: bold;
-}
-
-li.header .widescreen-optimised dt {
 	margin-right: -465px;
 }
 
-- 
cgit v1.2.1


From e3d81812facb205bdad7a8b7fcdd08855c130c6c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Dec 2011 11:15:10 +0100
Subject: [ticket/10504] Revert the changes for widescreen optimisation
 PHPBB3-10408

Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"

This reverts commit 88aacd0f2cffdf75af71d749c6ea602ed3912651.

PHPBB3-6632
PHPBB3-10408
PHPBB3-10504
---
 phpBB/styles/prosilver/template/ucp_attachments.html | 4 ++--
 phpBB/styles/prosilver/theme/content.css             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index c76316d93e..8052fdc435 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -20,7 +20,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl>
-					<dt><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
+					<dt style="width: 40%"><a href="{U_SORT_FILENAME}">{L_FILENAME}</a></dt>
 					<dd class="extra"><a href="{U_SORT_DOWNLOADS}">{L_DOWNLOADS}</a></dd>
 					<dd class="time"><span><a href="{U_SORT_POST_TIME}">{L_POST_TIME}</a></span></dd>
 					<dd class="mark">{L_MARK}</dd>
@@ -32,7 +32,7 @@
 		<!-- BEGIN attachrow -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl>
-				<dt><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
+				<dt style="width: 40%"><a href="{attachrow.U_VIEW_ATTACHMENT}" class="topictitle">{attachrow.FILENAME}</a> ({attachrow.SIZE})<br />
 					<!-- IF attachrow.S_IN_MESSAGE -->{L_PM}: <!-- ELSE -->{L_TOPIC}: <!-- ENDIF --><a href="{attachrow.U_VIEW_TOPIC}">{attachrow.TOPIC_TITLE}</a></dt>
 				<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd>
 				<dd class="time"><span>{attachrow.POST_TIME}</span></dd>
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index c278a16dc5..529a065e97 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -184,7 +184,7 @@ dd.extra {
 
 dd.mark {
 	float: right !important;
-	width: 90px;
+	width: 9%;
 	text-align: center;
 	line-height: 200%;
 	font-size: 1.2em;
-- 
cgit v1.2.1


From 8af9a0054ccf7df26c8b9057f1d2fb2f32fd5253 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Dec 2011 11:15:44 +0100
Subject: [ticket/10504] Revert the changes for widescreen optimisation
 PHPBB3-6632

Revert "[ticket/6632] Better viewing of topics for wide screen displays"

This reverts commit bb733b0204aef71c40290a9c8db8ad0a7e3e3d0a.

PHPBB3-6632
PHPBB3-10504
---
 phpBB/styles/prosilver/template/forumlist_body.html |  6 +++---
 phpBB/styles/prosilver/template/viewforum_body.html |  6 +++---
 phpBB/styles/prosilver/theme/content.css            | 12 +++---------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 2c2a242a9f..e9ed5d9daf 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -13,7 +13,7 @@
 			<ul class="topiclist">
 				<li class="header">
 					<dl class="icon">
-						<dt><div class="wrap-content"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
+						<dt><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></dt>
 						<dd class="topics">{L_TOPICS}</dd>
 						<dd class="posts">{L_POSTS}</dd>
 						<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -26,7 +26,7 @@
 	<!-- IF not forumrow.S_IS_CAT -->
 		<li class="row">
 			<dl class="icon" style="background-image: url({forumrow.FORUM_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}"><div class="wrap-content">
+				<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
 				<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"><img src="{T_THEME_PATH}/images/feed.gif" alt="{L_FEED} - {forumrow.FORUM_NAME}" /></a> --><!-- ENDIF -->
 
 					<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
@@ -36,7 +36,7 @@
 						<br /><strong>{forumrow.L_MODERATOR_STR}:</strong> {forumrow.MODERATORS}
 					<!-- ENDIF -->
 					<!-- IF forumrow.SUBFORUMS and forumrow.S_LIST_SUBFORUMS --><br /><strong>{forumrow.L_SUBFORUM_STR}</strong> {forumrow.SUBFORUMS}<!-- ENDIF -->
-				</div></dt>
+				</dt>
 				<!-- IF forumrow.CLICKS -->
 					<dd class="redirect"><span>{L_REDIRECTS}: {forumrow.CLICKS}</span></dd>
 				<!-- ELSEIF not forumrow.S_IS_LINK -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 4ad0990d98..02f42fa097 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -127,7 +127,7 @@
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
-					<dt><div class="wrap-content"><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></div></dt>
+					<dt><!-- IF S_DISPLAY_ACTIVE -->{L_ACTIVE_TOPICS}<!-- ELSEIF topicrow.S_TOPIC_TYPE_SWITCH and (topicrow.S_POST_ANNOUNCE or topicrow.S_POST_GLOBAL) -->{L_ANNOUNCEMENTS}<!-- ELSE -->{L_TOPICS}<!-- ENDIF --></dt>
 					<dd class="posts">{L_REPLIES}</dd>
 					<dd class="views">{L_VIEWS}</dd>
 					<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
@@ -139,12 +139,12 @@
 
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
 			<dl class="icon" style="background-image: url({topicrow.TOPIC_FOLDER_IMG_SRC}); background-repeat: no-repeat;">
-				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><div class="wrap-content"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
 					<!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF -->
 					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-				</div></dt>
+				</dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 529a065e97..5f627c8f77 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -29,15 +29,10 @@ ul.topiclist li.row dl {
 ul.topiclist dt {
 	display: block;
 	float: left;
-	width: 100%;
+	width: 50%;
 	font-size: 1.1em;
 	padding-left: 5px;
 	padding-right: 5px;
-	margin-right: -465px;
-}
-
-ul.topiclist dt .wrap-content {
-	padding-right: 465px;
 }
 
 ul.topiclist dd {
@@ -101,7 +96,6 @@ li.header dt, li.header dd {
 
 li.header dt {
 	font-weight: bold;
-	margin-right: -465px;
 }
 
 li.header dd {
@@ -132,7 +126,7 @@ dl.icon dt {
 }
 
 dd.posts, dd.topics, dd.views {
-	width: 90px;
+	width: 8%;
 	text-align: center;
 	line-height: 2.2em;
 	font-size: 1.2em;
@@ -151,7 +145,7 @@ dl.icon dt li {
 }
 
 dd.lastpost {
-	width: 230px;
+	width: 25%;
 	font-size: 1.1em;
 }
 
-- 
cgit v1.2.1


From dfb7cc625a37c6345fa647ee3a21f890ba5c9649 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 8 Dec 2011 23:35:26 +0200
Subject: [ticket/10319] Missing hidden fields in search form

Missing hidden fields in search form (bug added in 3.0.9)

PHPBB3-10319
---
 phpBB/includes/functions.php | 11 ++++++++++-
 phpBB/viewforum.php          |  9 +++++++++
 phpBB/viewtopic.php          |  9 +++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7ce83b871a..01b3ca92a9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4378,7 +4378,7 @@ function phpbb_http_login($param)
 */
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
-	global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
+	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
 
 	if (defined('HEADER_INC'))
 	{
@@ -4531,6 +4531,15 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		$s_search_hidden_fields['sid'] = $_SID;
 	}
 
+	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];
+		}
+	}
+
 	// The following assigns all _common_ variables that may be used at any point in a template.
 	$template->assign_vars(array(
 		'SITENAME'						=> $config['sitename'],
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 8a6b777bea..588f60b589 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -273,6 +273,15 @@ if ($_SID)
 	$s_search_hidden_fields['sid'] = $_SID;
 }
 
+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];
+	}
+}
+
 $template->assign_vars(array(
 	'MODERATORS'	=> (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index df631a474c..01cd6a28a8 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -602,6 +602,15 @@ if ($_SID)
 	$s_search_hidden_fields['sid'] = $_SID;
 }
 
+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];
+	}
+}
+
 // Send vars to template
 $template->assign_vars(array(
 	'FORUM_ID' 		=> $forum_id,
-- 
cgit v1.2.1


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: [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();
-- 
cgit v1.2.1


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: [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)
+		);
+	}
+}
-- 
cgit v1.2.1


From 730d2d5d19741508f243d61f47c28af2564be6b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Dec 2011 22:14:59 +0100
Subject: [ticket/8996] Revert initial fix to keep old behaviour on empty
 selection

Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.

PHPBB3-8996
---
 phpBB/adm/style/editor.js                  | 68 ++++++++++-----------
 phpBB/styles/prosilver/template/editor.js  | 61 ++++++++++---------
 phpBB/styles/subsilver2/template/editor.js | 96 +++++++++++++++---------------
 3 files changed, 108 insertions(+), 117 deletions(-)

diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 600fa254cf..217aa699e2 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -28,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/
-function initInsertions()
+*/ 
+function initInsertions() 
 {
 	var doc;
 	if(document.forms[form_name])
@@ -66,7 +66,7 @@ function bbstyle(bbnumber)
 	else
 	{
 		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
+		document.forms[form_name].elements[text_name].focus();		
 	}
 }
 
@@ -76,7 +76,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-
+		
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -84,10 +84,14 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		if (textarea.createTextRange && textarea.caretPos)
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
 		{
-			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
-			textarea.focus();
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
 			return;
 		}
 	}
@@ -98,10 +102,10 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-
+	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;
+	var new_pos = caret_pos + bbopen.length;		
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -112,12 +116,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	}	
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange();
-		range.move("character", bbopen.length);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -132,7 +136,7 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-
+	
 	if (!popup)
 	{
 		textarea = document.forms[form_name].elements[text_name];
@@ -155,18 +159,18 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}
-
+	}	
+	
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight)
+		if (baseHeight != textarea.caretPos.boundingHeight) 
 		{
 			textarea.focus();
 			storeCaret(textarea);
 		}
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-
+		
 	}
 	else
 	{
@@ -229,7 +233,7 @@ function addquote(post_id, username)
 			theSelection = theSelection.replace(/<br\/>/ig, '\n');
 			theSelection = theSelection.replace(/&lt\;/ig, '<');
 			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
+			theSelection = theSelection.replace(/&amp\;/ig, '&');			
 			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
 		}
 		else if (document.all)
@@ -264,7 +268,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2)
+	if (selEnd == 1 || selEnd == 2) 
 	{
 		selEnd = selLength;
 	}
@@ -288,17 +292,7 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	var keyCode = false;
-	if (is_ie)
-	{
-		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
-	}
-
-	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
-	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
-
-	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
+	if (textEl.createTextRange)
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -334,7 +328,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-
+			
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -374,9 +368,9 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-
+	
 	// simple Gecko/Opera way
-	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if (txtarea.selectionStart || txtarea.selectionStart == 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -390,19 +384,19 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-
+		
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
 		{
 			range_all.moveStart('character', 1);
 		}
-
+	
 		txtarea.sel_start = sel_start;
-
+	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;
+		caretPos.end = txtarea.sel_start;			
 	}
 
 	return caretPos;
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 5aa486d320..957c39b568 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -28,8 +28,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/
-function initInsertions()
+*/ 
+function initInsertions() 
 {
 	var doc;
 
@@ -37,7 +37,7 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else
+	else 
 	{
 		doc = opener.document;
 	}
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{
+{	
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
+	} 
+	else 
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -86,10 +86,10 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
+		textarea = document.forms[form_name].elements[text_name];
 		if (textarea.createTextRange && textarea.caretPos)
 		{
 			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
-			textarea.focus();
 			return;
 		}
 	}
@@ -100,7 +100,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-
+	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -114,12 +114,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	}	
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -134,16 +134,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-
-	if (!popup)
+	
+	if (!popup) 
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
+	} 
+	else 
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces)
+	if (spaces) 
 	{
 		text = ' ' + text + ' ';
 	}
@@ -161,7 +161,7 @@ function insert_text(text, spaces, popup)
 	}
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight)
+		if (baseHeight != textarea.caretPos.boundingHeight) 
 		{
 			textarea.focus();
 			storeCaret(textarea);
@@ -174,7 +174,7 @@ function insert_text(text, spaces, popup)
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup)
+	if (!popup) 
 	{
 		textarea.focus();
 	}
@@ -291,7 +291,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-
+				
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -319,7 +319,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2)
+	if (selEnd == 1 || selEnd == 2) 
 	{
 		selEnd = selLength;
 	}
@@ -351,9 +351,7 @@ function storeCaret(textEl)
 
 	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
 	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
-
-	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
+	if ((!is_ie || (keyCode != 16 && keyCode != 17 && keyCode != 18)) && (textEl.createTextRange))
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -389,7 +387,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-
+			
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -429,32 +427,33 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-
+	
 	// simple Gecko/Opera way
-	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if(!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if (document.selection)
+	else if(document.selection)
 	{
+	
 		// get current selection
 		var range = document.selection.createRange();
 
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-
+		
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
+		{		
 			range_all.moveStart('character', 1);
 		}
-
+	
 		txtarea.sel_start = sel_start;
-
+	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 5aa486d320..7cc5de9034 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -6,8 +6,8 @@
 // Startup variables
 var imageTag = false;
 var theSelection = false;
-
 var bbcodeEnabled = true;
+
 // Check for Browser & Platform for PC & IE specific bits
 // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
 var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@@ -15,6 +15,7 @@ var clientVer = parseInt(navigator.appVersion); // Get browser version
 
 var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
 var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
+
 var baseHeight;
 
 /**
@@ -28,8 +29,8 @@ function helpline(help)
 /**
 * Fix a bug involving the TextRange object. From
 * http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/
-function initInsertions()
+*/ 
+function initInsertions() 
 {
 	var doc;
 
@@ -37,15 +38,14 @@ function initInsertions()
 	{
 		doc = document;
 	}
-	else
+	else 
 	{
 		doc = opener.document;
 	}
 
 	var textarea = doc.forms[form_name].elements[text_name];
-
 	if (is_ie && typeof(baseHeight) != 'number')
-	{
+	{	
 		textarea.focus();
 		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
 
@@ -60,12 +60,12 @@ function initInsertions()
 * bbstyle
 */
 function bbstyle(bbnumber)
-{
+{	
 	if (bbnumber != -1)
 	{
 		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	}
-	else
+	} 
+	else 
 	{
 		insert_text('[*]');
 		document.forms[form_name].elements[text_name].focus();
@@ -78,7 +78,7 @@ function bbstyle(bbnumber)
 function bbfontstyle(bbopen, bbclose)
 {
 	theSelection = false;
-
+		
 	var textarea = document.forms[form_name].elements[text_name];
 
 	textarea.focus();
@@ -86,10 +86,14 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		if (textarea.createTextRange && textarea.caretPos)
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
 		{
-			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
-			textarea.focus();
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
 			return;
 		}
 	}
@@ -100,7 +104,7 @@ function bbfontstyle(bbopen, bbclose)
 		theSelection = '';
 		return;
 	}
-
+	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
 	var new_pos = caret_pos + bbopen.length;
@@ -114,12 +118,12 @@ function bbfontstyle(bbopen, bbclose)
 	{
 		textarea.selectionStart = new_pos;
 		textarea.selectionEnd = new_pos;
-	}
+	}	
 	// IE
 	else if (document.selection)
 	{
-		var range = textarea.createTextRange();
-		range.move("character", new_pos);
+		var range = textarea.createTextRange(); 
+		range.move("character", new_pos); 
 		range.select();
 		storeCaret(textarea);
 	}
@@ -134,16 +138,16 @@ function bbfontstyle(bbopen, bbclose)
 function insert_text(text, spaces, popup)
 {
 	var textarea;
-
-	if (!popup)
+	
+	if (!popup) 
 	{
 		textarea = document.forms[form_name].elements[text_name];
-	}
-	else
+	} 
+	else 
 	{
 		textarea = opener.document.forms[form_name].elements[text_name];
 	}
-	if (spaces)
+	if (spaces) 
 	{
 		text = ' ' + text + ' ';
 	}
@@ -158,26 +162,28 @@ function insert_text(text, spaces, popup)
 		mozWrap(textarea, text, '');
 		textarea.selectionStart = sel_start + text.length;
 		textarea.selectionEnd = sel_end + text.length;
-	}
+	}	
+	
 	else if (textarea.createTextRange && textarea.caretPos)
 	{
-		if (baseHeight != textarea.caretPos.boundingHeight)
+		if (baseHeight != textarea.caretPos.boundingHeight) 
 		{
 			textarea.focus();
 			storeCaret(textarea);
-		}
-
+		}		
 		var caret_pos = textarea.caretPos;
 		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
+		
 	}
 	else
 	{
 		textarea.value = textarea.value + text;
 	}
-	if (!popup)
+	if (!popup) 
 	{
 		textarea.focus();
-	}
+	} 	
+
 }
 
 /**
@@ -273,6 +279,7 @@ function addquote(post_id, username, l_wrote)
 	return;
 }
 
+
 function split_lines(text)
 {
 	var lines = text.split('\n');
@@ -291,7 +298,7 @@ function split_lines(text)
 			do
 			{
 				var splitAt = line.indexOf(' ', 80);
-
+				
 				if (splitAt == -1)
 				{
 					splitLines[j] = line;
@@ -309,6 +316,7 @@ function split_lines(text)
 	}
 	return splitLines;
 }
+
 /**
 * From http://www.massless.org/mozedit/
 */
@@ -319,7 +327,7 @@ function mozWrap(txtarea, open, close)
 	var selEnd = txtarea.selectionEnd;
 	var scrollTop = txtarea.scrollTop;
 
-	if (selEnd == 1 || selEnd == 2)
+	if (selEnd == 1 || selEnd == 2) 
 	{
 		selEnd = selLength;
 	}
@@ -343,17 +351,7 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	var keyCode = false;
-	if (is_ie)
-	{
-		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
-	}
-
-	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
-	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
-
-	if ((!is_ie || !is_control_key) && (textEl.createTextRange))
+	if (textEl.createTextRange)
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -389,7 +387,7 @@ function colorPalette(dir, width, height)
 			{
 				document.writeln('<tr>');
 			}
-
+			
 			for (b = 0; b < 5; b++)
 			{
 				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -429,15 +427,15 @@ function caretPosition()
 function getCaretPosition(txtarea)
 {
 	var caretPos = new caretPosition();
-
+	
 	// simple Gecko/Opera way
-	if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if(txtarea.selectionStart || txtarea.selectionStart == 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
 	}
 	// dirty and slow IE way
-	else if (document.selection)
+	else if(document.selection)
 	{
 		// get current selection
 		var range = document.selection.createRange();
@@ -445,16 +443,16 @@ function getCaretPosition(txtarea)
 		// a new selection of the whole textarea
 		var range_all = document.body.createTextRange();
 		range_all.moveToElementText(txtarea);
-
+		
 		// calculate selection start point by moving beginning of range_all to beginning of range
 		var sel_start;
 		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
-		{
+		{		
 			range_all.moveStart('character', 1);
 		}
-
+	
 		txtarea.sel_start = sel_start;
-
+	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
 		caretPos.end = txtarea.sel_start;
-- 
cgit v1.2.1


From 2bf4e8d3d0ad86038fe5ff84d3b48517b8033fc8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Dec 2011 22:17:39 +0100
Subject: [ticket/8996] Revert initial fix to keep old behaviour on empty
 selection Part2

Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"

This reverts commit 219bdbaf7044bd203755ed138d109cf39ccdb837.

PHPBB3-8996
---
 phpBB/styles/prosilver/template/editor.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 957c39b568..cfdb54f54b 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -86,10 +86,14 @@ function bbfontstyle(bbopen, bbclose)
 	if ((clientVer >= 4) && is_ie && is_win)
 	{
 		// Get text selection
-		textarea = document.forms[form_name].elements[text_name];
-		if (textarea.createTextRange && textarea.caretPos)
+		theSelection = document.selection.createRange().text;
+
+		if (theSelection)
 		{
-			textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+			// Add tags around selection
+			document.selection.createRange().text = bbopen + theSelection + bbclose;
+			document.forms[form_name].elements[text_name].focus();
+			theSelection = '';
 			return;
 		}
 	}
@@ -103,7 +107,7 @@ function bbfontstyle(bbopen, bbclose)
 	
 	//The new position for the cursor after adding the bbcode
 	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;
+	var new_pos = caret_pos + bbopen.length;		
 
 	// Open tag
 	insert_text(bbopen + bbclose);
@@ -343,15 +347,7 @@ function mozWrap(txtarea, open, close)
 */
 function storeCaret(textEl)
 {
-	var keyCode = false;
-	if (is_ie)
-	{
-		keyCode = (event.keyCode) ? event.keyCode : event.charCode;
-	}
-
-	// Did the user press Shift (16), Ctrl (17) or Alt (18)?
-	// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
-	if ((!is_ie || (keyCode != 16 && keyCode != 17 && keyCode != 18)) && (textEl.createTextRange))
+	if (textEl.createTextRange)
 	{
 		textEl.caretPos = document.selection.createRange().duplicate();
 	}
@@ -429,7 +425,7 @@ function getCaretPosition(txtarea)
 	var caretPos = new caretPosition();
 	
 	// simple Gecko/Opera way
-	if(!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
+	if(txtarea.selectionStart || txtarea.selectionStart == 0)
 	{
 		caretPos.start = txtarea.selectionStart;
 		caretPos.end = txtarea.selectionEnd;
@@ -456,7 +452,7 @@ function getCaretPosition(txtarea)
 	
 		// we ignore the end value for IE, this is already dirty enough and we don't need it
 		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;
+		caretPos.end = txtarea.sel_start;			
 	}
 
 	return caretPos;
-- 
cgit v1.2.1


From 0cfa843677eaac952df910c19df345452680d2ce Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 Dec 2011 23:17:16 +0100
Subject: [ticket/10531] Disallow deleting of the last style

Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d

PHPBB3-9675
PHPBB3-10531
---
 phpBB/includes/acp/acp_styles.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 3bc8c86500..5300265686 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -1634,6 +1634,13 @@ parse_css_file = {PARSE_CSS_FILE}
 			trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
+		$s_only_component = $this->display_component_options($mode, $style_row[$mode . '_id'], $style_row);
+
+		if ($s_only_component)
+		{
+			trigger_error($user->lang['ONLY_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		if ($update)
 		{
 			if ($mode == 'style')
@@ -1678,8 +1685,6 @@ parse_css_file = {PARSE_CSS_FILE}
 			trigger_error($user->lang[$message] . adm_back_link($this->u_action));
 		}
 
-		$this->display_component_options($mode, $style_row[$mode . '_id'], $style_row);
-
 		$this->page_title = 'DELETE_' . $l_prefix;
 
 		$template->assign_vars(array(
@@ -1765,11 +1770,14 @@ parse_css_file = {PARSE_CSS_FILE}
 
 	/**
 	* Display the options which can be used to replace a style/template/theme/imageset
+	*
+	* @return boolean Returns true if the component is the only component and can not be deleted.
 	*/
 	function display_component_options($component, $component_id, $style_row = false, $style_id = false)
 	{
 		global $db, $template, $user;
 
+		$is_only_component = true;
 		$component_in_use = array();
 		if ($component != 'style')
 		{
@@ -1801,6 +1809,9 @@ parse_css_file = {PARSE_CSS_FILE}
 		$s_options = '';
 		if (($component != 'style') && empty($component_in_use))
 		{
+			// If it is not in use, there must be another component
+			$is_only_component = false;
+
 			$sql = "SELECT {$component}_id, {$component}_name
 				FROM $sql_from
 				WHERE {$component}_id = {$component_id}";
@@ -1824,6 +1835,7 @@ parse_css_file = {PARSE_CSS_FILE}
 			{
 				if ($row[$component . '_id'] != $component_id)
 				{
+					$is_only_component = false;
 					$s_options .= '<option value="' . $row[$component . '_id'] . '">' . sprintf($user->lang['REPLACE_WITH_OPTION'], $row[$component . '_name']) . '</option>';
 				}
 				else if ($component != 'style')
@@ -1851,6 +1863,8 @@ parse_css_file = {PARSE_CSS_FILE}
 				}
 			}
 		}
+
+		return $is_only_component;
 	}
 
 	/**
-- 
cgit v1.2.1


From ba576f823b612b441f221b12be525e9638016910 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 16 Dec 2011 18:03:46 +0100
Subject: [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.

---
 phpBB/docs/CHANGELOG.html | 238 +++++++++++++++++++++++-----------------------
 1 file changed, 121 insertions(+), 117 deletions(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a4bbfb7d7f..a0690819d2 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -95,132 +95,136 @@
 
 <h4>Bug</h4>
 <ul>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-5506">PHPBB3-5506</a>] -  Deleting all items from last page results in empty list display</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6458">PHPBB3-6458</a>] -  Width of Topics and Posts columns in Board Index is causing problems with language packs</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6632">PHPBB3-6632</a>] -  Better viewing of topics for wide screen displays</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7138">PHPBB3-7138</a>] -  Cannot display simple header/footer with trigger_error()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7291">PHPBB3-7291</a>] -  Broken links of char selection in memberlist</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7932">PHPBB3-7932</a>] -  Fix font size in select boxes</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8094">PHPBB3-8094</a>] -  Text in the forums.php and install.php not matching</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8173">PHPBB3-8173</a>] -  Redundant BBCode helpline in JS</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8177">PHPBB3-8177</a>] -  February 29th birthdays not shown in non-leap year</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8571">PHPBB3-8571</a>] -  Users can make their age a negative number on memberlist</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8691">PHPBB3-8691</a>] -  Error creating log_time index</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8937">PHPBB3-8937</a>] -  Code tags - single space indent</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8996">PHPBB3-8996</a>] -  Wrong position when adding BBCodes with accesskey in IE</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9008">PHPBB3-9008</a>] -  Incorrect unread topic tracking for unapproved topics</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9066">PHPBB3-9066</a>] -  Invalid Prefix Names Allowed</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9416">PHPBB3-9416</a>] -  HTML entities in poll titles and options incorrectly re-encoded</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9525">PHPBB3-9525</a>] -  Minimum characters per post/message should never be '0'</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9645">PHPBB3-9645</a>] -  XHTML error on phpinfo page in ACP</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9776">PHPBB3-9776</a>] -  When deleting and recreating a poll, old options aren't deleted and reappear with the new ones</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9956">PHPBB3-9956</a>] -  No error message displayed when disapprove reason is invalid or empty</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9976">PHPBB3-9976</a>] -  Direct post links open the wrong page of viewtopic when multiple posts are posted in the same second</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9978">PHPBB3-9978</a>] -  Missing semicolons in // &lt;![CDATA[ part of overall_header.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10087">PHPBB3-10087</a>] -  Limited browser support for ban exclusion emphasis</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10157">PHPBB3-10157</a>] -  Missing error handling when a custom profile field is not defined for current language</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10166">PHPBB3-10166</a>] -  Post-admin activation email confusingly refers to username</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10187">PHPBB3-10187</a>] -  XHTML error in ucp_groups_manage.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10190">PHPBB3-10190</a>] -  Misleading information about permissions displayed after editing forum settings</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10212">PHPBB3-10212</a>] -  Captcha not displayed when username not exists</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10216">PHPBB3-10216</a>] -  Updater's failed query language grammatically incorrect</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10226">PHPBB3-10226</a>] -  Mysqli dbal extension does not allow connection via pipes</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10227">PHPBB3-10227</a>] -  Mysqli dbal extension does not allow persistent connection for PHP &gt;= 5.3.0</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10237">PHPBB3-10237</a>] -  Unwatching a forum/topic does not check for correct hash parameter</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10240">PHPBB3-10240</a>] -  Word filter evasion</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10253">PHPBB3-10253</a>] -  IE9 Quote problem</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10255">PHPBB3-10255</a>] -  gitignore ignores too much</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10257">PHPBB3-10257</a>] -  AAAA record parsing fails on older versions of Windows</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10259">PHPBB3-10259</a>] -  Incorrect email on joining Open group</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10265">PHPBB3-10265</a>] -  Unit test tests/random/mt_rand.php is not run because of missing _test suffix.</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10266">PHPBB3-10266</a>] -  Poor navigation links after reporting a post</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10267">PHPBB3-10267</a>] -  Missing strlen() on $table_prefix in db tools index name length check</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10274">PHPBB3-10274</a>] -  Hardcoded module ID in &quot;Re-check version&quot; link on ACP front page</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10275">PHPBB3-10275</a>] -  Wrong information about sent passwords in FAQ</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10292">PHPBB3-10292</a>] -  Whitespace inconsistency in acp_ranks</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10293">PHPBB3-10293</a>] -  Jumpbox allows jumping to invalid forums in prosilver</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10294">PHPBB3-10294</a>] -  sqlsrv_rows_affected non-functional in MSSQLNative.php</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10296">PHPBB3-10296</a>] -  incorrect cross join in SQL Server</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10298">PHPBB3-10298</a>] -  EMBED Tag Not Closed Properly In subSilver2 attachment.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10299">PHPBB3-10299</a>] -  Typo in comment about $max_store_length in truncate_string() (in functions_content.php)</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10303">PHPBB3-10303</a>] -  send_status_line() doesn't validate user input</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10304">PHPBB3-10304</a>] -  Bad url in U_ICQ on /ucp_mp_viewmessage.php</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10307">PHPBB3-10307</a>] -  Return value of $db-&gt;sql_fetchrow() on empty tables is not consistent</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10309">PHPBB3-10309</a>] -  Utf tests download data into temporary locations deep in source tree</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10320">PHPBB3-10320</a>] -  &quot;Most active topic&quot; can leak topic title of topics in password-protected forums</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10321">PHPBB3-10321</a>] -  Link to page 1 of the Memberlist has a useless question mark at the end</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10324">PHPBB3-10324</a>] -  XHTML error in Prosilver - MCP - User Notes</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10339">PHPBB3-10339</a>] -  Typo in prosilver's mcp_front.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10341">PHPBB3-10341</a>] -  Topic title of &quot;0&quot; does not show as &quot;Most active topic&quot;</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10351">PHPBB3-10351</a>] -  Invalid syntax for Oracle's sql_column_remove()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10352">PHPBB3-10352</a>] -  Missing break for Oracle's sql_table_drop()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10365">PHPBB3-10365</a>] -  Moderators can view forbidden information</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10377">PHPBB3-10377</a>] -  All moderators can change topic type</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10394">PHPBB3-10394</a>] -  Tests use call-time pass by reference which results in Fatal error on PHP 5.4</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10397">PHPBB3-10397</a>] -  Pagination code inconsistency </li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10400">PHPBB3-10400</a>] -  '0' (zero) not allowed as forum name</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10408">PHPBB3-10408</a>] -  Layout of topics/attachments list is broken in UCP and MCP</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10413">PHPBB3-10413</a>] -  Make create_schema_files usable</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10416">PHPBB3-10416</a>] -  Use dbport in phpbb_database_test_connection_manager::connect()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10420">PHPBB3-10420</a>] -  Update startup to account for PHP 5.4</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10421">PHPBB3-10421</a>] -  Interchanged parameters in includes/acp/acp_users.php</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10422">PHPBB3-10422</a>] -  Unnecessary &lt;!-- IF --&gt; statement in viewtopic_body.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10435">PHPBB3-10435</a>] -  Topic count mismatch on viewforum</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10437">PHPBB3-10437</a>] -  Announcements on moderation queue are not hidden</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10446">PHPBB3-10446</a>] -  Unencoded 8bit characters in email headers</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10452">PHPBB3-10452</a>] -  XHTML error when printing a PM</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10461'>PHPBB3-10461</a>] -  MCP&#39;s recent actions list is empty</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10479'>PHPBB3-10479</a>] -  Remove PostgreSQL version numbers from driver&#39;s language string</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10485'>PHPBB3-10485</a>] -  XHTML error in Prosilver - index and viewforum</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10488'>PHPBB3-10488</a>] -  Database updater for 3.0.10-RC1 overwrites config variable email_max_chunk_size without checking for custom value</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10497'>PHPBB3-10497</a>] -  SQL error when guest visits forum with unread topic</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-5506">PHPBB3-5506</a>] - Deleting all items from last page results in empty list display</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-6458">PHPBB3-6458</a>] - Width of Topics and Posts columns in Board Index is causing problems with language packs</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7138">PHPBB3-7138</a>] - Cannot display simple header/footer with trigger_error()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7291">PHPBB3-7291</a>] - Broken links of char selection in memberlist</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7932">PHPBB3-7932</a>] - Fix font size in select boxes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8094">PHPBB3-8094</a>] - Text in the forums.php and install.php not matching</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8173">PHPBB3-8173</a>] - Redundant BBCode helpline in JS</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8177">PHPBB3-8177</a>] - February 29th birthdays not shown in non-leap year</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8571">PHPBB3-8571</a>] - Users can make their age a negative number on memberlist</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8691">PHPBB3-8691</a>] - Error creating log_time index</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8937">PHPBB3-8937</a>] - Code tags - single space indent</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9008">PHPBB3-9008</a>] - Incorrect unread topic tracking for unapproved topics</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9066">PHPBB3-9066</a>] - Invalid Prefix Names Allowed</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9416">PHPBB3-9416</a>] - HTML entities in poll titles and options incorrectly re-encoded</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9525">PHPBB3-9525</a>] - Minimum characters per post/message should never be '0'</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9645">PHPBB3-9645</a>] - XHTML error on phpinfo page in ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9776">PHPBB3-9776</a>] - When deleting and recreating a poll, old options aren't deleted and reappear with the new ones</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9956">PHPBB3-9956</a>] - No error message displayed when disapprove reason is invalid or empty</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9976">PHPBB3-9976</a>] - Direct post links open the wrong page of viewtopic when multiple posts are posted in the same second</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9978">PHPBB3-9978</a>] - Missing semicolons in // &lt;![CDATA[ part of overall_header.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10087">PHPBB3-10087</a>] - Limited browser support for ban exclusion emphasis</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10157">PHPBB3-10157</a>] - Missing error handling when a custom profile field is not defined for current language</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10166">PHPBB3-10166</a>] - Post-admin activation email confusingly refers to username</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10187">PHPBB3-10187</a>] - XHTML error in ucp_groups_manage.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10190">PHPBB3-10190</a>] - Misleading information about permissions displayed after editing forum settings</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10212">PHPBB3-10212</a>] - Captcha not displayed when username not exists</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10216">PHPBB3-10216</a>] - Updater's failed query language grammatically incorrect</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10226">PHPBB3-10226</a>] - Mysqli dbal extension does not allow connection via pipes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10227">PHPBB3-10227</a>] - Mysqli dbal extension does not allow persistent connection for PHP &gt;= 5.3.0</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10237">PHPBB3-10237</a>] - Unwatching a forum/topic does not check for correct hash parameter</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10240">PHPBB3-10240</a>] - Word filter evasion</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10253">PHPBB3-10253</a>] - IE9 Quote problem</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10255">PHPBB3-10255</a>] - gitignore ignores too much</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10257">PHPBB3-10257</a>] - AAAA record parsing fails on older versions of Windows</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10259">PHPBB3-10259</a>] - Incorrect email on joining Open group</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10265">PHPBB3-10265</a>] - Unit test tests/random/mt_rand.php is not run because of missing _test suffix.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10266">PHPBB3-10266</a>] - Poor navigation links after reporting a post</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10267">PHPBB3-10267</a>] - Missing strlen() on $table_prefix in db tools index name length check</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10274">PHPBB3-10274</a>] - Hardcoded module ID in &quot;Re-check version&quot; link on ACP front page</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10275">PHPBB3-10275</a>] - Wrong information about sent passwords in FAQ</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10292">PHPBB3-10292</a>] - Whitespace inconsistency in acp_ranks</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10293">PHPBB3-10293</a>] - Jumpbox allows jumping to invalid forums in prosilver</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10294">PHPBB3-10294</a>] - sqlsrv_rows_affected non-functional in MSSQLNative.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10296">PHPBB3-10296</a>] - incorrect cross join in SQL Server</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10298">PHPBB3-10298</a>] - EMBED Tag Not Closed Properly In subSilver2 attachment.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10299">PHPBB3-10299</a>] - Typo in comment about $max_store_length in truncate_string() (in functions_content.php)</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10303">PHPBB3-10303</a>] - send_status_line() doesn't validate user input</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10304">PHPBB3-10304</a>] - Bad url in U_ICQ on /ucp_mp_viewmessage.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10307">PHPBB3-10307</a>] - Return value of $db-&gt;sql_fetchrow() on empty tables is not consistent</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10309">PHPBB3-10309</a>] - Utf tests download data into temporary locations deep in source tree</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10320">PHPBB3-10320</a>] - &quot;Most active topic&quot; can leak topic title of topics in password-protected forums</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10321">PHPBB3-10321</a>] - Link to page 1 of the Memberlist has a useless question mark at the end</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10324">PHPBB3-10324</a>] - XHTML error in Prosilver - MCP - User Notes</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10339">PHPBB3-10339</a>] - Typo in prosilver's mcp_front.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10341">PHPBB3-10341</a>] - Topic title of &quot;0&quot; does not show as &quot;Most active topic&quot;</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10351">PHPBB3-10351</a>] - Invalid syntax for Oracle's sql_column_remove()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10352">PHPBB3-10352</a>] - Missing break for Oracle's sql_table_drop()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10365">PHPBB3-10365</a>] - Moderators can view forbidden information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10377">PHPBB3-10377</a>] - All moderators can change topic type</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10394">PHPBB3-10394</a>] - Tests use call-time pass by reference which results in Fatal error on PHP 5.4</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10397">PHPBB3-10397</a>] - Pagination code inconsistency </li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10400">PHPBB3-10400</a>] - '0' (zero) not allowed as forum name</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10413">PHPBB3-10413</a>] - Make create_schema_files usable</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10416">PHPBB3-10416</a>] - Use dbport in phpbb_database_test_connection_manager::connect()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10420">PHPBB3-10420</a>] - Update startup to account for PHP 5.4</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10421">PHPBB3-10421</a>] - Interchanged parameters in includes/acp/acp_users.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10422">PHPBB3-10422</a>] - Unnecessary &lt;!-- IF --&gt; statement in viewtopic_body.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10435">PHPBB3-10435</a>] - Topic count mismatch on viewforum</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10437">PHPBB3-10437</a>] - Announcements on moderation queue are not hidden</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10446">PHPBB3-10446</a>] - Unencoded 8bit characters in email headers</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10452">PHPBB3-10452</a>] - XHTML error when printing a PM</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10461">PHPBB3-10461</a>] - MCP's recent actions list is empty</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10479">PHPBB3-10479</a>] - Remove PostgreSQL version numbers from driver's language string</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10485">PHPBB3-10485</a>] - XHTML error in Prosilver - index and viewforum</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10488">PHPBB3-10488</a>] - Database updater for 3.0.10-RC1 overwrites config variable email_max_chunk_size without checking for custom value</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10497">PHPBB3-10497</a>] - SQL error when guest visits forum with unread topic</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10319">PHPBB3-10319</a>] - Missing hidden fields in search form</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10501">PHPBB3-10501</a>] - Description of table prefix is wrong</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10502">PHPBB3-10502</a>] - CHANGELOG.html has a typo: 'red' should be 'read'.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10503">PHPBB3-10503</a>] - Debug error when previewing edits</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10504">PHPBB3-10504</a>] - MCP Layout STILL broken in ProSilver when screen is resized to less 1200 pixels</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10531">PHPBB3-10531</a>] - Last remaining style can be uninstalled</li>
 </ul>
 <h4>Improvement</h4>
 <ul>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] -  Add direct link to PM to notification message</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] -  Forums that can be listed but not read expose forum information</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] -  Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] -  Mass email $max_chunk_size</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] -  Edit account settings - Improved clarification needed</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9778">PHPBB3-9778</a>] -  Member Search from the Admin Control Panel is not Intuitive</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9898">PHPBB3-9898</a>] -  Readme needs updating to reflect more opening for patches</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9995">PHPBB3-9995</a>] -  Unnecessary coding in display_forums() in functions_display.php</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10032">PHPBB3-10032</a>] -  BBCode Add List Item Control Name Contains Typo</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10074">PHPBB3-10074</a>] -  Change default value of 'Set as special rank' to No for Add new rank</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10185">PHPBB3-10185</a>] -  Board startdate not being set</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10189">PHPBB3-10189</a>] -  Add &quot;automatically generated&quot; comment into schema-files.</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10199">PHPBB3-10199</a>] -  Performance: viewtopic has a useless join</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10222">PHPBB3-10222</a>] -  Also build language and styles changes in diff/patch format</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10239">PHPBB3-10239</a>] -  Add &quot;Are you sure&quot; confirmation to backup restore in ACP</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10243">PHPBB3-10243</a>] -  Add gmgetdate() wrapper for getdate() which returns dates in UTC.</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10245">PHPBB3-10245</a>] -  Messenger uses output buffering for error collection, should use error collector instead</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10246">PHPBB3-10246</a>] -  Remove VCS section from docs/coding-guidelines.html</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10254">PHPBB3-10254</a>] -  Remove style names from themes and fix some information on it</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10263">PHPBB3-10263</a>] -  Add phpbb_version_compare() wrapper for version_compare()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10278">PHPBB3-10278</a>] -  Improve timeout handling in get_remote_file()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10315">PHPBB3-10315</a>] -  Radio Buttons in ACP are clipped in Safari - Fix suggested</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10327">PHPBB3-10327</a>] -  Use &quot;ALTER TABLE ... ADD INDEX&quot; instead of &quot;CREATE INDEX&quot;</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10334">PHPBB3-10334</a>] -  Birthday List display not dependent on user privileges</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10335">PHPBB3-10335</a>] -  Responses to bots should have extra header to be used by reverse proxies</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10346">PHPBB3-10346</a>] -  Add drop_tables key for database updater</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10354">PHPBB3-10354</a>] -  When template tests are skipped because cache is not writable, print cache directory path</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10369">PHPBB3-10369</a>] -  Change error collector to always report errfile and errline</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10370">PHPBB3-10370</a>] -  Various improvements for get_backtrace()</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10402">PHPBB3-10402</a>] -  Displaying report texts with linebreaks and clickable links</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10419">PHPBB3-10419</a>] -  Add mbstring PHP ini parameters checks to ACP</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10430">PHPBB3-10430</a>] -  Some typos and the like in docs/coding-guidelines.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] - Add direct link to PM to notification message</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] - Forums that can be listed but not read expose forum information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] - Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] - Mass email $max_chunk_size</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] - Edit account settings - Improved clarification needed</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9778">PHPBB3-9778</a>] - Member Search from the Admin Control Panel is not Intuitive</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9898">PHPBB3-9898</a>] - Readme needs updating to reflect more opening for patches</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9995">PHPBB3-9995</a>] - Unnecessary coding in display_forums() in functions_display.php</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10032">PHPBB3-10032</a>] - BBCode Add List Item Control Name Contains Typo</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10074">PHPBB3-10074</a>] - Change default value of 'Set as special rank' to No for Add new rank</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10185">PHPBB3-10185</a>] - Board startdate not being set</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10189">PHPBB3-10189</a>] - Add &quot;automatically generated&quot; comment into schema-files.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10199">PHPBB3-10199</a>] - Performance: viewtopic has a useless join</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10222">PHPBB3-10222</a>] - Also build language and styles changes in diff/patch format</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10239">PHPBB3-10239</a>] - Add &quot;Are you sure&quot; confirmation to backup restore in ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10243">PHPBB3-10243</a>] - Add gmgetdate() wrapper for getdate() which returns dates in UTC.</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10245">PHPBB3-10245</a>] - Messenger uses output buffering for error collection, should use error collector instead</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10246">PHPBB3-10246</a>] - Remove VCS section from docs/coding-guidelines.html</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10254">PHPBB3-10254</a>] - Remove style names from themes and fix some information on it</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10263">PHPBB3-10263</a>] - Add phpbb_version_compare() wrapper for version_compare()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10278">PHPBB3-10278</a>] - Improve timeout handling in get_remote_file()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10315">PHPBB3-10315</a>] - Radio Buttons in ACP are clipped in Safari - Fix suggested</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10327">PHPBB3-10327</a>] - Use &quot;ALTER TABLE ... ADD INDEX&quot; instead of &quot;CREATE INDEX&quot;</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10334">PHPBB3-10334</a>] - Birthday List display not dependent on user privileges</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10335">PHPBB3-10335</a>] - Responses to bots should have extra header to be used by reverse proxies</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10346">PHPBB3-10346</a>] - Add drop_tables key for database updater</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10354">PHPBB3-10354</a>] - When template tests are skipped because cache is not writable, print cache directory path</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10369">PHPBB3-10369</a>] - Change error collector to always report errfile and errline</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10370">PHPBB3-10370</a>] - Various improvements for get_backtrace()</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10402">PHPBB3-10402</a>] - Displaying report texts with linebreaks and clickable links</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10419">PHPBB3-10419</a>] - Add mbstring PHP ini parameters checks to ACP</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10430">PHPBB3-10430</a>] - Some typos and the like in docs/coding-guidelines.html</li>
 </ul>
 <h4>New Feature</h4>
 <ul>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8240">PHPBB3-8240</a>] -  Request: db_tools to have two additional functions, table list and column list</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8240">PHPBB3-8240</a>] - Request: db_tools to have two additional functions, table list and column list</li>
 </ul>
 <h4>Task</h4>
 <ul>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9689">PHPBB3-9689</a>] -  Scripts and utilities</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10003">PHPBB3-10003</a>] -  Resolve db_tools proliferation</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10313">PHPBB3-10313</a>] -  Include slow unit tests when running build script</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10483'>PHPBB3-10483</a>] -  Test suite does not run with MySQL strict mode</li>
-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10486'>PHPBB3-10486</a>] -  Create git shortlog and git diff --stat in build script</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9689">PHPBB3-9689</a>] - Scripts and utilities</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10003">PHPBB3-10003</a>] - Resolve db_tools proliferation</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10313">PHPBB3-10313</a>] - Include slow unit tests when running build script</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10483">PHPBB3-10483</a>] - Test suite does not run with MySQL strict mode</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10486">PHPBB3-10486</a>] - Create git shortlog and git diff --stat in build script</li>
+<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>
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: [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
 			{
-- 
cgit v1.2.1


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: [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),
-- 
cgit v1.2.1


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: [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',
 
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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);
 			}
 
-- 
cgit v1.2.1


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: [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 -->
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: [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;
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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;
 		}
 	}
 
-- 
cgit v1.2.1


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: [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)
 	{
-- 
cgit v1.2.1


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: [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__);
 	}
-- 
cgit v1.2.1


From e14c3f3b77ab07ce97f357a15db5db5101df06c1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 1 Jan 2012 16:00:17 +0100
Subject: [prep-release-3.0.10] Bumping version number for 3.0.10 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 bf4c97297b..3d8d3de640 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-RC3" />
+	<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" />
+	<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" />
 	<!-- 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 3a798fc1ce..b70cf5bc59 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-RC3');
+define('PHPBB_VERSION', '3.0.10');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index eeadc9f862..5694c6e29f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC3');
+define('UPDATES_TO_VERSION', '3.0.10');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -991,6 +991,8 @@ function database_update_info()
 		'3.0.10-RC1'	=> array(),
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		'3.0.10-RC2'	=> array(),
+		// No changes from 3.0.10-RC3 to 3.0.10
+		'3.0.10-RC3'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2018,6 +2020,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		case '3.0.10-RC2':
 		break;
+
+		// No changes from 3.0.10-RC3 to 3.0.10
+		case '3.0.10-RC3':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index eb90d3a06d..d7433d52fd 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-RC3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10');
 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');
 
-- 
cgit v1.2.1


From 17991823ea72ef973852fd9d0a9c516703f2137e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 16:05:02 +0000
Subject: [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
 *
 */
 
-- 
cgit v1.2.1


From 0fc37fb3972845f76848c1e64d5edfe4b8cd0972 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sun, 1 Jan 2012 10:35:50 +0000
Subject: [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>
 
-- 
cgit v1.2.1


From 5e52734c240e5ecfb812202cd4cae305be9290c5 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Mon, 2 Jan 2012 15:09:38 +0000
Subject: [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>
 
-- 
cgit v1.2.1


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: [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__);
 	}
-- 
cgit v1.2.1


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: [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',
-- 
cgit v1.2.1


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

PHPBB3-10532
---
 phpBB/search.php | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 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);
+			if ($sql)
+			{
+				// 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))
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$id_ary[] = (int) $row[$field];
+				}
+				$db->sql_freeresult($result);
+			}
+			else if ($search_id == 'unreadposts')
 			{
-				$id_ary[] = (int) $row[$field];
+				$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
 		{
-- 
cgit v1.2.1


From cb7bb31129a38cbdbeb682e869e51b1199b43bfb Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 14 Jan 2012 15:50:47 +0800
Subject: [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
-- 
cgit v1.2.1


From aa21bc2a733c1690ad7a371f962c244542135a43 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 15 Jan 2012 18:18:04 +0800
Subject: [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
-- 
cgit v1.2.1


From 99164cd20b9d8ca77b1e9a54e0958cdb580945d0 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 17 Jan 2011 00:01:04 +0700
Subject: [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)
 		{
-- 
cgit v1.2.1


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: [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)),
-- 
cgit v1.2.1


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: [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 -->
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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;
 }
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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',
-- 
cgit v1.2.1


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: [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';
-$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/startup.php';
 
+$table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
 
 require_once 'test_framework/phpbb_test_case_helpers.php';
-- 
cgit v1.2.1


From f832f5a4ee88459dae6fda7e1b303b15f84768dc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 5 Feb 2012 22:03:02 +0800
Subject: [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)
-- 
cgit v1.2.1


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: [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>
 
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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];
 		}
 	}
 
-- 
cgit v1.2.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: [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];
 	}
 }
 
-- 
cgit v1.2.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: [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;
 				}
-- 
cgit v1.2.1


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: [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))
-	{
-		$undelivered_msg[] = $row['msg_id'];
-		$undelivered_user[$row['user_id']][] = true;
-	}
-	$db->sql_freeresult($result);
-
-	if (sizeof($undelivered_msg))
+	// Clean the private messages tables from the user
+	if (!function_exists('delete_user_pms'))
 	{
-		$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');
 
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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));
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


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: [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 -->
 
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [ticket/10532] Remove one unnecessary level of if block nesting.

PHPBB3-10532
---
 phpBB/search.php | 71 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 3006c0e5d9..d89bc79225 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -475,56 +475,53 @@ 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)));
+				$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)
+		$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)
 			{
-				// 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);
+				$found_more_search_matches = true;
+				$total_match_count = $total_matches_limit;
 			}
-			else
+
+			// Make sure $start is set to the last page if it exceeds the amount
+			if ($start < 0)
 			{
-				// Set $start to 0 if no matches were found
 				$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
 		{
-			$search_id = '';
+			// Set $start to 0 if no matches were found
+			$start = 0;
 		}
 	}
 
-- 
cgit v1.2.1


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: [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
 		{
-- 
cgit v1.2.1


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: [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;
 }
 
-- 
cgit v1.2.1


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: [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;
 	}
 }
 
-- 
cgit v1.2.1


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: [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
---
 phpBB/styles/prosilver/template/memberlist_body.html    |  2 +-
 phpBB/styles/prosilver/template/memberlist_leaders.html |  4 ++--
 phpBB/styles/prosilver/template/search_body.html        |  2 +-
 phpBB/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;
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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'];
 			}
 		}
-- 
cgit v1.2.1


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: [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 = "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;
 
-		$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);
+			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;
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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 '" . SEARCH_WORDMATCH_TABLE . "'";
-				$result = $db->sql_query($sql);
-				$this->stats['total_matches'] = (int) $db->sql_fetchfield('Rows');
-				$db->sql_freeresult($result);
-			break;
+			$sql = "SHOW TABLE STATUS
+				LIKE '" . $table_name . "'";
+			$result = $db->sql_query($sql);
+			$table_status = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
 
-			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;
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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);
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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."
+		);
+	}
 }
-- 
cgit v1.2.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: [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(
-- 
cgit v1.2.1


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: [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);
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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',
 
-- 
cgit v1.2.1


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: [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);
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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);
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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)
 {
-- 
cgit v1.2.1


From 025de9ee191654825f6ba09a4804e6ef3633b8cb Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 8 Mar 2012 14:57:47 +0800
Subject: [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
-- 
cgit v1.2.1


From ee6783109ad7af70665c98d6bbc12d170bc0f892 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 9 Mar 2012 16:41:49 +0800
Subject: [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
 */
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


From f563647e4b97fc62aa91bc3bf7c81fcc715f17c3 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 9 Mar 2012 22:35:13 +0800
Subject: [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;
 			}
 		}
 
-- 
cgit v1.2.1


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: [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,
-- 
cgit v1.2.1


From 89a6cb2886dfd4659e6db67e27e42c4df763f723 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 10 Mar 2012 00:17:39 +0800
Subject: [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)
-- 
cgit v1.2.1


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: [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>'),
 			));
 		}
 
-- 
cgit v1.2.1


From a79b3490c2b21d283d7bc1f15c4923180e0f10b2 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 11 Mar 2012 00:56:07 +0800
Subject: [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'],
-- 
cgit v1.2.1


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: [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/*
-- 
cgit v1.2.1


From 321d0d9b56011e049b245b6d54975b6c67b3b15b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:44:00 +0800
Subject: [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))
-- 
cgit v1.2.1


From da395edbca3e25d1758a6b8c26d14c2e48f112d9 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:47:28 +0800
Subject: [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))
 	{
-- 
cgit v1.2.1


From ff8d5237688beee9ea36848e1ac49565e538c2cd Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 12 Mar 2012 01:57:51 +0800
Subject: [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
-- 
cgit v1.2.1


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: [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";
 
-- 
cgit v1.2.1


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: [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');
 
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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);
 
 /*
-- 
cgit v1.2.1


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: [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,
-- 
cgit v1.2.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: [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)',
 
-- 
cgit v1.2.1


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: [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)
 		{
-- 
cgit v1.2.1


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: =?UTF-8?q?[ticket/10717]=20Fix=20profile=20field=20sample=20in=20?=
 =?UTF-8?q?prosilver=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>
-- 
cgit v1.2.1


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: [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/*
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


From 5a9dd1994fc20aaebe3145540b630826d7333998 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 22 Mar 2012 21:19:01 +0800
Subject: [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)';
-- 
cgit v1.2.1


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: [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
 
-- 
cgit v1.2.1


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: [task/travis] Rename travis phpunit config files

PHPBB3-10718
---
 .travis.yml                        |  2 +-
 travis/mysql.travis.xml            | 28 ----------------------------
 travis/phpunit-mysql-travis.xml    | 28 ++++++++++++++++++++++++++++
 travis/phpunit-postgres-travis.xml | 30 ++++++++++++++++++++++++++++++
 travis/postgres.travis.xml         | 30 ------------------------------
 5 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 travis/mysql.travis.xml
 create mode 100644 travis/phpunit-mysql-travis.xml
 create mode 100644 travis/phpunit-postgres-travis.xml
 delete mode 100644 travis/postgres.travis.xml

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/mysql.travis.xml
deleted file mode 100644
index a849f50136..0000000000
--- a/travis/mysql.travis.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
new file mode 100644
index 0000000000..a849f50136
--- /dev/null
+++ b/travis/phpunit-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/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
new file mode 100644
index 0000000000..e44696a335
--- /dev/null
+++ b/travis/phpunit-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>
diff --git a/travis/postgres.travis.xml b/travis/postgres.travis.xml
deleted file mode 100644
index e44696a335..0000000000
--- a/travis/postgres.travis.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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>
-- 
cgit v1.2.1


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: [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">
-- 
cgit v1.2.1


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: [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 -->
-- 
cgit v1.2.1


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: [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:
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


From 2768db44f557cd5db4b54a287ecb1d2fcbe94140 Mon Sep 17 00:00:00 2001
From: HTF <harderthanfire@gmail.com>
Date: Sat, 24 Mar 2012 15:13:04 +0000
Subject: [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',
-- 
cgit v1.2.1


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: [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) . '
-- 
cgit v1.2.1


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: [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);
 	}
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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))
-- 
cgit v1.2.1


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: [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);
 	}
 
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: [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);
 	}
 
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: =?UTF-8?q?[ticket/10605]=20Reset=20user=C2=B4s=20pm=20count=20to?=
 =?UTF-8?q?=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 . '
-- 
cgit v1.2.1


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: [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/*
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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)',
 
-- 
cgit v1.2.1


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: [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
+}
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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;
 }
 
-- 
cgit v1.2.1


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: [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),
-- 
cgit v1.2.1


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: [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),
-- 
cgit v1.2.1


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: [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;
 }
 
 /**
-- 
cgit v1.2.1


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: [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;
 }
 
 /**
-- 
cgit v1.2.1


From 0df3f1c5d0a4b2c71139a7f4c02cb81ee5200809 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Wed, 4 Apr 2012 00:09:05 +0800
Subject: [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',
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.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: [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
-- 
cgit v1.2.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: [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>
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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),
-- 
cgit v1.2.1


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: [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">
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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 */
 	);
-- 
cgit v1.2.1


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: [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',
 					),
 				),
-- 
cgit v1.2.1


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: [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?',
-- 
cgit v1.2.1


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: [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?',
-- 
cgit v1.2.1


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: [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;
 
-- 
cgit v1.2.1


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: [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;
 	}
 }
 
-- 
cgit v1.2.1


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: [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;
 	}
-- 
cgit v1.2.1


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: [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);
 			}
-- 
cgit v1.2.1


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: [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
 */
-- 
cgit v1.2.1


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: [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);
 
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: [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'));
+	}
 }
-- 
cgit v1.2.1


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: [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':
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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]
 
-- 
cgit v1.2.1


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: [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)
 {
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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',
-- 
cgit v1.2.1


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: [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 {
-- 
cgit v1.2.1


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: [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 */
-- 
cgit v1.2.1


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: [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()
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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
 }
-- 
cgit v1.2.1


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: [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+ */
 }
 
-- 
cgit v1.2.1


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: [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',
-- 
cgit v1.2.1


From edf60bcd550334a521f35700d52d800b1851d693 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 14 Apr 2012 18:57:21 +0200
Subject: [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 | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 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>';
-		}
-		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,
+			// 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>';
+			}
 
-			'S_EXPLAIN'		=> true,
-			'S_LEGEND'		=> false,
-		));
+			$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')
-- 
cgit v1.2.1


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: [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');
-- 
cgit v1.2.1


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: [ticket/10492] Separate config generation from the installer

PHPBB3-10492
---
 phpBB/includes/functions_install.php              | 52 +++++++++++++++++++++++
 phpBB/install/install_install.php                 | 28 +-----------
 tests/test_framework/phpbb_database_test_case.php | 42 +++---------------
 tests/test_framework/phpbb_test_case_helpers.php  | 45 ++++++++++++++++++++
 4 files changed, 103 insertions(+), 64 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');
-
-			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
+		$config = phpbb_test_case_helpers::get_test_config();
+
+		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;
+	}
 }
-- 
cgit v1.2.1


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: [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 ++++
 .../test_framework/phpbb_functional_test_case.php  | 164 +++++++++++++++++++++
 tests/test_framework/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 0000000000..20b7166a67
Binary files /dev/null and b/vendor/goutte.phar differ
-- 
cgit v1.2.1


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: [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());
+	}
+}
-- 
cgit v1.2.1


From a21b367b21d811a3673145572b0bdd123ccc4767 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 14:16:55 +0200
Subject: [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');
-- 
cgit v1.2.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: [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 +++++++++++
 .../test_framework/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);
+	}
 }
-- 
cgit v1.2.1


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: [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];
-- 
cgit v1.2.1


From 1a8db76a200bd0de0bf17acd89e87e4875513d4c Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Sat, 21 Apr 2012 22:52:11 +0200
Subject: [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
 	*/
-- 
cgit v1.2.1


From 8d45901657801dcbf33ac2936559dbfe2ac373d8 Mon Sep 17 00:00:00 2001
From: galaxyAbstractor <galaxyAbstractor@gmail.com>
Date: Fri, 27 Apr 2012 22:19:41 +0200
Subject: [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}',
-- 
cgit v1.2.1


From 665f38d42f8692f5eab76348568ddb46b372492d Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 30 Apr 2012 22:01:53 +0200
Subject: [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');
-- 
cgit v1.2.1


From 2dd71f65204c8e484c81147e4966e33fcb7d1f42 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 1 May 2012 09:52:48 +0200
Subject: [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>
-- 
cgit v1.2.1


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: [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>
 
-- 
cgit v1.2.1


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: [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>
 
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


From 8d15f1b02ecff1c9e90b8bed1b1f356eaaff348b Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 7 May 2012 08:18:50 +0200
Subject: [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…',
-- 
cgit v1.2.1


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: [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;
 	}
 
 	/**
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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
 	*/
-- 
cgit v1.2.1


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: [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:
 //
-- 
cgit v1.2.1


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: [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}" />
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


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: [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 -->
-- 
cgit v1.2.1


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: [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,
 				));
 
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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.',
-- 
cgit v1.2.1


From 8393b8e755150593dbf85f545ac7ca3d8798e58c Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 10 Apr 2012 11:14:05 +0200
Subject: [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>
 
-- 
cgit v1.2.1


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: [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 -->
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


From 74e9245df3b6652db10e46302510d27a54db827e Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Fri, 11 May 2012 08:09:56 +0200
Subject: [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.',
-- 
cgit v1.2.1


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: [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()
-- 
cgit v1.2.1


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: [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' => '',
-- 
cgit v1.2.1


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: [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>
 
-- 
cgit v1.2.1


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: [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
 
-- 
cgit v1.2.1


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: [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';
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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,
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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;
 }
 
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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;
 			}
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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);
-- 
cgit v1.2.1


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: [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),
+			);
 		}
 	}
 
-- 
cgit v1.2.1


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: [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();
 
-- 
cgit v1.2.1


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: [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();
 
-- 
cgit v1.2.1


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: [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();
 
-- 
cgit v1.2.1


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: [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;
 
-- 
cgit v1.2.1


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: [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
 
-- 
cgit v1.2.1


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: [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;
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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(
-- 
cgit v1.2.1


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: [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.',
 ));
-- 
cgit v1.2.1


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: [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';
-- 
cgit v1.2.1


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: [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)
 						{
-- 
cgit v1.2.1


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: [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', '');
 
-- 
cgit v1.2.1


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: [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'),
 		);
 	}
 
-- 
cgit v1.2.1


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: [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':
-- 
cgit v1.2.1


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: [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
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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)
-- 
cgit v1.2.1


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: [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
 
-- 
cgit v1.2.1


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: [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');
 
-- 
cgit v1.2.1


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: [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>
-- 
cgit v1.2.1