[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2

[prep-release-3.2.0-a2] Add migration for 3.2.0-a2
[prep-release-3.2.0-a2] Update version to 3.2.0-a2
2025-09-13 17:42:08 +02:00 · 2015-12-14 22:41:25 +01:00 · 2015-12-14 22:39:10 +01:00 · 2015-12-14 22:35:41 +01:00
626 changed files with 4024 additions and 16356 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +0,0 @@
-Checklist:
-
- [ ] Correct branch: master for new features; 3.2.x, 3.1.x for fixes
- [ ] Tests pass
- [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html)
- [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages)
-
-Tracker ticket (set the ticket ID to **your ticket ID**):
-
-https://tracker.phpbb.com/browse/PHPBB3-12345
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,5 +2,5 @@

 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
 2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
-3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request
--- a/README.md
+++ b/README.md
@@ -2,34 +2,34 @@

 ## ABOUT

-phpBB is a free open-source bulletin board written in PHP.
+phpBB is a free bulletin board written in PHP.

 ## COMMUNITY

-Get your copy of phpBB, find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).
+Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).

 ## INSTALLING DEPENDENCIES

 To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.

 	cd phpBB
-	php ../composer.phar install
+	php ../composer.phar install --dev


 ## CONTRIBUTE

 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
 2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
-3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+3. [Read our Git Contribution Guidelines](http://wiki.phpbb.com/Git); if you're new to git, also read [the introduction guide](http://wiki.phpbb.com/display/DEV/Working+with+Git)
 4. Send us a pull request

 ## AUTOMATED TESTING

-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis builds below:
+We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below:

 * [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=master)](http://travis-ci.org/phpbb/phpbb) **master** - Latest development version
-* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.2.x)](http://travis-ci.org/phpbb/phpbb) **3.2.x** - Development of version 3.2.x
 * [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.1.x)](http://travis-ci.org/phpbb/phpbb) **3.1.x** - Development of version 3.1.x
+* [![Build Status](https://secure.travis-ci.org/phpbb/phpbb.png?branch=3.0.x)](http://travis-ci.org/phpbb/phpbb) **3.0.x** - Development of version 3.0.x

 ## LICENSE

--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@

 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.0-RC1" />
-	<property name="prevversion" value="3.2.0-b2" />
-	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" />
+	<property name="newversion" value="3.2.0-a2" />
+	<property name="prevversion" value="3.2.0-a1" />
+	<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -303,65 +303,13 @@

 	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
-		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
-
-		<delete dir="${dir}/vendor/google/recaptcha/examples" />
-		<delete dir="${dir}/vendor/google/recaptcha/tests" />
-		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
-		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
-		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/google/recaptcha/README.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/build" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/guzzle/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.editorconfig" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/README.md" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/.travis.yml" />
-		<delete file="${dir}/vendor/guzzlehttp/guzzle/UPGRADING.md" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/docs" />
-		<delete dir="${dir}/vendor/guzzlehttp/ringphp/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/CHANGELOG.md" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/ringphp/.travis.yml" />
-
-		<delete dir="${dir}/vendor/guzzlehttp/streams/tests" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/CHANGELOG.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.gitignore" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/Makefile" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
-		<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />
-
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />

-		<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
-		<delete dir="${dir}/vendor/paragonie/random_compat/other" />
-		<delete file="${dir}/vendor/paragonie/random_compat/CHANGELOG.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/ERRATA.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/README.md" />
-		<delete file="${dir}/vendor/paragonie/random_compat/SECURITY.md" />
-
 		<delete file="${dir}/vendor/patchwork/utf8/.travis.yml" />
 		<delete file="${dir}/vendor/patchwork/utf8/CHANGELOG.md" />
 		<delete file="${dir}/vendor/patchwork/utf8/phpunit.xml.dist" />
@@ -371,13 +319,6 @@
 		<delete file="${dir}/vendor/psr/log/.gitignore" />
 		<delete file="${dir}/vendor/psr/log/README.md" />

-		<delete dir="${dir}/vendor/react/promise/tests" />
-		<delete file="${dir}/vendor/react/promise/CHANGELOG.md" />
-		<delete file="${dir}/vendor/react/promise/.gitignore" />
-		<delete file="${dir}/vendor/react/promise/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/react/promise/README.md" />
-		<delete file="${dir}/vendor/react/promise/.travis.yml" />
-
 		<delete dir="${dir}/vendor/s9e/text-formatter/.git" />

 		<delete dir="${dir}/vendor/symfony/config/.git" />
@@ -443,13 +384,6 @@
 		<delete file="${dir}/vendor/symfony/http-kernel/README.md" />
 		<delete file="${dir}/vendor/symfony/http-kernel/phpunit.xml.dist" />

-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/proxy-manager-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/proxy-manager-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/routing/.git" />
 		<delete dir="${dir}/vendor/symfony/routing/Tests" />
 		<delete file="${dir}/vendor/symfony/routing/.gitignore" />
@@ -457,19 +391,12 @@
 		<delete file="${dir}/vendor/symfony/routing/README.md" />
 		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />

-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
-
 		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
+		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />

 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -477,18 +404,38 @@
 		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
 		<delete file="${dir}/vendor/twig/twig/.gitignore" />
 		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
+		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.rst" />
+		<delete file="${dir}/vendor/twig/twig/README.markdown" />

-		<delete file="${dir}/vendor/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-core/.git" />
+		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
+		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />

-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
+		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
+		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />

-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
+
+		<delete dir="${dir}/vendor/symfony/security/.git" />
+		<delete dir="${dir}/vendor/symfony/security/Tests" />
+		<delete file="${dir}/vendor/symfony/security/.gitignore" />
+		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/security/README.md" />
+		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
 	</target>

 	<target name="clean-diff-dir">
--- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
@@ -87,11 +87,6 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 				$old_simple_statement = $simple_statement;

 				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
-
-				if ($simple_class_name_start === false) {
-					continue;
-				}
-
 				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);

 				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
@@ -134,19 +129,53 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 			}
 		}

-		$old_docblock = $stackPtr;
-		while (($docblock = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, ($old_docblock + 1))) !== false)
-		{
-			$old_docblock = $docblock;
-			$ok = $this->checkDocblock($phpcsFile, $docblock, $tokens, $class_name_full, $class_name_short) ? true : $ok;
-		}
-
 		// Checks in type hinting
 		$old_function_declaration = $stackPtr;
 		while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false)
 		{
 			$old_function_declaration = $function_declaration;

+			// Check docblocks
+			$find = array(
+				T_COMMENT,
+				T_DOC_COMMENT_CLOSE_TAG,
+				T_DOC_COMMENT,
+				T_CLASS,
+				T_FUNCTION,
+				T_OPEN_TAG,
+			);
+
+			$comment_end = $phpcsFile->findPrevious($find, ($function_declaration - 1));
+			if ($comment_end !== false)
+			{
+				if ($tokens[$comment_end]['code'] === T_DOC_COMMENT_CLOSE_TAG)
+				{
+					$comment_start = $tokens[$comment_end]['comment_opener'];
+					foreach ($tokens[$comment_start]['comment_tags'] as $tag) {
+						if ($tokens[$tag]['content'] !== '@param' && $tokens[$tag]['content'] !== '@return' && $tokens[$tag]['content'] !== '@throws') {
+							continue;
+						}
+
+						$classes = $tokens[($tag + 2)]['content'];
+						$space = strpos($classes, ' ');
+						if ($space !== false) {
+							$classes = substr($classes, 0, $space);
+						}
+
+						$tab = strpos($classes, "\t");
+						if ($tab !== false) {
+							$classes = substr($classes, 0, $tab);
+						}
+
+						$classes = explode('|', str_replace('[]', '', $classes));
+						foreach ($classes as $class)
+						{
+							$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
+						}
+					}
+				}
+			}
+
 			// Check type hint
 			$params = $phpcsFile->getMethodParameters($function_declaration);
 			foreach ($params as $param)
@@ -205,49 +234,4 @@ class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
 		return false;

 	}
-
-	/**
-	 * @param PHP_CodeSniffer_File $phpcsFile
-	 * @param int $field
-	 * @param array $tokens
-	 * @param string $class_name_full
-	 * @param string $class_name_short
-	 * @param bool $ok
-	 *
-	 * @return bool
-	 */
-	private function checkDocblock(PHP_CodeSniffer_File $phpcsFile, $comment_end, $tokens, $class_name_full, $class_name_short)
-	{
-		$ok = false;
-
-		$comment_start = $tokens[$comment_end]['comment_opener'];
-		foreach ($tokens[$comment_start]['comment_tags'] as $tag)
-		{
-			if (!in_array($tokens[$tag]['content'], array('@param', '@var', '@return', '@throws'), true))
-			{
-				continue;
-			}
-
-			$classes = $tokens[($tag + 2)]['content'];
-			$space = strpos($classes, ' ');
-			if ($space !== false)
-			{
-				$classes = substr($classes, 0, $space);
-			}
-
-			$tab = strpos($classes, "\t");
-			if ($tab !== false)
-			{
-				$classes = substr($classes, 0, $tab);
-			}
-
-			$classes = explode('|', str_replace('[]', '', $classes));
-			foreach ($classes as $class)
-			{
-				$ok = $this->check($phpcsFile, $class, $class_name_full, $class_name_short, $tokens[$tag + 2]['line']) ? true : $ok;
-			}
-		}
-
-		return $ok;
-	}
 }
--- a/composer.phar
+++ b/composer.phar
--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -1,16 +1,6 @@
 <IfModule mod_rewrite.c>
 RewriteEngine on

-#
-# Uncomment the statement below if URL rewriting doesn't
-# work properly. If you installed phpBB in a subdirectory
-# of your site, properly set the argument for the statement.
-# e.g.: if your domain is test.com and you installed phpBB
-# in http://www.test.com/phpBB/index.php you have to set
-# the statement RewriteBase /phpBB/
-#
-#RewriteBase /
-
 #
 # Uncomment the statement below if you want to make use of
 # HTTP authentication and it does not already work.
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -196,7 +196,7 @@
 		</dl>
 		<dl>
 			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" min="0" max="999999999999999" step="any" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
 			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
@@ -346,7 +346,7 @@
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" min="0" max="9999999999" name="post_id[{orphan.ATTACH_ID}]" value="{orphan.POST_ID}" style="width: 75%;" /></td>
+			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" min="{AVATAR_MIN_WIDTH}" max="{AVATAR_MAX_WIDTH}" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" min="{AVATAR_MIN_HEIGHT}" max="{AVATAR_MAX_HEIGHT}" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
+		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
+		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
 	</dd>
 </dl>
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -27,11 +27,11 @@
 </dl>
 <dl>
 	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
 	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
 	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -14,7 +14,7 @@
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
 		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
-		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_FIRST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
+		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>

 	<p class="submit-buttons">
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -242,7 +242,7 @@
 		</dl>
 		<dl>
 			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" min="0" max="9999" /></dd>
+			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
 		</dl>
 		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>
@@ -257,15 +257,15 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
@@ -289,11 +289,11 @@
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
 			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" min="0" max="9999" /> {L_DAYS}</dd>
+			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
 		</dl>
 		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -86,11 +86,11 @@
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
 		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" min="0" max="9999" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
@@ -267,12 +267,11 @@

 	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -282,7 +281,7 @@
 		<!-- IF groups.S_SPECIAL -->
 		<!-- IF groups.S_FIRST_ROW -->
 			<tr>
-				<td colspan="6" class="row3">{L_NO_GROUPS_CREATED}</td>
+				<td colspan="5" class="row3">{L_NO_GROUPS_CREATED}</td>
 			</tr>
 		<!-- ENDIF -->
 	</tbody>
@@ -303,12 +302,11 @@
 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>

 	<table class="table1">
-		<col class="col1" /><col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" />
+		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
 		<th style="width: 50%">{L_GROUP}</th>
 		<th>{L_TOTAL_MEMBERS}</th>
-		<th>{L_PENDING_MEMBERS}</th>
 		<th colspan="2">{L_OPTIONS}</th>
 		<th>{L_ACTION}</th>
 	</tr>
