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

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

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

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

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

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

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

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

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

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

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

From 28fac327426de08b7a5476b2417fef4f03be6908 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 29 Mar 2012 15:51:06 +0100
Subject: [PATCH 04/76] [ticket/10705] Change WARNINGS_ZERO_TOTAL in en
 language

Located the WARNINGS_ZERO_TOTAL in the language and replaced it with
NO_WARNINGS

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

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 664365b1ec..d57036cc0e 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -388,7 +388,7 @@ $lang = array_merge($lang, array(
 	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
 	'WARNING_PM_SUBJECT'	=> 'Board warning issued',
 	'WARNING_POST_DEFAULT'	=> 'This is a warning regarding the following post made by you: %s .',
-	'WARNINGS_ZERO_TOTAL'	=> 'No warnings exist.',
+	'NO_WARNINGS'	=> 'No warnings exist.',
 
 	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s.',
 

From d0e7b38aecbd5f357401297c8d57824a0504e9b6 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 29 Mar 2012 15:52:06 +0100
Subject: [PATCH 05/76] [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver

Located the L_WARNINGS_ZERO_TOTAL in prosilver and replaced it with
L_NO_WARNINGS

PHPBB3-10705
---
 phpBB/styles/prosilver/template/mcp_warn_front.html | 4 ++--
 phpBB/styles/prosilver/template/mcp_warn_list.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index 8f42e28cc0..2f7d939b16 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -55,7 +55,7 @@
 		</tbody>
 		</table>
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	<span class="corners-bottom"><span></span></span></div>
@@ -88,7 +88,7 @@
 		</tbody>
 		</table>
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index d9c0bce088..5e43903f11 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -53,7 +53,7 @@
 			</li>
 		</ul>
 	<!-- ELSE -->
-		<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
+		<p><strong>{L_NO_WARNINGS}</strong></p>
 	<!-- ENDIF -->
 
 	<span class="corners-bottom"><span></span></span></div>

From 56629d8e3c80cd490b8ec39d4fa102d0303f9a4b Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 29 Mar 2012 15:52:28 +0100
Subject: [PATCH 06/76] [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2

Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with
L_NO_WARNINGS

PHPBB3-10705
---
 phpBB/styles/subsilver2/template/mcp_warn_front.html | 4 ++--
 phpBB/styles/subsilver2/template/mcp_warn_list.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html
index 417355d537..020a79f419 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html
@@ -38,7 +38,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END highest -->
 </table>
@@ -64,7 +64,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END latest -->
 </table>
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html
index 6ed0b68bd5..0b0cfa8a45 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_list.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html
@@ -21,7 +21,7 @@
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
+		<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
 	</tr>
 <!-- END user -->
 <tr align="center">

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

To keep the .gitignore's the same.

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

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

From a7045e65724481002e232a7d143b7cc2ed6acb3a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 30 Mar 2012 21:43:00 -0400
Subject: [PATCH 08/76] [feature/qrpreview] Preview from Quick Reply

PHPBB3-10726
---
 phpBB/language/en/viewtopic.php                       |  2 +-
 phpBB/posting.php                                     |  2 +-
 phpBB/styles/prosilver/template/ajax.js               | 11 +++++++++++
 .../styles/prosilver/template/quickreply_editor.html  |  4 ++--
 .../styles/subsilver2/template/quickreply_editor.html |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 1460490672..184f88ed3c 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
 
 	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
 	'FORK_TOPIC'			=> 'Copy topic',
-	'FULL_EDITOR'			=> 'Full Editor',
+	'FULL_EDITOR'			=> 'Full Editor &amp; Preview',
 	
 	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
 	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 56fb7832f2..71ba353e89 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -38,7 +38,7 @@ $load		= (isset($_POST['load'])) ? true : false;
 $delete		= (isset($_POST['delete'])) ? true : false;
 $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
 
-$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['full_editor']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
+$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
 $mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
 
 $error = $post_data = array();
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index cc886c42b1..54f34e4204 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -66,6 +66,17 @@ $('[data-ajax]').each(function() {
 });
 
 
+/**
+ * This simply appends #preview to the action of the
+ * QR action when you click the Full Editor & Preview button
+ */
+$('#qr_full_editor').click(function() {
+	$('#qr_postform').attr('action', function(i, val) {
+		return val + '#preview';
+	});
+});
+
+
 
 /**
  * This AJAXifies the quick-mod tools. The reason it cannot be a standard
diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index 4cd5eedd3e..c7d998eca5 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -14,8 +14,8 @@
 				<fieldset class="submit-buttons">
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
-					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
-					<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" />&nbsp;
+					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" id="qr_full_editor" />&nbsp;
+					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
 				</fieldset>
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
diff --git a/phpBB/styles/subsilver2/template/quickreply_editor.html b/phpBB/styles/subsilver2/template/quickreply_editor.html
index de5017280c..4c3f7a3d0b 100644
--- a/phpBB/styles/subsilver2/template/quickreply_editor.html
+++ b/phpBB/styles/subsilver2/template/quickreply_editor.html
@@ -14,8 +14,8 @@
 		</tr>
 		<tr>
 			<td class="cat" colspan="2" align="center">
-				<input class="btnmain" type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" />&nbsp;
-				<input class="btnlite" type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" />
+				<input class="btnlite" type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" />&nbsp;
+				<input class="btnmain" type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" />
 
 				{S_FORM_TOKEN}
 				{QR_HIDDEN_FIELDS}

From 0c8d0a82de69277d090907618eee71f815f12436 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 30 Mar 2012 21:46:20 -0400
Subject: [PATCH 09/76] [feature/qrpreview] Add id qr_postform to prosilver QR

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

diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index c7d998eca5..a08b5dc3cc 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -1,4 +1,4 @@
-<form method="post" action="{U_QR_ACTION}">
+<form method="post" action="{U_QR_ACTION}" id="qr_postform">
 	<div class="panel">
 		<div class="inner"><span class="corners-top"><span></span></span>
 				<h2>{L_QUICKREPLY}</h2>

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

Add period to ATTACH_DISK_FULL language string

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

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

From b3f46b9565117940b79c7530a1c21336cd072073 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 21:20:18 +0300
Subject: [PATCH 11/76] [ticket/10735] Changing locator paths structure

Changing locator paths to 2 dimensional array

PHPBB3-10735
---
 phpBB/includes/extension/finder.php           | 18 +++--
 .../style/extension_path_provider.php         | 36 +++++-----
 phpBB/includes/style/path_provider.php        | 16 +----
 .../style/path_provider_interface.php         |  7 --
 phpBB/includes/style/resource_locator.php     | 66 ++++++++-----------
 phpBB/includes/style/style.php                |  4 +-
 6 files changed, 62 insertions(+), 85 deletions(-)

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index 23b9f1c658..87ca40917d 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -270,11 +270,12 @@ class phpbb_extension_finder
 	* Finds all directories matching the configured options
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $extension_keys Whether the result should have extension name as array key
 	* @return array An array of paths to found directories
 	*/
-	public function get_directories($cache = true)
+	public function get_directories($cache = true, $extension_keys = false)
 	{
-		return $this->find_with_root_path($cache, true);
+		return $this->find_with_root_path($cache, true, $extension_keys);
 	}
 
 	/**
@@ -294,16 +295,25 @@ class phpbb_extension_finder
 	* @param bool $cache Whether the result should be cached
 	* @param bool $is_dir Directories will be returned when true, only files
 	*                     otherwise
+	* @param bool $extension_keys If true, result will be associative array
+	*					with extension name as key
 	* @return array An array of paths to found items
 	*/
-	protected function find_with_root_path($cache = true, $is_dir = false)
+	protected function find_with_root_path($cache = true, $is_dir = false, $extension_keys = false)
 	{
 		$items = $this->find($cache, $is_dir);
 
 		$result = array();
 		foreach ($items as $item => $ext_name)
 		{
-			$result[] = $this->phpbb_root_path . $item;
+			if ($extension_keys)
+			{
+				$result[$ext_name] = $this->phpbb_root_path . $item;
+			}
+			else
+			{
+				$result[] = $this->phpbb_root_path . $item;
+			}
 		}
 
 		return $result;
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index 1fb6580ce1..4eac300424 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php
@@ -82,22 +82,26 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 		$directories = array();
 
 		$finder = $this->extension_manager->get_finder();
-		foreach ($this->base_path_provider as $path)
+		foreach ($this->base_path_provider as $key => $paths)
 		{
-			if ($path && !phpbb_is_absolute($path))
+			if ($key == 'style')
 			{
-				$directories = array_merge($directories, $finder
-					->directory('/' . $this->ext_dir_prefix . $path)
-					->get_directories()
-				);
+				foreach ($paths as $path)
+				{
+					$directories['style'][] = $path;
+					if ($path && !phpbb_is_absolute($path))
+					{
+						$result = $finder->directory('/' . $this->ext_dir_prefix . $path)
+							->get_directories(true, true);
+						foreach ($result as $ext => $ext_path)
+						{
+							$directories[$ext][] = $ext_path;
+						}
+					}
+				}
 			}
 		}
 
-		foreach ($this->base_path_provider as $path)
-		{
-			$directories[] = $path;
-		}
-
 		return $directories;
 	}
 
@@ -112,14 +116,4 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 		$this->base_path_provider->set_styles($styles);
 		$this->items = null;
 	}
-
-	/**
-	* Retrieves the path to the main style passed into set_styles()
-	*
-	* @return string Main style path
-	*/
-	public function get_main_style_path()
-	{
-		return $this->base_path_provider->get_main_style_path();
-	}
 }
diff --git a/phpBB/includes/style/path_provider.php b/phpBB/includes/style/path_provider.php
index c229af92ba..731d682e88 100644
--- a/phpBB/includes/style/path_provider.php
+++ b/phpBB/includes/style/path_provider.php
@@ -24,7 +24,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_provider_interface
 {
-	protected $main_style_name = '';
 	protected $paths = array();
 
 	/**
@@ -41,25 +40,14 @@ class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_p
 	* Overwrites the current style paths
 	*
 	* The first element of the passed styles map, is considered the main
-	* style and can be retrieved through get_main_style_path().
+	* style.
 	*
 	* @param array $styles An array of style paths. The first element is the main style.
 	* @return null
 	*/
 	public function set_styles(array $styles)
 	{
-		$this->paths = $styles;
-		$this->main_style_path = $this->paths[0];
-	}
-
-	/**
-	* Retrieves the path to the main style passed into set_styles()
-	*
-	* @return string Main style path
-	*/
-	public function get_main_style_path()
-	{
-		return $this->main_style_path;
+		$this->paths = array('style' => $styles);
 	}
 
 	/**
diff --git a/phpBB/includes/style/path_provider_interface.php b/phpBB/includes/style/path_provider_interface.php
index 7ae94e17f4..1a6153a4d3 100644
--- a/phpBB/includes/style/path_provider_interface.php
+++ b/phpBB/includes/style/path_provider_interface.php
@@ -39,11 +39,4 @@ interface phpbb_style_path_provider_interface extends Traversable
 	* @return null
 	*/
 	public function set_styles(array $styles);
-
-	/**
-	* Retrieves the path to the main style passed into set_styles()
-	*
-	* @return string Main style path
-	*/
-	public function get_main_style_path();
 }
diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/includes/style/resource_locator.php
index af261534c3..39505cedb5 100644
--- a/phpBB/includes/style/resource_locator.php
+++ b/phpBB/includes/style/resource_locator.php
@@ -38,12 +38,6 @@ class phpbb_style_resource_locator
 	*/
 	private $roots = array();
 
-	/**
-	* Index of the main style in the roots array.
-	* @var int
-	*/
-	private $main_root_id = 0;
-
 	/**
 	* Location of templates directory within style directories.
 	* Must have trailing slash. Empty if templates are stored in root
@@ -69,17 +63,6 @@ class phpbb_style_resource_locator
 	*/
 	private $filenames = array();
 
-	/**
-	* Set main style location (must have been added through set_paths first).
-	*
-	* @param string $style_path Path to style directory
-	* @return null
-	*/
-	public function set_main_style($style_path)
-	{
-		$this->main_root_id = array_search($style_path, $this->roots, true);
-	}
-
 	/**
 	* Sets the list of style paths
 	*
@@ -95,16 +78,18 @@ class phpbb_style_resource_locator
 		$this->roots = array();
 		$this->files = array();
 		$this->filenames = array();
-		$this->main_root_id = 0;
 
-		foreach ($style_paths as $path)
+		foreach ($style_paths as $key => $paths)
 		{
-			// Make sure $path has no ending slash
-			if (substr($path, -1) === '/')
+			foreach ($paths as $path)
 			{
-				$path = substr($path, 0, -1);
+				// Make sure $path has no ending slash
+				if (substr($path, -1) === '/')
+				{
+					$path = substr($path, 0, -1);
+				}
+				$this->roots[$key][] = $path;
 			}
-			$this->roots[] = $path;
 		}
 	}
 
@@ -125,9 +110,12 @@ class phpbb_style_resource_locator
 
 			$this->filename[$handle] = $filename;
 
-			foreach ($this->roots as $root_index => $root)
+			foreach ($this->roots as $root_key => $root_paths)
 			{
-				$this->files[$root_index][$handle] = $root . '/' . $this->template_path . $filename;
+				foreach ($root_paths as $root_index => $root)
+				{
+					$this->files[$root_key][$root_index][$handle] = $root . '/' . $this->template_path . $filename;
+				}
 			}
 		}
 	}
@@ -174,12 +162,12 @@ class phpbb_style_resource_locator
 	public function get_virtual_source_file_for_handle($handle)
 	{
 		// If we don't have a file assigned to this handle, die.
-		if (!isset($this->files[$this->main_root_id][$handle]))
+		if (!isset($this->files['style'][0][$handle]))
 		{
 			trigger_error("style resource locator: No file specified for handle $handle", E_USER_ERROR);
 		}
 
-		$source_file = $this->files[$this->main_root_id][$handle];
+		$source_file = $this->files['style'][0][$handle];
 		return $source_file;
 	}
 
@@ -202,26 +190,28 @@ class phpbb_style_resource_locator
 	public function get_source_file_for_handle($handle)
 	{
 		// If we don't have a file assigned to this handle, die.
-		if (!isset($this->files[$this->main_root_id][$handle]))
+		if (!isset($this->files['style'][0][$handle]))
 		{
 			trigger_error("style resource locator: No file specified for handle $handle", E_USER_ERROR);
 		}
 
 		// locate a source file that exists
-		$source_file = $this->files[0][$handle];
+		$source_file = $this->files['style'][0][$handle];
 		$tried = $source_file;
-		for ($i = 1, $n = count($this->roots); $i < $n && !file_exists($source_file); $i++)
+		foreach ($this->roots as $root_key => $root_paths)
 		{
-			$source_file = $this->files[$i][$handle];
-			$tried .= ', ' . $source_file;
+			foreach ($root_paths as $root_index => $root)
+			{
+				$source_file = $this->files[$root_key][$root_index][$handle];
+				if (file_exists($source_file))
+				{
+					return $source_file;
+				}
+				$tried .= ', ' . $source_file;
+			}
 		}
 
 		// search failed
-		if (!file_exists($source_file))
-		{
-			trigger_error("style resource locator: File for handle $handle does not exist. Could not find: $tried", E_USER_ERROR);
-		}
-
-		return $source_file;
+		trigger_error("style resource locator: File for handle $handle does not exist. Could not find: $tried", E_USER_ERROR);
 	}
 }
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 539a2642ee..dc1e71dff6 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -92,6 +92,9 @@ class phpbb_style
 			$paths[] = $this->get_style_path($dir);
 		}
 
+		// Add 'all' path, used as last fallback path by hooks and extensions
+		$paths[] = $this->get_style_path('all');
+
 		return $this->set_custom_style($style_name, $paths);
 	}
 
@@ -113,7 +116,6 @@ class phpbb_style
 
 		$this->provider->set_styles($paths);
 		$this->locator->set_paths($this->provider);
-		$this->locator->set_main_style($this->provider->get_main_style_path());
 
 		$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';
 

From 2ce73baeab35adc3515a04c1db38af62c98d5c93 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 22:07:04 +0300
Subject: [PATCH 12/76] [ticket/10733] Extending get_source_file_for_handle

Extending resource locator's function get_source_file_for_handle to find all files. This modified function should be used by template events to locate all templates before compiling them.

PHPBB3-10733
---
 phpBB/includes/style/resource_locator.php | 31 ++++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/includes/style/resource_locator.php
index 39505cedb5..1b35752111 100644
--- a/phpBB/includes/style/resource_locator.php
+++ b/phpBB/includes/style/resource_locator.php
@@ -185,9 +185,12 @@ class phpbb_style_resource_locator
 	* handle to a path without any filesystem or styles tree checks.
 	*
 	* @param string $handle Template handle (i.e. "friendly" template name)
+	* @param bool $find_all If true, each root path will be checked and function
+	*				will return array of files instead of string and will not
+	*				trigger a error if template does not exist
 	* @return string Source file path
 	*/
-	public function get_source_file_for_handle($handle)
+	public function get_source_file_for_handle($handle, $find_all = false)
 	{
 		// If we don't have a file assigned to this handle, die.
 		if (!isset($this->files['style'][0][$handle]))
@@ -198,20 +201,40 @@ class phpbb_style_resource_locator
 		// locate a source file that exists
 		$source_file = $this->files['style'][0][$handle];
 		$tried = $source_file;
+		$found = false;
+		$found_all = array();
 		foreach ($this->roots as $root_key => $root_paths)
 		{
 			foreach ($root_paths as $root_index => $root)
 			{
 				$source_file = $this->files[$root_key][$root_index][$handle];
+				$tried .= ', ' . $source_file;
 				if (file_exists($source_file))
 				{
-					return $source_file;
+					$found = true;
+					break;
+				}
+			}
+			if ($found)
+			{
+				if ($find_all)
+				{
+					$found_all[] = $source_file;
+					$found = false;
+				}
+				else
+				{
+					break;
 				}
-				$tried .= ', ' . $source_file;
 			}
 		}
 
 		// search failed
-		trigger_error("style resource locator: File for handle $handle does not exist. Could not find: $tried", E_USER_ERROR);
+		if (!$found && !$find_all)
+		{
+			trigger_error("style resource locator: File for handle $handle does not exist. Could not find: $tried", E_USER_ERROR);
+		}
+
+		return ($find_all) ? $found_all : $source_file;
 	}
 }

From 5ccd6915e3e8af30856319d84a48dde074fdbaee Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 31 Mar 2012 15:52:16 -0400
Subject: [PATCH 13/76] [feature/qrpreview] Do not error or show preview if no
 text is entered

PHPBB3-10726
---
 phpBB/posting.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 71ba353e89..7f57f693af 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -38,7 +38,7 @@ $load		= (isset($_POST['load'])) ? true : false;
 $delete		= (isset($_POST['delete'])) ? true : false;
 $cancel		= (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false;
 
-$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false;
+$refresh	= (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview) ? true : false;
 $mode		= ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', '');
 
 $error = $post_data = array();
@@ -1198,8 +1198,8 @@ if (!sizeof($error) && $preview)
 			'PREVIEW_MESSAGE'		=> $preview_message,
 			'PREVIEW_SIGNATURE'		=> $preview_signature,
 
-			'S_DISPLAY_PREVIEW'		=> true)
-		);
+			'S_DISPLAY_PREVIEW'		=> !empty($preview_message),
+		));
 	}
 }
 