@@ -318,7 +316,6 @@
 		<tr>
 			<td><strong>{groups.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
-			<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
 			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -111,8 +111,8 @@
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
 			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="number" min="0" max="999" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<!-- IF not S_SMILIES -->
 			<td><input class="text post" type="text" name="alt[{items.IMG}]" value="{items.ALT}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
@@ -142,8 +142,8 @@
 		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
 		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
 		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="number" min="0" max="999" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
 		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
 		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -52,7 +52,7 @@
 </table>

 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" min="0" max="999" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>

--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -31,7 +31,7 @@
 </dl>
 <dl>
 	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
 	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
@@ -50,7 +50,7 @@
 <!-- ENDIF -->
 <dl>
 	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" min="0" max="99999" /></dd>
+	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
 </dl>

 </fieldset>
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -44,7 +44,7 @@
 	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
 	<dl>
 		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" min="0" max="9999999999" value="{MIN_POSTS}" /></dd>
+		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>

--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -18,11 +18,11 @@
 	</dl>
 	<dl>
 		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
 		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
@@ -30,15 +30,15 @@
 	</dl>
 	<dl>
 		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>

--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -52,7 +52,7 @@
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
-		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd>
+		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2471,7 +2471,7 @@ fieldset.permissions .padding {

 .roles-options > .dropdown {
 	left: auto;
-	top: 3.2em;
+	top: 3em;
 	width: 250px;
 }

@@ -2489,7 +2489,7 @@ fieldset.permissions .padding {
 	border-radius: 3px;
 	padding: 4px;
 	width: 250px;
-	display: none;
+	display: block;
 	background: url('../images/arrow_down.gif') no-repeat 245px .7em;
 }

@@ -2554,7 +2554,6 @@ fieldset.permissions .padding {
 #progress-bar {
 	position: relative;
 	width: 90%;
-	text-align: center;
 	height: 25px;
 	margin: 20px auto;
 	border: 1px solid #cecece;
@@ -2564,7 +2563,10 @@ fieldset.permissions .padding {
 	position: absolute;
 	top: 0;
 	width: 100%;
-	color: #000;
+	text-align: center;
+	line-height: 25px;
+	font-weight: bold;
+	color: #fff;
 }

 #progress-bar #progress-bar-filler {
@@ -2575,11 +2577,4 @@ fieldset.permissions .padding {
 	background-color: #3c84ad;
 	width: 0;
 	height: 25px;
-	overflow: hidden;
-	color: #fff;
-}
-
-#progress-bar p {
-	line-height: 25px;
-	font-weight: bold;
 }
--- a/phpBB/adm/style/installer_convert.html
+++ b/phpBB/adm/style/installer_convert.html
@@ -1,87 +0,0 @@
-<!-- INCLUDE installer_header.html -->
-<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF -->
-<!-- IF S_ERROR_BOX -->
-<div class="errorbox">
-	<h3>{ERROR_TITLE}</h3>
-	<p>{ERROR_MSG}</p>
-</div>
-<!-- ENDIF -->
-<!-- IF .errors -->
-<div id="error-container">
-<!-- BEGIN errors -->
-	<strong>{errors.TITLE}</strong>
-	<!-- IF errors.DESCRIPTION --><p>{errors.DESCRIPTION}</p><!-- ENDIF -->
-<!-- END errors -->
-</div>
-<!-- ENDIF -->
-<!-- IF BODY --><p>{BODY}</p><!-- ENDIF -->
-<!-- IF CONTENT -->{CONTENT}<!-- ENDIF -->
-<!-- IF S_CONV_IN_PROGRESS -->
-<p class="centered-text"><a href="{U_ACTION}" class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->"<!-- IF S_REFRESH --> onclick="return false;"<!-- ENDIF -->>{L_SUBMIT}</a></p>
-<!-- ENDIF -->
-<!-- IF S_CONTINUE -->
-<div id="download-wrapper" class="download-box">
-	<p class="centered-text">
-		<a href="{U_NEW_ACTION}" class="button1">{L_CONVERT_NEW_CONVERSION}</a>
-		<a href="{U_CONTINUE_ACTION}" class="button1">{L_CONTINUE_OLD_CONVERSION}</a>
-	</p>
-</div>
-<!-- ENDIF -->
-<!-- IF S_LIST -->
-<table class="table1">
-	<caption>{L_AVAILABLE_CONVERTORS}</caption>
-	<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
-	<thead>
-	<tr>
-		<th>{L_SOFTWARE}</th>
-		<th>{L_VERSION}</th>
-		<th>{L_AUTHOR}</th>
-		<th>{L_CONVERT_OPTIONS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .convertors -->
-	<!-- BEGIN convertors -->
-	<tr>
-		<td>{convertors.SOFTWARE}</td>
-		<td>{convertors.VERSION}</td>
-		<td>{convertors.AUTHOR}</td>
-		<td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td>
-	</tr>
-	<!-- END convertors -->
-	<!-- ELSE -->
-	<tr>
-		<td>{L_NO_CONVERTORS}</td>
-		<td>-</td>
-		<td>-</td>
-		<td>-</td>
-	</tr>
-	<!-- ENDIF -->
-	</tbody>
-</table>
-<!-- ENDIF -->
-<!-- IF .checks -->
-<fieldset>
-
-	<!-- BEGIN checks -->
-	<!-- IF checks.S_LEGEND -->
-	<!-- IF not checks.S_FIRST_ROW -->
-</fieldset>
-
-<fieldset>
-	<!-- ENDIF -->
-	<legend>{checks.LEGEND}</legend>
-	<!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF -->
-	<!-- ELSE -->
-
-	<dl>
-		<dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-		<dd>{checks.RESULT}</dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- END checks -->
-
-</fieldset>
-<!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
-<!-- INCLUDE installer_footer.html -->
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -11,18 +11,9 @@
 	</div>
 </div>

-<script type="text/javascript">
-<!--
-installLang = {
-	title: '{LA_TIMEOUT_DETECTED_TITLE}',
-	msg: '{LA_TIMEOUT_DETECTED_MESSAGE}'
-};
-//-->
-</script>
-
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js">\x3C/script>');</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}

--- a/phpBB/adm/style/installer_header.html
+++ b/phpBB/adm/style/installer_header.html
@@ -2,12 +2,11 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
 	<!-- IF META -->{META}<!-- ENDIF -->
 	<title>{PAGE_TITLE}</title>

-	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{T_TEMPLATE_PATH}admin.css" rel="stylesheet" type="text/css" media="screen" />
 </head>

 <body class="{S_CONTENT_DIRECTION} nojs">
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
--- a/phpBB/adm/style/installer_update.html
+++ b/phpBB/adm/style/installer_update.html
@@ -9,5 +9,5 @@
 	</fieldset>
 </form>
 <!-- ENDIF -->
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}javascript/installer.js -->
 <!-- INCLUDE installer_footer.html -->
--- a/phpBB/adm/style/installer_update_file_status.html
+++ b/phpBB/adm/style/installer_update_file_status.html
@@ -4,7 +4,7 @@
 <p>{L_FILES_DELETED_EXPLAIN}</p>

 <fieldset id="deleted">
-	<legend><img src="{T_IMAGE_PATH}/icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend>
 	<!-- BEGIN deleted -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<!-- ENDIF --><strong>{deleted.FILE_PART}</strong></dt>
@@ -20,7 +20,7 @@
 <p>{L_FILES_CONFLICT_EXPLAIN}</p>

 <fieldset id="conflict">
-	<legend><img src="{T_IMAGE_PATH}/file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend>
 	<!-- BEGIN conflict -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<!-- ENDIF --><strong>{conflict.FILE_PART}</strong></dt>
@@ -36,7 +36,7 @@
 <p>{L_FILES_MODIFIED_EXPLAIN}</p>

 <fieldset id="modified">
-	<legend><img src="{T_IMAGE_PATH}/file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend>
 	<!-- BEGIN modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF modified.DIR_PART -->{modified.DIR_PART}<!-- ENDIF --><strong>{modified.FILE_PART}</strong></dt>
@@ -52,7 +52,7 @@
 <p>{L_FILES_NEW_EXPLAIN}</p>

 <fieldset id="new_files" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_new.gif" alt="{L_STATUS_NEW}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend>
 	<!-- BEGIN new -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF new.DIR_PART -->{new.DIR_PART}<!-- ENDIF --><strong>{new.FILE_PART}</strong>
@@ -69,7 +69,7 @@
 <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>

 <fieldset id="not_modified" style="display: none;">
-	<legend><img src="{T_IMAGE_PATH}/file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
+	<legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend>
 	<!-- BEGIN not_modified -->
 	<dl>
 		<dt style="width: 100%;"><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<!-- ENDIF --><strong>{not_modified.FILE_PART}</strong></dt>
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -34,7 +34,7 @@
 </div>

 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS ajax.js -->
 <!-- INCLUDEJS admin.js -->
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
@@ -50,7 +49,7 @@ function marklist(id, name, state)
 	}

 	var rb = parent.getElementsByTagName('input');
-
+	
 	for (var r = 0; r < rb.length; r++)
 	{
 		if (rb[r].name.substr(0, name.length) == name)
@@ -104,7 +103,7 @@ function popup(url, width, height, name)
 		<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 	</div>
-
+	
 	<div id="page-body">
 		<div id="tabs">
 			<ul>
@@ -121,7 +120,7 @@ function popup(url, width, height, name)
 						<!-- DEFINE $LI_USED = 0 -->
 						<!-- BEGIN l_block1 -->
 							<!-- IF l_block1.S_SELECTED -->
-
+	
 						<!-- BEGIN l_block2 -->
 							<!-- IF .l_block1.l_block2.l_block3 -->
 							<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -130,13 +129,13 @@ function popup(url, width, height, name)
 								<ul>
 							<!-- DEFINE $LI_USED = 1 -->
 							<!-- ENDIF -->
-
+	
 							<!-- BEGIN l_block3 -->
 								<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
 								<!-- DEFINE $LI_USED = 1 -->
 							<!-- END l_block3 -->
 						<!-- END l_block2 -->
-
+						
 							<!-- ENDIF -->
 						<!-- END l_block1 -->
 						<!-- IF $LI_USED -->
@@ -144,13 +143,6 @@ function popup(url, width, height, name)
 							</div>
 						<!-- ENDIF -->
 					</div>
-
+	
 					<div id="main">
 						<div class="main">
-							{% if CONTAINER_EXCEPTION !== false %}
-							<div class="errorbox">
-								<p>{{ lang('CONTAINER_EXCEPTION') }}</p><br />
-								<p>{{ lang('EXCEPTION') }}{{ lang('COLON') }} {{ CONTAINER_EXCEPTION.getMessage() }}</p>
-								<pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
-							</div>
-							{% endif %}
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -39,19 +39,18 @@
 		</div>
 		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
-			{% if p_mask.f_mask.role_options %}
+			{% if role_options %}
 				<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
 					<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
-						<select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]">{p_mask.f_mask.S_ROLE_OPTIONS}</select>
 						<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
 						<div class="dropdown hidden">
 							<ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" >
-								{% for role in p_mask.f_mask.role_options %}
+								{% for role in loops.role_options %}
 									<li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li>
 								{% endfor %}
 							</ul>
 						</div>
-						<input type="hidden" data-name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if p_mask.f_mask.S_ROLE_ID %}value="{{ p_mask.f_mask.S_ROLE_ID }}"{% endif %} />
+						<input type="hidden" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]"{% if S_ROLE_ID %}value="{{ S_ROLE_ID }}"{% endif %} />
 					</div>
 				</dd>
 			{% else %}
--- a/phpBB/adm/style/simple_footer.html
+++ b/phpBB/adm/style/simple_footer.html
@@ -17,7 +17,7 @@
 </div>

 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
-<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>

 <!-- EVENT acp_simple_footer_after -->
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -2,7 +2,6 @@
 <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <!-- IF META -->{META}<!-- ENDIF -->
 <title>{PAGE_TITLE}</title>
--- a/phpBB/adm/style/tooltip.js
+++ b/phpBB/adm/style/tooltip.js
@@ -141,43 +141,20 @@ phpbb.positionTooltip = function ($element) {
 */
 phpbb.prepareRolesDropdown = function () {
 	var $options = $('.roles-options li');
-
-	// Display span and hide select
-	$('.roles-options > span').css('display', 'block');
-	$('.roles-options > select').hide();
-	$('.roles-options > input[type=hidden]').each(function () {
-		var $this = $(this);
-
-		if ($this.attr('data-name') && !$this.attr('name')) {
-			$this.attr('name', $this.attr('data-name'));
-		}
-	});
+	var $rolesOptions = $options.closest('.roles-options');
+	var $span = $rolesOptions.children('span');

 	// Prepare highlighting of select options and settings update
 	$options.each(function () {
 		var $this = $(this);
-		var $rolesOptions = $this.closest('.roles-options');
-		var $span = $rolesOptions.children('span');

 		// Correctly show selected option
 		if (typeof $this.attr('data-selected') !== 'undefined') {
-			$rolesOptions
+			$rolesOptions.closest('.roles-options')
 				.children('span')
 				.text($this.text())
 				.attr('data-default', $this.text())
 				.attr('data-default-val', $this.attr('data-id'));
-
-			// Save default text of drop down if there is no default set yet
-			if (typeof $span.attr('data-default') === 'undefined') {
-				$span.attr('data-default', $span.text());
-			}
-
-			// Prepare resetting drop down on form reset
-			$this.closest('form').on('reset', function () {
-				$span.text($span.attr('data-default'));
-				$rolesOptions.children('input[type=hidden]')
-					.val($span.attr('data-default-val'));
-			});
 		}

 		$this.on('mouseover', function () {
@@ -186,7 +163,6 @@ phpbb.prepareRolesDropdown = function () {
 			$this.addClass('roles-highlight');
 		}).on('click', function () {
 			var $this = $(this);
-			var $rolesOptions = $this.closest('.roles-options');

 			// Update settings
 			set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
@@ -202,6 +178,19 @@ phpbb.prepareRolesDropdown = function () {
 			$('body').trigger('click');
 		});
 	});
+
+	// Save default text of drop down if there is no default set yet
+	if (typeof $span.attr('data-default') === 'undefined') {
+		$span.attr('data-default', $span.text());
+	}
+
+	// Prepare resetting drop down on form reset
+	$options.closest('form').on('reset', function () {
+		$span.text($span.attr('data-default'));
+		$rolesOptions.children('input[type=hidden]')
+			.val($span.attr('data-id'));
+	});
+
 };

 // Run onload functions for RolesDropdown and tooltips
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1032,7 +1032,7 @@ phpbb.resizeTextArea = function($items, options) {

 	function autoResize(item) {
 		function setHeight(height) {
-			height += parseInt($item.css('height'), 10) - $item.innerHeight();
+			height += parseInt($item.css('height'), 10) - $item.height();
 			$item
 				.css({ height: height + 'px', resize: 'none' })
 				.addClass('auto-resized');
@@ -1051,7 +1051,7 @@ phpbb.resizeTextArea = function($items, options) {
 				configuration.maxHeight
 			),
 			$item = $(item),
-			height = parseInt($item.innerHeight(), 10),
+			height = parseInt($item.height(), 10),
 			scrollHeight = (item.scrollHeight) ? item.scrollHeight : 0;

 		if (height < 0) {
@@ -1541,13 +1541,6 @@ phpbb.toggleSelectSettings = function(el) {
 		var $this = $(this),
 			$setting = $($this.data('toggle-setting'));
 		$setting.toggle($this.is(':selected'));
-
-		// Disable any input elements that are not visible right now
-		if ($this.is(':selected')) {
-			$($this.data('toggle-setting') + ' input').prop('disabled', false);
-		} else {
-			$($this.data('toggle-setting') + ' input').prop('disabled', true);
-		}
 	});
 };

--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -414,12 +414,6 @@ function getCaretPosition(txtarea) {
 		if ($('#attach-panel').length) {
 			phpbb.showDragNDrop(textarea);
 		}
-
-		$('textarea').on('keydown', function (e) {
-			if (e.which === 13 && (e.metaKey || e.ctrlKey)) {
-				$(this).closest('form').submit();
-			}
-		});
 	});
 })(jQuery);

--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -12,8 +12,6 @@
 	var progressTimer = null;
 	var currentProgress = 0;
 	var refreshRequested = false;
-	var transmissionOver = false;
-	var statusCount = 0;

 	// Template related variables
 	var $contentWrapper = $('.install-body').find('.main');
@@ -179,7 +177,7 @@
 	 * @param progressObject
 	 */
 	function setProgress(progressObject) {
-		var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
+		var $statusText, $progressBar, $progressText, $progressFiller;

 		if (progressObject.task_name.length) {
 			if (!progressBarTriggered) {
@@ -191,34 +189,27 @@
 				$progressBar.attr('id', 'progress-bar');
 				$progressText = $('<p />');
 				$progressText.attr('id', 'progress-bar-text');
-				$progressFiller = $('<div />');
+				$progressFiller = $('<span />');
 				$progressFiller.attr('id', 'progress-bar-filler');
-				$progressFillerText = $('<p />');
-				$progressFillerText.attr('id', 'progress-bar-filler-text');
+				$progressFiller.html($progressText);

 				$statusText = $('<p />');
 				$statusText.attr('id', 'progress-status-text');

-				$progressFiller.append($progressFillerText);
-				$progressBar.append($progressText);
 				$progressBar.append($progressFiller);

 				$progressBarWrapper.append($statusText);
 				$progressBarWrapper.append($progressBar);

-				$progressFillerText.css('width', $progressBar.width());
-
 				progressBarTriggered = true;
 			} else if (progressObject.hasOwnProperty('restart')) {
 				clearInterval(progressTimer);

 				$progressFiller = $('#progress-bar-filler');
-				$progressFillerText = $('#progress-bar-filler-text');
 				$progressText = $('#progress-bar-text');
 				$statusText = $('#progress-status-text');

 				$progressText.text('0%');
-				$progressFillerText.text('0%');
 				$progressFiller.css('width', '0%');

 				currentProgress = 0;
@@ -245,22 +236,6 @@
 		}
 	}

-	// Redirects user
-	function redirect(url, use_ajax) {
-		if (use_ajax) {
-			resetPolling();
-
-			var xhReq = createXhrObject();
-			xhReq.open('GET', url, true);
-			xhReq.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-			xhReq.send();
-
-			startPolling(xhReq);
-		} else {
-			window.location.href = url;
-		}
-	}
-
 	/**
 	 * Parse messages from the response object
 	 *
@@ -327,67 +302,6 @@
 		if (responseObject.hasOwnProperty('refresh')) {
 			refreshRequested = true;
 		}
-
-		if (responseObject.hasOwnProperty('redirect')) {
-			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
-		}
-
-		if (responseObject.hasOwnProperty('over')) {
-			if (responseObject.over) {
-				transmissionOver = true;
-			}
-		}
-	}
-
-	/**
-	 * Processes status data
-	 *
-	 * @param status
-	 */
-	function processTimeoutResponse(status) {
-		if (statusCount === 12) { // 1 minute hard cap
-			status = 'fail';
-		}
-
-		if (status === 'continue') {
-			refreshRequested = false;
-			doRefresh();
-		} else if (status === 'running') {
-			statusCount++;
-			$('#loading_indicator').css('display', 'block');
-			setTimeout(queryInstallerStatus, 5000);
-		} else {
-			$('#loading_indicator').css('display', 'none');
-			addMessage('error',
-				[{
-					title: installLang.title,
-					description: installLang.msg
-				}]
-			);
-		}
-	}
-
-	/**
-	 * Queries the installer's status
-	 */
-	function queryInstallerStatus() {
-		var url = $(location).attr('pathname');
-		var lookUp = 'install/app.php';
-		var position = url.indexOf(lookUp);
-
-		if (position === -1) {
-			lookUp = 'install';
-			position = url.indexOf(lookUp);
-
-			if (position === -1) {
-				return false;
-			}
-		}
-
-		url = url.substring(0, position) + lookUp + '/installer/status';
-		$.getJSON(url, function(data) {
-			processTimeoutResponse(data.status);
-		});
 	}

 	/**
@@ -416,17 +330,10 @@
 			$('#loading_indicator').css('display', 'none');
 			resetPolling();

-			var timeoutDetected = !transmissionOver;
-
 			if (refreshRequested) {
 				refreshRequested = false;
 				doRefresh();
 			}
-
-			if (timeoutDetected) {
-				statusCount = 0;
-				queryInstallerStatus();
-			}
 		}
 	}

@@ -435,20 +342,15 @@
 	 *
 	 * @param $progressText
 	 * @param $progressFiller
-	 * @param $progressFillerText
 	 * @param progressLimit
 	 */
-	function incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit) {
+	function incrementFiller($progressText, $progressFiller, progressLimit) {
 		if (currentProgress >= progressLimit || currentProgress >= 100) {
 			clearInterval(progressTimer);
 			return;
 		}

-		var $progressBar = $('#progress-bar');
-
 		currentProgress++;
-		$progressFillerText.css('width', $progressBar.width());
-		$progressFillerText.text(currentProgress + '%');
 		$progressText.text(currentProgress + '%');
 		$progressFiller.css('width', currentProgress + '%');
 	}
@@ -460,14 +362,13 @@
 	 */
 	function incrementProgressBar(progressLimit) {
 		var $progressFiller = $('#progress-bar-filler');
-		var $progressFillerText = $('#progress-bar-filler-text');
 		var $progressText = $('#progress-bar-text');
 		var progressStart = $progressFiller.width() / $progressFiller.offsetParent().width() * 100;
 		currentProgress = Math.floor(progressStart);

 		clearInterval(progressTimer);
 		progressTimer = setInterval(function() {
-			incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
+			incrementFiller($progressText, $progressFiller, progressLimit);
 		}, 10);
 	}

@@ -486,7 +387,6 @@
 	 */
 	function startPolling(xhReq) {
 		resetPolling();
-		transmissionOver = false;
 		pollTimer = setInterval(function () {
 			pollContent(xhReq);
 		}, 250);
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -68,12 +68,8 @@ $phpbb_container = $phpbb_container_builder->get_container();
 $phpbb_container->get('request')->enable_super_globals();
 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);

-register_compatibility_globals();
-
 /* @var $user \phpbb\user */
 $user = $phpbb_container->get('user');
-$user->data['user_id'] = ANONYMOUS;
-$user->ip = '127.0.0.1';
 $user->add_lang('acp/common');
 $user->add_lang('cli');

--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -43,13 +43,7 @@ if (!defined('PHPBB_INSTALLED'))
 	// available as used by the redirect function
 	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
 	$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
-	$secure = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 1 : 0;
-
-	if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
-	{
-		$secure = 1;
-		$server_port = 443;
-	}
+	$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;

 	$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
 	if (!$script_name)
@@ -96,14 +90,8 @@ include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);

-if (PHPBB_ENVIRONMENT === 'development')
-{
-	\phpbb\debug\debug::enable();
-}
-else
-{
-	set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
-}
+// Set PHP error handler to ours
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');

 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
@@ -116,17 +104,10 @@ try
 }
 catch (InvalidArgumentException $e)
 {
-	if (PHPBB_ENVIRONMENT !== 'development')
-	{
-		trigger_error(
-			'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
-			E_USER_ERROR
-		);
-	}
-	else
-	{
-		throw $e;
-	}
+	trigger_error(
+		'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.',
+		E_USER_ERROR
+	);
 }

 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
@@ -134,8 +115,6 @@ $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));

 require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);

-register_compatibility_globals();
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -27,31 +27,27 @@
 	"require": {
 		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
-		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~5.3",
-		"lusitanian/oauth": "^0.8.1",
+	  	"google/recaptcha": "~1.1",
+		"lusitanian/oauth": "0.2.*",
 		"marc1706/fast-image-size": "1.1.*",
-		"paragonie/random_compat": "^1.2",
 		"patchwork/utf8": "1.1.*",
-		"s9e/text-formatter": "^0.4.2",
+		"s9e/text-formatter": "dev-release/php5.3",
 		"symfony/config": "2.8.*",
 		"symfony/console": "2.8.*",
-		"symfony/debug": "2.8.*",
 		"symfony/dependency-injection": "2.8.*",
 		"symfony/event-dispatcher": "2.8.*",
 		"symfony/filesystem": "2.8.*",
 		"symfony/finder": "2.8.*",
-		"symfony/http-foundation": "2.8.*",
 		"symfony/http-kernel": "2.8.*",
-		"symfony/proxy-manager-bridge": "2.8.*",
 		"symfony/routing": "2.8.*",
+		"symfony/security-core": "2.8.*",
+		"symfony/security-csrf": "2.8.*",
 		"symfony/twig-bridge": "2.8.*",
 		"symfony/yaml": "2.8.*",
 		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "~2.0",
-		"facebook/webdriver": "~1.1",
+		"fabpot/goutte": "1.0.*",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",
@@ -59,16 +55,9 @@
 		"squizlabs/php_codesniffer": "2.*",
 		"symfony/browser-kit": "2.8.*",
 		"symfony/css-selector": "2.8.*",
-		"symfony/dom-crawler": "2.8.*"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.2.x-dev"
-		}
-	},
-	"config": {
-		"platform": {
-			"php": "5.4"
-		}
+		"symfony/debug": "2.8.*",
+		"symfony/dom-crawler": "2.8.*",
+		"symfony/http-foundation": "2.8.*",
+		"symfony/process": "2.8.*"
 	}
 }
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -161,7 +161,7 @@ services:

    version_helper:
        class: phpbb\version_helper
-        shared: false
+        scope: prototype
        arguments:
            - '@cache'
            - '@config'
--- a/phpBB/config/default/container/services_attachment.yml
+++ b/phpBB/config/default/container/services_attachment.yml
@@ -1,7 +1,7 @@
 services:
    attachment.delete:
        class: phpbb\attachment\delete
-        shared: false
+        scope: prototype
        arguments:
            - '@config'
            - '@dbal.conn'
@@ -12,7 +12,7 @@ services:

    attachment.manager:
        class: phpbb\attachment\manager
-        shared: false
+        scope: prototype
        arguments:
            - '@attachment.delete'
            - '@attachment.resync'
@@ -20,13 +20,13 @@ services:

    attachment.resync:
        class: phpbb\attachment\resync
-        shared: false
+        scope: prototype
        arguments:
            - '@dbal.conn'

    attachment.upload:
        class: phpbb\attachment\upload
-        shared: false
+        scope: prototype
        arguments:
            - '@auth'
            - '@cache'
--- a/phpBB/config/default/container/services_auth.yml
+++ b/phpBB/config/default/container/services_auth.yml
@@ -58,7 +58,6 @@ services:
            - '@request'
            - '@user'
            - '%tables.auth_provider_oauth_token_storage%'
-            - '%tables.auth_provider_oauth_states%'
            - '%tables.auth_provider_oauth_account_assoc%'
            - '@auth.provider.oauth.service_collection'
            - '%tables.users%'
--- a/phpBB/config/default/container/services_captcha.yml
+++ b/phpBB/config/default/container/services_captcha.yml
@@ -6,7 +6,7 @@ services:
            - '@captcha.plugins.service_collection'

 # ----- Captcha plugins -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
    captcha.plugins.service_collection:
        class: phpbb\di\service_collection
        arguments:
@@ -16,7 +16,7 @@ services:

    core.captcha.plugins.gd:
        class: phpbb\captcha\plugins\gd
-        shared: false
+        scope: prototype
        calls:
            - [set_name, [core.captcha.plugins.gd]]
        tags:
@@ -24,7 +24,7 @@ services:

    core.captcha.plugins.gd_wave:
        class: phpbb\captcha\plugins\gd_wave
-        shared: false
+        scope: prototype
        calls:
            - [set_name, [core.captcha.plugins.gd_wave]]
        tags:
@@ -32,7 +32,7 @@ services:

    core.captcha.plugins.nogd:
        class: phpbb\captcha\plugins\nogd
-        shared: false
+        scope: prototype
        calls:
            - [set_name, [core.captcha.plugins.nogd]]
        tags:
@@ -40,7 +40,7 @@ services:

    core.captcha.plugins.qa:
        class: phpbb\captcha\plugins\qa
-        shared: false
+        scope: prototype
        arguments:
            - '%tables.captcha_qa_questions%'
            - '%tables.captcha_qa_answers%'
@@ -52,7 +52,7 @@ services:

    core.captcha.plugins.recaptcha:
        class: phpbb\captcha\plugins\recaptcha
-        shared: false
+        scope: prototype
        calls:
            - [set_name, [core.captcha.plugins.recaptcha]]
        tags:
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -219,53 +219,3 @@ services:
            - '@user'
        tags:
            - { name: console.command }
-
-    console.command.user.activate:
-        class: phpbb\console\command\user\activate
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@log'
-            - '@notification_manager'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.add:
-        class: phpbb\console\command\user\add
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@config'
-            - '@language'
-            - '@passwords.manager'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.delete:
-        class: phpbb\console\command\user\delete
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-            - '@log'
-            - '@user_loader'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: console.command }
-
-    console.command.user.reclean:
-        class: phpbb\console\command\user\reclean
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@language'
-        tags:
-            - { name: console.command }
--- a/phpBB/config/default/container/services_cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
@@ -75,7 +75,6 @@ services:
            - '%core.root_path%'
            - '%core.php_ext%'
            - '@config'
-            - '%core.cache_dir%'
        calls:
            - [set_name, [cron.task.core.queue]]
        tags:
@@ -107,8 +106,6 @@ services:
        arguments:
            - '%core.root_path%'
            - '@config'
-            - '@log'
-            - '@user'
        calls:
            - [set_name, [cron.task.core.tidy_plupload]]
        tags:
--- a/phpBB/config/default/container/services_db.yml
+++ b/phpBB/config/default/container/services_db.yml
@@ -31,10 +31,10 @@ services:
        factory: ['@dbal.extractor.factory', get]

 # ----- DB Extractors for different drivers -----