From f80512f1066ebfc09d2a4ffac412c56a3fb247de Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 09:52:55 +0300
Subject: [PATCH 14/76] [ticket/10733] Adding functions to locate resources

Adding $style->locate() and $template->locate() functions

PHPBB3-10733
---
 phpBB/includes/style/resource_locator.php | 51 +++++++++++++++++++++++
 phpBB/includes/style/style.php            | 28 +++++++++++++
 phpBB/includes/style/template.php         | 36 ++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/includes/style/resource_locator.php
index 1b35752111..3e6dd5d6aa 100644
--- a/phpBB/includes/style/resource_locator.php
+++ b/phpBB/includes/style/resource_locator.php
@@ -237,4 +237,55 @@ class phpbb_style_resource_locator
 
 		return ($find_all) ? $found_all : $source_file;
 	}
+
+	/**
+	* Locates source file path, accounting for styles tree and verifying that
+	* the path exists.
+	*
+	* Unlike previous functions, this function works without template handle
+	* and it can search for more than one file. If more than one file name is
+	* specified, it will return location of file that it finds first.
+	*
+	* @param array $files List of files to locate.
+	* @param bool $return_default Determines what to return if file does not
+	*				exist. If true, function will return location where file is
+	*				supposed to be. If false, function will return false.
+	* @param bool $return_full_path If true, function will return full path
+	*				to file. If false, function will return file name. This
+	*				parameter can be used to check which one of set of files
+	*				is available.
+	* @return string or boolean Source file path if file exists or $return_default is
+	*				true. False if file does not exist and $return_default is false
+	*/
+	public function get_first_file_location($files, $return_default = false, $return_full_path = true)
+	{
+		// set default value
+		$default_result = false;
+
+		// check all available paths
+		foreach ($this->roots as $root_paths)
+		{
+			foreach ($root_paths as $path)
+			{
+				// check all files
+				foreach ($files as $filename)
+				{
+					$source_file = $path . '/' . $filename;
+					if (file_exists($source_file))
+					{
+						return ($return_full_path) ? $source_file : $filename;
+					}
+
+					// assign first file as result if $return_default is true
+					if ($return_default && $default_result === false)
+					{
+						$default_result = $source_file;
+					}
+				}
+			}
+		}
+
+		// search failed
+		return $default_result;
+	}
 }
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index dc1e71dff6..5ac61c9f10 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -150,4 +150,32 @@ class phpbb_style
 	{
 		$this->provider->set_ext_dir_prefix($ext_dir_prefix);
 	}
+
+	/**
+	* Locates source file path, accounting for styles tree and verifying that
+	* the path exists.
+	*
+	* @param string or array $files List of files to locate. If there is only
+	*				one file, $files can be a string to make code easier to read.
+	* @param bool $return_default Determines what to return if file does not
+	*				exist. If true, function will return location where file is
+	*				supposed to be. If false, function will return false.
+	* @param bool $return_full_path If true, function will return full path
+	*				to file. If false, function will return file name. This
+	*				parameter can be used to check which one of set of files
+	*				is available.
+	* @return string or boolean Source file path if file exists or $return_default is
+	*				true. False if file does not exist and $return_default is false
+	*/
+	public function locate($files, $return_default = false, $return_full_path = true)
+	{
+		// convert string to array
+		if (is_string($files))
+		{
+			$files = array($files);
+		}
+
+		// use resource locator to find files
+		return $this->locator->get_first_file_location($files, $return_default, $return_full_path);
+	}
 }
diff --git a/phpBB/includes/style/template.php b/phpBB/includes/style/template.php
index 21a2e821dd..aebf1da603 100644
--- a/phpBB/includes/style/template.php
+++ b/phpBB/includes/style/template.php
@@ -456,4 +456,40 @@ class phpbb_style_template
 		}
 		include($file);
 	}
+
+	/**
+	* Locates source template path, accounting for styles tree and verifying that
+	* the path exists.
+	*
+	* @param string or array $files List of templates to locate. If there is only
+	*				one template, $files can be a string to make code easier to read.
+	* @param bool $return_default Determines what to return if template does not
+	*				exist. If true, function will return location where template is
+	*				supposed to be. If false, function will return false.
+	* @param bool $return_full_path If true, function will return full path
+	*				to template. If false, function will return template file name.
+	*				This parameter can be used to check which one of set of template
+	*				files is available.
+	* @return string or boolean Source template path if template exists or $return_default is
+	*				true. False if template does not exist and $return_default is false
+	*/
+	public function locate($files, $return_default = false, $return_full_path = true)
+	{
+		// add tempalte path prefix
+		$templates = array();
+		if (is_string($files))
+		{
+			$templates[] = $this->template_path . $files;
+		}
+		else
+		{
+			foreach ($files as $file)
+			{
+				$templates[] = $this->template_path . $file;
+			}
+		}
+
+		// use resource locator to find files
+		return $this->locator->get_first_file_location($templates, $return_default, $return_full_path);
+	}
 }

From 2509853ca530b3b5e0d5b2e10080eeba5a29d937 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 09:53:23 +0300
Subject: [PATCH 15/76] [ticket/10733] Adding test for locator

Adding test for $template->locate

PHPBB3-10733
---
 tests/template/template_locate_test.php | 84 +++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 tests/template/template_locate_test.php

diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
new file mode 100644
index 0000000000..591a6afe0c
--- /dev/null
+++ b/tests/template/template_locate_test.php
@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_locate_test extends phpbb_template_template_test_case
+{
+	public static function template_data()
+	{
+		return array(
+			// First element of the array is test name - keep them distinct
+			array(
+				'simple inheritance - only parent template exists',
+				'parent_only.html',
+				false,
+				true,
+				dirname(__FILE__) . '/parent_templates/parent_only.html',
+			),
+			array(
+				'simple inheritance - only child template exists',
+				'child_only.html',
+				false,
+				true,
+				dirname(__FILE__) . '/templates/child_only.html',
+			),
+			array(
+				'simple inheritance - both parent and child templates exist',
+				'parent_and_child.html',
+				false,
+				true,
+				dirname(__FILE__) . '/templates/parent_and_child.html',
+			),
+			array(
+				'find first template - only child template exists in main style',
+				array('parent_only.html', 'child_only.html'),
+				false,
+				false,
+				'child_only.html',
+			),
+			array(
+				'find first template - both templates exist in main style',
+				array('parent_and_child.html', 'child_only.html'),
+				false,
+				false,
+				'parent_and_child.html',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($name, $files, $return_default, $return_full_path, $expected)
+	{
+		// Reset the engine state
+		$this->setup_engine();
+
+		// Locate template
+		$result = $this->template->locate($files, $return_default, $return_full_path);
+		$this->assertEquals($result, $expected);
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = dirname(__FILE__) . '/templates';
+		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+	}
+}

From a7d0ef90ea921b2ed876bb933bfa022863771a6e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 10:58:24 +0300
Subject: [PATCH 16/76] [ticket/10665] INCLUDEJS template tag

Implementing INLCUDEJS template tag in style classes

PHPBB3-10665
---
 phpBB/includes/style/template.php         | 21 +++++++-
 phpBB/includes/style/template_compile.php | 32 +++++++++++-
 phpBB/includes/style/template_filter.php  | 61 ++++++++++++++++++++++-
 3 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/style/template.php b/phpBB/includes/style/template.php
index aebf1da603..4586e8dbf9 100644
--- a/phpBB/includes/style/template.php
+++ b/phpBB/includes/style/template.php
@@ -288,7 +288,7 @@ class phpbb_style_template
 			return new phpbb_style_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_style_template_compile($this->config['tpl_allow_php']);
+		$compile = new phpbb_style_template_compile($this->config['tpl_allow_php'], $this->locator, $this->phpbb_root_path);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
@@ -492,4 +492,23 @@ class phpbb_style_template
 		// use resource locator to find files
 		return $this->locator->get_first_file_location($templates, $return_default, $return_full_path);
 	}
+
+	/**
+	* Include JS file
+	*
+	* @param string $file file name
+	* @param bool $locate True if file needs to be located
+	*/
+	function _js_include($file, $locate = false)
+	{
+		// Locate file
+		if ($locate)
+		{
+			$file = $this->locator->get_first_file_location(array($file), true, true);
+		}
+
+		// Add HTML code
+		$code = '<script src="' . htmlspecialchars($file) . '"></script>';
+		$this->context->append_var('SCRIPTS', $code);
+	}
 }
diff --git a/phpBB/includes/style/template_compile.php b/phpBB/includes/style/template_compile.php
index 3ef3fffc00..bd9e18e102 100644
--- a/phpBB/includes/style/template_compile.php
+++ b/phpBB/includes/style/template_compile.php
@@ -25,6 +25,13 @@ stream_filter_register('phpbb_template', 'phpbb_style_template_filter');
 */
 class phpbb_style_template_compile
 {
+	/**
+	* Array of parameters to forward to template filter
+	*
+	* @var array
+	*/
+	private $filter_params;
+
 	/**
 	* Whether <!-- PHP --> tags are allowed
 	*
@@ -32,14 +39,31 @@ class phpbb_style_template_compile
 	*/
 	private $allow_php;
 
+	/**
+	* Style resource locator
+	*
+	* @var phpbb_style_resource_locator
+	*/
+	private $locator;
+
+	/**
+	* @var string phpBB root path
+	*/
+	private $phpbb_root_path;
+
 	/**
 	* Constructor.
 	*
 	* @param bool @allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
+	* @param phpbb_style_resource_locator $locator Resource locator
+	* @param string $phpbb_root_path Path to phpBB root directory
 	*/
-	public function __construct($allow_php)
+	public function __construct($allow_php, $locator, $phpbb_root_path)
 	{
+		$this->filter_params = array();
 		$this->allow_php = $allow_php;
+		$this->locator = $locator;
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
@@ -116,7 +140,11 @@ class phpbb_style_template_compile
 	*/
 	private function compile_stream_to_stream($source_stream, $dest_stream)
 	{
-		stream_filter_append($source_stream, 'phpbb_template', null, array('allow_php' => $this->allow_php));
+		$params = $this->filter_params;
+		$params['allow_php'] = $this->allow_php;
+		$params['locator'] = $this->locator;
+		$params['phpbb_root_path'] = $this->phpbb_root_path;
+		stream_filter_append($source_stream, 'phpbb_template', null, $params);
 		stream_copy_to_stream($source_stream, $dest_stream);
 	}
 }
diff --git a/phpBB/includes/style/template_filter.php b/phpBB/includes/style/template_filter.php
index 04fe85e07f..d62ad0ba1e 100644
--- a/phpBB/includes/style/template_filter.php
+++ b/phpBB/includes/style/template_filter.php
@@ -75,6 +75,18 @@ class phpbb_style_template_filter extends php_user_filter
 	*/
 	private $allow_php;
 
+	/**
+	* Resource locator.
+	*
+	* @var phpbb_template_locator
+	*/
+	private $locator;
+
+	/**
+	* @var string phpBB root path
+	*/
+	private $phpbb_root_path;
+
 	/**
 	* Stream filter
 	*
@@ -126,14 +138,16 @@ class phpbb_style_template_filter extends php_user_filter
 	/**
 	* Initializer, called on creation.
 	*
-	* Get the allow_php option from params, which is passed
-	* to stream_filter_append.
+	* Get the allow_php option, root directory and locator from params, 
+	* which are passed to stream_filter_append.
 	*/
 	public function onCreate()
 	{
 		$this->chunk = '';
 		$this->in_php = false;
 		$this->allow_php = $this->params['allow_php'];
+		$this->locator = $this->params['locator'];
+		$this->phpbb_root_path = $this->params['phpbb_root_path'];
 		return true;
 	}
 
@@ -281,6 +295,10 @@ class phpbb_style_template_filter extends php_user_filter
 				return ($this->allow_php) ? '<?php ' . $this->compile_tag_include_php($matches[2]) . ' ?>' : '';
 			break;
 
+			case 'INCLUDEJS':
+				return '<?php ' . $this->compile_tag_include_js($matches[2]) . ' ?>';
+			break;
+
 			case 'PHP':
 				if ($this->allow_php)
 				{
@@ -856,6 +874,45 @@ class phpbb_style_template_filter extends php_user_filter
 		return $tokens;
 	}
 
+	/**
+	* Compile INCLUDEJS tag
+	*
+	* @param string $tag_args Expression given with INCLUDEJS in source template
+	* @return string compiled template code
+	*/
+	private function compile_tag_include_js($tag_args)
+	{
+		// Process dynamic includes
+		if ($tag_args[0] == '{')
+		{
+			$var = $this->get_varref($tag_args, $is_expr);
+			if (!$is_expr)
+			{
+				return " \$_template->_js_include($var, true);";
+			}
+			return '';
+		}
+
+		// Locate file
+		$filename = $this->locator->get_first_file_location(array($tag_args), false, true);
+		
+		if ($filename === false)
+		{
+			// File does not exist, find it during run time
+			return ' $_template->_js_include(\'' . addslashes($tag_args) . '\', true); ';
+		}
+		
+		if (substr($filename, 0, strlen($this->phpbb_root_path)) != $this->phpbb_root_path)
+		{
+			// Absolute path, include as is
+			return ' $_template->_js_include(\'' . addslashes($filename) . '\', false); ';
+		}
+
+		// Relative path, remove root path from it
+		$filename = substr($filename, strlen($this->phpbb_root_path));
+		return ' global $phpbb_root_path; $_template->_js_include($phpbb_root_path . \'' . addslashes($filename) . '\', false); ';
+	}
+
 	/**
 	* Generates a reference to the given variable inside the given (possibly nested)
 	* block namespace. This is a string of the form:

From 2225efc5609add8baf0dc0e7867d9f9f0fae4245 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 10:58:59 +0300
Subject: [PATCH 17/76] [ticket/10665] INCLUDEJS template changes

Implementing INLCUDEJS template tag in styles

PHPBB3-10665
---
 phpBB/styles/prosilver/template/overall_footer.html  | 3 ++-
 phpBB/styles/prosilver/template/simple_footer.html   | 1 +
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 phpBB/styles/subsilver2/template/simple_footer.html  | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 1561bae26a..47071ba4df 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -52,7 +52,8 @@
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
-<script type="text/javascript" src="{T_TEMPLATE_PATH}/ajax.js"></script>
+<!-- INCLUDEJS template/ajax.js -->
+{SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 3458d02495..549c31cfb6 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -8,6 +8,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+{SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 9b0b95372e..77b11034b9 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -10,6 +10,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+{SCRIPTS}
 
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index b51be3ac4c..4a65bafd1c 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -7,6 +7,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+{SCRIPTS}
 
 </body>
 </html>

From 38c988fb5997f947976ca4c12e3e0d57d1e82b60 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 11:16:57 +0300
Subject: [PATCH 18/76] [ticket/10665] Changing template compiler test

Adding new constructor parameters to template compiler test

PHPBB3-10665
---
 tests/template/template_compile_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/template/template_compile_test.php b/tests/template/template_compile_test.php
index fb158cabd5..e2264fb1b7 100644
--- a/tests/template/template_compile_test.php
+++ b/tests/template/template_compile_test.php
@@ -16,7 +16,7 @@ class phpbb_template_template_compile_test extends phpbb_test_case
 
 	protected function setUp()
 	{
-		$this->template_compile = new phpbb_style_template_compile(false);
+		$this->template_compile = new phpbb_style_template_compile(false, null, '');
 		$this->template_path = dirname(__FILE__) . '/templates';
 	}
 

From 4b2ede433e9336cf115fdd41e5c88738b03aa448 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 11:17:13 +0300
Subject: [PATCH 19/76] [ticket/10665] INCLUDEJS unit test

Adding INLCUDEJS test

PHPBB3-10665
---
 tests/template/template_includejs_test.php | 48 ++++++++++++++++++++++
 tests/template/templates/includejs.html    |  5 +++
 2 files changed, 53 insertions(+)
 create mode 100644 tests/template/template_includejs_test.php
 create mode 100644 tests/template/templates/includejs.html

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
new file mode 100644
index 0000000000..e0229e978b
--- /dev/null
+++ b/tests/template/template_includejs_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_includejs_test extends phpbb_template_template_test_case
+{
+	public function test_includejs_compilation()
+	{
+		// Reset the engine state
+		$this->setup_engine();
+
+		// Prepare correct result
+		$dir = dirname(__FILE__);
+		$scripts = array(
+			'<script src="' . $dir . '/templates/parent_and_child.html"></script>',
+			'<script src="' . $dir . '/parent_templates/parent_only.html"></script>',
+			'<script src="' . $dir . '/templates/child_only.html"></script>'
+		);
+
+		// Run test
+		$cache_file = $this->template->cachepath . 'includejs.html.php';
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = dirname(__FILE__) . '/templates';
+		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+		$this->template->set_filenames(array('body' => 'includejs.html'));
+	}
+}
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
new file mode 100644
index 0000000000..186fc30b43
--- /dev/null
+++ b/tests/template/templates/includejs.html
@@ -0,0 +1,5 @@
+<!-- INCLUDEJS parent_and_child.html -->
+<!-- INCLUDEJS {PARENT} -->
+<!-- DEFINE $TEST = 'child_only.html' -->
+<!-- INCLUDEJS {$TEST} -->
+{SCRIPTS}
\ No newline at end of file

From e7cf4bfb2ed2b549e567c7237df799b6af0977ae Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 1 Apr 2012 18:25:50 +0530
Subject: [PATCH 20/76] [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  | 2 +-
 phpBB/styles/subsilver2/template/editor.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 2c41b543b5..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();
 	}
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index b47583ec75..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();
 	}

From 48616c7cf25555f2a5ae681a245ac0da9e812d89 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 1 Apr 2012 18:33:18 +0530
Subject: [PATCH 21/76] [ticket/10740] Changed styling of phpbb_alert box, to
 be centered.

Changed the styling of the phpbb.alert() and phpbb.confirm()
dialogue boxes to me more centered on a page.

PHPBB3-10740
---
 phpBB/styles/prosilver/theme/common.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 31015b28f9..e154db236f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -594,9 +594,10 @@ li.pagination {
 	border: 1px solid transparent;
 	position: fixed;
 	display: none;
-	top: 100px;
-	left: 35%;
+	top: 40%;
+	left: 50%;
 	width: 30%;
+	margin-left: -15%;
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;

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

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

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

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

From f5bac7686b1678dbd33eddd368d845237bb18943 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 19:14:53 +0300
Subject: [PATCH 23/76] [ticket/10733] Removing static from data providers

Removing static from data provider functions

PHPBB3-10733
---
 tests/dbal/select_test.php                     | 14 +++++++-------
 tests/dbal/write_test.php                      |  4 ++--
 tests/group_positions/group_positions_test.php | 14 +++++++-------
 tests/request/request_var_test.php             |  4 ++--
 tests/security/extract_current_page_test.php   |  2 +-
 tests/security/redirect_test.php               |  2 +-
 tests/template/template_inheritance_test.php   |  2 +-
 tests/template/template_locate_test.php        |  2 +-
 tests/template/template_test.php               |  4 ++--
 tests/text_processing/make_clickable_test.php  |  2 +-
 tests/utf/utf8_clean_string_test.php           |  2 +-
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 21b12777dc..cc213f09bc 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -17,7 +17,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
 	}
 
-	public static function return_on_error_select_data()
+	public function return_on_error_select_data()
 	{
 		return array(
 			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
@@ -44,7 +44,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function fetchrow_data()
+	public function fetchrow_data()
 	{
 		return array(
 			array('', array(array('username_clean' => 'barfoo'),
@@ -95,7 +95,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function fetchfield_data()
+	public function fetchfield_data()
 	{
 		return array(
 			array('', array('barfoo', 'foobar', 'bertie')),
@@ -125,7 +125,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $ary);
 	}
 
-	public static function query_limit_data()
+	public function query_limit_data()
 	{
 		return array(
 			array(0, 0, array(array('username_clean' => 'barfoo'),
@@ -166,7 +166,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $ary);
 	}
 
-	public static function like_expression_data()
+	public function like_expression_data()
 	{
 		// * = any_char; # = one_char
 		return array(
@@ -203,7 +203,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function in_set_data()
+	public function in_set_data()
 	{
 		return array(
 			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
@@ -277,7 +277,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function build_array_data()
+	public function build_array_data()
 	{
 		return array(
 			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index 596c50a220..987161a831 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -16,7 +16,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
 	}
 
-	public static function build_array_insert_data()
+	public function build_array_insert_data()
 	{
 		return array(
 			array(array(
@@ -104,7 +104,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function update_data()
+	public function update_data()
 	{
 		return array(
 			array(
diff --git a/tests/group_positions/group_positions_test.php b/tests/group_positions/group_positions_test.php
index fd9f57e78f..c17e25511b 100644
--- a/tests/group_positions/group_positions_test.php
+++ b/tests/group_positions/group_positions_test.php
@@ -15,7 +15,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/group_positions.xml');
 	}
 
-	public static function get_group_value_data()
+	public function get_group_value_data()
 	{
 		return array(
 			array('teampage', 1, 0),
@@ -38,7 +38,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $test_class->get_group_value($group_id));
 	}
 
-	public static function get_group_count_data()
+	public function get_group_count_data()
 	{
 		return array(
 			array('teampage', 2),
@@ -59,7 +59,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $test_class->get_group_count());
 	}
 
-	public static function add_group_data()
+	public function add_group_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -93,7 +93,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function delete_group_data()
+	public function delete_group_data()
 	{
 		return array(
 			array('teampage', 1, false, array(
@@ -147,7 +147,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_up_data()
+	public function move_up_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -186,7 +186,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_down_data()
+	public function move_down_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -225,7 +225,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_data()
+	public function move_data()
 	{
 		return array(
 			array('teampage', 1, 1, array(
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index 1fa0afae13..0e85d4694b 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -112,7 +112,7 @@ class phpbb_request_var_test extends phpbb_test_case
 		$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path);
 	}
 
-	public static function deep_access()
+	public function deep_access()
 	{
 		return array(
 			// array(path, default, expected result)
@@ -123,7 +123,7 @@ class phpbb_request_var_test extends phpbb_test_case
 		);
 	}
 
-	public static function request_variables()
+	public function request_variables()
 	{
 		return array(
 			// strings
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index b4a475ffb3..d77cbbcaf3 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
-	public static function security_variables()
+	public 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'),
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index da318209e2..1325466137 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_security_redirect_test extends phpbb_security_test_base
 {
-	public static function provider()
+	public function provider()
 	{
 		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
 		return array(
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index 7348da9a4a..a76658701a 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -14,7 +14,7 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			// First element of the array is test name - keep them distinct
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 591a6afe0c..8edbd6a008 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/template_test_case.php';
 
 class phpbb_template_template_locate_test extends phpbb_template_template_test_case
 {
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			// First element of the array is test name - keep them distinct
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index edf621e16c..739bbe9387 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -15,7 +15,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			/*
@@ -394,7 +394,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
 	}
 
-	public static function alter_block_array_data()
+	public function alter_block_array_data()
 	{
 		return array(
 			array(
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 8697907311..d94fac2ae4 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
-	public static function make_clickable_data()
+	public function make_clickable_data()
 	{
 		// value => whether it should work
 		$prefix_texts = array(
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 70bd549d5b..ae11e00fbd 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
-	public static function cleanable_strings()
+	public function cleanable_strings()
 	{
 		return array(
 			array('MiXed CaSe', 'mixed case', 'Checking case folding'),

From eaba2ed9ca6025358de0432bb569cfb2e3ca6985 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 19:20:42 +0300
Subject: [PATCH 24/76] [ticket/10733] Fixing test

Changing expected and result in locator test

PHPBB3-10733
---
 tests/template/template_locate_test.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 8edbd6a008..89a4ae6fb1 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -17,38 +17,38 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 			// First element of the array is test name - keep them distinct
 			array(
 				'simple inheritance - only parent template exists',
+				dirname(__FILE__) . '/parent_templates/parent_only.html',
 				'parent_only.html',
 				false,
 				true,
-				dirname(__FILE__) . '/parent_templates/parent_only.html',
 			),
 			array(
 				'simple inheritance - only child template exists',
+				dirname(__FILE__) . '/templates/child_only.html',
 				'child_only.html',
 				false,
 				true,
-				dirname(__FILE__) . '/templates/child_only.html',
 			),
 			array(
 				'simple inheritance - both parent and child templates exist',
+				dirname(__FILE__) . '/templates/parent_and_child.html',
 				'parent_and_child.html',
 				false,
 				true,
-				dirname(__FILE__) . '/templates/parent_and_child.html',
 			),
 			array(
 				'find first template - only child template exists in main style',
+				'child_only.html',
 				array('parent_only.html', 'child_only.html'),
 				false,
 				false,
-				'child_only.html',
 			),
 			array(
 				'find first template - both templates exist in main style',
+				'parent_and_child.html',
 				array('parent_and_child.html', 'child_only.html'),
 				false,
 				false,
-				'parent_and_child.html',
 			),
 		);
 	}
@@ -56,14 +56,14 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 	/**
 	* @dataProvider template_data
 	*/
-	public function test_template($name, $files, $return_default, $return_full_path, $expected)
+	public function test_template($name, $expected, $files, $return_default, $return_full_path)
 	{
 		// Reset the engine state
 		$this->setup_engine();
 
 		// Locate template
 		$result = $this->template->locate($files, $return_default, $return_full_path);
-		$this->assertEquals($result, $expected);
+		$this->assertSame($expected, $result);
 	}
 
 	protected function setup_engine(array $new_config = array())

From f36a6f0ae35107ac75be3cffff2f0f341baee7a8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 1 Apr 2012 18:44:05 +0200
Subject: [PATCH 25/76] [ticket/10740] Revert margin-left changes of previous
 commit

PHPBB3-10740
---
 phpBB/styles/prosilver/theme/common.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index e154db236f..77e2b8c0c6 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -595,9 +595,8 @@ li.pagination {
 	position: fixed;
 	display: none;
 	top: 40%;
-	left: 50%;
+	left: 35%;
 	width: 30%;
-	margin-left: -15%;
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;

From fb0df8d2e398a634457b317a721734e53596f002 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:19:07 +0300
Subject: [PATCH 26/76] [ticket/10665] Moving filter parameters to one array

Moving filter parameters to one array in template compiler class

PHPBB3-10665
---
 phpBB/includes/style/template_compile.php | 34 ++++-------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/phpBB/includes/style/template_compile.php b/phpBB/includes/style/template_compile.php
index bd9e18e102..fa0928f424 100644
--- a/phpBB/includes/style/template_compile.php
+++ b/phpBB/includes/style/template_compile.php
@@ -32,25 +32,6 @@ class phpbb_style_template_compile
 	*/
 	private $filter_params;
 
-	/**
-	* Whether <!-- PHP --> tags are allowed
-	*
-	* @var bool
-	*/
-	private $allow_php;
-
-	/**
-	* Style resource locator
-	*
-	* @var phpbb_style_resource_locator
-	*/
-	private $locator;
-
-	/**
-	* @var string phpBB root path
-	*/
-	private $phpbb_root_path;
-
 	/**
 	* Constructor.
 	*
@@ -60,10 +41,11 @@ class phpbb_style_template_compile
 	*/
 	public function __construct($allow_php, $locator, $phpbb_root_path)
 	{
-		$this->filter_params = array();
-		$this->allow_php = $allow_php;
-		$this->locator = $locator;
-		$this->phpbb_root_path = $phpbb_root_path;
+		$this->filter_params = array(
+			'allow_php'	=> $allow_php,
+			'locator'	=> $locator,
+			'phpbb_root_path'	=> $phpbb_root_path
+		);
 	}
 
 	/**
@@ -140,11 +122,7 @@ class phpbb_style_template_compile
 	*/
 	private function compile_stream_to_stream($source_stream, $dest_stream)
 	{
-		$params = $this->filter_params;
-		$params['allow_php'] = $this->allow_php;
-		$params['locator'] = $this->locator;
-		$params['phpbb_root_path'] = $this->phpbb_root_path;
-		stream_filter_append($source_stream, 'phpbb_template', null, $params);
+		stream_filter_append($source_stream, 'phpbb_template', null, $this->filter_params);
 		stream_copy_to_stream($source_stream, $dest_stream);
 	}
 }

From 1ffc7c1fab85b1eb732b31bfd8a0f48c7351e68a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:29:03 +0300
Subject: [PATCH 27/76] [ticket/10665] Changing template->_js_include to public

Changing template->_js_include to public function

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

diff --git a/phpBB/includes/style/template.php b/phpBB/includes/style/template.php
index 4586e8dbf9..3f15355f7a 100644
--- a/phpBB/includes/style/template.php
+++ b/phpBB/includes/style/template.php
@@ -499,7 +499,7 @@ class phpbb_style_template
 	* @param string $file file name
 	* @param bool $locate True if file needs to be located
 	*/
-	function _js_include($file, $locate = false)
+	public function _js_include($file, $locate = false)
 	{
 		// Locate file
 		if ($locate)

From 2d9d8d367389c6bc0cef7852849e3d43ac682789 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:37:45 +0300
Subject: [PATCH 28/76] [ticket/10665] New test class for templates with tree

New parent template test class for tests that use styles tree

PHPBB3-10665
---
 tests/template/template_includejs_test.php    | 21 ++------------
 tests/template/template_inheritance_test.php  | 20 ++-----------
 tests/template/template_locate_test.php       | 20 ++-----------
 .../template/template_test_case_with_tree.php | 29 +++++++++++++++++++
 4 files changed, 35 insertions(+), 55 deletions(-)
 create mode 100644 tests/template/template_test_case_with_tree.php

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index e0229e978b..fa23837553 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-require_once dirname(__FILE__) . '/template_test_case.php';
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
 
-class phpbb_template_template_includejs_test extends phpbb_template_template_test_case
+class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
 {
 	public function test_includejs_compilation()
 	{
@@ -28,21 +28,4 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 		$cache_file = $this->template->cachepath . 'includejs.html.php';
 		$this->run_template('includejs.html', array('PARENT' => 'parent_only.html'), array(), array(), implode('', $scripts), $cache_file);
 	}
-
-	protected function setup_engine(array $new_config = array())
-	{
-		global $phpbb_root_path, $phpEx, $user;
-
-		$defaults = $this->config_defaults();
-		$config = new phpbb_config(array_merge($defaults, $new_config));
-
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
-		$this->style_resource_locator = new phpbb_style_resource_locator();
-		$this->style_provider = new phpbb_style_path_provider();
-		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
-		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
-		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
-		$this->template->set_filenames(array('body' => 'includejs.html'));
-	}
 }
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
index a76658701a..febfed9ef0 100644
--- a/tests/template/template_inheritance_test.php
+++ b/tests/template/template_inheritance_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-require_once dirname(__FILE__) . '/template_test_case.php';
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
 
-class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case
+class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree
 {
 	/**
 	 * @todo put test data into templates/xyz.test
@@ -61,20 +61,4 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
 
 		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
 	}
-
-	protected function setup_engine(array $new_config = array())
-	{
-		global $phpbb_root_path, $phpEx, $user;
-
-		$defaults = $this->config_defaults();
-		$config = new phpbb_config(array_merge($defaults, $new_config));
-
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
-		$this->style_resource_locator = new phpbb_style_resource_locator();
-		$this->style_provider = new phpbb_style_path_provider();
-		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
-		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
-		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
-	}
 }
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
index 89a4ae6fb1..d6e2e82a47 100644
--- a/tests/template/template_locate_test.php
+++ b/tests/template/template_locate_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-require_once dirname(__FILE__) . '/template_test_case.php';
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
 
-class phpbb_template_template_locate_test extends phpbb_template_template_test_case
+class phpbb_template_template_locate_test extends phpbb_template_template_test_case_with_tree
 {
 	public function template_data()
 	{
@@ -65,20 +65,4 @@ class phpbb_template_template_locate_test extends phpbb_template_template_test_c
 		$result = $this->template->locate($files, $return_default, $return_full_path);
 		$this->assertSame($expected, $result);
 	}
-
-	protected function setup_engine(array $new_config = array())
-	{
-		global $phpbb_root_path, $phpEx, $user;
-
-		$defaults = $this->config_defaults();
-		$config = new phpbb_config(array_merge($defaults, $new_config));
-
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
-		$this->style_resource_locator = new phpbb_style_resource_locator();
-		$this->style_provider = new phpbb_style_path_provider();
-		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
-		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
-		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
-	}
 }
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
new file mode 100644
index 0000000000..e76d9436cf
--- /dev/null
+++ b/tests/template/template_test_case_with_tree.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case
+{
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = dirname(__FILE__) . '/templates';
+		$this->parent_template_path = dirname(__FILE__) . '/parent_templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+	}
+}

From c89ea703bda1006b382f8cc0da292f6e2a3701f5 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:46:10 +0300
Subject: [PATCH 29/76] [ticket/10665] Solution for T_SUPER_TEMPLATE_PATH

Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete

PHPBB3-10665
---
 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 74db8cb8fd..a44ebb04e8 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4770,7 +4770,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'T_ASSETS_PATH'			=> "{$web_path}assets",
 		'T_THEME_PATH'			=> "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/theme',
 		'T_TEMPLATE_PATH'		=> "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template',
-		'T_SUPER_TEMPLATE_PATH'	=> ($user->theme['style_parent_id']) ? "{$web_path}styles/" . rawurlencode($user->theme['style_parent_tree']) . '/template' : "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template',
+		'T_SUPER_TEMPLATE_PATH'	=> "{$web_path}styles/" . rawurlencode($user->theme['style_path']) . '/template',
 		'T_IMAGES_PATH'			=> "{$web_path}images/",
 		'T_SMILIES_PATH'		=> "{$web_path}{$config['smilies_path']}/",
 		'T_AVATAR_PATH'			=> "{$web_path}{$config['avatar_path']}/",

From 37480e5594145bbead07c8f70644d52983f92913 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 20:50:59 +0300
Subject: [PATCH 30/76] [ticket/10665] Adding includejs to acp templates

Adding includejs to acp overall_footer.html

PHPBB3-10665
---
 phpBB/adm/style/overall_footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 0337080f3d..a486a69514 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -39,7 +39,8 @@
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js"></script>
-<script type="text/javascript" src="style/ajax.js"></script>
+<!-- INCLUDEJS ajax.js -->
+{SCRIPTS}
 
 </body>
 </html>

From 06d26ef46e914c823889dab37627e7fa39d883ce Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 2 Apr 2012 00:35:39 +0530
Subject: [PATCH 31/76] [ticket/10438] Alligning the Smileys on the same line
 as the text.

Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.

PHPBB3-10438
---
 phpBB/includes/functions_content.php    | 2 +-
 phpBB/styles/prosilver/theme/common.css | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index f2faf20f43..6b2ee98d7a 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -739,7 +739,7 @@ function smiley_text($text, $force_option = false)
 	else
 	{
 		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
 	}
 }
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 31015b28f9..1d645ed177 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,3 +713,7 @@ p.rules a {
 .hidden {
 	display: none;
 }
+
+.smilies {
+	vertical-align: text-bottom;
+}

From 24cd3a21a0e8d3e9f7b45acf9194bd70bf595425 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sun, 1 Apr 2012 22:16:53 +0300
Subject: [PATCH 32/76] [ticket/10742] Fixing table widths

Fixing table widths for members list, team page, online users list

PHPBB3-10742
---
 phpBB/styles/prosilver/theme/common.css | 2 +-
 phpBB/styles/prosilver/theme/tweaks.css | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 77e2b8c0c6..14bbdc79a9 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -385,7 +385,7 @@ ul.rightside {
 /* Table styles
 ----------------------------------------*/
 table.table1 {
-	/* See tweaks.css */
+	width: 100%;
 }
 
 #ucp-main table.table1 {
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 416c4a5510..b32faaf501 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -4,10 +4,6 @@ These style definitions are IE 7 and 8 specific
 tweaks required due to its poor CSS support.
 -------------------------------------------------*/
 
-table.table1 {
-	width: 100%;
-}
-
 /* Align checkboxes/radio buttons nicely */
 dd label input { 
 	vertical-align: text-bottom; 

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

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

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

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

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

Fixed minor issues in formatting.

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

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

From 7c99525b98cfa015fd21ba2e873d0617596e064f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:14:30 +0300
Subject: [PATCH 35/76] [ticket/10752] Removing globals acp_styles

Removing global variables from functions in acp_styles

PHPBB3-10752
---
 phpBB/includes/acp/acp_styles.php | 268 ++++++++++++++----------------
 1 file changed, 127 insertions(+), 141 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2772fb2217..c7f66b7253 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -26,25 +26,46 @@ class acp_styles
 	var $mode;
 	var $styles_path;
 	var $styles_path_absolute = 'styles';
+	var $default_style = 0;
+
+	private $db = false;
+	private $user = false;
+	private $template = false;
+	private $request = false;
+	private $cache = false;
+	private $auth = false;
+	private $phpbb_root_path = false;
+	private $phpEx = false;
 
 	function main($id, $mode)
 	{
-		global $user, $phpbb_admin_path, $phpbb_root_path, $phpEx, $template, $request;
+		global $db, $user, $phpbb_admin_path, $phpbb_root_path, $phpEx, $template, $request, $cache, $auth, $config;
 
-		$this->styles_path = $phpbb_root_path . $this->styles_path_absolute . '/';
+		$this->db = $db;
+		$this->user = $user;
+		$this->template = $template;
+		$this->request = $request;
+		$this->cache = $cache;
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpEx = $phpEx;
+
+		$this->default_style = $config['default_style'];
+		$this->styles_path = $this->phpbb_root_path . $this->styles_path_absolute . '/';
 
 		$this->u_base_action = append_sid("{$phpbb_admin_path}index.$phpEx", "i={$id}");
 		$this->s_hidden_fields = array(
 			'mode'		=> $mode,
 		);
 
-		$user->add_lang('acp/styles');
+		$this->user->add_lang('acp/styles');
 
 		$this->tpl_name = 'acp_styles';
 		$this->page_title = 'ACP_CAT_STYLES';
 		$this->mode = $mode;
 
-		$action = $request->variable('action', '');
+		$action = $this->request->variable('action', '');
 		$post_actions = array('install', 'activate', 'deactivate', 'uninstall');
 		foreach ($post_actions as $key)
 		{
@@ -58,7 +79,7 @@ class acp_styles
 			$this->s_hidden_fields['action'] = $action;
 		}
 
-		$template->assign_vars(array(
+		$this->template->assign_vars(array(
 			'U_ACTION'			=> $this->u_base_action,
 			'S_HIDDEN_FIELDS'	=> build_hidden_fields($this->s_hidden_fields)
 			)
@@ -107,8 +128,7 @@ class acp_styles
 				$this->action_cache();
 				return;
 		}
-		global $user;
-		trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
+		trigger_error($this->user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 	}
 	
 	/**
@@ -116,17 +136,15 @@ class acp_styles
 	*/
 	function action_cache()
 	{
-		global $cache, $auth, $user;
-		
-		$cache->purge();
+		$this->cache->purge();
 
 		// Clear permissions
-		$auth->acl_clear_prefetch();
+		$this->auth->acl_clear_prefetch();
 		cache_moderators();
 
 		add_log('admin', 'LOG_PURGE_CACHE');
 		
-		trigger_error($user->lang['PURGED_CACHE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
+		trigger_error($this->user->lang['PURGED_CACHE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
 	}
 	
 	/**
@@ -134,8 +152,6 @@ class acp_styles
 	*/
 	function action_install()
 	{
-		global $user;
-	
 		// Get list of styles to install
 		$dirs = $this->request_vars('dir', '', true);
 		
@@ -166,23 +182,23 @@ class acp_styles
 					$last_installed = $style['style_id'];
 					$installed_names[] = $style['style_name'];
 					$installed_dirs[] = $style['style_path'];
-					$messages[] = sprintf($user->lang['STYLE_INSTALLED'], htmlspecialchars($style['style_name']));
+					$messages[] = sprintf($this->user->lang['STYLE_INSTALLED'], htmlspecialchars($style['style_name']));
 				}
 			}
 			if (!$found)
 			{
-				$messages[] = sprintf($user->lang['STYLE_NOT_INSTALLED'], htmlspecialchars($dir));
+				$messages[] = sprintf($this->user->lang['STYLE_NOT_INSTALLED'], htmlspecialchars($dir));
 			}
 		}
 		
 		// Show message
 		if (!count($messages))
 		{
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 		$message = implode('<br />', $messages);
-		$message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&amp;mode=style');
-		$message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&amp;mode=install');
+		$message .= '<br /><br />' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&amp;mode=style');
+		$message .= '<br /><br />' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&amp;mode=install');
 		trigger_error($message, E_USER_NOTICE);
 	}
 	
@@ -191,8 +207,6 @@ class acp_styles
 	*/
 	function action_uninstall()
 	{
-		global $user, $config, $template, $request;
-		
 		// Get list of styles to uninstall
 		$ids = $this->request_vars('id', 0, true);
 		
@@ -200,7 +214,7 @@ class acp_styles
 		if (confirm_box(true))
 		{
 			// Uninstall
-			$this->action_uninstall_confirmed($ids, $request->variable('confirm_delete_files', false));
+			$this->action_uninstall_confirmed($ids, $this->request->variable('confirm_delete_files', false));
 			return;
 		}
 		
@@ -209,8 +223,8 @@ class acp_styles
 			'action'	=> 'uninstall',
 			'ids'		=> $ids
 		));
-		$template->assign_var('S_CONFIRM_DELETE', true);
-		confirm_box(false, $user->lang['CONFIRM_UNINSTALL_STYLES'], $s_hidden, 'acp_styles.html');
+		$this->template->assign_var('S_CONFIRM_DELETE', true);
+		confirm_box(false, $this->user->lang['CONFIRM_UNINSTALL_STYLES'], $s_hidden, 'acp_styles.html');
 		
 		// Canceled - show styles list
 		$this->frontend();
@@ -224,9 +238,7 @@ class acp_styles
 	*/
 	function action_uninstall_confirmed($ids, $delete_files)
 	{
-		global $db, $user, $cache, $config;
-
-		$default = $config['default_style'];
+		$default = $this->default_style;
 		$uninstalled = array();
 		$messages = array();
 
@@ -235,11 +247,11 @@ class acp_styles
 		{
 			if (!$id)
 			{
-				trigger_error($user->lang['INVALID_STYLE_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				trigger_error($this->user->lang['INVALID_STYLE_ID'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 			if ($id == $default)
 			{
-				trigger_error($user->lang['UNINSTALL_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING);
+				trigger_error($this->user->lang['UNINSTALL_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 			$uninstalled[$id] = false;
 		}
@@ -250,10 +262,10 @@ class acp_styles
 			FROM ' . STYLES_TABLE . '
 			WHERE style_id IN (' . implode(', ', $ids) . ')
 			ORDER BY style_id DESC';
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-		$rows = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
+		$rows = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
 
 		// Uinstall each style
 		$uninstalled = array();
@@ -266,20 +278,20 @@ class acp_styles
 				$messages[] = $result;
 				continue;
 			}
-			$messages[] = sprintf($user->lang['STYLE_UNINSTALLED'], $style['style_name']);
+			$messages[] = sprintf($this->user->lang['STYLE_UNINSTALLED'], $style['style_name']);
 			$uninstalled[] = $style['style_name'];
 
 			// Attempt to delete files
 			if ($delete_files)
 			{
-				$messages[] = sprintf($user->lang[$this->delete_style_files($style['style_path']) ? 'DELETE_STYLE_FILES_SUCCESS' : 'DELETE_STYLE_FILES_FAILED'], $style['style_name']);
+				$messages[] = sprintf($this->user->lang[$this->delete_style_files($style['style_path']) ? 'DELETE_STYLE_FILES_SUCCESS' : 'DELETE_STYLE_FILES_FAILED'], $style['style_name']);
 			}
 		}
 
 		if (empty($messages))
 		{
 			// Nothing to uninstall?
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		// Log action
@@ -289,7 +301,7 @@ class acp_styles
 		}
 
 		// Clear cache
-		$cache->purge();
+		$this->cache->purge();
 
 		// Show message
 		trigger_error(implode('<br />', $messages) . adm_back_link($this->u_action), E_USER_NOTICE);
@@ -300,8 +312,6 @@ class acp_styles
 	*/
 	function action_activate()
 	{
-		global $user, $config, $cache, $db;
-	
 		// Get list of styles to activate
 		$ids = $this->request_vars('id', 0, true);
 		
@@ -309,10 +319,10 @@ class acp_styles
 		$sql = 'UPDATE ' . STYLES_TABLE . '
 			SET style_active = 1
 			WHERE style_id IN (' . implode(', ', $ids) . ')';
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 
 		// Purge cache
-		$cache->destroy('sql', STYLES_TABLE);
+		$this->cache->destroy('sql', STYLES_TABLE);
 		
 		// Show styles list
 		$this->frontend();
@@ -323,17 +333,15 @@ class acp_styles
 	*/
 	function action_deactivate()
 	{
-		global $user, $config, $cache, $db;
-
 		// Get list of styles to deactivate
 		$ids = $this->request_vars('id', 0, true);
 
 		// Check for default style
 		foreach ($ids as $id)
 		{
-			if ($id == $config['default_style'])
+			if ($id == $this->default_style)
 			{
-				trigger_error($user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING);
+				trigger_error($this->user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 		}
 
@@ -341,16 +349,16 @@ class acp_styles
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_style = 0
 			WHERE user_style IN (' . implode(', ', $ids) . ')';
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 
 		// Deactivate styles
 		$sql = 'UPDATE ' . STYLES_TABLE . '
 			SET style_active = 0
 			WHERE style_id IN (' . implode(', ', $ids) . ')';
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 
 		// Purge cache
-		$cache->destroy('sql', STYLES_TABLE);
+		$this->cache->destroy('sql', STYLES_TABLE);
 
 		// Show styles list
 		$this->frontend();
@@ -361,12 +369,10 @@ class acp_styles
 	*/
 	function action_details()
 	{
-		global $user, $config, $db, $request, $template, $cache;
-		
-		$id = $request->variable('id', 0);
+		$id = $this->request->variable('id', 0);
 		if (!$id)
 		{
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 		
 		// Get all styles
@@ -386,19 +392,19 @@ class acp_styles
 
 		if ($style === false)
 		{
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 		
 		// Find all available parent styles
 		$list = $this->find_possible_parents($styles, $id);
 		
 		// Change data
-		if ($request->variable('update', false))
+		if ($this->request->variable('update', false))
 		{
 			$update = array(
-				'style_name'		=> trim($request->variable('style_name', $style['style_name'])),
-				'style_parent_id'	=> $request->variable('style_parent', (int) $style['style_parent_id']),
-				'style_active'		=> $request->variable('style_active', (int) $style['style_active']),
+				'style_name'		=> trim($this->request->variable('style_name', $style['style_name'])),
+				'style_parent_id'	=> $this->request->variable('style_parent', (int) $style['style_parent_id']),
+				'style_active'		=> $this->request->variable('style_active', (int) $style['style_active']),
 			);
 			$update_action = $this->u_action . '&amp;action=details&amp;id=' . $id;
 			
@@ -407,13 +413,13 @@ class acp_styles
 			{
 				if (!strlen($update['style_name']))
 				{
-					trigger_error($user->lang['STYLE_ERR_STYLE_NAME'] . adm_back_link($update_action), E_USER_WARNING);
+					trigger_error($this->user->lang['STYLE_ERR_STYLE_NAME'] . adm_back_link($update_action), E_USER_WARNING);
 				}
 				foreach ($styles as $row)
 				{
 					if ($row['style_name'] == $update['style_name'])
 					{
-						trigger_error($user->lang['STYLE_ERR_NAME_EXIST'] . adm_back_link($update_action), E_USER_WARNING);
+						trigger_error($this->user->lang['STYLE_ERR_NAME_EXIST'] . adm_back_link($update_action), E_USER_WARNING);
 					}
 				}
 			}
@@ -439,7 +445,7 @@ class acp_styles
 					}
 					if (!$found)
 					{
-						trigger_error($user->lang['STYLE_ERR_INVALID_PARENT'] . adm_back_link($update_action), E_USER_WARNING);
+						trigger_error($this->user->lang['STYLE_ERR_INVALID_PARENT'] . adm_back_link($update_action), E_USER_WARNING);
 					}
 				}
 				else
@@ -455,9 +461,9 @@ class acp_styles
 			// Check style_active
 			if ($update['style_active'] != $style['style_active'])
 			{
-				if (!$update['style_active'] && $config['default_style'] == $style['style_id'])
+				if (!$update['style_active'] && $this->default_style == $style['style_id'])
 				{
-					trigger_error($user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($update_action), E_USER_WARNING);
+					trigger_error($this->user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($update_action), E_USER_WARNING);
 				}
 			}
 			else
@@ -469,9 +475,9 @@ class acp_styles
 			if (count($update))
 			{
 				$sql = 'UPDATE ' . STYLES_TABLE . '
-					SET ' . $db->sql_build_array('UPDATE', $update) . "
+					SET ' . $this->db->sql_build_array('UPDATE', $update) . "
 					WHERE style_id = $id";
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 				
 				$style = array_merge($style, $update);
 				
@@ -482,22 +488,22 @@ class acp_styles
 					if ($this->update_styles_tree(&$styles, $style))
 					{
 						// Something was changed in styles tree, purge all cache
-						$cache->purge();
+						$this->cache->purge();
 					}
 				}
 				add_log('admin', 'LOG_STYLE_EDIT_DETAILS', $style['style_name']);
 			}
 			
 			// Update default style
-			$default = $request->variable('style_default', 0);
+			$default = $this->request->variable('style_default', 0);
 			if ($default)
 			{
 				if (!$style['style_active'])
 				{
-					trigger_error($user->lang['STYLE_DEFAULT_CHANGE_INACTIVE'] . adm_back_link($update_action), E_USER_WARNING);
+					trigger_error($this->user->lang['STYLE_DEFAULT_CHANGE_INACTIVE'] . adm_back_link($update_action), E_USER_WARNING);
 				}
 				set_config('default_style', $id);
-				$cache->purge();
+				$this->cache->purge();
 			}
 			
 			// Show styles list
@@ -508,7 +514,7 @@ class acp_styles
 		// Show parent styles
 		foreach ($list as $row)
 		{
-			$template->assign_block_vars('parent_styles', array(
+			$this->template->assign_block_vars('parent_styles', array(
 				'STYLE_ID'		=> $row['style_id'],
 				'STYLE_NAME'	=> htmlspecialchars($row['style_name']),
 				'LEVEL'			=> $row['level'],
@@ -518,7 +524,7 @@ class acp_styles
 		}
 		
 		// Show style details
-		$template->assign_vars(array(
+		$this->template->assign_vars(array(
 			'S_STYLE_DETAILS'	=> true,
 			'STYLE_ID'			=> $style['style_id'],
 			'STYLE_NAME'		=> htmlspecialchars($style['style_name']),
@@ -526,7 +532,7 @@ class acp_styles
 			'STYLE_COPYRIGHT'	=> strip_tags($style['style_copyright']),
 			'STYLE_PARENT'		=> $style['style_parent_id'],
 			'S_STYLE_ACTIVE'	=> $style['style_active'],
-			'S_STYLE_DEFAULT'	=> ($style['style_id'] == $config['default_style'])
+			'S_STYLE_DEFAULT'	=> ($style['style_id'] == $this->default_style)
 			)
 		);
 	}
@@ -536,14 +542,12 @@ class acp_styles
 	*/
 	function show_installed()
 	{
-		global $user, $template;
-
 		// Get all installed styles
 		$styles = $this->get_styles();
 
 		if (!count($styles))
 		{
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 		
 		usort($styles, 'acp_styles::sort_styles');
@@ -560,7 +564,7 @@ class acp_styles
 		// Set up styles list variables
 		// Addons should increase this number and update template variable
 		$this->styles_list_cols = 4;
-		$template->assign_var('STYLES_LIST_COLS', $this->styles_list_cols);
+		$this->template->assign_var('STYLES_LIST_COLS', $this->styles_list_cols);
 
 		// Show styles list
 		$this->show_styles_list(&$styles, 0, 0);
@@ -570,29 +574,29 @@ class acp_styles
 		{
 			if (empty($style['_shown']))
 			{
-				$style['_note'] = sprintf($user->lang['REQUIRES_STYLE'], htmlspecialchars($style['style_parent_tree']));
+				$style['_note'] = sprintf($this->user->lang['REQUIRES_STYLE'], htmlspecialchars($style['style_parent_tree']));
 				$this->list_style($style, 0);
 			}
 		}
 
 		// Add buttons
-		$template->assign_block_vars('extra_actions', array(
+		$this->template->assign_block_vars('extra_actions', array(
 				'ACTION_NAME'	=> 'activate',
-				'L_ACTION'		=> $user->lang['STYLE_ACTIVATE'],
+				'L_ACTION'		=> $this->user->lang['STYLE_ACTIVATE'],
 			)
 		);
 
-		$template->assign_block_vars('extra_actions', array(
+		$this->template->assign_block_vars('extra_actions', array(
 				'ACTION_NAME'	=> 'deactivate',
-				'L_ACTION'		=> $user->lang['STYLE_DEACTIVATE'],
+				'L_ACTION'		=> $this->user->lang['STYLE_DEACTIVATE'],
 			)
 		);
 
 		if (isset($this->style_counters) && $this->style_counters['total'] > 1)
 		{
-			$template->assign_block_vars('extra_actions', array(
+			$this->template->assign_block_vars('extra_actions', array(
 					'ACTION_NAME'	=> 'uninstall',
-					'L_ACTION'		=> $user->lang['STYLE_UNINSTALL'],
+					'L_ACTION'		=> $this->user->lang['STYLE_UNINSTALL'],
 				)
 			);
 		}
@@ -603,21 +607,19 @@ class acp_styles
 	*/
 	function show_available()
 	{
-		global $user, $template;
-	
 		// Get list of styles
 		$styles = $this->find_available(true);
 		
 		// Show styles
 		if (empty($styles))
 		{
-			trigger_error($user->lang['NO_UNINSTALLED_STYLE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
+			trigger_error($this->user->lang['NO_UNINSTALLED_STYLE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
 		}
 		
 		usort($styles, 'acp_styles::sort_styles');
 
 		$this->styles_list_cols = 3;
-		$template->assign_vars(array(
+		$this->template->assign_vars(array(
 			'STYLES_LIST_COLS'	=> $this->styles_list_cols,
 			'STYLES_LIST_HIDE_COUNT'	=> true
 			)
@@ -658,9 +660,9 @@ class acp_styles
 		// Add button
 		if (isset($this->style_counters) && $this->style_counters['caninstall'] > 0)
 		{
-			$template->assign_block_vars('extra_actions', array(
+			$this->template->assign_block_vars('extra_actions', array(
 					'ACTION_NAME'	=> 'install',
-					'L_ACTION'		=> $user->lang['INSTALL_STYLES'],
+					'L_ACTION'		=> $this->user->lang['INSTALL_STYLES'],
 				)
 			);
 		}
@@ -674,8 +676,6 @@ class acp_styles
 	*/
 	function find_available($all)
 	{
-		global $user;
-
 		// Get list of installed styles
 		$installed = $this->get_styles();
 
@@ -743,7 +743,7 @@ class acp_styles
 				{
 					// Parent style is not installed yet
 					$style['_available'] = false;
-					$style['_note'] = sprintf($user->lang['REQUIRES_STYLE'], htmlspecialchars($parent));
+					$style['_note'] = sprintf($this->user->lang['REQUIRES_STYLE'], htmlspecialchars($parent));
 				}
 			}
 			
@@ -821,11 +821,10 @@ class acp_styles
 		}
 		if ($update)
 		{
-			global $db;
 			$sql = 'UPDATE ' . STYLES_TABLE . "
-				SET style_parent_tree = '" . $db->sql_escape($parent_tree) . "'
+				SET style_parent_tree = '" . $this->db->sql_escape($parent_tree) . "'
 				WHERE style_parent_id = {$parent_id}";
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 			$updated = true;
 		}
 		return $updated;
@@ -869,8 +868,6 @@ class acp_styles
 	*/
 	function list_style($style, $level)
 	{
-		global $template, $config, $db, $user, $phpbb_root_path, $phpEx;
-		
 		// Mark row as shown
 		if (!empty($style['_shown'])) return;
 		$style['_shown'] = true;
@@ -886,7 +883,7 @@ class acp_styles
 			'STYLE_ACTIVE'	=> $style['style_active'],
 			
 			// Additional data
-			'DEFAULT'		=> ($style['style_id'] && $style['style_id'] == $config['default_style']),
+			'DEFAULT'		=> ($style['style_id'] && $style['style_id'] == $this->default_style),
 			'USERS'			=> (isset($style['_users'])) ? $style['_users'] : '',
 			'LEVEL'			=> $level,
 			'PADDING'		=> (4 + 16 * $level),
@@ -909,31 +906,31 @@ class acp_styles
 			// Details
 			$actions[] = array(
 				'U_ACTION'	=> $this->u_action . '&amp;action=details&amp;id=' . $style['style_id'],
-				'L_ACTION'	=> $user->lang['DETAILS']
+				'L_ACTION'	=> $this->user->lang['DETAILS']
 			);
 
 			// Activate
 			$actions[] = array(
 				'U_ACTION'	=> $this->u_action . '&amp;action=' . ($style['style_active'] ? 'de' : '') . 'activate&amp;id=' . $style['style_id'],
-				'L_ACTION'	=> $user->lang['STYLE_' . ($style['style_active'] ? 'DE' : '') . 'ACTIVATE']
+				'L_ACTION'	=> $this->user->lang['STYLE_' . ($style['style_active'] ? 'DE' : '') . 'ACTIVATE']
 			);
 
 /*			// Export
 			$actions[] = array(
 				'U_ACTION'	=> $this->u_action . '&amp;action=export&amp;id=' . $style['style_id'],
-				'L_ACTION'	=> $user->lang['EXPORT']
+				'L_ACTION'	=> $this->user->lang['EXPORT']
 			); */
 
 			// Uninstall
 			$actions[] = array(
 				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;id=' . $style['style_id'],
-				'L_ACTION'	=> $user->lang['STYLE_UNINSTALL']
+				'L_ACTION'	=> $this->user->lang['STYLE_UNINSTALL']
 			);
 			
 			// Preview
 			$actions[] = array(
-				'U_ACTION'	=> append_sid("{$phpbb_root_path}index.$phpEx", 'style=' . $style['style_id']),
-				'L_ACTION'	=> $user->lang['PREVIEW']
+				'U_ACTION'	=> append_sid($this->phpbb_root_path . 'index.' . $this->phpEx, 'style=' . $style['style_id']),
+				'L_ACTION'	=> $this->user->lang['PREVIEW']
 			);
 		}
 		else
@@ -942,14 +939,14 @@ class acp_styles
 			if (empty($style['_available']))
 			{
 				$actions[] = array(
-					'HTML'		=> $user->lang['CANNOT_BE_INSTALLED']
+					'HTML'		=> $this->user->lang['CANNOT_BE_INSTALLED']
 				);
 			}
 			else
 			{
 				$actions[] = array(
 					'U_ACTION'	=> $this->u_action . '&amp;action=install&amp;dir=' . urlencode($style['style_path']),
-					'L_ACTION'	=> $user->lang['INSTALL_STYLE']
+					'L_ACTION'	=> $this->user->lang['INSTALL_STYLE']
 				);
 			}
 		}
@@ -957,10 +954,10 @@ class acp_styles
 		// todo: add hook
 		
 		// Assign template variables
-		$template->assign_block_vars('styles_list', $row);
+		$this->template->assign_block_vars('styles_list', $row);
 		foreach($actions as $action)
 		{
-			$template->assign_block_vars('styles_list.actions', $action);
+			$this->template->assign_block_vars('styles_list.actions', $action);
 		}
 		
 		// Increase counters
@@ -987,10 +984,9 @@ class acp_styles
 	*/
 	function welcome_message($title, $description)
 	{
-		global $user, $template;
-		$template->assign_vars(array(
-			'L_TITLE'	=> (isset($user->lang[$title])) ? $user->lang[$title] : $title,
-			'L_EXPLAIN'	=> (isset($user->lang[$description])) ? $user->lang[$description] : $description
+		$this->template->assign_vars(array(
+			'L_TITLE'	=> (isset($this->user->lang[$title])) ? $this->user->lang[$title] : $title,
+			'L_EXPLAIN'	=> (isset($this->user->lang[$description])) ? $this->user->lang[$description] : $description
 			)
 		);
 	}
@@ -1084,8 +1080,6 @@ class acp_styles
 	*/
 	function install_style($style)
 	{
-		global $db;
-		
 		// Generate row
 		$sql_ary = array();
 		foreach ($style as $key => $value)
@@ -1097,15 +1091,15 @@ class acp_styles
 		}
 		
 		// Add to database
-		$db->sql_transaction('begin');
+		$this->db->sql_transaction('begin');
 
 		$sql = 'INSERT INTO ' . STYLES_TABLE . '
-			' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
+			' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
 
-		$id = $db->sql_nextid();
+		$id = $this->db->sql_nextid();
 
-		$db->sql_transaction('commit');
+		$this->db->sql_transaction('commit');
 
 		add_log('admin', 'LOG_STYLE_ADD', $sql_ary['style_name']);
 		
@@ -1119,14 +1113,12 @@ class acp_styles
 	*/
 	function get_styles()
 	{
-		global $db;
-		
 		$sql = 'SELECT * 
 			FROM ' . STYLES_TABLE;
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-		$rows = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
+		$rows = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
 
 		return $rows;
 	}
@@ -1138,19 +1130,17 @@ class acp_styles
 	*/
 	function get_users()
 	{
-		global $db;
-
 		$sql = 'SELECT user_style, COUNT(user_style) AS style_count
 			FROM ' . USERS_TABLE . '
 			GROUP BY user_style';
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		$style_count = array();		
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$style_count[$row['user_style']] = $row['style_count'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 	
 		return $style_count;
 	}
@@ -1163,35 +1153,33 @@ class acp_styles
 	*/
 	function uninstall_style($style)
 	{
-		global $db, $user;
-		
 		$id = $style['style_id'];
 		$path = $style['style_path'];
 		
 		// Check if style has child styles
 		$sql = 'SELECT style_id 
 			FROM ' . STYLES_TABLE . '
-			WHERE style_parent_id = ' . $id . " OR style_parent_tree = '" . $db->sql_escape($path) . "'";
-		$result = $db->sql_query($sql);
+			WHERE style_parent_id = ' . $id . " OR style_parent_tree = '" . $this->db->sql_escape($path) . "'";
+		$result = $this->db->sql_query($sql);
 		
-		$conflict = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$conflict = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
 		if ($conflict !== false)
 		{
-			return sprintf($user->lang['STYLE_UNINSTALL_DEPENDENT'], $style['style_name']);
+			return sprintf($this->user->lang['STYLE_UNINSTALL_DEPENDENT'], $style['style_name']);
 		}
 		
 		// Change default style for users
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_style = 0
 			WHERE user_style = ' . $id;
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 		
 		// Uninstall style
 		$sql = 'DELETE FROM ' . STYLES_TABLE . '
 			WHERE style_id = ' . $id;
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 		return true;
 	}
 
@@ -1253,10 +1241,8 @@ class acp_styles
 	*/
 	function request_vars($name, $default, $error = false)
 	{
-		global $request, $user;
-
-		$item = $request->variable($name, $default);
-		$items = $request->variable($name . 's', array($default));
+		$item = $this->request->variable($name, $default);
+		$items = $this->request->variable($name . 's', array($default));
 
 		if (count($items) == 1 && $items[0] == $default)
 		{
@@ -1270,7 +1256,7 @@ class acp_styles
 		
 		if ($error && !count($items))
 		{
-			trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
+			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
 		return $items;

From e558a3cb05777c838fcf09fc82f99c4d069ac62c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:18:52 +0300
Subject: [PATCH 36/76] [ticket/10752] Pass-by-reference fix for acp_styles

Fixing pass-by-reference bug in acp_styles

PHPBB3-10752
---
 phpBB/includes/acp/acp_styles.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index c7f66b7253..dc14b42d5f 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -567,7 +567,7 @@ class acp_styles
 		$this->template->assign_var('STYLES_LIST_COLS', $this->styles_list_cols);
 
 		// Show styles list
-		$this->show_styles_list(&$styles, 0, 0);
+		$this->show_styles_list($styles, 0, 0);
 		
 		// Show styles with invalid inherits_id
 		foreach ($styles as $style)
@@ -643,8 +643,8 @@ class acp_styles
 			}
 			if (!$has_parent)
 			{
-				$this->list_style(&$style, 0);
-				$this->show_available_child_styles(&$styles, $style['style_name'], 1);
+				$this->list_style($style, 0);
+				$this->show_available_child_styles($styles, $style['style_name'], 1);
 			}
 		}
 		
@@ -763,14 +763,14 @@ class acp_styles
 	* @param int $parent parent style id
 	* @param int $level style inheritance level
 	*/
-	function show_styles_list($styles, $parent, $level)
+	function show_styles_list(&$styles, $parent, $level)
 	{
 		foreach ($styles as &$style)
 		{
 			if (empty($style['_shown']) && $style['style_parent_id'] == $parent)
 			{
-				$this->list_style(&$style, $level);
-				$this->show_styles_list(&$styles, $style['style_id'], $level + 1);
+				$this->list_style($style, $level);
+				$this->show_styles_list($styles, $style['style_id'], $level + 1);
 			}
 		}
 	}
@@ -782,14 +782,14 @@ class acp_styles
 	* @param string $name Name of parent style
 	* @param string $level Styles tree level
 	*/
-	function show_available_child_styles($styles, $name, $level)
+	function show_available_child_styles(&$styles, $name, $level)
 	{
 		foreach ($styles as &$style)
 		{
 			if (empty($style['_shown']) && $style['_inherit_name'] == $name)
 			{
-				$this->list_style(&$style, $level);
-				$this->show_available_child_styles(&$styles, $style['style_name'], $level + 1);
+				$this->list_style($style, $level);
+				$this->show_available_child_styles($styles, $style['style_name'], $level + 1);
 			}
 		}
 	}
@@ -801,7 +801,7 @@ class acp_styles
 	* @param array $style Current style, false if root
 	* @returns true if something was updated, false if not
 	*/
-	function update_styles_tree($styles, $style = false)
+	function update_styles_tree(&$styles, $style = false)
 	{
 		$parent_id = ($style === false) ? 0 : $style['style_id'];
 		$parent_tree = ($style === false) ? '' : ($style['style_parent_tree'] == '' ? '' : $style['style_parent_tree']) . $style['style_path'];
@@ -816,7 +816,7 @@ class acp_styles
 					$row['style_parent_tree'] = $parent_tree;
 					$update = true;
 				}
-				$updated |= $this->update_styles_tree(&$styles, $row);
+				$updated |= $this->update_styles_tree($styles, $row);
 			}
 		}
 		if ($update)
@@ -866,7 +866,7 @@ class acp_styles
 	* @param array $style style row
 	* @param array $level style inheritance level
 	*/
-	function list_style($style, $level)
+	function list_style(&$style, $level)
 	{
 		// Mark row as shown
 		if (!empty($style['_shown'])) return;

From a46b5480e1e3a3050be8deae870a6c74e1d76c9d Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:19:16 +0300
Subject: [PATCH 37/76] [ticket/10752] More fixes for acp_styles

Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes

PHPBB3-10752
---
 phpBB/includes/acp/acp_styles.php | 203 +++++++++++++++---------------
 1 file changed, 101 insertions(+), 102 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index dc14b42d5f..2306e7d41c 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -84,7 +84,7 @@ class acp_styles
 			'S_HIDDEN_FIELDS'	=> build_hidden_fields($this->s_hidden_fields)
 			)
 		);
-		
+
 		// Execute actions
 		switch ($action)
 		{
@@ -107,7 +107,7 @@ class acp_styles
 				$this->frontend();
 		}
 	}
-	
+
 	/**
 	* Main page
 	*/
@@ -130,7 +130,7 @@ class acp_styles
 		}
 		trigger_error($this->user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 	}
-	
+
 	/**
 	* Purge cache
 	*/
@@ -143,10 +143,10 @@ class acp_styles
 		cache_moderators();
 
 		add_log('admin', 'LOG_PURGE_CACHE');
-		
+
 		trigger_error($this->user->lang['PURGED_CACHE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
 	}
-	
+
 	/**
 	* Install style(s)
 	*/
@@ -154,10 +154,10 @@ class acp_styles
 	{
 		// Get list of styles to install
 		$dirs = $this->request_vars('dir', '', true);
-		
+
 		// Get list of styles that can be installed
 		$styles = $this->find_available(false);
-		
+
 		// Install each style
 		$messages = array();
 		$installed_names = array();
@@ -190,7 +190,7 @@ class acp_styles
 				$messages[] = sprintf($this->user->lang['STYLE_NOT_INSTALLED'], htmlspecialchars($dir));
 			}
 		}
-		
+
 		// Show message
 		if (!count($messages))
 		{
@@ -201,7 +201,7 @@ class acp_styles
 		$message .= '<br /><br />' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&amp;mode=install');
 		trigger_error($message, E_USER_NOTICE);
 	}
-	
+
 	/**
 	* Confirm styles removal
 	*/
@@ -209,7 +209,7 @@ class acp_styles
 	{
 		// Get list of styles to uninstall
 		$ids = $this->request_vars('id', 0, true);
-		
+
 		// Check if confirmation box was submitted
 		if (confirm_box(true))
 		{
@@ -217,7 +217,7 @@ class acp_styles
 			$this->action_uninstall_confirmed($ids, $this->request->variable('confirm_delete_files', false));
 			return;
 		}
-		
+
 		// Confirm box
 		$s_hidden = build_hidden_fields(array(
 			'action'	=> 'uninstall',
@@ -225,7 +225,7 @@ class acp_styles
 		));
 		$this->template->assign_var('S_CONFIRM_DELETE', true);
 		confirm_box(false, $this->user->lang['CONFIRM_UNINSTALL_STYLES'], $s_hidden, 'acp_styles.html');
-		
+
 		// Canceled - show styles list
 		$this->frontend();
 	}
@@ -314,7 +314,7 @@ class acp_styles
 	{
 		// Get list of styles to activate
 		$ids = $this->request_vars('id', 0, true);
-		
+
 		// Activate styles
 		$sql = 'UPDATE ' . STYLES_TABLE . '
 			SET style_active = 1
@@ -323,7 +323,7 @@ class acp_styles
 
 		// Purge cache
 		$this->cache->destroy('sql', STYLES_TABLE);
-		
+
 		// Show styles list
 		$this->frontend();
 	}
@@ -363,7 +363,7 @@ class acp_styles
 		// Show styles list
 		$this->frontend();
 	}
-	
+
 	/**
 	* Show style details
 	*/
@@ -374,11 +374,11 @@ class acp_styles
 		{
 			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		
+
 		// Get all styles
 		$styles = $this->get_styles();
-		usort($styles, 'acp_styles::sort_styles');
-		
+		usort($styles, array($this, 'sort_styles'));
+
 		// Find current style
 		$style = false;
 		foreach ($styles as $row)
@@ -394,10 +394,10 @@ class acp_styles
 		{
 			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		
+
 		// Find all available parent styles
 		$list = $this->find_possible_parents($styles, $id);
-		
+
 		// Change data
 		if ($this->request->variable('update', false))
 		{
@@ -407,7 +407,7 @@ class acp_styles
 				'style_active'		=> $this->request->variable('style_active', (int) $style['style_active']),
 			);
 			$update_action = $this->u_action . '&amp;action=details&amp;id=' . $id;
-			
+
 			// Check style name
 			if ($update['style_name'] != $style['style_name'])
 			{
@@ -427,7 +427,7 @@ class acp_styles
 			{
 				unset($update['style_name']);
 			}
-			
+
 			// Check parent style id
 			if ($update['style_parent_id'] != $style['style_parent_id'])
 			{
@@ -457,7 +457,7 @@ class acp_styles
 			{
 				unset($update['style_parent_id']);
 			}
-			
+
 			// Check style_active
 			if ($update['style_active'] != $style['style_active'])
 			{
@@ -470,7 +470,7 @@ class acp_styles
 			{
 				unset($update['style_active']);
 			}
-			
+
 			// Update data
 			if (count($update))
 			{
@@ -478,14 +478,14 @@ class acp_styles
 					SET ' . $this->db->sql_build_array('UPDATE', $update) . "
 					WHERE style_id = $id";
 				$this->db->sql_query($sql);
-				
+
 				$style = array_merge($style, $update);
-				
+
 				if (isset($update['style_parent_id']))
 				{
 					// Update styles tree
 					$styles = $this->get_styles();
-					if ($this->update_styles_tree(&$styles, $style))
+					if ($this->update_styles_tree($styles, $style))
 					{
 						// Something was changed in styles tree, purge all cache
 						$this->cache->purge();
@@ -493,7 +493,7 @@ class acp_styles
 				}
 				add_log('admin', 'LOG_STYLE_EDIT_DETAILS', $style['style_name']);
 			}
-			
+
 			// Update default style
 			$default = $this->request->variable('style_default', 0);
 			if ($default)
@@ -505,12 +505,12 @@ class acp_styles
 				set_config('default_style', $id);
 				$this->cache->purge();
 			}
-			
+
 			// Show styles list
 			$this->frontend();
 			return;
 		}
-		
+
 		// Show parent styles
 		foreach ($list as $row)
 		{
@@ -522,7 +522,7 @@ class acp_styles
 				)
 			);
 		}
-		
+
 		// Show style details
 		$this->template->assign_vars(array(
 			'S_STYLE_DETAILS'	=> true,
@@ -549,18 +549,18 @@ class acp_styles
 		{
 			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		
-		usort($styles, 'acp_styles::sort_styles');
+
+		usort($styles, array($this, 'sort_styles'));
 
 		// Get users
 		$users = $this->get_users();
-		
+
 		// Add users counter to rows
 		foreach ($styles as &$style)
 		{
 			$style['_users'] = isset($users[$style['style_id']]) ? $users[$style['style_id']] : 0;
 		}
-		
+
 		// Set up styles list variables
 		// Addons should increase this number and update template variable
 		$this->styles_list_cols = 4;
@@ -568,7 +568,7 @@ class acp_styles
 
 		// Show styles list
 		$this->show_styles_list($styles, 0, 0);
-		
+
 		// Show styles with invalid inherits_id
 		foreach ($styles as $style)
 		{
@@ -609,14 +609,14 @@ class acp_styles
 	{
 		// Get list of styles
 		$styles = $this->find_available(true);
-		
+
 		// Show styles
 		if (empty($styles))
 		{
 			trigger_error($this->user->lang['NO_UNINSTALLED_STYLE'] . adm_back_link($this->u_base_action), E_USER_NOTICE);
 		}
-		
-		usort($styles, 'acp_styles::sort_styles');
+
+		usort($styles, array($this, 'sort_styles'));
 
 		$this->styles_list_cols = 3;
 		$this->template->assign_vars(array(
@@ -624,7 +624,7 @@ class acp_styles
 			'STYLES_LIST_HIDE_COUNT'	=> true
 			)
 		);
-		
+
 		// Show styles
 		foreach ($styles as &$style)
 		{
@@ -647,16 +647,16 @@ class acp_styles
 				$this->show_available_child_styles($styles, $style['style_name'], 1);
 			}
 		}
-		
+
 		// Show styles that do not have parent style in styles list
 		foreach ($styles as $style)
 		{
 			if (empty($style['_shown']))
 			{
-				$this->list_style(&$style, 0);
+				$this->list_style($style, 0);
 			}
 		}
-		
+
 		// Add button
 		if (isset($this->style_counters) && $this->style_counters['caninstall'] > 0)
 		{
@@ -667,12 +667,12 @@ class acp_styles
 			);
 		}
 	}
-	
+
 	/**
 	* Find styles available for installation
 	*
 	* @param bool $all if true, function will return all installable styles. if false, function will return only styles that can be installed
-	* @returns array list of styles
+	* @return array List of styles
 	*/
 	function find_available($all)
 	{
@@ -691,10 +691,10 @@ class acp_styles
 				'tree'		=> (strlen($style['style_parent_tree']) ? $style['style_parent_tree'] . '/' : '') . $style['style_path'],
 			);
 		}
-		
+
 		// Get list of directories
 		$dirs = $this->find_style_dirs();
-		
+
 		// Find styles that can be installed
 		$styles = array();
 		foreach ($dirs as $dir)
@@ -746,7 +746,7 @@ class acp_styles
 					$style['_note'] = sprintf($this->user->lang['REQUIRES_STYLE'], htmlspecialchars($parent));
 				}
 			}
-			
+
 			if ($all || $style['_available'])
 			{
 				$styles[] = $style;
@@ -755,7 +755,7 @@ class acp_styles
 
 		return $styles;
 	}
-	
+
 	/**
 	* Show styles list
 	*
@@ -774,7 +774,7 @@ class acp_styles
 			}
 		}
 	}
-	
+
 	/**
 	* Show available styles tree
 	*
@@ -793,13 +793,13 @@ class acp_styles
 			}
 		}
 	}
-	
+
 	/**
 	* Update styles tree
 	*
 	* @param array $styles Styles list, passed as reference
 	* @param array $style Current style, false if root
-	* @returns true if something was updated, false if not
+	* @return bool True if something was updated, false if not
 	*/
 	function update_styles_tree(&$styles, $style = false)
 	{
@@ -829,7 +829,7 @@ class acp_styles
 		}
 		return $updated;
 	}
-	
+
 	/**
 	* Find all possible parent styles for style
 	*
@@ -837,7 +837,7 @@ class acp_styles
 	* @param int $id id of style
 	* @param int $parent current parent style id
 	* @param int $level current tree level
-	* @returns array of style ids, names and levels
+	* @return array Style ids, names and levels
 	*/
 	function find_possible_parents($styles, $id = -1, $parent = 0, $level = 0)
 	{
@@ -859,7 +859,7 @@ class acp_styles
 		}
 		return $results;
 	}
-	
+
 	/**
 	* Show item in styles list
 	*
@@ -871,7 +871,7 @@ class acp_styles
 		// Mark row as shown
 		if (!empty($style['_shown'])) return;
 		$style['_shown'] = true;
-		
+
 		// Generate template variables
 		$actions = array();
 		$row = array(
@@ -881,7 +881,7 @@ class acp_styles
 			'STYLE_PATH'	=> htmlspecialchars($style['style_path']),
 			'STYLE_COPYRIGHT'	=> strip_tags($style['style_copyright']),
 			'STYLE_ACTIVE'	=> $style['style_active'],
-			
+
 			// Additional data
 			'DEFAULT'		=> ($style['style_id'] && $style['style_id'] == $this->default_style),
 			'USERS'			=> (isset($style['_users'])) ? $style['_users'] : '',
@@ -889,20 +889,20 @@ class acp_styles
 			'PADDING'		=> (4 + 16 * $level),
 			'SHOW_COPYRIGHT'	=> ($style['style_id']) ? false : true,
 			'STYLE_PATH_FULL'	=> htmlspecialchars($this->styles_path_absolute . '/' . $style['style_path']) . '/',
-			
+
 			// Comment to show below style
 			'COMMENT'		=> (isset($style['_note'])) ? $style['_note'] : '',
-			
+
 			// The following variables should be used by hooks to add custom HTML code
 			'EXTRA'			=> '',
 			'EXTRA_OPTIONS'	=> ''
 		);
-		
+
 		// Status specific data
 		if ($style['style_id'])
 		{
 			// Style is installed
-		
+
 			// Details
 			$actions[] = array(
 				'U_ACTION'	=> $this->u_action . '&amp;action=details&amp;id=' . $style['style_id'],
@@ -926,7 +926,7 @@ class acp_styles
 				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['STYLE_UNINSTALL']
 			);
-			
+
 			// Preview
 			$actions[] = array(
 				'U_ACTION'	=> append_sid($this->phpbb_root_path . 'index.' . $this->phpEx, 'style=' . $style['style_id']),
@@ -950,16 +950,16 @@ class acp_styles
 				);
 			}
 		}
-		
+
 		// todo: add hook
-		
+
 		// Assign template variables
 		$this->template->assign_block_vars('styles_list', $row);
 		foreach($actions as $action)
 		{
 			$this->template->assign_block_vars('styles_list.actions', $action);
 		}
-		
+
 		// Increase counters
 		$counter = ($style['style_id']) ? ($style['style_active'] ? 'active' : 'inactive') : (empty($style['_available']) ? 'cannotinstall' : 'caninstall');
 		if (!isset($this->style_counters))
@@ -972,10 +972,10 @@ class acp_styles
 				'cannotinstall'	=> 0
 				);
 		}
-		$this->style_counters[$counter] ++;
-		$this->style_counters['total'] ++;
+		$this->style_counters[$counter]++;
+		$this->style_counters['total']++;
 	}
-	
+
 	/**
 	* Show welcome message
 	*
@@ -990,11 +990,11 @@ class acp_styles
 			)
 		);
 	}
-	
+
 	/**
 	* Find all directories that have styles
 	*
-	* @returns array of directory names
+	* @return array Directory names
 	*/
 	function find_style_dirs()
 	{
@@ -1021,7 +1021,7 @@ class acp_styles
 
 		return $styles;
 	}
-	
+
 	/**
 	* Sort styles
 	*/
@@ -1037,19 +1037,18 @@ class acp_styles
 		}
 		return strcasecmp(isset($style1['style_name']) ? $style1['style_name'] : $style1['name'], isset($style2['style_name']) ? $style2['style_name'] : $style2['name']);
 	}
-	
+
 	/**
 	* Read style configuration file
 	*
 	* @param string $dir style directory
-	* @returns array of style data
-	* @returns false on error
+	* @return array|bool Style data, false on error
 	*/
 	function read_style_cfg($dir)
 	{
 		static $required = array('name', 'version', 'copyright');
 		$cfg = parse_cfg_file($this->styles_path . $dir . '/style.cfg');
-		
+
 		// Check if it is a valid file
 		foreach ($required as $key)
 		{
@@ -1058,7 +1057,7 @@ class acp_styles
 				return false;
 			}
 		}
-		
+
 		// Check data
 		if (!isset($cfg['parent']) || !is_string($cfg['parent']) || $cfg['parent'] == $cfg['name'])
 		{
@@ -1068,15 +1067,15 @@ class acp_styles
 		{
 			$cfg['template_bitfield'] = $this->default_bitfield();
 		}
-		
+
 		return $cfg;
 	}
-	
+
 	/**
 	* Install style
 	*
 	* @param $style style data
-	* @returns int style id
+	* @return int Style id
 	*/
 	function install_style($style)
 	{
@@ -1089,7 +1088,7 @@ class acp_styles
 				$sql_ary[$key] = $value;
 			}
 		}
-		
+
 		// Add to database
 		$this->db->sql_transaction('begin');
 
@@ -1102,18 +1101,18 @@ class acp_styles
 		$this->db->sql_transaction('commit');
 
 		add_log('admin', 'LOG_STYLE_ADD', $sql_ary['style_name']);
-		
+
 		return $id;
 	}
 
 	/**
 	* Lists all styles
 	*
-	* @returns array of rows with styles data
+	* @return array Rows with styles data
 	*/
 	function get_styles()
 	{
-		$sql = 'SELECT * 
+		$sql = 'SELECT *
 			FROM ' . STYLES_TABLE;
 		$result = $this->db->sql_query($sql);
 
@@ -1126,7 +1125,7 @@ class acp_styles
 	/**
 	* Count users for each style
 	*
-	* @returns array of styles in following format: [style_id] = number of users
+	* @return array Styles in following format: [style_id] = number of users
 	*/
 	function get_users()
 	{
@@ -1135,33 +1134,33 @@ class acp_styles
 			GROUP BY user_style';
 		$result = $this->db->sql_query($sql);
 
-		$style_count = array();		
+		$style_count = array();
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$style_count[$row['user_style']] = $row['style_count'];
 		}
 		$this->db->sql_freeresult($result);
-	
+
 		return $style_count;
 	}
-	
+
 	/**
 	* Uninstall style
 	*
 	* @param array $style Style data
-	* @returns true on success, error message on error
+	* @return bool|string True on success, error message on error
 	*/
 	function uninstall_style($style)
 	{
 		$id = $style['style_id'];
 		$path = $style['style_path'];
-		
+
 		// Check if style has child styles
-		$sql = 'SELECT style_id 
+		$sql = 'SELECT style_id
 			FROM ' . STYLES_TABLE . '
-			WHERE style_parent_id = ' . $id . " OR style_parent_tree = '" . $this->db->sql_escape($path) . "'";
+			WHERE style_parent_id = ' . (int) $id . " OR style_parent_tree = '" . $this->db->sql_escape($path) . "'";
 		$result = $this->db->sql_query($sql);
-		
+
 		$conflict = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
 
@@ -1169,13 +1168,13 @@ class acp_styles
 		{
 			return sprintf($this->user->lang['STYLE_UNINSTALL_DEPENDENT'], $style['style_name']);
 		}
-		
+
 		// Change default style for users
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_style = 0
 			WHERE user_style = ' . $id;
 		$this->db->sql_query($sql);
-		
+
 		// Uninstall style
 		$sql = 'DELETE FROM ' . STYLES_TABLE . '
 			WHERE style_id = ' . $id;
@@ -1188,13 +1187,13 @@ class acp_styles
 	*
 	* @param string $path Style directory
 	* @param string $dir Directory to remove inside style's directory
-	* @returns true on success, false on error
+	* @return bool True on success, false on error
 	*/
 	function delete_style_files($path, $dir = '')
 	{
 		$dirname = $this->styles_path . $path . $dir;
 		$result = true;
-		
+
 		$dp = @opendir($dirname);
 
 		if ($dp)
@@ -1227,17 +1226,17 @@ class acp_styles
 		{
 			return false;
 		}
-		
+
 		return $result;
 	}
-	
+
 	/**
 	* Get list of items from posted data
 	*
 	* @param string $name Variable name
 	* @param $default Default value for array: string or number
 	* @param bool $error If true, error will be triggered if list is empty
-	* @returns array of items
+	* @return array Items
 	*/
 	function request_vars($name, $default, $error = false)
 	{
@@ -1253,7 +1252,7 @@ class acp_styles
 		{
 			$items[] = $item;
 		}
-		
+
 		if ($error && !count($items))
 		{
 			trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -1265,7 +1264,7 @@ class acp_styles
 	/**
 	* Generates hardcoded bitfield
 	*
-	* @returns bitfield string
+	* @return string Bitfield
 	*/
 	function default_bitfield()
 	{
@@ -1274,7 +1273,7 @@ class acp_styles
 		{
 			return $value;
 		}
-		
+
 		// Hardcoded template bitfield to add for new templates
 		$bitfield = new bitfield();
 		$bitfield->set(0);

From f739d7accec1706abfd74352c876dd1f3fd02b09 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 01:14:14 +0300
Subject: [PATCH 38/76] [ticket/10752] Changing private to protected variables
 in acp_styles

Changing private to protected variables in acp_styles

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

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2306e7d41c..2632c96660 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -28,14 +28,14 @@ class acp_styles
 	var $styles_path_absolute = 'styles';
 	var $default_style = 0;
 
-	private $db = false;
-	private $user = false;
-	private $template = false;
-	private $request = false;
-	private $cache = false;
-	private $auth = false;
-	private $phpbb_root_path = false;
-	private $phpEx = false;
+	protected $db;
+	protected $user;
+	protected $template;
+	protected $request;
+	protected $cache;
+	protected $auth;
+	protected $phpbb_root_path;
+	protected $phpEx;
 
 	function main($id, $mode)
 	{

From e27326a57bde7a73291b5e4787dbc17454d09b90 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 14:26:38 +0300
Subject: [PATCH 39/76] [ticket/10752] Fixes for acp_styles

Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
---
 phpBB/includes/acp/acp_styles.php | 90 +++++++++++++++++--------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 2632c96660..d33be274b4 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -20,13 +20,14 @@ if (!defined('IN_PHPBB'))
 */
 class acp_styles
 {
-	var $u_action;
-	var $u_base_action;
-	var $s_hidden_fields;
-	var $mode;
-	var $styles_path;
-	var $styles_path_absolute = 'styles';
-	var $default_style = 0;
+	public $u_action;
+	
+	protected $u_base_action;
+	protected $s_hidden_fields;
+	protected $mode;
+	protected $styles_path;
+	protected $styles_path_absolute = 'styles';
+	protected $default_style = 0;
 
 	protected $db;
 	protected $user;
@@ -37,7 +38,7 @@ class acp_styles
 	protected $phpbb_root_path;
 	protected $phpEx;
 
-	function main($id, $mode)
+	public function main($id, $mode)
 	{
 		global $db, $user, $phpbb_admin_path, $phpbb_root_path, $phpEx, $template, $request, $cache, $auth, $config;
 
@@ -111,7 +112,7 @@ class acp_styles
 	/**
 	* Main page
 	*/
-	function frontend()
+	protected function frontend()
 	{
 		// Check mode
 		switch ($this->mode)
@@ -134,7 +135,7 @@ class acp_styles
 	/**
 	* Purge cache
 	*/
-	function action_cache()
+	protected function action_cache()
 	{
 		$this->cache->purge();
 
@@ -150,7 +151,7 @@ class acp_styles
 	/**
 	* Install style(s)
 	*/
-	function action_install()
+	protected function action_install()
 	{
 		// Get list of styles to install
 		$dirs = $this->request_vars('dir', '', true);
@@ -205,7 +206,7 @@ class acp_styles
 	/**
 	* Confirm styles removal
 	*/
-	function action_uninstall()
+	protected function action_uninstall()
 	{
 		// Get list of styles to uninstall
 		$ids = $this->request_vars('id', 0, true);
@@ -236,7 +237,7 @@ class acp_styles
 	* @param array $ids List of style IDs
 	* @param bool $delete_files If true, script will attempt to remove files for selected styles
 	*/
-	function action_uninstall_confirmed($ids, $delete_files)
+	protected function action_uninstall_confirmed($ids, $delete_files)
 	{
 		$default = $this->default_style;
 		$uninstalled = array();
@@ -310,7 +311,7 @@ class acp_styles
 	/**
 	* Activate styles
 	*/
-	function action_activate()
+	protected function action_activate()
 	{
 		// Get list of styles to activate
 		$ids = $this->request_vars('id', 0, true);
@@ -331,7 +332,7 @@ class acp_styles
 	/**
 	* Deactivate styles
 	*/
-	function action_deactivate()
+	protected function action_deactivate()
 	{
 		// Get list of styles to deactivate
 		$ids = $this->request_vars('id', 0, true);
@@ -367,7 +368,7 @@ class acp_styles
 	/**
 	* Show style details
 	*/
-	function action_details()
+	protected function action_details()
 	{
 		$id = $this->request->variable('id', 0);
 		if (!$id)
@@ -398,9 +399,18 @@ class acp_styles
 		// Find all available parent styles
 		$list = $this->find_possible_parents($styles, $id);
 
+		// Add form key
+		$form_key = 'acp_styles';
+		add_form_key($form_key);
+
 		// Change data
 		if ($this->request->variable('update', false))
 		{
+			if (!check_form_key($form_key))
+			{
+				trigger_error($this->user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+			}
+
 			$update = array(
 				'style_name'		=> trim($this->request->variable('style_name', $style['style_name'])),
 				'style_parent_id'	=> $this->request->variable('style_parent', (int) $style['style_parent_id']),
@@ -540,7 +550,7 @@ class acp_styles
 	/**
 	* List installed styles
 	*/
-	function show_installed()
+	protected function show_installed()
 	{
 		// Get all installed styles
 		$styles = $this->get_styles();
@@ -605,7 +615,7 @@ class acp_styles
 	/**
 	* Show list of styles that can be installed
 	*/
-	function show_available()
+	protected function show_available()
 	{
 		// Get list of styles
 		$styles = $this->find_available(true);
@@ -674,7 +684,7 @@ class acp_styles
 	* @param bool $all if true, function will return all installable styles. if false, function will return only styles that can be installed
 	* @return array List of styles
 	*/
-	function find_available($all)
+	protected function find_available($all)
 	{
 		// Get list of installed styles
 		$installed = $this->get_styles();
@@ -763,7 +773,7 @@ class acp_styles
 	* @param int $parent parent style id
 	* @param int $level style inheritance level
 	*/
-	function show_styles_list(&$styles, $parent, $level)
+	protected function show_styles_list(&$styles, $parent, $level)
 	{
 		foreach ($styles as &$style)
 		{
@@ -782,7 +792,7 @@ class acp_styles
 	* @param string $name Name of parent style
 	* @param string $level Styles tree level
 	*/
-	function show_available_child_styles(&$styles, $name, $level)
+	protected function show_available_child_styles(&$styles, $name, $level)
 	{
 		foreach ($styles as &$style)
 		{
@@ -801,7 +811,7 @@ class acp_styles
 	* @param array $style Current style, false if root
 	* @return bool True if something was updated, false if not
 	*/
-	function update_styles_tree(&$styles, $style = false)
+	protected function update_styles_tree(&$styles, $style = false)
 	{
 		$parent_id = ($style === false) ? 0 : $style['style_id'];
 		$parent_tree = ($style === false) ? '' : ($style['style_parent_tree'] == '' ? '' : $style['style_parent_tree']) . $style['style_path'];
@@ -839,7 +849,7 @@ class acp_styles
 	* @param int $level current tree level
 	* @return array Style ids, names and levels
 	*/
-	function find_possible_parents($styles, $id = -1, $parent = 0, $level = 0)
+	protected function find_possible_parents($styles, $id = -1, $parent = 0, $level = 0)
 	{
 		$results = array();
 		foreach ($styles as $style)
@@ -866,7 +876,7 @@ class acp_styles
 	* @param array $style style row
 	* @param array $level style inheritance level
 	*/
-	function list_style(&$style, $level)
+	protected function list_style(&$style, $level)
 	{
 		// Mark row as shown
 		if (!empty($style['_shown'])) return;
@@ -982,11 +992,11 @@ class acp_styles
 	* @param string $title main title
 	* @param string $description page description
 	*/
-	function welcome_message($title, $description)
+	protected function welcome_message($title, $description)
 	{
 		$this->template->assign_vars(array(
-			'L_TITLE'	=> (isset($this->user->lang[$title])) ? $this->user->lang[$title] : $title,
-			'L_EXPLAIN'	=> (isset($this->user->lang[$description])) ? $this->user->lang[$description] : $description
+			'L_TITLE'	=> $this->user->lang[$title],
+			'L_EXPLAIN'	=> (isset($this->user->lang[$description])) ? $this->user->lang[$description] : ''
 			)
 		);
 	}
@@ -996,7 +1006,7 @@ class acp_styles
 	*
 	* @return array Directory names
 	*/
-	function find_style_dirs()
+	protected function find_style_dirs()
 	{
 		$styles = array();
 
@@ -1025,7 +1035,7 @@ class acp_styles
 	/**
 	* Sort styles
 	*/
-	function sort_styles($style1, $style2)
+	public function sort_styles($style1, $style2)
 	{
 		if ($style1['style_active'] != $style2['style_active'])
 		{
@@ -1044,7 +1054,7 @@ class acp_styles
 	* @param string $dir style directory
 	* @return array|bool Style data, false on error
 	*/
-	function read_style_cfg($dir)
+	protected function read_style_cfg($dir)
 	{
 		static $required = array('name', 'version', 'copyright');
 		$cfg = parse_cfg_file($this->styles_path . $dir . '/style.cfg');
@@ -1077,7 +1087,7 @@ class acp_styles
 	* @param $style style data
 	* @return int Style id
 	*/
-	function install_style($style)
+	protected function install_style($style)
 	{
 		// Generate row
 		$sql_ary = array();
@@ -1110,7 +1120,7 @@ class acp_styles
 	*
 	* @return array Rows with styles data
 	*/
-	function get_styles()
+	protected function get_styles()
 	{
 		$sql = 'SELECT *
 			FROM ' . STYLES_TABLE;
@@ -1127,7 +1137,7 @@ class acp_styles
 	*
 	* @return array Styles in following format: [style_id] = number of users
 	*/
-	function get_users()
+	protected function get_users()
 	{
 		$sql = 'SELECT user_style, COUNT(user_style) AS style_count
 			FROM ' . USERS_TABLE . '
@@ -1150,7 +1160,7 @@ class acp_styles
 	* @param array $style Style data
 	* @return bool|string True on success, error message on error
 	*/
-	function uninstall_style($style)
+	protected function uninstall_style($style)
 	{
 		$id = $style['style_id'];
 		$path = $style['style_path'];
@@ -1189,7 +1199,7 @@ class acp_styles
 	* @param string $dir Directory to remove inside style's directory
 	* @return bool True on success, false on error
 	*/
-	function delete_style_files($path, $dir = '')
+	protected function delete_style_files($path, $dir = '')
 	{
 		$dirname = $this->styles_path . $path . $dir;
 		$result = true;
@@ -1234,11 +1244,11 @@ class acp_styles
 	* Get list of items from posted data
 	*
 	* @param string $name Variable name
-	* @param $default Default value for array: string or number
+	* @param string|int $default Default value for array
 	* @param bool $error If true, error will be triggered if list is empty
 	* @return array Items
 	*/
-	function request_vars($name, $default, $error = false)
+	protected function request_vars($name, $default, $error = false)
 	{
 		$item = $this->request->variable($name, $default);
 		$items = $this->request->variable($name . 's', array($default));
@@ -1262,11 +1272,13 @@ class acp_styles
 	}
 
 	/**
-	* Generates hardcoded bitfield
+	* Generates default bitfield
+	*
+	* This bitfield decides which bbcodes are defined in a template.
 	*
 	* @return string Bitfield
 	*/
-	function default_bitfield()
+	protected function default_bitfield()
 	{
 		static $value;
 		if (isset($value))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Instead set PHP_BIN if it is not set.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Instead merge stderr into stdout.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From f32547c2150a3e6201edf0f856a93229040c73be Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [PATCH 54/76] [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/adm/style/acp_forums.html                     | 5 +++++
 phpBB/develop/create_schema_files.php               | 1 +
 phpBB/includes/acp/acp_forums.php                   | 4 ++++
 phpBB/includes/functions_display.php                | 1 +
 phpBB/install/database_update.php                   | 3 +++
 phpBB/language/en/acp/forums.php                    | 2 ++
 phpBB/styles/prosilver/template/forumlist_body.html | 5 ++++-
 7 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 048a24a328..ec82947f92 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -237,6 +237,11 @@
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
+		<dl>
+			<dt><label for="display_last_subject">{L_DISPLAY_LAST_SUBJECT}:</label><br /><span>{L_DISPLAY_LAST_SUBJECT_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" class="radio" name="display_last_subject" value="1"<!-- IF S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="display_last_subject" value="0"<!-- IF not S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 4088657743..067ad198e3 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1109,6 +1109,7 @@ function get_schema_struct()
 			'forum_options'			=> array('UINT:20', 0),
 			'display_subforum_list'	=> array('BOOL', 1),
 			'display_on_index'		=> array('BOOL', 1),
+			'display_last_subject'	=> array('BOOL', 1),
 			'enable_indexing'		=> array('BOOL', 1),
 			'enable_icons'			=> array('BOOL', 1),
 			'enable_prune'			=> array('BOOL', 0),
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 3a3b2021eb..29eabba0c7 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -133,6 +133,7 @@ class acp_forums
 						'forum_style'			=> request_var('forum_style', 0),
 						'display_subforum_list'	=> request_var('display_subforum_list', false),
 						'display_on_index'		=> request_var('display_on_index', false),
+						'display_last_subject'	=> request_var('display_last_subject',true),
 						'forum_topics_per_page'	=> request_var('topics_per_page', 0),
 						'enable_indexing'		=> request_var('enable_indexing', true),
 						'enable_icons'			=> request_var('enable_icons', false),
@@ -444,6 +445,7 @@ class acp_forums
 							'enable_prune'			=> false,
 							'prune_days'			=> 7,
 							'prune_viewed'			=> 7,
+							'display_last_subject'	=> 0,
 							'prune_freq'			=> 1,
 							'forum_flags'			=> FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS,
 							'forum_options'			=> 0,
@@ -636,6 +638,7 @@ class acp_forums
 					'S_ENABLE_INDEXING'			=> ($forum_data['enable_indexing']) ? true : false,
 					'S_TOPIC_ICONS'				=> ($forum_data['enable_icons']) ? true : false,
 					'S_DISPLAY_SUBFORUM_LIST'	=> ($forum_data['display_subforum_list']) ? true : false,
+					'S_DISPLAY_SUBJECT'	=> ($forum_data['display_last_subject']) ? true : false,
 					'S_DISPLAY_ON_INDEX'		=> ($forum_data['display_on_index']) ? true : false,
 					'S_PRUNE_ENABLE'			=> ($forum_data['enable_prune']) ? true : false,
 					'S_FORUM_LINK_TRACK'		=> ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? true : false,
@@ -804,6 +807,7 @@ class acp_forums
 					'FORUM_TOPICS'		=> $row['forum_topics'],
 					'FORUM_POSTS'		=> $row['forum_posts'],
 
+					'S_DISPLAY_SUBJECT' => ($row['display_last_subject']) ? true : false,
 					'S_FORUM_LINK'		=> ($forum_type == FORUM_LINK) ? true : false,
 					'S_FORUM_POST'		=> ($forum_type == FORUM_POST) ? true : false,
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 18db64cc68..9b80763ee4 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -451,6 +451,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_DISPLAY_SUBJECT'	=>	($row['display_last_subject']) ? 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'],
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a84136388c..509e991c81 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,6 +1084,9 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
+				FORUMS_TABLE		=> array(
+					'display_last_subject'	=> array('BOOL', 1),
+				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 756cb7ae0f..d456e8693d 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,6 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index d6596203e5..e1070ca23d 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -44,7 +44,10 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+						<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a><!-- ENDIF --> 
+						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
 					</dd>
 				<!-- ENDIF -->

From fd409c49a5daac5cc0b055798ce9b601525b11a4 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sun, 25 Mar 2012 01:39:34 +0530
Subject: [PATCH 55/76] [ticket/10650] Added static sql files

Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
---
 phpBB/install/schemas/firebird_schema.sql | 1 +
 phpBB/install/schemas/mssql_schema.sql    | 1 +
 phpBB/install/schemas/mysql_40_schema.sql | 1 +
 phpBB/install/schemas/mysql_41_schema.sql | 1 +
 phpBB/install/schemas/oracle_schema.sql   | 1 +
 phpBB/install/schemas/postgres_schema.sql | 1 +
 phpBB/install/schemas/sqlite_schema.sql   | 1 +
 7 files changed, 7 insertions(+)

diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 51565ef2d4..950362e746 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,6 +376,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
+	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2c78dd009f..90a9563760 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,6 +455,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
+	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d19f1930d0..7f7225463d 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune 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 3fd8d4f1d1..cd23c6ec86 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,6 +262,7 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
+	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8a0f3e56b1..0fe1eb9acb 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,6 +522,7 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
+	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index c624024362..91e5629791 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,6 +398,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
+	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index bd002c93ed..090ae0911b 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,6 +255,7 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
+	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',

From 01e6254ccca0536a43703c118496b189654d3904 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 31 Mar 2012 22:41:41 +0530
Subject: [PATCH 56/76] [ticket/10650] Changed language files and forumlist

The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php                    | 4 ++--
 phpBB/styles/prosilver/template/forumlist_body.html | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index d456e8693d..9141abc8eb 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index e1070ca23d..17454ed330 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -46,7 +46,8 @@
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-						<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a><!-- ENDIF --> 
+							<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a>
+						<!-- ENDIF --> 
 						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
 					</dd>

From 1dd5b48434a8defe82860666750c8e78f62cc933 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 31 Mar 2012 23:25:13 +0530
Subject: [PATCH 57/76] [ticket/10650] Corrected space before true

Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
---
 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 29eabba0c7..5323a0e4e6 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -133,7 +133,7 @@ class acp_forums
 						'forum_style'			=> request_var('forum_style', 0),
 						'display_subforum_list'	=> request_var('display_subforum_list', false),
 						'display_on_index'		=> request_var('display_on_index', false),
-						'display_last_subject'	=> request_var('display_last_subject',true),
+						'display_last_subject'	=> request_var('display_last_subject', true),
 						'forum_topics_per_page'	=> request_var('topics_per_page', 0),
 						'enable_indexing'		=> request_var('enable_indexing', true),
 						'enable_icons'			=> request_var('enable_icons', false),

From 663b5f6542cc3088919836324f71413320997fe8 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Tue, 3 Apr 2012 21:36:26 +0530
Subject: [PATCH 58/76] [ticket/10650] Cropped subject and inserted newline

The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
---
 phpBB/includes/functions_display.php                | 5 +++++
 phpBB/styles/prosilver/template/forumlist_body.html | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9b80763ee4..b331ed7d71 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -397,6 +397,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		if ($row['forum_last_post_id'])
 		{
 			$last_post_subject = $row['forum_last_post_subject'];
+			if (strlen($last_post_subject) > 30)
+					{
+						$last_post_subject = substr($last_post_subject, 0, 30);
+						$last_post_subject .= '...';
+					}
 			$last_post_time = $user->format_date($row['forum_last_post_time']);
 			$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
 		}
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 17454ed330..68df81932a 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -46,7 +46,7 @@
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-							<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a>
+							<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a></br>
 						<!-- ENDIF --> 
 						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>

From 08bee4c522dd68f7da591fd8ea7a674ac5b9bf67 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Thu, 5 Apr 2012 00:39:52 +0530
Subject: [PATCH 59/76] [ticket/10650]Added permission checking and utf8
 functions

Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index b331ed7d71..8e0005eadf 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -397,9 +397,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		if ($row['forum_last_post_id'])
 		{
 			$last_post_subject = $row['forum_last_post_subject'];
-			if (strlen($last_post_subject) > 30)
-					{
-						$last_post_subject = substr($last_post_subject, 0, 30);
+			if (utf8_strlen(htmlspecialchars_decode($last_post_subject)) > 30)
+					{	
+						$last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30)));
 						$last_post_subject .= '...';
 					}
 			$last_post_time = $user->format_date($row['forum_last_post_time']);
@@ -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_DISPLAY_SUBJECT'	=>	($row['display_last_subject']) ? true : false,
+			'S_DISPLAY_SUBJECT'	=>	($row['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? 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'],

From 7bb9e301994cb9789478b32c1282238e5762acee Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Thu, 5 Apr 2012 01:19:46 +0530
Subject: [PATCH 60/76] [ticket/10650] Corrected intendation

Corrected the intendation of if condition.

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

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 8e0005eadf..a28f546be0 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -398,10 +398,10 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			$last_post_subject = $row['forum_last_post_subject'];
 			if (utf8_strlen(htmlspecialchars_decode($last_post_subject)) > 30)
-					{	
-						$last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30)));
-						$last_post_subject .= '...';
-					}
+			{	
+				$last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30)));
+				$last_post_subject .= '...';
+			}
 			$last_post_time = $user->format_date($row['forum_last_post_time']);
 			$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
 		}

From 3e9711d6a4c1786ec4702b1d87810c4ed0182953 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Thu, 5 Apr 2012 02:02:02 +0530
Subject: [PATCH 61/76] [ticket/10650] Added checking for empty subjects

Now empty subjects will not be displayed in a
new line on the forum list.

PHPBB3-10650
---
 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 a28f546be0..4e70a4911c 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_DISPLAY_SUBJECT'	=>	($row['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? true : false,
+			'S_DISPLAY_SUBJECT'	=>	($last_post_subject && $row['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? 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'],

From 98964a913cb22761553d04170aa4830e324f7488 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 18:28:36 -0400
Subject: [PATCH 62/76] [ticket/10650] Revert merge of 'rahulr92/ticket/10650'
 into develop

The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
---
 phpBB/adm/style/acp_forums.html                     | 5 -----
 phpBB/develop/create_schema_files.php               | 1 -
 phpBB/includes/acp/acp_forums.php                   | 4 ----
 phpBB/includes/functions_display.php                | 6 ------
 phpBB/install/database_update.php                   | 3 ---
 phpBB/install/schemas/firebird_schema.sql           | 1 -
 phpBB/install/schemas/mssql_schema.sql              | 1 -
 phpBB/install/schemas/mysql_40_schema.sql           | 1 -
 phpBB/install/schemas/mysql_41_schema.sql           | 1 -
 phpBB/install/schemas/oracle_schema.sql             | 1 -
 phpBB/install/schemas/postgres_schema.sql           | 1 -
 phpBB/install/schemas/sqlite_schema.sql             | 1 -
 phpBB/language/en/acp/forums.php                    | 2 --
 phpBB/styles/prosilver/template/forumlist_body.html | 6 +-----
 14 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index ec82947f92..048a24a328 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -237,11 +237,6 @@
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		<dl>
-			<dt><label for="display_last_subject">{L_DISPLAY_LAST_SUBJECT}:</label><br /><span>{L_DISPLAY_LAST_SUBJECT_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="display_last_subject" value="1"<!-- IF S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="display_last_subject" value="0"<!-- IF not S_DISPLAY_SUBJECT --> id="display_subject" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
 			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 067ad198e3..4088657743 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1109,7 +1109,6 @@ function get_schema_struct()
 			'forum_options'			=> array('UINT:20', 0),
 			'display_subforum_list'	=> array('BOOL', 1),
 			'display_on_index'		=> array('BOOL', 1),
-			'display_last_subject'	=> array('BOOL', 1),
 			'enable_indexing'		=> array('BOOL', 1),
 			'enable_icons'			=> array('BOOL', 1),
 			'enable_prune'			=> array('BOOL', 0),
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 5323a0e4e6..3a3b2021eb 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -133,7 +133,6 @@ class acp_forums
 						'forum_style'			=> request_var('forum_style', 0),
 						'display_subforum_list'	=> request_var('display_subforum_list', false),
 						'display_on_index'		=> request_var('display_on_index', false),
-						'display_last_subject'	=> request_var('display_last_subject', true),
 						'forum_topics_per_page'	=> request_var('topics_per_page', 0),
 						'enable_indexing'		=> request_var('enable_indexing', true),
 						'enable_icons'			=> request_var('enable_icons', false),
@@ -445,7 +444,6 @@ class acp_forums
 							'enable_prune'			=> false,
 							'prune_days'			=> 7,
 							'prune_viewed'			=> 7,
-							'display_last_subject'	=> 0,
 							'prune_freq'			=> 1,
 							'forum_flags'			=> FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS,
 							'forum_options'			=> 0,
@@ -638,7 +636,6 @@ class acp_forums
 					'S_ENABLE_INDEXING'			=> ($forum_data['enable_indexing']) ? true : false,
 					'S_TOPIC_ICONS'				=> ($forum_data['enable_icons']) ? true : false,
 					'S_DISPLAY_SUBFORUM_LIST'	=> ($forum_data['display_subforum_list']) ? true : false,
-					'S_DISPLAY_SUBJECT'	=> ($forum_data['display_last_subject']) ? true : false,
 					'S_DISPLAY_ON_INDEX'		=> ($forum_data['display_on_index']) ? true : false,
 					'S_PRUNE_ENABLE'			=> ($forum_data['enable_prune']) ? true : false,
 					'S_FORUM_LINK_TRACK'		=> ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? true : false,
@@ -807,7 +804,6 @@ class acp_forums
 					'FORUM_TOPICS'		=> $row['forum_topics'],
 					'FORUM_POSTS'		=> $row['forum_posts'],
 
-					'S_DISPLAY_SUBJECT' => ($row['display_last_subject']) ? true : false,
 					'S_FORUM_LINK'		=> ($forum_type == FORUM_LINK) ? true : false,
 					'S_FORUM_POST'		=> ($forum_type == FORUM_POST) ? true : false,
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 4e70a4911c..18db64cc68 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -397,11 +397,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		if ($row['forum_last_post_id'])
 		{
 			$last_post_subject = $row['forum_last_post_subject'];
-			if (utf8_strlen(htmlspecialchars_decode($last_post_subject)) > 30)
-			{	
-				$last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30)));
-				$last_post_subject .= '...';
-			}
 			$last_post_time = $user->format_date($row['forum_last_post_time']);
 			$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
 		}
@@ -456,7 +451,6 @@ 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_DISPLAY_SUBJECT'	=>	($last_post_subject && $row['display_last_subject'] && !$row['forum_password'] && $auth->acl_get('f_read', $row['forum_id'])) ? 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'],
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 509e991c81..a84136388c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1084,9 +1084,6 @@ function database_update_info()
 				GROUPS_TABLE		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
-				FORUMS_TABLE		=> array(
-					'display_last_subject'	=> array('BOOL', 1),
-				),
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 950362e746..51565ef2d4 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -376,7 +376,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER DEFAULT 0 NOT NULL,
 	display_subforum_list INTEGER DEFAULT 1 NOT NULL,
 	display_on_index INTEGER DEFAULT 1 NOT NULL,
-	display_last_subject INTEGER DEFAULT 1 NOT NULL,
 	enable_indexing INTEGER DEFAULT 1 NOT NULL,
 	enable_icons INTEGER DEFAULT 1 NOT NULL,
 	enable_prune INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 90a9563760..2c78dd009f 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -455,7 +455,6 @@ CREATE TABLE [phpbb_forums] (
 	[forum_options] [int] DEFAULT (0) NOT NULL ,
 	[display_subforum_list] [int] DEFAULT (1) NOT NULL ,
 	[display_on_index] [int] DEFAULT (1) NOT NULL ,
-	[display_last_subject] [int] DEFAULT (1) NOT NULL ,
 	[enable_indexing] [int] DEFAULT (1) NOT NULL ,
 	[enable_icons] [int] DEFAULT (1) NOT NULL ,
 	[enable_prune] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 7f7225463d..d19f1930d0 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune 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 cd23c6ec86..3fd8d4f1d1 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -262,7 +262,6 @@ CREATE TABLE phpbb_forums (
 	forum_options int(20) UNSIGNED DEFAULT '0' NOT NULL,
 	display_subforum_list tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	display_last_subject tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_indexing tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_icons tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	enable_prune tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 0fe1eb9acb..8a0f3e56b1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -522,7 +522,6 @@ CREATE TABLE phpbb_forums (
 	forum_options number(20) DEFAULT '0' NOT NULL,
 	display_subforum_list number(1) DEFAULT '1' NOT NULL,
 	display_on_index number(1) DEFAULT '1' NOT NULL,
-	display_last_subject number(1) DEFAULT '1' NOT NULL,
 	enable_indexing number(1) DEFAULT '1' NOT NULL,
 	enable_icons number(1) DEFAULT '1' NOT NULL,
 	enable_prune number(1) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 91e5629791..c624024362 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -398,7 +398,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INT4 DEFAULT '0' NOT NULL CHECK (forum_options >= 0),
 	display_subforum_list INT2 DEFAULT '1' NOT NULL CHECK (display_subforum_list >= 0),
 	display_on_index INT2 DEFAULT '1' NOT NULL CHECK (display_on_index >= 0),
-	display_last_subject INT2 DEFAULT '1' NOT NULL CHECK (display_last_subject >= 0),
 	enable_indexing INT2 DEFAULT '1' NOT NULL CHECK (enable_indexing >= 0),
 	enable_icons INT2 DEFAULT '1' NOT NULL CHECK (enable_icons >= 0),
 	enable_prune INT2 DEFAULT '0' NOT NULL CHECK (enable_prune >= 0),
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 090ae0911b..bd002c93ed 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -255,7 +255,6 @@ CREATE TABLE phpbb_forums (
 	forum_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_subforum_list INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	display_on_index INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	display_last_subject INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_indexing INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_icons INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	enable_prune INTEGER UNSIGNED NOT NULL DEFAULT '0',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 9141abc8eb..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,6 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 68df81932a..d6596203e5 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -44,11 +44,7 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
-							<a href="{forumrow.U_LAST_POST}">{forumrow.LAST_POST_SUBJECT}</a></br>
-						<!-- ENDIF --> 
-						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn> {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
 					</dd>
 				<!-- ENDIF -->

From 1c9993055a563cab323b03f15d2d3bc1ae696b0b Mon Sep 17 00:00:00 2001
From: Gabriel Anca <gabrielanca@phpbb.com>
Date: Thu, 22 Mar 2012 19:03:07 +0100
Subject: [PATCH 63/76] [ticket/10547] User is not logged in as admin after
 installation

After installing, when user clicks Login button (final installation step),
he is not logged in because there's a missing var ($data)

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

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 361376763d..7558fde944 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1804,6 +1804,9 @@ class install_install extends module
 
 		$this->page_title = $lang['STAGE_FINAL'];
 
+		// Obtain any submitted data
+		$data = $this->get_submitted_data();
+
 		// We need to fill the config to let internal functions correctly work
 		$config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE);
 		set_config(null, null, null, $config);

From c8da69d9c26e0017f13abb2c954e52c4cd593fdc Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 5 Apr 2012 14:14:40 +0100
Subject: [PATCH 64/76] [ticket/10575] Fixing non-static access to static
 functions get_instance

These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.

PHPBB3-10575
---
 phpBB/includes/captcha/captcha_factory.php                      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 62fb90d3c5..602c8d130a 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -25,7 +25,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	function get_instance($name)
+	static function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index a63b0e448f..5b3adee047 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_gd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index f523cae191..1d5922a5ca 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		return new phpbb_captcha_gd_wave();
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 4a0418146d..8814a3cfdd 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_nogd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index e12ad00d25..412b332c3a 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_qa();
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 0ea8b9c6e7..67dc2f3747 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_recaptcha();
 		return $instance;

From 2bf1c4eb32f1e668a215f1dabb42fe88e8a9cd11 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 5 Apr 2012 14:16:56 +0100
Subject: [PATCH 65/76] [ticket/10575] Adding public visibility to the methods.

Added public visibility to the methods

PHPBB3-10575
---
 phpBB/includes/captcha/captcha_factory.php                      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 602c8d130a..d57b333c69 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -25,7 +25,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	static function get_instance($name)
+	public static function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 5b3adee047..6c1f3bf00b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_gd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 1d5922a5ca..a5588178bb 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		return new phpbb_captcha_gd_wave();
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 8814a3cfdd..96f13fbe1b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_nogd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 412b332c3a..99813189d7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_qa();
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 67dc2f3747..70c24a8c30 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_recaptcha();
 		return $instance;

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

Fixed minor changes as suggested by @bantu.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Updates made to database_update.php

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

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

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

Changes made to function name, reverted to old.

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

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

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

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

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

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

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

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

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

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

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

From 2a48284fc9125edad2dbd9de41dfb1ef61926b6b Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 9 Apr 2012 01:25:17 +0530
Subject: [PATCH 76/76] [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;