-# Service MUST NOT be shared for all the handlers to work correctly.
+# Scope MUST be prototype for all the handlers to work correctly.
    dbal.extractor.extractors.mssql_extractor:
        class: phpbb\db\extractor\mssql_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
@@ -42,7 +42,7 @@ services:

    dbal.extractor.extractors.mysql_extractor:
        class: phpbb\db\extractor\mysql_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
@@ -50,7 +50,7 @@ services:

    dbal.extractor.extractors.oracle_extractor:
        class: phpbb\db\extractor\oracle_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
@@ -58,7 +58,7 @@ services:

    dbal.extractor.extractors.postgres_extractor:
        class: phpbb\db\extractor\postgres_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
@@ -66,7 +66,7 @@ services:

    dbal.extractor.extractors.sqlite3_extractor:
        class: phpbb\db\extractor\sqlite3_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
@@ -74,7 +74,7 @@ services:

    dbal.extractor.extractors.sqlite_extractor:
        class: phpbb\db\extractor\sqlite_extractor
-        shared: false
+        scope: prototype
        arguments:
            - '%core.root_path%'
            - '@request'
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -23,7 +23,7 @@ services:

    feed.forum:
        class: phpbb\feed\forum
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -36,7 +36,7 @@ services:

    feed.forums:
        class: phpbb\feed\forums
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -49,7 +49,7 @@ services:

    feed.news:
        class: phpbb\feed\news
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -62,7 +62,7 @@ services:

    feed.overall:
        class: phpbb\feed\overall
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -75,7 +75,7 @@ services:

    feed.topic:
        class: phpbb\feed\topic
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -88,7 +88,7 @@ services:

    feed.topics:
        class: phpbb\feed\topics
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
@@ -101,7 +101,7 @@ services:

    feed.topics_active:
        class: phpbb\feed\topics_active
-        shared: false
+        scope: prototype
        arguments:
            - '@feed.helper'
            - '@config'
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -6,7 +6,7 @@ services:

    files.filespec:
        class: phpbb\files\filespec
-        shared: false
+        scope: prototype
        arguments:
            - '@filesystem'
            - '@language'
@@ -18,7 +18,7 @@ services:

    files.upload:
        class: phpbb\files\upload
-        shared: false
+        scope: prototype
        arguments:
            - '@filesystem'
            - '@files.factory'
@@ -28,7 +28,7 @@ services:

    files.types.form:
        class: phpbb\files\types\form
-        shared: false
+        scope: prototype
        arguments:
            - '@files.factory'
            - '@language'
@@ -38,7 +38,7 @@ services:

    files.types.local:
        class: phpbb\files\types\form
-        shared: false
+        scope: prototype
        arguments:
            - '@files.factory'
            - '@language'
@@ -47,9 +47,8 @@ services:

    files.types.remote:
        class: phpbb\files\types\remote
-        shared: false
+        scope: prototype
        arguments:
-            - '@config'
            - '@files.factory'
            - '@language'
            - '@php_ini'
--- a/phpBB/config/default/container/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -15,7 +15,7 @@ services:
            - '%tables.user_notifications%'

 # ----- Notification's types -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
    notification.type_collection:
        class: phpbb\di\service_collection
        arguments:
@@ -36,7 +36,7 @@ services:

    notification.type.admin_activate_user:
        class: phpbb\notification\type\admin_activate_user
-        shared: false
+        scope: prototype
        parent: notification.type.base
        calls:
            - [set_user_loader, ['@user_loader']]
@@ -46,42 +46,42 @@ services:

    notification.type.approve_post:
        class: phpbb\notification\type\approve_post
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.approve_topic:
        class: phpbb\notification\type\approve_topic
-        shared: false
+        scope: prototype
        parent: notification.type.topic
        tags:
            - { name: notification.type }

    notification.type.bookmark:
        class: phpbb\notification\type\bookmark
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.disapprove_post:
        class: phpbb\notification\type\disapprove_post
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.disapprove_topic:
        class: phpbb\notification\type\disapprove_topic
-        shared: false
+        scope: prototype
        parent: notification.type.topic
        tags:
            - { name: notification.type }

    notification.type.group_request:
        class: phpbb\notification\type\group_request
-        shared: false
+        scope: prototype
        parent: notification.type.base
        calls:
            - [set_user_loader, ['@user_loader']]
@@ -90,14 +90,14 @@ services:

    notification.type.group_request_approved:
        class: phpbb\notification\type\group_request_approved
-        shared: false
+        scope: prototype
        parent: notification.type.base
        tags:
            - { name: notification.type }

    notification.type.pm:
        class: phpbb\notification\type\pm
-        shared: false
+        scope: prototype
        parent: notification.type.base
        calls:
            - [set_user_loader, ['@user_loader']]
@@ -107,7 +107,7 @@ services:

    notification.type.post:
        class: phpbb\notification\type\post
-        shared: false
+        scope: prototype
        parent: notification.type.base
        calls:
            - [set_user_loader, ['@user_loader']]
@@ -117,14 +117,14 @@ services:

    notification.type.post_in_queue:
        class: phpbb\notification\type\post_in_queue
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.quote:
        class: phpbb\notification\type\quote
-        shared: false
+        scope: prototype
        parent: notification.type.post
        calls:
            - [set_utils, ['@text_formatter.utils']]
@@ -133,35 +133,35 @@ services:

    notification.type.report_pm:
        class: phpbb\notification\type\report_pm
-        shared: false
+        scope: prototype
        parent: notification.type.pm
        tags:
            - { name: notification.type }

    notification.type.report_pm_closed:
        class: phpbb\notification\type\report_pm_closed
-        shared: false
+        scope: prototype
        parent: notification.type.pm
        tags:
            - { name: notification.type }

    notification.type.report_post:
        class: phpbb\notification\type\report_post
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.report_post_closed:
        class: phpbb\notification\type\report_post_closed
-        shared: false
+        scope: prototype
        parent: notification.type.post
        tags:
            - { name: notification.type }

    notification.type.topic:
        class: phpbb\notification\type\topic
-        shared: false
+        scope: prototype
        parent: notification.type.base
        calls:
            - [set_user_loader, ['@user_loader']]
@@ -171,13 +171,13 @@ services:

    notification.type.topic_in_queue:
        class: phpbb\notification\type\topic_in_queue
-        shared: false
+        scope: prototype
        parent: notification.type.topic
        tags:
            - { name: notification.type }

 # ----- Notification's methods -----
-# Service MUST NOT be shared for all the plugins to work.
+# Scope MUST be prototype for all the plugins to work.
    notification.method_collection:
        class: phpbb\di\service_collection
        arguments:
@@ -187,7 +187,7 @@ services:

    notification.method.board:
        class: phpbb\notification\method\board
-        shared: false
+        scope: prototype # scope MUST be prototype for this to work!
        arguments:
            - '@user_loader'
            - '@dbal.conn'
@@ -201,7 +201,7 @@ services:

    notification.method.email:
        class: phpbb\notification\method\email
-        shared: false
+        scope: prototype
        arguments:
            - '@user_loader'
            - '@user'
@@ -213,7 +213,7 @@ services:

    notification.method.jabber:
        class: phpbb\notification\method\jabber
-        shared: false
+        scope: prototype
        arguments:
            - '@user_loader'
            - '@user'
--- a/phpBB/config/default/container/services_report.yml
+++ b/phpBB/config/default/container/services_report.yml
@@ -29,10 +29,10 @@ services:
            - '@user'

 # ----- Report handlers -----
-# Service MUST NOT be shared for all the handlers to work correctly.
+# Scope MUST be prototype for all the handlers to work correctly.
    phpbb.report.handlers.report_handler_pm:
        class: phpbb\report\report_handler_pm
-        shared: false
+        scope: prototype
        arguments:
            - '@dbal.conn.driver'
            - '@dispatcher'
@@ -43,7 +43,7 @@ services:

    phpbb.report.handlers.report_handler_post:
        class: phpbb\report\report_handler_post
-        shared: false
+        scope: prototype
        arguments:
            - '@dbal.conn.driver'
            - '@dispatcher'
--- a/phpBB/config/default/container/services_routing.yml
+++ b/phpBB/config/default/container/services_routing.yml
@@ -5,8 +5,9 @@ services:
            - '@service_container'
            - '@routing.chained_resources_locator'
            - '@routing.delegated_loader'
+            - '%core.root_path%'
            - '%core.php_ext%'
-            - '%core.cache_dir%'
+            - '%core.environment%'

    router.listener:
        class: Symfony\Component\HttpKernel\EventListener\RouterListener
--- a/phpBB/config/default/container/services_text_formatter.yml
+++ b/phpBB/config/default/container/services_text_formatter.yml
@@ -1,5 +1,5 @@
 parameters:
-    text_formatter.cache.dir: '%core.cache_dir%'
+    text_formatter.cache.dir: '%core.root_path%cache/%core.environment%/'
    text_formatter.cache.parser.key: _text_formatter_parser
    text_formatter.cache.renderer.key: _text_formatter_renderer

@@ -33,14 +33,10 @@ services:
            - '@cache.driver'
            - '@dispatcher'
            - '@config'
-            - '@text_formatter.s9e.link_helper'
            - '%text_formatter.cache.dir%'
            - '%text_formatter.cache.parser.key%'
            - '%text_formatter.cache.renderer.key%'

-    text_formatter.s9e.link_helper:
-        class: phpbb\textformatter\s9e\link_helper
-
    text_formatter.s9e.parser:
        class: phpbb\textformatter\s9e\parser
        arguments:
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -1,5 +1,5 @@
 parameters:
-    core.template.cache_path: '%core.cache_dir%twig/'
+    core.template.cache_path: '%core.root_path%cache/%core.environment%/twig/'

 services:
    template.twig.environment:
@@ -8,16 +8,14 @@ services:
            - '@config'
            - '@filesystem'
            - '@path_helper'
+            - '@service_container'
            - '%core.template.cache_path%'
            - '@ext.manager'
            - '@template.twig.loader'
            - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]

    template.twig.lexer:
        class: phpbb\template\twig\lexer
-        lazy: true
        arguments:
            - '@template.twig.environment'

--- a/phpBB/config/default/container/tables.yml
+++ b/phpBB/config/default/container/tables.yml
@@ -6,7 +6,6 @@ parameters:
    tables.acl_users: '%core.table_prefix%acl_users'
    tables.attachments: '%core.table_prefix%attachments'
    tables.auth_provider_oauth_token_storage: '%core.table_prefix%oauth_tokens'
-    tables.auth_provider_oauth_states: '%core.table_prefix%oauth_states'
    tables.auth_provider_oauth_account_assoc: '%core.table_prefix%oauth_accounts'
    tables.banlist: '%core.table_prefix%banlist'
    tables.bbcodes: '%core.table_prefix%bbcodes'
--- a/phpBB/config/installer/container/services.yml
+++ b/phpBB/config/installer/container/services.yml
@@ -12,14 +12,12 @@ services:
    cache.driver:
        class: '%cache.driver.class%'
        arguments:
-            - '%core.cache_dir%'
+            - '%core.root_path%/cache/installer/'

    config:
        class: phpbb\config\config
        arguments:
-            -
-                rand_seed: 'installer_seed'
-                rand_seed_last_update: 0
+            - []

    controller.resolver:
        class: phpbb\controller\resolver
@@ -81,12 +79,11 @@ services:
            - '@config'
            - '@filesystem'
            - '@path_helper'
+            - '@service_container'
            - '%core.template.cache_path%'
            - null
            - '@template.twig.loader'
            - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]

    console.exception_subscriber:
        class: phpbb\console\exception_subscriber
--- a/phpBB/config/installer/container/services_install_console.yml
+++ b/phpBB/config/installer/container/services_install_console.yml
@@ -21,6 +21,7 @@ services:
        arguments:
            - '@language'
            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
        tags:
            - { name: console.installer.command }

@@ -30,32 +31,6 @@ services:
        arguments:
            - '@language'
            - '@installer.helper.iohandler_factory'
-        tags:
-            - { name: console.installer.command }
-
-    console.updater.command.update:
-        class: phpbb\install\console\command\update\update
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
-            - '@installer.installer.update'
-            - '@installer.helper.install_helper'
-        tags:
-            - { name: console.installer.command }
-
-    console.updater.command.config.show:
-        class: phpbb\install\console\command\update\config\show
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
-        tags:
-            - { name: console.installer.command }
-
-
-    console.updater.command.config.validate:
-        class: phpbb\install\console\command\update\config\validate
-        arguments:
-            - '@language'
-            - '@installer.helper.iohandler_factory'
+            - '@installer.installer.install'
        tags:
            - { name: console.installer.command }
--- a/phpBB/config/installer/container/services_install_controller.yml
+++ b/phpBB/config/installer/container/services_install_controller.yml
@@ -49,25 +49,3 @@ services:
        class: phpbb\install\controller\archive_download
        arguments:
            - '@installer.helper.config'
-
-    phpbb.installer.controller.convert:
-        class: phpbb\convert\controller\convertor
-        arguments:
-            - '@cache.driver'
-            - '@installer.helper.container_factory'
-            - '@installer.helper.database'
-            - '@phpbb.installer.controller.helper'
-            - '@installer.helper.install_helper'
-            - '@installer.helper.iohandler_factory'
-            - '@language'
-            - '@installer.navigation.provider'
-            - '@request'
-            - '@template'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-
-    phpbb.installer.controller.status:
-        class: phpbb\install\controller\timeout_check
-        arguments:
-            - '@phpbb.installer.controller.helper'
-            - '%core.root_path%'
--- a/phpBB/config/installer/container/services_install_data.yml
+++ b/phpBB/config/installer/container/services_install_data.yml
@@ -23,7 +23,6 @@ services:
    installer.install_data.add_modules:
        class: phpbb\install\module\install_data\task\add_modules
        arguments:
-            - '@installer.helper.config'
            - '@installer.helper.iohandler'
            - '@installer.helper.container_factory'
        tags:
--- a/phpBB/config/installer/container/services_install_database.yml
+++ b/phpBB/config/installer/container/services_install_database.yml
@@ -1,35 +1,15 @@
 services:
-    installer.install_database.create_schema_file:
-        class: phpbb\install\module\install_database\task\create_schema_file
-        arguments:
-            - '@installer.helper.config'
-            - '@installer.helper.database'
-            - '@filesystem'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: install_database_install, order: 10 }
-
-    installer.install_database.set_up_database:
-        class: phpbb\install\module\install_database\task\set_up_database
+    installer.install_database.create_schema:
+        class: phpbb\install\module\install_database\task\create_schema
        arguments:
            - '@installer.helper.config'
            - '@installer.helper.database'
            - '@filesystem'
            - '@installer.helper.iohandler'
            - '%core.root_path%'
+            - '%core.php_ext%'
        tags:
-            - { name: install_database_install, order: 20 }
-
-    installer.install_database.add_tables:
-        class: phpbb\install\module\install_database\task\add_tables
-        arguments:
-            - '@installer.helper.config'
-            - '@installer.helper.database'
-            - '@filesystem'
-            - '%core.root_path%'
-        tags:
-            - { name: install_database_install, order: 30 }
+            - { name: install_database_install, order: 10 }

    installer.install_database.add_default_data:
        class: phpbb\install\module\install_database\task\add_default_data
@@ -41,7 +21,7 @@ services:
            - '@language'
            - '%core.root_path%'
        tags:
-            - { name: install_database_install, order: 40 }
+            - { name: install_database_install, order: 20 }

    installer.install_database.add_config_settings:
        class: phpbb\install\module\install_database\task\add_config_settings
@@ -53,7 +33,7 @@ services:
            - '@language'
            - '%core.root_path%'
        tags:
-            - { name: install_database_install, order: 50 }
+            - { name: install_database_install, order: 30 }

    installer.module.install_database_collection:
        class: phpbb\di\ordered_service_collection
--- a/phpBB/config/installer/container/services_install_finish.yml
+++ b/phpBB/config/installer/container/services_install_finish.yml
@@ -2,7 +2,6 @@ services:
    installer.install_finish.populate_migrations:
        class: phpbb\install\module\install_finish\task\populate_migrations
        arguments:
-            - '@installer.helper.config'
            - '@installer.helper.container_factory'
        tags:
            - { name: install_finish, order: 10 }
@@ -26,7 +25,7 @@ services:
            - { name: service_collection, tag: install_finish, class_name_aware: true }

    installer.module.finish_install:
-        class: phpbb\install\module\install_finish\module
+        class: phpbb\install\module\install_filesystem\module
        parent: installer.module_base
        arguments:
            - '@installer.module.install_finish_collection'
--- a/phpBB/config/installer/container/services_install_navigation.yml
+++ b/phpBB/config/installer/container/services_install_navigation.yml
@@ -13,7 +13,7 @@ services:

    installer.navigation.main_navigation:
        class: phpbb\install\helper\navigation\main_navigation
-        shared: false
+        scope: prototype
        tags:
            - { name: installer.navigation }

@@ -21,7 +21,7 @@ services:
        class: phpbb\install\helper\navigation\install_navigation
        arguments:
            - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
        tags:
            - { name: installer.navigation }

@@ -29,14 +29,7 @@ services:
        class: phpbb\install\helper\navigation\update_navigation
        arguments:
            - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
        tags:
            - { name: installer.navigation }

-    installer.navigation.convertor_navigation:
-        class: phpbb\install\helper\navigation\convertor_navigation
-        arguments:
-            - '@installer.helper.install_helper'
-        shared: false
-        tags:
-            - { name: installer.navigation }
--- a/phpBB/config/installer/container/services_installer.yml
+++ b/phpBB/config/installer/container/services_installer.yml
@@ -47,7 +47,6 @@ services:
            - '@request'
            - '@template'
            - '@router'
-            - '%core.root_path%'

    installer.helper.iohandler_cli:
        class: phpbb\install\helper\iohandler\cli_iohandler
@@ -90,7 +89,6 @@ services:
            - '@cache.driver'
            - '@installer.helper.config'
            - '@path_helper'
-            - '@installer.helper.container_factory'

    installer.install.module_collection:
        class: phpbb\di\ordered_service_collection
@@ -110,10 +108,8 @@ services:
        parent: installer.installer.abstract
        calls:
            - [set_modules, ['@installer.install.module_collection']]
-            - [set_purge_cache_before, [false]]

    installer.installer.update:
        parent: installer.installer.abstract
        calls:
            - [set_modules, ['@installer.update.module_collection']]
-            - [set_purge_cache_before, [true]]
--- a/phpBB/config/installer/container/services_update_requirements.yml
+++ b/phpBB/config/installer/container/services_update_requirements.yml
@@ -15,7 +15,6 @@ services:
        arguments:
            - '@installer.helper.container_factory'
            - '@filesystem'
-            - '@installer.helper.config'
            - '@installer.helper.iohandler'
            - '@installer.helper.update_helper'
            - '%core.root_path%'
--- a/phpBB/config/installer/routing/installer.yml
+++ b/phpBB/config/installer/routing/installer.yml
@@ -35,33 +35,3 @@ phpbb_installer_update_conflict_download:
    path: /download/conflict
    defaults:
        _controller: phpbb.installer.controller.file_downloader:conflict_archive
-
-phpbb_convert_intro:
-    path: /convert/{start_new}
-    defaults:
-        _controller: phpbb.installer.controller.convert:intro
-        start_new: 0
-
-phpbb_convert_settings:
-    path: /convert/settings/{convertor}
-    defaults:
-        _controller: phpbb.installer.controller.convert:settings
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_convert:
-    path: /convert/in_progress/{converter}
-    defaults:
-        _controller: phpbb.installer.controller.convert:convert
-    requirements:
-        converter: "[a-zA-Z0-9_]+"
-
-phpbb_convert_finish:
-    path: /convert/finished
-    defaults:
-        _controller: phpbb.installer.controller.convert:finish
-
-phpbb_installer_status:
-    path: /installer/status
-    defaults:
-        _controller: phpbb.installer.controller.status:status
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -57,18 +57,6 @@ if ($cron_lock->acquire())
 	$task = $cron->find_task($cron_type);
 	if ($task)
 	{
-		/**
-		 * This event enables you to catch the task before it runs
-		 *
-		 * @event core.cron_run_before
-		 * @var	\phpbb\cron\task\wrapper	task	Current Cron task
-		 * @since 3.1.8-RC1
-		 */
-		$vars = array(
-			'task',
-		);
-		extract($phpbb_dispatcher->trigger_event('core.cron_run_before', compact($vars)));
-
 		if ($task->is_parametrized())
 		{
 			$task->parse_parameters($request);
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -389,7 +389,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						foreach ($sql_subary as $sql)
 						{
 							$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)";
-							$db->sql_query($sql);
+							$result = $db->sql_query($sql);
 							$sql = '';
 						}
 				}
@@ -397,7 +397,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 				if ($sql != '')
 				{
 					$sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql";
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 				}
 				break;

@@ -405,7 +405,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 			case 'delete':
 				foreach ($sql_subary as $sql)
 				{
-					$db->sql_query($sql);
+					$result = $db->sql_query($sql);
 					$sql = '';
 				}
 				break;
--- a/phpBB/develop/benchmark.php
+++ b/phpBB/develop/benchmark.php
@@ -143,7 +143,7 @@ function filldb($newposts)
 		if ((rand(0,30) < 1) || ($forum_topic_count[$forum] == 0))
 		{
 			// create a new topic 1 in 30 times (or when there are none);
-			make_topic($userid, "Testing topic $i", $forum);
+			$topic = make_topic($userid, "Testing topic $i", $forum);
 			$forum_topic_count[$forum]++;
 		} 
 		else 
--- a/phpBB/develop/unicode_testing.php
+++ b/phpBB/develop/unicode_testing.php
@@ -19,7 +19,7 @@ if (!headers_sent())
 function unicode_to_utf8($string)
 {
 	$utf8 = '';
-
+	$chars = array();
 	for ($i = 0; $i < strlen($string); $i++)
 	{
 		if (isset($string[$i + 5]) && substr($string, $i, 2) == '\\u' && ctype_xdigit(substr($string, $i + 2, 4)))
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.2.x Changelog" />
+<meta name="description" content="phpBB 3.1.x Changelog" />
 <title>phpBB &bull; Changelog</title>

 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +20,7 @@

 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.2.x Changelog</h1>
+				<h1>phpBB 3.1.x Changelog</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>

@@ -36,7 +35,7 @@
 <!-- BEGIN DOCUMENT -->

 <p class="paragraph main-description">
-	This is a non-exhaustive (but still near complete) changelog for phpBB 3.2.x including release candidate versions.
+	This is a non-exhaustive (but still near complete) changelog for phpBB 3.1.x including release candidate versions.
 	Our thanks to all those people who've contributed bug reports and code fixes.
 </p>

@@ -50,14 +49,8 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
-		<li><a href="#v320b2">Changes since 3.2.0-b2</a></li>
-		<li><a href="#v320b1">Changes since 3.2.0-b1</a></li>
-		<li><a href="#v320a2">Changes since 3.2.0-a2</a></li>
 		<li><a href="#v320a1">Changes since 3.2.0-a1</a></li>
 		<li><a href="#v31x">Changes since 3.1.x</a></li>
-		<li><a href="#v318">Changes since 3.1.8</a></li>
-		<li><a href="#v317pl1">Changes since 3.1.7-PL1</a></li>
-		<li><a href="#v317">Changes since 3.1.7</a></li>
 		<li><a href="#v316">Changes since 3.1.6</a></li>
 		<li><a href="#v315">Changes since 3.1.5</a></li>
 		<li><a href="#v314">Changes since 3.1.4</a></li>
@@ -122,140 +115,8 @@
 		<div class="inner">

 		<div class="content">
-			<a name="v320b2"></a><h3>Changes since 3.2.0-b2</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9435">PHPBB3-9435</a>] - &quot;magic numbers&quot; in message_parser.php/bbcode.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13616">PHPBB3-13616</a>] - Pass lexer directly to TWIG environment</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13972">PHPBB3-13972</a>] - 3.1.5 - Waiting time conflict</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14136">PHPBB3-14136</a>] - IE compatibility meta is missing in overall_header.html</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14198">PHPBB3-14198</a>] - Container cache filename doesn't depend on the build options</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14260">PHPBB3-14260</a>] - Right parenthesis breaks (some?) magic URLs</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14318">PHPBB3-14318</a>] - Board Notifications Config Migration Not Working</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14329">PHPBB3-14329</a>] - Updater Cannot remove files</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14381">PHPBB3-14381</a>] - Text Reparser fails with empty sql fields</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14393">PHPBB3-14393</a>] - Update 3.2.0a1 to 3.2.0a2 --&gt; Error: CANNOT_DELETE_FILES </li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14426">PHPBB3-14426</a>] - viewtopic error posts bbcode pregmatch</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14481">PHPBB3-14481</a>] - phpBB does not obey HTTP_X_FORWARDED_PORT header</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14497">PHPBB3-14497</a>] - Update nginx sample config for new installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14527">PHPBB3-14527</a>] - Dataloss caused by link shortening</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14528">PHPBB3-14528</a>] - Structured data - breadcrumbs error</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14530">PHPBB3-14530</a>] - Signature parsing inconsistant</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14532">PHPBB3-14532</a>] - Database column default incorrectly escaped on MSSQL</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14550">PHPBB3-14550</a>] - function unique_id()</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14555">PHPBB3-14555</a>] - Inconsistent usage of the cache directory</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14559">PHPBB3-14559</a>] - Attachments' behaviour in quotes</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14562">PHPBB3-14562</a>] - Extension's permissions don't have language fallback</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14564">PHPBB3-14564</a>] - config cookie domain is empty</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14569">PHPBB3-14569</a>] - Add a method for console progress bar initialisation</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14572">PHPBB3-14572</a>] - Quote notifications deleted on edit</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14576">PHPBB3-14576</a>] - Functional Test Framework should include functions.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14577">PHPBB3-14577</a>] - Stop using sizeof() inside for() loop</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14589">PHPBB3-14589</a>] - Requirements test showing required text for &quot;yellow/amber&quot; (optional) requirements</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14590">PHPBB3-14590</a>] - Installer gets stuck at sending notification e-mail</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14591">PHPBB3-14591</a>] - Some installation data not being inserted when running under MS SQL Server</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14607">PHPBB3-14607</a>] - Missing Auto Increment in Report Table</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14619">PHPBB3-14619</a>] - docs/ folder need work to change 3.1.x to 3.2.x in readme, install, changelog etc</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14648">PHPBB3-14648</a>] - Users don't receive default notifications if another setting is set.</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14649">PHPBB3-14649</a>] - Missing variable within event</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13502">PHPBB3-13502</a>] - controller resolver should handle callable functions and objects</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14540">PHPBB3-14540</a>] - Adjust class recursive_dot_prefix_filter_iterator to increase performance</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14561">PHPBB3-14561</a>] - Add additional commands for user actions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14664">PHPBB3-14664</a>] - Fix PHPDoc comment in cron manager</li>
-			</ul>
-			<h4>New Feature</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12684">PHPBB3-12684</a>] - Add a command to add a user from the CLI</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13969">PHPBB3-13969</a>] - Remove old help_* language files</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14565">PHPBB3-14565</a>] - Updates composer to 1.0.0-b2</li>
-			</ul>

-			<a name="v320b1"></a><h3>Changes since 3.2.0-b1</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14307">PHPBB3-14307</a>] - Incorrect wording used in installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14315">PHPBB3-14315</a>] - Changing multiple forum permissions at once forces identical permissions on all groups</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14416">PHPBB3-14416</a>] - navlnks in header have incorrect tool tip styling</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14431">PHPBB3-14431</a>] - Remote avatar uploading does not support https</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14440">PHPBB3-14440</a>] - Paths can break for extensions with deep route patterns/paths</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14460">PHPBB3-14460</a>] - Use the selected language in AJAX pages as well in the installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14461">PHPBB3-14461</a>] - Text reparser migration might finish too late</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14488">PHPBB3-14488</a>] - Grab correct session ID in ui tests</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14489">PHPBB3-14489</a>] - Extension compiler pass cannot find class</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14503">PHPBB3-14503</a>] - Allow superglobals in installer cli</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14510">PHPBB3-14510</a>] - Prevent infinite loop in adding bots task</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14312">PHPBB3-14312</a>] - Allow installer updating only without updating files</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14448">PHPBB3-14448</a>] - Use guzzle for remote files uploading</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14462">PHPBB3-14462</a>] - Add further measures to prevent timeouts in the installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14478">PHPBB3-14478</a>] - Move facebook/webdriver to main composer.json</li>
-			</ul>
-			<h4>New Feature</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14499">PHPBB3-14499</a>] - CLI updater</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14447">PHPBB3-14447</a>] - Cleanup whitespaces in Prosilver</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14477">PHPBB3-14477</a>] - Update text formatter to latest release</li>
-			</ul>
-
-			<a name="v320a2"></a><h3>Changes since 3.2.0-a2</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10628">PHPBB3-10628</a>] - http:// prepended to &quot;www.&quot; urls (but not reflected in preview)</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11875">PHPBB3-11875</a>] - mediumint(8) too small for post_id</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12221">PHPBB3-12221</a>] - URLs Containing javascript: are Garbled</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14129">PHPBB3-14129</a>] - Adding custom extensions autoloaders feature slow downs the board</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14321">PHPBB3-14321</a>] - Fatal error on download the merged conflicts archive during update from 3.1.6 to 3.2-a1</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14323">PHPBB3-14323</a>] - Long urls are no longer shortened</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14368">PHPBB3-14368</a>] - Post Editors Text Should Be Black, Not Blue</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14371">PHPBB3-14371</a>] - Small fix for the aligment quick links</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14373">PHPBB3-14373</a>] - Do not use strpos() on arrays in iohandler_base::add_error_message()</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14378">PHPBB3-14378</a>] - Maintain consistent template var paths in 3.2 installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14380">PHPBB3-14380</a>] - Maintain consistent template var paths in 3.2 installer</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14402">PHPBB3-14402</a>] - Tidy plupload cron should not rely on user id/ip being available</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14403">PHPBB3-14403</a>] - phpbb\log should still work even when no user data is given</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14405">PHPBB3-14405</a>] - Text processor parses invalid use of url bbcode</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14419">PHPBB3-14419</a>] - Update composer dependencies and fix outdated composer lock file</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14420">PHPBB3-14420</a>] - Search Results pagination not up to date / broken</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14428">PHPBB3-14428</a>] - Use other links for files remote test</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14431">PHPBB3-14431</a>] - Remote avatar uploading does not support https</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14432">PHPBB3-14432</a>] - The lang() function needs to handle key array</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14434">PHPBB3-14434</a>] - Schema generator fails if extensions have non-migrations in migrations dir</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14436">PHPBB3-14436</a>] - Default data type migration misses oauth_states dependency</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14442">PHPBB3-14442</a>] - Use Goutte ~2.0 after allowing PHP &gt;= 5.4</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14444">PHPBB3-14444</a>] - Fatal error in functions_messenger.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14446">PHPBB3-14446</a>] - Add predefined placeholder variables to twig</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14452">PHPBB3-14452</a>] - Undefined $progressFillerText in installer.js</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14453">PHPBB3-14453</a>] - Missing dependency in the text_reparser migration</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13454">PHPBB3-13454</a>] - Remove unused variables, globals, parameters</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13733">PHPBB3-13733</a>] - Allow non-migration files inside migrations folder</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14177">PHPBB3-14177</a>] - Catch exceptions and display a nice error page</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14253">PHPBB3-14253</a>] - Show group requests pending aproval at the ACP groups summary</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14377">PHPBB3-14377</a>] - Allow extensions to register custom compiler pass</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14418">PHPBB3-14418</a>] - Add missing language string PM_TOOLS</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14445">PHPBB3-14445</a>] - Force page refresh before the installer generates the schema</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14250">PHPBB3-14250</a>] - Review/bump composer dependencies</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14262">PHPBB3-14262</a>] - Move converter code into a controller</li>
-			</ul>
-
-			<a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3>
-			<h4>Bug</h4>
+			<a name="v320a1"></a><h3>Changes since 3.2.0-a1</h3><h4>Bug</h4>
 			<ul>
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9791">PHPBB3-9791</a>] - invalid [] - chars on search URI</li>
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13451">PHPBB3-13451</a>] - A very long string inside message crashes PHP</li>
@@ -527,115 +388,6 @@
 				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li>
 			</ul>

-			<a name="v318"></a><h3>Changes since 3.1.8</h3>
-
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8058">PHPBB3-8058</a>] - Default style in ACP-&gt;Board Settings not observing offset</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13028">PHPBB3-13028</a>] - &quot;View unanswered posts&quot; link should be called instead &quot;View unanswered topics&quot;</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13264">PHPBB3-13264</a>] - Editing an unapproved post as a moderator/admin approves it</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13521">PHPBB3-13521</a>] - Q&amp;A Captcha ACP, required fields error corrupts inputted data</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13630">PHPBB3-13630</a>] - NULL value parsed into $select_single can cause 403 Forbidden on certain restrictive hosting environments for &quot;Find a Member&quot; function within Private Message composition</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13681">PHPBB3-13681</a>] - Email queue shouldn't be cached by opcache</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13683">PHPBB3-13683</a>] - Controller generates urls with absolute path of phpbb's root</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13842">PHPBB3-13842</a>] - Missing rewrite module on IIS7 leads to an error</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13977">PHPBB3-13977</a>] - Fatal error entering UCP if bookmarked topic was deleted</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14132">PHPBB3-14132</a>] - SQL Error when creating a new subject on fresh installation</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14136">PHPBB3-14136</a>] - IE compatibility meta is missing in overall_header.html</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14241">PHPBB3-14241</a>] - Security bug into Spambot control Questions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14272">PHPBB3-14272</a>] - Use valid html5 input elements in forms</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14290">PHPBB3-14290</a>] - Function set_modified_headers() never sends 304 'Not Modified' header</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14408">PHPBB3-14408</a>] - Remove span corners</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14422">PHPBB3-14422</a>] - Support cmd+enter &amp; ctrl+enter for submitting message</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14437">PHPBB3-14437</a>] - Place Inline Images on Post get scrambled up -- not follow the order you place them in.</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14443">PHPBB3-14443</a>] - jabber notification-template prefix &quot;short&quot; breaks resolution of paths in extensions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14475">PHPBB3-14475</a>] - Do not log upon automatically removing users form newly registered users group</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14481">PHPBB3-14481</a>] - phpBB does not obey HTTP_X_FORWARDED_PORT header</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14483">PHPBB3-14483</a>] - call to header(arg, arg) function sendHeaders() in Response.php causes Error 500 in app.php generated links</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14496">PHPBB3-14496</a>] - Automatic update relies on cache creating files in cache folder</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14500">PHPBB3-14500</a>] - Duplicate newversion in build.xml</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14514">PHPBB3-14514</a>] - Users get skipped in passwords_convert_p1 migration</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14519">PHPBB3-14519</a>] - Do not query database for unread notifications if all are retrieved</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14532">PHPBB3-14532</a>] - Database column default incorrectly escaped on MSSQL</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14533">PHPBB3-14533</a>] - &quot;U_NOTIFICATION_SETTINGS&quot; doesn't return the correct URL</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14536">PHPBB3-14536</a>] - Force timestamp to be integer in user::format_date()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14559">PHPBB3-14559</a>] - Attachments' behaviour in quotes</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14562">PHPBB3-14562</a>] - Extension's permissions don't have language fallback</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14570">PHPBB3-14570</a>] - Board versions for 3.2.x can be accidentally downgraded to 3.1.x</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14577">PHPBB3-14577</a>] - Stop using sizeof() inside for() loop</li>
-	</ul>
-	<h4>Improvement</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10356">PHPBB3-10356</a>] - Username search should find all users for administrators instead of NORMALs and FOUNDERs only</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12305">PHPBB3-12305</a>] - Add new event core.viewforum_get_topic_id_sql to control forum topic listing</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14134">PHPBB3-14134</a>] - Send warning notification PM in user's language.</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14316">PHPBB3-14316</a>] - Add memberlist_view.html template events before/after the custom fields and zebra links</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14365">PHPBB3-14365</a>] - Add core event to the function topic_review() </li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14366">PHPBB3-14366</a>] - Add core events to the function decode_message()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14395">PHPBB3-14395</a>] - Add event core.viewtopic_add_quickmod_option_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14471">PHPBB3-14471</a>] - Add filedata var to the core.avatar_driver_upload_move_file_before event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14486">PHPBB3-14486</a>] - Add an event and fix an event in login_box()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14508">PHPBB3-14508</a>] - Change language notice on account activation</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14540">PHPBB3-14540</a>] - Adjust class recursive_dot_prefix_filter_iterator to increase performance</li>
-	</ul>
-	<h4>New Feature</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12684">PHPBB3-12684</a>] - Add a command to add a user from the CLI</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14189">PHPBB3-14189</a>] - [PHP] - core.gen_sort_selects_after</li>
-	</ul>
-	<h4>Task</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14538">PHPBB3-14538</a>] - Update composer dependencies</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14565">PHPBB3-14565</a>] - Updates composer to 1.0.0-b2</li>
-	</ul>
-
-	<a name="v317pl1"></a><h3>Changes since 3.1.7-PL1</h3>
-
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12441">PHPBB3-12441</a>] - Database-size in ACP missing after update MariaDB from 5.5 to 10.0</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12618">PHPBB3-12618</a>] - Extension Version Check does not support https</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13180">PHPBB3-13180</a>] - Increase the field size of date format to allow more syntax for other calendars</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13908">PHPBB3-13908</a>] - After clause in migration add_column schema tool not honored</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14046">PHPBB3-14046</a>] - Instant message (jabber) dialog says message sent on the creation screen</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14303">PHPBB3-14303</a>] - Some changes for UTF-8 variant on language pack?</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14374">PHPBB3-14374</a>] - Update dynamically generated jquery CDN script tag</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14386">PHPBB3-14386</a>] - open_basedir restriction in effect with remote upload avatar</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14387">PHPBB3-14387</a>] - Extend avatar-driver by extension in ACP not possible</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14394">PHPBB3-14394</a>] - Only purge cache in functional tests if necessary</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14396">PHPBB3-14396</a>] - Use VCHAR_UNI instead of VCHAR for user_dateformat</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14397">PHPBB3-14397</a>] - Fix @since tag in event 'core.ucp_prefs_view_after'</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14403">PHPBB3-14403</a>] - phpbb\log should still work even when no user data is given</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14407">PHPBB3-14407</a>] - Users not being removed from Newly Registered Users group</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14409">PHPBB3-14409</a>] - Update session page info before displaying online list</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14411">PHPBB3-14411</a>] - Delete permanently is not working as it should be</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14423">PHPBB3-14423</a>] - Display database size for Aria storage engine</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14425">PHPBB3-14425</a>] - Database tests do not allow using socket</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14427">PHPBB3-14427</a>] - Memberlist Display Wrong</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14433">PHPBB3-14433</a>] - Functional tests fail for extensions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14439">PHPBB3-14439</a>] - Error page shown in Manage users -&gt; Anonymous -&gt; Select Form -&gt; Avatar when board wide all avatar settings are disabled</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14467">PHPBB3-14467</a>] - Automatic resize of textarea calculates wrong height</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14475">PHPBB3-14475</a>] - Do not log removal of users from newly registered group</li>
-	</ul>
-	<h4>Improvement</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14289">PHPBB3-14289</a>] - Add events in navbar header</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14356">PHPBB3-14356</a>] - Add template events to viewtopic around back2top link</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14412">PHPBB3-14412</a>] - Comment fixes for PHPDoc in the events</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14458">PHPBB3-14458</a>] - Explicitly state RewriteBase into .htaccess root file</li>
-	</ul>
-
-			<a name="v317"></a><h3>Changes since 3.1.7</h3>
-
-	<h4>Security Issue</h4>
-	<ul>
-		<li>[SECURITY-188] - Check form key in acp_bbcodes</li>
-	</ul>
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Undefined variable $phpbb_dispatcher when (un-)locking a topic or post</li>
-	</ul>
-
 			<a name="v316"></a><h3>Changes since 3.1.6</h3>

 	<h4>Bug</h4>
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.2.x frequently asked questions" />
+<meta name="description" content="phpBB 3.1.x frequently asked questions" />
 <title>phpBB &bull; FAQ</title>

 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,8 +20,8 @@

 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.2.x FAQ</h1>
-				<p>phpBB 3.2.x frequently asked questions</p>
+				<h1>phpBB 3.1.x FAQ</h1>
+				<p>phpBB 3.1.x frequently asked questions</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>

--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.2.x Installation, updating and conversion informations" />
+<meta name="description" content="phpBB 3.1.x Installation, updating and conversion informations" />
 <title>phpBB &bull; Install</title>

 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,8 +20,8 @@

 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.2.x Install</h1>
-				<p>phpBB 3.2.x Installation, updating and conversion informations</p>
+				<h1>phpBB 3.1.x Install</h1>
+				<p>phpBB 3.1.x Installation, updating and conversion informations</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>

@@ -133,7 +132,7 @@

 		<div class="content">

-	<p>phpBB 3.2.x has a few requirements which must be met before you are able to install and use it.</p>
+	<p>phpBB 3.1.x has a few requirements which must be met before you are able to install and use it.</p>

 	<ul>
 		<li>A webserver or web hosting account running on any major Operating System with support for PHP</li>
@@ -166,7 +165,7 @@
 		</li>
 	</ul>

-	<p>If your server or hosting account does not meet the requirements above then you will be unable to install phpBB 3.2.x.</p>
+	<p>If your server or hosting account does not meet the requirements above then you will be unable to install phpBB 3.1.x.</p>

 		</div>

@@ -257,7 +256,7 @@

 	<hr />

-	<a name="update"></a><h2>4. Updating from stable releases of phpBB 3.2.x</h2>
+	<a name="update"></a><h2>4. Updating from stable releases of phpBB 3.1.x</h2>

 	<div class="paragraph">
 		<div class="inner">
@@ -282,7 +281,7 @@

 	<p>This package is meant for those wanting to only replace the files that were changed between a previous version and the latest version.</p>

-	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <strong>3.2.0</strong> you should select the appropriate <code>phpBB-3.2.1-files.zip/tar.bz2</code> file.</p>
+	<p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <strong>3.1.0</strong> you should select the appropriate <code>phpBB-3.1.1-files.zip/tar.bz2</code> file.</p>

 	<p>The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>

--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="phpBB 3.2.x Readme" />
+<meta name="description" content="phpBB 3.1.x Readme" />
 <title>phpBB &bull; Readme</title>

 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -21,7 +20,7 @@

 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
-				<h1>phpBB 3.2.x Readme</h1>
+				<h1>phpBB 3.1.x Readme</h1>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>

@@ -225,7 +224,7 @@

 		<div class="content">

-	<p>This is a stable release of phpBB. The 3.2.x line is feature frozen, with point releases principally including fixes for bugs and security issues. Feature alterations and minor feature additions may be done if deemed absolutely required. The next major release will be phpBB 3.3 which is currently under development. Please do not post questions asking when 3.3 will be available, no release date has been set.</p>
+	<p>This is a stable release of phpBB. The 3.1.x line is feature frozen, with point releases principally including fixes for bugs and security issues. Feature alterations and minor feature additions may be done if deemed absolutely required. The next major release will be phpBB 3.2 which is currently under development. Please do not post questions asking when 3.2 will be available, no release date has been set.</p>

 	<p>Those interested in the development of phpBB should keep an eye on the development forums to see how things are progressing:</p>

--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -2,7 +2,6 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
 <meta name="description" content="This is an explanation of how to use the phpBB auth/acl API" />
 <title>phpBB3 &bull; Auth API</title>
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en">
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="keywords" content="" />
-<meta name="description" content="Rhea coding guidelines document" />
+<meta name="description" content="Ascraeus coding guidelines document" />
 <title>phpBB3 &bull; Coding Guidelines</title>

 <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@@ -22,7 +21,7 @@
 			<div id="doc-description">
 				<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
 				<h1>Coding Guidelines</h1>
-				<p>Rhea coding guidelines document</p>
+				<p>Ascraeus coding guidelines document</p>
 				<p style="display: none;"><a href="#start_here">Skip</a></p>
 			</div>

@@ -37,7 +36,7 @@
 <!-- BEGIN DOCUMENT -->

 <p class="paragraph main-description">
-	These are the phpBB Coding Guidelines for Rhea, all attempts should be made to follow them as closely as possible.
+	These are the phpBB Coding Guidelines for Ascraeus, all attempts should be made to follow them as closely as possible.
 </p>

 <h1>Coding Guidelines</h1>
@@ -1187,8 +1186,8 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 # General Information about this style
 name = prosilver_duplicate
 copyright = © phpBB Limited, 2007
-style_version = 3.2.0
-phpbb_version = 3.2.0
+style_version = 3.1.0
+phpbb_version = 3.1.0

 # Defining a different template bitfield
 # template_bitfield = lNg=
@@ -1677,8 +1676,8 @@ div
 # General Information about this style
 name = Custom Style
 copyright = © phpBB Limited, 2007
-style_version = 3.2.0-b1
-phpbb_version = 3.2.0-b1
+style_version = 3.1.0-b1
+phpbb_version = 3.1.0-b1

 # Defining a different template bitfield
 # template_bitfield = lNg=
@@ -1725,7 +1724,7 @@ This may span multiple lines.
    + first/file/path.html
    + second/file/path.html
 * Purpose: Same as above.
-* Since: 3.2.0-b1
+* Since: 3.1.0-b1
 </pre></div>
 		<li>An event that is found multiple times in a file should have the number of instances in parenthesis next to the filename.
 		<div class="codebox"><pre>event_name
@@ -1734,7 +1733,7 @@ This may span multiple lines.
    + first/file/path.html (2)
    + second/file/path.html
 * Purpose: Same as above.
-* Since: 3.2.0-b1
+* Since: 3.1.0-b1
 </pre></div></li>
 		<li>An actual example event documentation:
 		<div class="codebox"><pre>forumlist_body_last_post_title_prepend
@@ -1743,7 +1742,7 @@ This may span multiple lines.
    + styles/prosilver/template/forumlist_body.html
    + styles/subsilver2/template/forumlist_body.html
 * Purpose: Add content before the post title of the latest post in a forum on the forum list.
-* Since: 3.2.0-a1
+* Since: 3.1.0-a1
 </pre></div></ul><br />

 		</div>
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -937,20 +937,6 @@ memberlist_view_contact_before
 * Since: 3.1.0-b2
 * Purpose: Add content before the user contact part of any user profile

-memberlist_view_contact_custom_fields_after
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content after the user contact related custom fields
-
-memberlist_view_contact_custom_fields_before
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content before the user contact related custom fields
-
 memberlist_view_content_append
 ===
 * Locations:
@@ -965,20 +951,6 @@ memberlist_view_content_prepend
 * Since: 3.1.0-b3
 * Purpose: Add custom content to the user profile view before the main content

-memberlist_view_non_contact_custom_fields_after
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content after the user not contact related custom fields
-
-memberlist_view_non_contact_custom_fields_before
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content before the user not contact related custom fields
-
 memberlist_view_rank_avatar_after
 ===
 * Locations:
@@ -1021,20 +993,6 @@ memberlist_view_user_statistics_before
 * Since: 3.1.0-a1
 * Purpose: Add entries before the user statistics part of any user profile

-memberlist_view_zebra_after
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content after the user friends/foes links
-
-memberlist_view_zebra_before
-===
-* Locations:
-    + styles/prosilver/template/memberlist_view.html
-* Since: 3.1.9-RC1
-* Purpose: Add content before the user friends/foes links
-
 navbar_header_logged_out_content
 ===
 * Locations:
@@ -1070,20 +1028,6 @@ navbar_header_quick_links_before
 * Since: 3.1.0-RC2
 * Purpose: Add links to the top of the quick-links drop-down menu in the header

-navbar_header_user_profile_append
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.8-RC1
-* Purpose: Add links to the right of the user drop down area
-
-navbar_header_user_profile_prepend
-===
-* Locations:
-    + styles/prosilver/template/navbar_header.html
-* Since: 3.1.8-RC1
-* Purpose: Add links to the left of the notification area
-
 navbar_header_username_append
 ===
 * Locations:
@@ -2281,34 +2225,6 @@ viewtopic_body_post_subject_before
 * Since: 3.1.7-RC1
 * Purpose: Add data before post icon and subject

-viewtopic_body_postrow_back2top_after
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom after the back to top link 
-
-viewtopic_body_postrow_back2top_append
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom directly after the back to top link 
-
-viewtopic_body_postrow_back2top_before
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom before the back to top link 
-
-viewtopic_body_postrow_back2top_prepend
-===
-* Locations:
-    + styles/prosilver/template/viewtopic_body.html
-* Since: 3.1.8-RC1
-* Purpose: Add content to the post's bottom directly before the back to top link 
-
 viewtopic_body_postrow_custom_fields_after
 ===
 * Locations:
--- a/phpBB/docs/install-config.sample.yml
+++ b/phpBB/docs/install-config.sample.yml
@@ -22,7 +22,6 @@ installer:
        enabled: false
        smtp_delivery : ~
        smtp_host: ~
-        smtp_port: ~
        smtp_auth: ~
        smtp_user: ~
        smtp_pass: ~
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -62,7 +62,7 @@ http {
        root /path/to/phpbb;

        location / {
-            # phpBB uses index.htm
+            # phpbb uses index.htm
            index index.php index.html index.htm;
            try_files $uri $uri/ @rewriteapp;
        }
@@ -92,29 +92,6 @@ http {
            fastcgi_pass php;
        }

-        # Correctly pass scripts for installer
-        location /install/ {
-            # phpBB uses index.htm
-            try_files $uri $uri/ @rewrite_installapp;
-
-            # Pass the php scripts to fastcgi server specified in upstream declaration.
-            location ~ \.php(/|$) {
-                # Unmodified fastcgi_params from nginx distribution.
-                include fastcgi_params;
-                # Necessary for php.
-                fastcgi_split_path_info ^(.+\.php)(/.*)$;
-                fastcgi_param PATH_INFO $fastcgi_path_info;
-                fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-                fastcgi_param DOCUMENT_ROOT $realpath_root;
-                try_files $uri $uri/ /install/app.php$is_args$args;
-                fastcgi_pass php;
-            }
-        }
-
-        location @rewrite_installapp {
-            rewrite ^(.*)$ /install/app.php/$1 last;
-        }
-
        # Deny access to version control system directories.
        location ~ /\.svn|/\.git {
            deny all;
--- a/phpBB/docs/update-config.sample.yml
+++ b/phpBB/docs/update-config.sample.yml
@@ -1,2 +0,0 @@
-updater:
-    type: all
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -709,6 +709,8 @@ class acp_attachments
 							$forum_ids = array();
 						}

+						$extensions = array();
+
 						$sql = 'SELECT *
 							FROM ' . EXTENSIONS_TABLE . "
 							WHERE group_id = $group_id
@@ -1431,7 +1433,7 @@ class acp_attachments
 		$row['group_name'] = $user->lang['NOT_ASSIGNED'];
 		$group_name[] = $row;

-		for ($i = 0, $groups_size = sizeof($group_name); $i < $groups_size; $i++)
+		for ($i = 0; $i < sizeof($group_name); $i++)
 		{
 			if ($default_group === false)
 			{
@@ -1570,6 +1572,7 @@ class acp_attachments
 						if ($ip_2_counter == 0 && $ip_2_end == 254)
 						{
 							$ip_2_counter = 256;
+							$ip_2_fragment = 256;

 							$iplist[] = "'$ip_1_counter.*'";
 						}
@@ -1582,6 +1585,7 @@ class acp_attachments
 							if ($ip_3_counter == 0 && $ip_3_end == 254)
 							{
 								$ip_3_counter = 256;
+								$ip_3_fragment = 256;

 								$iplist[] = "'$ip_1_counter.$ip_2_counter.*'";
 							}
@@ -1594,6 +1598,7 @@ class acp_attachments
 								if ($ip_4_counter == 0 && $ip_4_end == 254)
 								{
 									$ip_4_counter = 256;
+									$ip_4_fragment = 256;

 									$iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'";
 								}
@@ -1744,8 +1749,8 @@ class acp_attachments
 		$size_var = $filesize['si_identifier'];
 		$value = $filesize['value'];

-		// size and maxlength must not be specified for input of type number
-		return '<input type="number" id="' . $key . '" min="0" max="999999999999999" step="any" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		// size="8" and maxlength="15" attributes as a fallback for browsers that do not support type="number" yet.
+		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
 	}

 	/**
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -195,6 +195,7 @@ class acp_ban
 			case 'user':

 				$field = 'username';
+				$l_ban_cell = $user->lang['USERNAME'];

 				$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
 					FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u
@@ -207,6 +208,7 @@ class acp_ban
 			case 'ip':

 				$field = 'ban_ip';
+				$l_ban_cell = $user->lang['IP_HOSTNAME'];

 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '
@@ -219,6 +221,7 @@ class acp_ban
 			case 'email':

 				$field = 'ban_email';
+				$l_ban_cell = $user->lang['EMAIL_ADDRESS'];

 				$sql = 'SELECT *
 					FROM ' . BANLIST_TABLE . '
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -25,15 +25,14 @@ class acp_bbcodes

 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
-		global $phpbb_log;
+		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_log;

 		$user->add_lang('acp/posting');

 		// Set up general vars
 		$action	= $request->variable('action', '');
 		$bbcode_id = $request->variable('bbcode', 0);
-		$submit = $request->is_set_post('submit');

 		$this->tpl_name = 'acp_bbcodes';
 		$this->page_title = 'ACP_BBCODES';
@@ -41,11 +40,6 @@ class acp_bbcodes

 		add_form_key($form_key);

-		if ($submit && !check_form_key($form_key))
-		{
-			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
 		// Set up mode-specific vars
 		switch ($action)
 		{
@@ -373,7 +367,7 @@ class acp_bbcodes
 		*
 		* @event core.acp_bbcodes_display_form
 		* @var	string	action			Type of the action: modify|create
-		* @var	array	sql_ary			The SQL array to get custom bbcode data
+		* @var	string	sql_ary			The SQL array to get custom bbcode data
 		* @var	array	template_data	Array with form template data
 		* @var	string	u_action		The u_action link
 		* @since 3.1.0-a3
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -30,12 +30,13 @@ class acp_board

 	function main($id, $mode)
 	{
-		global $user, $template, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $cache, $phpbb_container, $phpbb_dispatcher, $phpbb_log;

 		$user->add_lang('acp/board');

+		$action	= $request->variable('action', '');
 		$submit = (isset($_POST['submit']) || isset($_POST['allow_quick_reply_enable'])) ? true : false;

 		$form_key = 'acp_board';
@@ -415,7 +416,6 @@ class acp_board
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'referer_validation'	=> array('lang' => 'REFERRER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
-						'remote_upload_verify'	=> array('lang' => 'UPLOAD_CERT_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'check_dnsbl'			=> array('lang' => 'CHECK_DNSBL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'email_check_mx'		=> array('lang' => 'EMAIL_CHECK_MX',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
@@ -760,7 +760,7 @@ class acp_board
 	*/
 	function select_auth_method($selected_method, $key = '')
 	{
-		global $phpbb_container;
+		global $phpbb_root_path, $phpEx, $phpbb_container;

 		/* @var $auth_providers \phpbb\auth\provider_collection */
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
@@ -868,7 +868,7 @@ class acp_board
 	{
 		global $user;

-		return '<input id="' . $key . '" type="number" min="1" max="999" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}

 	/**
@@ -896,7 +896,7 @@ class acp_board
 	{
 		global $user;

-		return '<input id="' . $key . '" type="number" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" min="8" max="255" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="255" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}

 	/**
@@ -940,6 +940,8 @@ class acp_board
 	*/
 	function board_disable($value, $key)
 	{
+		global $user;
+
 		$radio_ary = array(1 => 'YES', 0 => 'NO');

 		return h_radio('config[board_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[board_disable_msg]" maxlength="255" size="40" value="' . $this->new_config['board_disable_msg'] . '" />';
@@ -1049,6 +1051,8 @@ class acp_board
 	*/
 	function select_news_forums($value, $key)
 	{
+		global $user, $config;
+
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);

 		// Build forum options
@@ -1066,6 +1070,8 @@ class acp_board

 	function select_exclude_forums($value, $key)
 	{
+		global $user, $config;
+
 		$forum_list = make_forum_select(false, false, true, true, true, false, true);

 		// Build forum options
@@ -1121,7 +1127,7 @@ class acp_board
 	*/
 	function enable_mod_rewrite($value, $key)
 	{
-		global $user;
+		global $user, $config;

 		// Determine whether mod_rewrite is enabled on the server
 		// NOTE: This only works on Apache servers on which PHP is NOT
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -25,8 +25,8 @@ class acp_bots

 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template, $cache, $request, $phpbb_log;
-		global $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $cache, $request, $phpbb_log;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;

 		$action = $request->variable('action', '');
 		$submit = (isset($_POST['submit'])) ? true : false;
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -25,8 +25,8 @@ class acp_captcha

 	function main($id, $mode)
 	{
-		global $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_container;
+		global $user, $auth, $template, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;

 		$user->add_lang('acp/board');

@@ -178,7 +178,7 @@ class acp_captcha
 	*/
 	function deliver_demo($selected)
 	{
-		global $phpbb_container;
+		global $db, $user, $config, $phpbb_container;

 		$captcha = $phpbb_container->get('captcha.factory')->get_instance($selected);
 		$captcha->init(CONFIRM_REG);
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -37,6 +37,7 @@ class acp_database
 		$this->page_title = 'ACP_DATABASE';

 		$action	= $request->variable('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;

 		$template->assign_vars(array(
 			'MODE'	=> $mode
--- a/phpBB/includes/acp/acp_disallow.php
+++ b/phpBB/includes/acp/acp_disallow.php
@@ -25,7 +25,8 @@ class acp_disallow

 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache, $phpbb_log, $request;
+		global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $config, $phpbb_admin_path;

 		$user->add_lang('acp/posting');

--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -25,8 +25,8 @@ class acp_email

 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template, $phpbb_log, $request;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_dispatcher;
+		global $config, $db, $user, $auth, $template, $cache, $phpbb_log, $request;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $phpbb_dispatcher;

 		$user->add_lang('acp/email');
 		$this->tpl_name = 'acp_email';
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -34,7 +34,7 @@ class acp_extensions
 	function main()
 	{
 		// Start the page
-		global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpbb_log, $cache;
+		global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpEx, $phpbb_log, $cache;

 		$this->db = $db;
 		$this->config = $config;
@@ -122,6 +122,8 @@ class acp_extensions
 					'U_ACTION' 				=> $this->u_action,
 				));

+				add_form_key('version_check_settings');
+
 				$this->tpl_name = 'acp_ext_list';
 			break;

@@ -539,7 +541,7 @@ class acp_extensions

 		$version_helper = new \phpbb\version_helper($this->cache, $this->config, new \phpbb\file_downloader(), $this->user);
 		$version_helper->set_current_version($meta['version']);
-		$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename'], isset($version_check['ssl']) ? $version_check['ssl'] : false);
+		$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename']);
 		$version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);

 		return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -27,7 +27,7 @@ class acp_forums
 	function main($id, $mode)
 	{
 		global $db, $user, $auth, $template, $cache, $request, $phpbb_dispatcher;
-		global $phpbb_admin_path, $phpbb_root_path, $phpEx, $phpbb_log;
+		global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx, $phpbb_log;

 		$user->add_lang('acp/forums');
 		$this->tpl_name = 'acp_forums';
@@ -1264,6 +1264,8 @@ class acp_forums
 							return array($user->lang['NO_FORUM']);
 						}

+						$subforums_to_name = $_row['forum_name'];
+
 						$sql = 'SELECT forum_id
 							FROM ' . FORUMS_TABLE . "
 							WHERE parent_id = {$row['forum_id']}";
@@ -1381,7 +1383,7 @@ class acp_forums
 	{
 		global $db, $user, $phpbb_dispatcher;

-		$errors = array();
+		$to_data = $moved_ids = $errors = array();

 		// Check if we want to move to a parent with link type
 		if ($to_id > 0)
@@ -1420,7 +1422,7 @@ class acp_forums
 		$diff = sizeof($moved_forums) * 2;

 		$moved_ids = array();
-		for ($i = 0, $size = sizeof($moved_forums); $i < $size; ++$i)
+		for ($i = 0; $i < sizeof($moved_forums); ++$i)
 		{
 			$moved_ids[] = $moved_forums[$i]['forum_id'];
 		}
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -26,7 +26,7 @@ class acp_groups
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $auth, $template, $cache;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
 		global $request, $phpbb_container, $phpbb_dispatcher;

 		$user->add_lang('acp/groups');
@@ -306,6 +306,8 @@ class acp_groups
 					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 				}

+				$data = $submit_ary = array();
+
 				if ($action == 'edit' && !$group_id)
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -325,11 +327,10 @@ class acp_groups
 				$avatar_data = null;
 				$avatar_error = array();

-				/** @var \phpbb\avatar\manager $phpbb_avatar_manager */
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-
 				if ($config['allow_avatar'])
 				{
+					/* @var $phpbb_avatar_manager \phpbb\avatar\manager */
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();

 					// This is normalised data, without the group_ prefix
@@ -670,21 +671,14 @@ class acp_groups
 					$avatars_enabled = false;
 					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));

-					// Assign min and max values before generating avatar driver html
-					$template->assign_vars(array(
-							'AVATAR_MIN_WIDTH'		=> $config['avatar_min_width'],
-							'AVATAR_MAX_WIDTH'		=> $config['avatar_max_width'],
-							'AVATAR_MIN_HEIGHT'		=> $config['avatar_min_height'],
-							'AVATAR_MAX_HEIGHT'		=> $config['avatar_max_height'],
-					));
-
 					foreach ($avatar_drivers as $current_driver)
 					{
 						$driver = $phpbb_avatar_manager->get_driver($current_driver);

 						$avatars_enabled = true;
+						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
-							'avatar' => $driver->get_acp_template_name(),
+							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));

 						if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error))
@@ -939,12 +933,11 @@ class acp_groups
 			// used for easy access to the data within a group
 			$cached_group_data[$type][$row['group_id']] = $row;
 			$cached_group_data[$type][$row['group_id']]['total_members'] = 0;
-			$cached_group_data[$type][$row['group_id']]['pending_members'] = 0;
 		}
 		$db->sql_freeresult($result);

 		// How many people are in which group?
-		$sql = 'SELECT COUNT(ug.user_id) AS total_members, SUM(ug.user_pending) AS pending_members, ug.group_id
+		$sql = 'SELECT COUNT(ug.user_id) AS total_members, ug.group_id
 			FROM ' . USER_GROUP_TABLE . ' ug
 			WHERE ' . $db->sql_in_set('ug.group_id', array_keys($lookup)) . '
 			GROUP BY ug.group_id';
@@ -954,7 +947,6 @@ class acp_groups
 		{
 			$type = $lookup[$row['group_id']];
 			$cached_group_data[$type][$row['group_id']]['total_members'] = $row['total_members'];
-			$cached_group_data[$type][$row['group_id']]['pending_members'] = $row['pending_members'];
 		}
 		$db->sql_freeresult($result);

@@ -983,7 +975,6 @@ class acp_groups

 					'GROUP_NAME'	=> $group_name,
 					'TOTAL_MEMBERS'	=> $row['total_members'],
-					'PENDING_MEMBERS' => $row['pending_members']
 				));
 			}
 		}
@@ -1104,6 +1095,7 @@ class acp_groups
 			ORDER BY group_legend ASC, group_type DESC, group_name ASC';
 		$result = $db->sql_query($sql);

+		$s_group_select_legend = '';
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$group_name = $group_helper->get_name($row['group_name']);
@@ -1141,6 +1133,7 @@ class acp_groups
 			ORDER BY t.teampage_position ASC';
 		$result = $db->sql_query($sql);

+		$category_data = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
 			if ($row['teampage_id'] == $category_id)
@@ -1183,6 +1176,7 @@ class acp_groups
 			ORDER BY g.group_type DESC, g.group_name ASC';
 		$result = $db->sql_query($sql);

+		$s_group_select_teampage = '';
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$group_name = $group_helper->get_name($row['group_name']);
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -28,8 +28,8 @@ class acp_icons

 	function main($id, $mode)
 	{
-		global $db, $user, $template, $cache;
-		global $config, $phpbb_root_path;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request, $phpbb_container;

 		$user->add_lang('acp/posting');
@@ -194,6 +194,7 @@ class acp_icons

 				$data = array();
 				$after = false;
+				$display = 0;
 				$order_lists = array('', '');
 				$add_order_lists = array('', '');
 				$display_count = 0;
@@ -208,6 +209,7 @@ class acp_icons
 					if ($row[$fields . '_id'] == $icon_id)
 					{
 						$after = true;
+						$display = $row['display_on_posting'];
 						$data[$row[$fields . '_url']] = $row;
 					}
 					else
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -32,7 +32,7 @@ class acp_inactive
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $auth, $template, $phpbb_container, $phpbb_log, $request;
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;

 		if (!function_exists('user_active_flip'))
 		{
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -29,8 +29,8 @@ class acp_jabber

 	function main($id, $mode)
 	{
-		global $db, $user, $template, $phpbb_log, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $phpbb_log, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;

 		$user->add_lang('acp/board');

@@ -39,6 +39,7 @@ class acp_jabber
 			include($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
 		}

+		$action	= $request->variable('action', '');
 		$submit = (isset($_POST['submit'])) ? true : false;

 		if ($mode != 'settings')
@@ -67,6 +68,8 @@ class acp_jabber
 				trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
 			}

+			$error = array();
+
 			$message = $user->lang['JAB_SETTINGS_CHANGED'];
 			$log = 'JAB_SETTINGS_CHANGED';

--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -25,8 +25,8 @@ class acp_logs

 	function main($id, $mode)
 	{
-		global $user, $auth, $template, $phpbb_container;
-		global $config;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request;

 		$user->add_lang('mcp');
@@ -34,6 +34,7 @@ class acp_logs
 		// Set up general vars
 		$action		= $request->variable('action', '');
 		$forum_id	= $request->variable('f', 0);
+		$topic_id	= $request->variable('t', 0);
 		$start		= $request->variable('start', 0);
 		$deletemark = $request->variable('delmarked', false, false, \phpbb\request\request_interface::POST);
 		$deleteall	= $request->variable('delall', false, false, \phpbb\request\request_interface::POST);
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -579,7 +579,7 @@ class acp_modules
 	*/
 	function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false)
 	{
-		global $db, $user;
+		global $db, $user, $auth, $config;

 		$sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth
 			FROM ' . MODULES_TABLE . "
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -26,8 +26,8 @@ class acp_permission_roles

 	function main($id, $mode)
 	{
-		global $db, $user, $template, $phpbb_container;
-		global $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 		global $request, $phpbb_log;

 		if (!function_exists('user_get_id_name'))
@@ -477,7 +477,7 @@ class acp_permission_roles
 	*/
 	function display_auth_options($auth_options)
 	{
-		global $template, $phpbb_container;
+		global $template, $user, $phpbb_container;

 		/* @var $phpbb_permissions \phpbb\permissions */
 		$phpbb_permissions = $phpbb_container->get('acl.permissions');
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -31,8 +31,8 @@ class acp_permissions

 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $phpbb_container, $request;
-		global $config, $phpbb_root_path, $phpEx;
+		global $db, $user, $auth, $template, $cache, $phpbb_container, $request;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;

 		if (!function_exists('user_get_id_name'))
 		{
@@ -167,6 +167,8 @@ class acp_permissions
 		}

 		// Define some common variables for every mode
+		$error = array();
+
 		$permission_scope = (strpos($mode, '_global') !== false) ? 'global' : 'local';

 		// Showing introductionary page?
@@ -690,6 +692,8 @@ class acp_permissions
 			trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}

+		$ug_id = $forum_id = 0;
+
 		// We loop through the auth settings defined in our submit
 		list($ug_id, ) = each($psubmit);
 		list($forum_id, ) = each($psubmit[$ug_id]);
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -25,7 +25,8 @@ class acp_php_info

 	function main($id, $mode)
 	{
-		global $template;
+		global $db, $user, $auth, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;

 		if ($mode != 'info')
 		{
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -33,8 +33,8 @@ class acp_profile

 	function main($id, $mode)
 	{
-		global $config, $db, $user, $template;
-		global $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $cache;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
 		global $request, $phpbb_container, $phpbb_log, $phpbb_dispatcher;

 		if (!function_exists('generate_smilies'))
@@ -55,6 +55,7 @@ class acp_profile
 		$action = (isset($_POST['create'])) ? 'create' : $request->variable('action', '');

 		$error = array();
+		$s_hidden_fields = '';

 		if (!$field_id && in_array($action, array('delete','activate', 'deactivate', 'move_up', 'move_down', 'edit')))
 		{
@@ -775,7 +776,7 @@ class acp_profile
 	*/
 	function build_language_options(&$cp, $field_type, $action = 'create')
 	{
-		global $user, $config, $db, $request;
+		global $user, $config, $db, $phpbb_container, $request;

 		$default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']];

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tristan Darricau	aca1ad5df0	[prep-release-3.2.0-a2] Add changelog for 3.2.0-a2	2015-12-14 22:41:25 +01:00
Tristan Darricau	3db76d411e	[prep-release-3.2.0-a2] Add migration for 3.2.0-a2	2015-12-14 22:39:10 +01:00
Tristan Darricau	6cb028fcdf	[prep-release-3.2.0-a2] Update version to 3.2.0-a2	2015-12-14 22:35:41 +01:00