[prep-release-3.2.0-b1] Updates changelog

PHPBB3-14453

.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

.gitignore

@@ -4,7 +4,7 @@
 !/phpBB/cache/.htaccess
 !/phpBB/cache/index.html
 /phpBB/composer.phar
-/phpBB/config*.php*
+/phpBB/config*.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
@@ -22,5 +22,3 @@
 /tests/test_config*.php
 /tests/tmp/*
 /tests/vendor
-/vagrant/phpbb-install-config.yml
-.vagrant

.jshintrc

@@ -19,7 +19,6 @@
   "jquery": true,
 
   "globals": {
-    "JSON": true,
-    "phpbb": true
+    "JSON": true
   }
 }

.travis.yml

@@ -22,15 +22,10 @@ matrix:
       env: DB=mysqli
     - php: 7.0
       env: DB=mysqli
-    - php: 7.1
-      env: DB=mysqli
-    - php: nightly
-      env: DB=mysqli
     - php: hhvm
       env: DB=mysqli
   allow_failures:
     - php: hhvm
-    - php: nightly
   fast_finish: true
 
 services:
@@ -49,6 +44,6 @@ script:
   - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
   - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./
   - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi"
-  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi"
+  - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
   - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
   - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"

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

README.md

@@ -2,38 +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
 
-## VAGRANT
-
-Read our [Vagrant documentation](phpBB/docs/vagrant.md) to find out how to use Vagrant to develop and contribute to phpBB.
-
 ## 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
 

Vagrantfile

@@ -1,25 +0,0 @@
-require 'json'
-require 'yaml'
-
-VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
-
-homesteadYamlPath = "vagrant/bootstrap.yaml"
-afterScriptPath = "vagrant/after.sh"
-aliasesPath = "vagrant/aliases"
-
-require File.expand_path(confDir + '/scripts/homestead.rb')
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exists? aliasesPath then
-        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
-    end
-
-    if File.exists? homesteadYamlPath then
-        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
-    end
-
-    if File.exists? afterScriptPath then
-        config.vm.provision "shell", path: afterScriptPath
-    end
-end

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.1" />
-	<property name="prevversion" value="3.2.0" />
-	<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.1.10, 3.1.11, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.1-RC1" />
+	<property name="newversion" value="3.2.0-b1" />
+	<property name="prevversion" value="3.2.0-a2" />
+	<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.2.0-a1" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -49,7 +49,7 @@
 	-->
 	<target name="composer">
 		<exec dir="phpBB"
-			command="php ../composer.phar install --ignore-platform-reqs"
+			command="php ../composer.phar install --dev"
 			checkreturn="true"
 			passthru="true" />
 	</target>
@@ -142,9 +142,7 @@
 
 		<phingcall target="export">
 			<property name="revision" value="release-${version}" />
-			<property name="version" value="${version}" />
 			<property name="dir" value="build/old_versions/release-${version}" />
-			<property name="skip-composer" value="true" />
 		</phingcall>
 
 		<phingcall target="clean-diff-dir">
@@ -250,35 +248,26 @@
 			<equals arg1="${composer-has-dependencies}" arg2="1" trim="true" />
 			<then>
 				<!-- We have non-dev composer dependencies -->
+				<exec dir="."
+					command="git ls-tree ${revision} composer.phar"
+					checkreturn="true"
+					outputProperty='composer-ls-tree-output' />
 				<if>
-					<not><isset property="skip-composer" /></not>
+					<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
 					<then>
-						<exec dir="."
-							command="git ls-tree ${revision} composer.phar"
-							checkreturn="true"
-							outputProperty='composer-ls-tree-output' />
-						<if>
-							<equals arg1="${composer-ls-tree-output}" arg2="" trim="true" />
-							<then>
-								<fail message="There are composer dependencies, but composer.phar is missing." />
-							</then>
-							<else>
-								<!-- Export the phar, install dependencies, delete phar. -->
-								<exec dir="."
-									command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
-									checkreturn="true" />
-								<exec dir="${dir}"
-									command="php composer.phar install --no-dev --optimize-autoloader --ignore-platform-reqs"
-									checkreturn="true"
-									passthru="true" />
-								<delete file="${dir}/composer.phar" />
-
-								<phingcall target="clean-vendor-dir">
-									<property name="dir" value="${dir}" />
-								</phingcall>
-							</else>
-						</if>
+						<fail message="There are composer dependencies, but composer.phar is missing." />
 					</then>
+					<else>
+						<!-- Export the phar, install dependencies, delete phar. -->
+						<exec dir="."
+							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
+							checkreturn="true" />
+						<exec dir="${dir}"
+							command="php composer.phar install --no-dev --optimize-autoloader"
+							checkreturn="true"
+							passthru="true" />
+						<delete file="${dir}/composer.phar" />
+					</else>
 				</if>
 			</then>
 			<else>
@@ -288,54 +277,6 @@
 			</else>
 		</if>
 
-		<!-- Checkout latest viglink to ext folder -->
-		<available file="${dir}/ext" type="dir" property="add-viglink-ext" />
-		<exec dir="${dir}"
-			command='php -r "echo version_compare(&apos;${version}&apos;, &apos;3.2.0-RC2&apos;, &apos;>=&apos;) ? &apos;true&apos; : &apos;false&apos;;"'
-			checkreturn="true"
-			outputProperty='viglink-available' />
-		<if>
-			<and>
-				<equals arg1="${add-viglink-ext}" arg2="1" trim="true" />
-				<or>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<equals arg1="${viglink-available}" arg2="1" trim="true" />
-				</or>
-			</and>
-			<then>
-				<exec dir="${dir}/ext" command="mkdir phpbb" passthru="true" />
-
-				<exec dir="${dir}/ext/phpbb" command="git clone https://github.com/phpbb-extensions/viglink.git viglink" passthru="true" checkreturn="true" />
-				<if>
-					<equals arg1="${revision}" arg2="HEAD" trim="true" />
-					<then>
-						<exec dir="${dir}/ext/phpbb/viglink"
-							command="git rev-parse release-phpbb-${version}"
-							returnProperty='viglink_head_tag_exists' />
-						<if>
-							<equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" />
-							<then>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-							</then>
-							<else>
-								<exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" />
-							</else>
-						</if>
-					</then>
-					<else>
-						<exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" />
-					</else>
-				</if>
-				<delete dir="${dir}/ext/phpbb/viglink/.git" />
-				<delete dir="${dir}/ext/phpbb/viglink/tests" />
-				<delete dir="${dir}/ext/phpbb/viglink/travis" />
-				<delete file="${dir}/ext/phpbb/viglink/.gitattributes" />
-				<delete file="${dir}/ext/phpbb/viglink/.travis.yml" />
-				<delete file="${dir}/ext/phpbb/viglink/phpunit.xml.dist" />
-				<delete file="${dir}/ext/phpbb/viglink/README.md" />
-			</then>
-		</if>
-
 		<!-- Create schema.json -->
 		<exec dir="${dir}" command="php develop/create_schema_files.php" />
 
@@ -345,6 +286,10 @@
 		<delete dir="${dir}/config/development" />
 		<delete dir="${dir}/config/test" />
 
+		<phingcall target="clean-vendor-dir">
+			<property name="dir" value="${dir}" />
+		</phingcall>
+
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
@@ -373,35 +318,6 @@
 		<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" />
@@ -410,13 +326,6 @@
 		<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" />
@@ -426,13 +335,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" />
@@ -498,13 +400,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" />
@@ -535,15 +430,6 @@
 		<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/zendframework/zend-code/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-code/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-eventmanager/README.md" />
-
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/CONTRIBUTING.md" />
-		<delete file="${dir}/vendor/zendframework/zend-stdlib/README.md" />
 	</target>
 
 	<target name="clean-diff-dir">

build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php

@@ -134,19 +134,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 +239,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;
-	}
 }

build/sami-all.conf.php

@@ -25,7 +25,6 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../'
 	*/
 	->add('3.0.x')
 	->add('3.1.x')
-	->add('3.2.x')
 	->add('master')
 ;
 

git-tools/setup_github_network.php

@@ -0,0 +1,292 @@
+#!/usr/bin/env php
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+function show_usage()
+{
+	$filename = basename(__FILE__);
+
+	echo "$filename adds repositories of a github network as remotes to a local git repository.\n";
+	echo "\n";
+
+	echo "Usage: [php] $filename -s collaborators|organisation|contributors|forks [OPTIONS]\n";
+	echo "\n";
+
+	echo "Scopes:\n";
+	echo "  collaborators                 Repositories of people who have push access to the specified repository\n";
+	echo "  contributors                  Repositories of people who have contributed to the specified repository\n";
+	echo "  organisation                  Repositories of members of the organisation at github\n";
+	echo "  forks                         All repositories of the whole github network\n";
+	echo "\n";
+
+	echo "Options:\n";
+	echo " -s scope                       See description above (mandatory)\n";
+	echo " -u github_username             Overwrites the github username (optional)\n";
+	echo " -r repository_name             Overwrites the repository name (optional)\n";
+	echo " -m your_github_username        Sets up ssh:// instead of git:// for pushable repositories (optional)\n";
+	echo " -d                             Outputs the commands instead of running them (optional)\n";
+	echo " -h                             This help text\n";
+
+	exit(1);
+}
+
+// Handle arguments
+$opts = getopt('s:u:r:m:dh');
+
+if (empty($opts) || isset($opts['h']))
+{
+	show_usage();
+}
+
+$scope			= get_arg($opts, 's', '');
+$username		= get_arg($opts, 'u', 'phpbb');
+$repository 	= get_arg($opts, 'r', 'phpbb3');
+$developer		= get_arg($opts, 'm', '');
+$dry_run		= !get_arg($opts, 'd', true);
+run(null, $dry_run);
+exit(work($scope, $username, $repository, $developer));
+
+function work($scope, $username, $repository, $developer)
+{
+	// Get some basic data
+	$forks		= get_forks($username, $repository);
+	$collaborators	= get_collaborators($username, $repository);
+
+	if ($forks === false || $collaborators === false)
+	{
+		echo "Error: failed to retrieve forks or collaborators\n";
+		return 1;
+	}
+
+	switch ($scope)
+	{
+		case 'collaborators':
+			$remotes = array_intersect_key($forks, $collaborators);
+		break;
+
+		case 'organisation':
+			$remotes = array_intersect_key($forks, get_organisation_members($username));
+		break;
+
+		case 'contributors':
+			$remotes = array_intersect_key($forks, get_contributors($username, $repository));
+		break;
+
+		case 'forks':
+			$remotes = $forks;
+		break;
+
+		default:
+			show_usage();
+	}
+
+	if (file_exists('.git'))
+	{
+		add_remote($username, $repository, isset($collaborators[$developer]));
+	}
+	else
+	{
+		clone_repository($username, $repository, isset($collaborators[$developer]));
+	}
+
+	// Add private security repository for developers
+	if ($username == 'phpbb' && $repository == 'phpbb3' && isset($collaborators[$developer]))
+	{
+		run("git remote add $username-security " . get_repository_url($username, "$repository-security", true));
+	}
+
+	// Skip blessed repository.
+	unset($remotes[$username]);
+
+	foreach ($remotes as $remote)
+	{
+		add_remote($remote['username'], $remote['repository'], $remote['username'] == $developer);
+	}
+
+	run('git remote update');
+}
+
+function clone_repository($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git clone $url ./ --origin $username");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function add_remote($username, $repository, $pushable = false)
+{
+	$url = get_repository_url($username, $repository, false);
+	run("git remote add $username $url");
+
+	if ($pushable)
+	{
+		$ssh_url = get_repository_url($username, $repository, true);
+		run("git remote set-url --push $username $ssh_url");
+	}
+}
+
+function get_repository_url($username, $repository, $ssh = false)
+{
+	$url_base = ($ssh) ? 'git@github.com:' : 'git://github.com/';
+
+	return $url_base . $username . '/' . $repository . '.git';
+}
+
+function api_request($query)
+{
+	return api_url_request("https://api.github.com/$query?per_page=100");
+}
+
+function api_url_request($url)
+{
+	$contents = file_get_contents($url, false, stream_context_create(array(
+		'http' => array(
+			'header' => "User-Agent: phpBB/1.0\r\n",
+		),
+	)));
+
+	$sub_request_result = array();
+	// Check headers for pagination links
+	if (!empty($http_response_header))
+	{
+		foreach ($http_response_header as $header_element)
+		{
+			// Find Link Header which gives us a link to the next page
+			if (strpos($header_element, 'Link: ') === 0)
+			{
+				list($head, $header_content) = explode(': ', $header_element);
+				foreach (explode(', ', $header_content) as $links)
+				{
+					list($url, $rel) = explode('; ', $links);
+					if ($rel == 'rel="next"')
+					{
+						// Found a next link, follow it and merge the results
+						$sub_request_result = api_url_request(substr($url, 1, -1));
+					}
+				}
+			}
+		}
+	}
+
+	if ($contents === false)
+	{
+		return false;
+	}
+	$contents = json_decode($contents);
+
+	if (isset($contents->message) && strpos($contents->message, 'API Rate Limit') === 0)
+	{
+		throw new RuntimeException('Reached github API Rate Limit. Please try again later' . "\n", 4);
+	}
+
+	return ($sub_request_result) ? array_merge($sub_request_result, $contents) : $contents;
+}
+
+function get_contributors($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/stats/contributors");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $contribution)
+	{
+		$usernames[$contribution->author->login] = $contribution->author->login;
+	}
+
+	return $usernames;
+}
+
+function get_organisation_members($username)
+{
+	$request = api_request("orgs/$username/public_members");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $member)
+	{
+		$usernames[$member->login] = $member->login;
+	}
+
+	return $usernames;
+}
+
+function get_collaborators($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/collaborators");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $collaborator)
+	{
+		$usernames[$collaborator->login] = $collaborator->login;
+	}
+
+	return $usernames;
+}
+
+function get_forks($username, $repository)
+{
+	$request = api_request("repos/$username/$repository/forks");
+	if ($request === false)
+	{
+		return false;
+	}
+
+	$usernames = array();
+	foreach ($request as $fork)
+	{
+		$usernames[$fork->owner->login] = array(
+			'username'		=> $fork->owner->login,
+			'repository'	=> $fork->name,
+		);
+	}
+
+	return $usernames;
+}
+
+function get_arg($array, $index, $default)
+{
+	return isset($array[$index]) ? $array[$index] : $default;
+}
+
+function run($cmd, $dry = false)
+{
+	static $dry_run;
+
+	if (is_null($cmd))
+	{
+		$dry_run = $dry;
+	}
+	else if (!empty($dry_run))
+	{
+		echo "$cmd\n";
+	}
+	else
+	{
+		passthru(escapeshellcmd($cmd));
+	}
+}

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.

phpBB/adm/index.php

@@ -41,7 +41,6 @@ if (!isset($user->data['session_admin']) || !$user->data['session_admin'])
 // check specific permissions but this is a catchall
 if (!$auth->acl_get('a_'))
 {
-	send_status_line(403, 'Forbidden');
 	trigger_error('NO_ADMIN');
 }
 

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>

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>

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>

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>

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">

phpBB/adm/style/acp_ext_details.html

@@ -7,19 +7,20 @@
 	<h1>{L_EXTENSIONS_ADMIN}</h1>
 
 	<!-- IF S_VERSIONCHECK -->
-		<!-- IF S_VERSIONCHECK_FAIL -->
-		<div class="errorbox notice">
-			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p>{VERSIONCHECK_FAIL_REASON}</p>
-			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-		<!-- ELSE -->
-		<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
-			<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-		</div>
-		<!-- ENDIF -->
+	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
+		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
+	<div class="errorbox notice">
+		<p>{L_VERSIONCHECK_FAIL}</p>
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+	</div>
+	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
+	<div class="errorbox notice">
+		<p>{VERSIONCHECK_FAIL_REASON}</p>
+	</div>
 	<!-- ENDIF -->
-<!-- EVENT acp_ext_details_notice -->
 
 	<fieldset>
 		<legend>{L_EXT_DETAILS}</legend>
@@ -135,5 +136,4 @@
 		<!-- END meta_authors -->
 	</fieldset>
 
-	<!-- EVENT acp_ext_details_end -->
 <!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_ext_list.html

@@ -44,11 +44,11 @@
 	<tbody>
 		<!-- IF .enabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong><!-- EVENT acp_ext_list_enabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
 		</tr>
 		<!-- BEGIN enabled -->
 		<tr class="ext_enabled row-highlight">
-			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
+			<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF enabled.S_VERSIONCHECK -->
 				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
@@ -69,11 +69,11 @@
 
 		<!-- IF .disabled -->
 		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong><!-- EVENT acp_ext_list_disabled_title_after --></td>
+			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
 		</tr>
 		<!-- BEGIN disabled -->
 		<tr class="ext_disabled row-highlight">
-			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
+			<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td>
 			<td style="text-align: center;">
 				<!-- IF disabled.S_VERSIONCHECK -->
 				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>

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>

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>

phpBB/adm/style/acp_help_phpbb.html

@@ -1,61 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-<h1>{L_ACP_HELP_PHPBB}</h1>
-
-<form id="acp_help_phpbb" method="post" action="{U_ACTION}" data-ajax-action="{U_COLLECT_STATS}">
-<div class="send-stats-row">
-	<!-- EVENT acp_help_phpbb_stats_before -->
-	<div class="send-stats-tile">
-		<h2><i class="icon fa-bar-chart"></i>{L_SEND_STATISTICS}</h2>
-		<p>{L_EXPLAIN_SEND_STATISTICS}</p>
-		<div class="send-stats-row">
-			<div class="send-stats-data-row send-stats-data-only-row">
-				<a id="trigger-configlist" data-ajax="toggle_link" data-overlay="false" data-toggle-text="{L_HIDE_STATISTICS}"><span>{L_SHOW_STATISTICS}</span><i class="icon fa-angle-down"></i></a>
-			</div>
-			<div class="send-stats-data-row">
-				<div class="configlist" id="configlist">
-					<!-- BEGIN providers -->
-					<fieldset>
-						<legend>{providers.NAME}</legend>
-						<!-- BEGIN values -->
-						<dl>
-							<dt>{providers.values.KEY}</dt>
-							<dd>{providers.values.VALUE}</dd>
-						</dl>
-						<!-- END values -->
-					</fieldset>
-					<!-- END providers -->
-				</div>
-			</div>
-		</div>
-		<dl class="send-stats-settings">
-			<dt>
-				<input name="help_send_statistics" id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
-				<label for="help_send_statistics"></label>
-			</dt>
-			<dd>{L_SEND_STATISTICS_LONG}</dd>
-		</dl>
-	</div>
-	<!-- EVENT acp_help_phpbb_stats_after -->
-	<fieldset>
-		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-			<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
-			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
-		</p>
-		{S_FORM_TOKEN}
-	</fieldset>
-</div>
-</form>
-<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
-	<fieldset>
-		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
-			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
-		</p>
-	</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->

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>

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>
 

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>
@@ -47,25 +47,10 @@
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
-<dl>
-	<dt><label for="jab_verify_peer">{L_JAB_VERIFY_PEER}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer" name="jab_verify_peer" value="1"<!-- IF JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer" value="0"<!-- IF not JAB_VERIFY_PEER --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_verify_peer_name">{L_JAB_VERIFY_PEER_NAME}{L_COLON}</label><br /><span>{L_JAB_VERIFY_PEER_NAME_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_verify_peer_name" name="jab_verify_peer_name" value="1"<!-- IF JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_verify_peer_name" value="0"<!-- IF not JAB_VERIFY_PEER_NAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
-<dl>
-	<dt><label for="jab_allow_self_signed">{L_JAB_ALLOW_SELF_SIGNED}{L_COLON}</label><br /><span>{L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}</span></dt>
-	<dd><label><input type="radio" class="radio" id="jab_allow_self_signed" name="jab_allow_self_signed" value="1"<!-- IF JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-		<label><input type="radio" class="radio" name="jab_allow_self_signed" value="0"<!-- IF not JAB_ALLOW_SELF_SIGNED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-</dl>
 <!-- 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>

phpBB/adm/style/acp_main.html

@@ -14,11 +14,7 @@
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	<!-- IF S_UPDATE_INCOMPLETE -->
-		<div class="errorbox">
-			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
-		</div>
-	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
+	<!-- IF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
 			<p>{L_VERSIONCHECK_FAIL}</p>
 			<p>{VERSIONCHECK_FAIL_REASON}</p>
@@ -30,11 +26,6 @@
 			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
 	<!-- ENDIF -->
-	<!-- IF S_VERSION_UPGRADEABLE -->
-		<div class="errorbox notice">
-			<p>{UPGRADE_INSTRUCTIONS}</p>
-		</div>
-	<!-- ENDIF -->
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">
@@ -130,6 +121,8 @@
 		<td>{L_FILES_PER_DAY}{L_COLON} </td>
 		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>
+
+
 	<tr>
 		<td>{L_BOARD_STARTED}{L_COLON} </td>
 		<td><strong>{START_DATE}</strong></td>
@@ -148,25 +141,22 @@
 		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
+	<!-- IF S_TOTAL_ORPHAN or S_VERSIONCHECK -->
 	<tr>
-		<td>{L_PHP_VERSION}{L_COLON} </td>
-		<td><strong>{PHP_VERSION_INFO}</strong></td>
-	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
-		<td><strong>{TOTAL_ORPHAN}</strong></td>
-	<!-- ELSE -->
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	<!-- ENDIF -->
-	</tr>
 	<!-- IF S_VERSIONCHECK -->
-	<tr>
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
 			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;" <!-- ELSEIF not S_VERSIONCHECK_FAIL -->style="color: #BC2A4D;" <!-- ENDIF -->title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
+	<!-- ENDIF -->
+	<!-- IF S_TOTAL_ORPHAN -->
+		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
+		<td><strong>{TOTAL_ORPHAN}</strong></td>
+	<!-- ENDIF -->
+	<!-- IF not S_TOTAL_ORPHAN or not S_VERSIONCHECK -->
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
+	<!-- ENDIF -->
 	</tr>
 	<!-- ENDIF -->
 	</tbody>

phpBB/adm/style/acp_posting_buttons.html

@@ -63,7 +63,6 @@
 		<!-- ENDIF -->
 		<!-- ENDIF -->
 	</select>
-	<!-- EVENT acp_posting_buttons_custom_tags_before -->
 	<!-- BEGIN custom_tags -->
 	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
 	<!-- END custom_tags -->

phpBB/adm/style/acp_profile.html

@@ -85,7 +85,6 @@
 			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
 			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
 			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
-			<!-- EVENT acp_profile_contact_last -->
 		</dl>
 		</fieldset>
 
@@ -128,7 +127,6 @@
 			<!-- ENDIF -->
 			</dl>
 		<!-- ENDIF -->
-		<!-- EVENT acp_profile_step_one_lang_after -->
 		</fieldset>
 
 		<fieldset class="quick">

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>
 

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>
 

phpBB/adm/style/acp_send_statistics.html

@@ -0,0 +1,64 @@
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+
+<h1>{L_SEND_STATISTICS}</h1>
+
+<p>{L_EXPLAIN_SEND_STATISTICS}</p>
+
+<script type="text/javascript">
+//<![CDATA[
+var iframect = 0;
+
+function iframe_updated()
+{
+	if (iframect++ == 0)
+	{
+		return;
+	}
+
+	phpbb.toggleDisplay('questionnaire-form', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', 1);
+}
+//]]>
+</script>
+
+<iframe onload="iframe_updated();" name="questionaire_result" style="display: none;"></iframe>
+
+<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
+
+	<p><a href="{U_ACP_MAIN}">{L_DONT_SEND_STATISTICS}</a></p>
+
+	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
+
+	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+
+	<div id="configlist">
+		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+		</p>
+
+		<!-- BEGIN providers -->
+		<fieldset>
+			<legend>{providers.NAME}</legend>
+			<!-- BEGIN values -->
+			<dl>
+				<dt>{providers.values.KEY}</dt>
+				<dd>{providers.values.VALUE}</dd>
+			</dl>
+			<!-- END values -->
+		</fieldset>
+		<!-- END providers -->
+	</div>
+	<p class="submit-buttons">
+		<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
+	</p>
+</form>
+
+<div id="questionnaire-thanks" class="successbox">
+	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
+</div>
+
+<!-- INCLUDE overall_footer.html -->

phpBB/adm/style/acp_styles.html

@@ -51,10 +51,6 @@
 		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_PATH}</strong></dd>
 	</dl>
-	<dl>
-		<dt><label>{L_STYLE_VERSION}{L_COLON}</label></dt>
-		<dd><strong>{STYLE_VERSION}</strong></dd>
-	</dl>
 	<dl>
 		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
 		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>

phpBB/adm/style/acp_update.html

@@ -6,43 +6,22 @@
 
 <p>{L_VERSION_CHECK_EXPLAIN}</p>
 
-<!-- IF S_UPDATE_INCOMPLETE -->
-	<div class="errorbox">
-		<p>{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}</p>
-	</div>
-<!-- ENDIF -->
 <!-- IF S_UP_TO_DATE -->
 	<div class="successbox">
 		<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
-<!-- ELSEIF not S_UPDATE_INCOMPLETE -->
+<!-- ELSE -->
 	<div class="errorbox">
 		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
 	</div>
 <!-- ENDIF -->
-<!-- IF S_VERSION_UPGRADEABLE -->
-	<div class="errorbox notice">
-		<p>{UPGRADE_INSTRUCTIONS}</p>
-	</div>
-<!-- ENDIF -->
 
 <fieldset>
 	<legend></legend>
-	<!-- IF not S_UPDATE_INCOMPLETE -->
 	<dl>
 		<dt><label>{L_CURRENT_VERSION}</label></dt>
 		<dd><strong>{CURRENT_VERSION}</strong></dd>
 	</dl>
-	<!-- ELSE -->
-	<dl>
-		<dt><label>{L_FILES_VERSION}</label></dt>
-		<dd><strong>{FILES_VERSION}</strong></dd>
-	</dl>
-	<dl>
-		<dt><label>{L_DATABASE_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-	<!-- ENDIF -->
 </fieldset>
 
 <!-- BEGIN updates_available -->
@@ -59,11 +38,6 @@
 	</fieldset>
 <!-- END updates_available -->
 
-<!-- IF S_UPDATE_INCOMPLETE -->
-	{INCOMPLETE_INSTRUCTIONS}
-	<br>
-<!-- ENDIF -->
-
 <!-- IF not S_UP_TO_DATE -->
 	{UPDATE_INSTRUCTIONS}
 	<br /><br />

phpBB/adm/style/admin.css

@@ -1,4 +1,4 @@
-/*  phpBB 3.2 Admin Style Sheet
+/*  phpBB 3.1 Admin Style Sheet
 	------------------------------------------------------------------------
 	Original author:	subBlue ( http://www.subblue.com/ )
 	Copyright (c) phpBB Limited <https://www.phpbb.com>
@@ -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;
 }
 
@@ -2583,120 +2583,3 @@ fieldset.permissions .padding {
 	line-height: 25px;
 	font-weight: bold;
 }
-
-.send-stats-row {
-	margin: 15px 0;
-}
-
-.send-stats-row:before {
-	display: table;
-	content: " ";
-}
-
-.send-stats-tile {
-	position: relative;
-	padding: 14px;
-	margin-bottom: 20px;
-	background-color: #eff0f2;
-	border-radius: 6px;
-	box-shadow: rgba(0,0,0,0.3) 1px 1px 5px;
-}
-
-.send-stats-tile h2 {
-	margin-top: 0;
-	text-align: center;
-    padding-bottom: 1em;
-}
-
-.send-stats-tile i {
-	padding-right: 0.3em;
-}
-
-.icon {
-	font-family: FontAwesome;
-	font-style: normal;
-}
-
-.send-stats-data-row {
-	background: #f9f9f9;
-	border-radius: 6px;
-	border: #DEDEDE 1px solid;
-	padding: 10px;
-	border-top-width: 0;
-	border-top-right-radius: 0;
-	border-top-left-radius: 0;
-}
-
-.send-stats-data-hidden .configlist {
-	display: none;
-}
-
-.send-stats-data-only-row {
-	border-radius: 6px !important;
-	border-bottom-width: 1px !important;
-}
-
-.send-stats-data-hidden {
-	padding: 0;
-	border: none;
-}
-
-.send-stats-row > .send-stats-data-row:first-child {
-	background-color: #d9edf7;
-	border-bottom-width: 0;
-	border-top-right-radius: 6px;
-	border-top-left-radius: 6px;
-	border-top-width: 1px;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.send-stats-settings dt, .send-stats-settings dd {
-	min-width: 25px;
-}
-
-.send-stats-settings dd {
-	line-height: 1.5em;
-}
-
-.send-stats-settings input {
-	display: none;
-}
-
-.send-stats-settings input[type=checkbox] + label:before {
-	content: "\f096";
-	font-family: FontAwesome;
-	font-size: 1.5em;
-}
-
-.send-stats-settings input[type=checkbox]:checked + label:before {
-	content: "\f14a";
-	color: #3c763d;
-}
-
-.send-stats-data-row a:hover span {
-	text-decoration: underline;
-}
-
-.send-stats-data-row a {
-	text-decoration: none;
-	cursor: default;
-}
-
-.send-stats-data-row i {
-	padding-left: 6px;
-}
-
-.configlist {
-	word-wrap: break-word;
-	word-break: break-all;
-}
-
-/* stylelint-disable declaration-property-unit-whitelist */
-.emoji {
-	min-height: 18px;
-	min-width: 18px;
-	height: 1em;
-	width: 1em;
-}
-/* stylelint-enable declaration-property-unit-whitelist */

phpBB/adm/style/admin.js

@@ -243,16 +243,8 @@ function parse_document(container)
 
 		parse_document($('body'));
 
-		$('#questionnaire-form').css('display', 'none');
-		var $triggerConfiglist = $('#trigger-configlist');
-
-		$triggerConfiglist.on('click', function () {
-			var $configlist = $('#configlist');
-			$configlist.closest('.send-stats-data-row').toggleClass('send-stats-data-hidden');
-			$configlist.closest('.send-stats-row').find('.send-stats-data-row:first-child').toggleClass('send-stats-data-only-row');
-			$(this).find('i').toggleClass('fa-angle-down fa-angle-up');
-		});
-
-		$('#configlist').closest('.send-stats-data-row').addClass('send-stats-data-hidden');
+		// Hide configlist and success message in send statistics page
+		phpbb.toggleDisplay('configlist', -1);
+		phpbb.toggleDisplay('questionnaire-thanks', -1);
 	});
 })(jQuery);

phpBB/adm/style/ajax.js

@@ -4,101 +4,6 @@
 
 'use strict';
 
-
-phpbb.prepareSendStats = function () {
-	var $form = $('#acp_help_phpbb');
-	var $dark = $('#darkenwrapper');
-	var $loadingIndicator;
-
-	$form.on('submit', function (event) {
-		var $this = $(this),
-			currentTime = Math.floor(new Date().getTime() / 1000),
-			statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
-
-		event.preventDefault();
-		$this.unbind('submit');
-
-		// Skip ajax request if form is submitted too early or send stats
-		// checkbox is not checked
-		if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
-			statsTime > currentTime) {
-			$form.find('input[type=submit]').click();
-			setTimeout(function () {
-				$form.find('input[type=submit]').click();
-			}, 300);
-			return;
-		}
-
-		/**
-		 * Handler for AJAX errors
-		 */
-		function errorHandler(jqXHR, textStatus, errorThrown) {
-			if (typeof console !== 'undefined' && console.log) {
-				console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
-			}
-			phpbb.clearLoadingTimeout();
-			var errorText = '';
-
-			if (typeof errorThrown === 'string' && errorThrown.length > 0) {
-				errorText = errorThrown;
-			} else {
-				errorText = $dark.attr('data-ajax-error-text-' + textStatus);
-				if (typeof errorText !== 'string' || !errorText.length) {
-					errorText = $dark.attr('data-ajax-error-text');
-				}
-			}
-			phpbb.alert($dark.attr('data-ajax-error-title'), errorText);
-		}
-
-		/**
-		 * This is a private function used to handle the callbacks, refreshes
-		 * and alert. It calls the callback, refreshes the page if necessary, and
-		 * displays an alert to the user and removes it after an amount of time.
-		 *
-		 * It cannot be called from outside this function, and is purely here to
-		 * avoid repetition of code.
-		 *
-		 * @param {object} res The object sent back by the server.
-		 */
-		function returnHandler(res) {
-			phpbb.clearLoadingTimeout();
-
-			// If a confirmation is not required, display an alert and call the
-			// callbacks.
-			$dark.fadeOut(phpbb.alertTime);
-
-			if ($loadingIndicator) {
-				$loadingIndicator.fadeOut(phpbb.alertTime);
-			}
-
-			var $sendStatisticsSuccess = $('<input />', {
-				type: 'hidden',
-				name: 'send_statistics_response',
-				value: res
-			});
-			$sendStatisticsSuccess.appendTo('p.submit-buttons');
-
-			// Finish actual form submission
-			$form.find('input[type=submit]').click();
-		}
-
-		$loadingIndicator = phpbb.loadingIndicator();
-
-		$.ajax({
-			url: $this.attr('data-ajax-action').replace('&amp;', '&'),
-			type: 'POST',
-			data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
-			success: returnHandler,
-			error: errorHandler,
-			cache: false
-		}).always(function() {
-			if ($loadingIndicator && $loadingIndicator.is(':visible')) {
-				$loadingIndicator.fadeOut(phpbb.alertTime);
-			}
-		});
-	});
-};
-
 /**
  * The following callbacks are for reording items. row_down
  * is triggered when an item is moved down, and row_up is triggered when
@@ -157,139 +62,7 @@ phpbb.addAjaxCallback('row_delete', function(res) {
 	}
 });
 
-/**
- * Handler for submitting permissions form in chunks
- * This call will submit permissions forms in chunks of 5 fieldsets.
- */
-function submitPermissions() {
-	var $form = $('form#set-permissions'),
-		fieldsetList = $form.find('fieldset[id^=perm]'),
-		formDataSets = [],
-		dataSetIndex = 0,
-		$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
-		$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
 
-	// Set proper start values for handling refresh of page
-	var permissionSubmitSize = 0,
-		permissionRequestCount = 0,
-		forumIds = [],
-		permissionSubmitFailed = false;
-
-	if ($submitAllButton !== $submitButton) {
-		fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
-	}
-
-	$.each(fieldsetList, function (key, value) {
-		dataSetIndex = Math.floor(key / 5);
-		var $fieldset = $('fieldset#' + value.id);
-		if (key % 5 === 0) {
-			formDataSets[dataSetIndex] = $fieldset.find('select:visible, input:not([data-name])').serialize();
-		} else {
-			formDataSets[dataSetIndex] += '&' + $fieldset.find('select:visible, input:not([data-name])').serialize();
-		}
-
-		// Find proper role value
-		var roleInput = $fieldset.find('input[name^=role][data-name]');
-		if (roleInput.val()) {
-			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' + roleInput.val();
-		} else {
-			formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' +
-				$fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
-		}
-	});
-
-	permissionSubmitSize = formDataSets.length;
-
-	// Add each forum ID to forum ID list to preserve selected forums
-	$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
-		if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
-			forumIds.push(value.value);
-		}
-	});
-
-	/**
-	 * Handler for submitted permissions form chunk
-	 *
-	 * @param {object} res Object returned by AJAX call
-	 */
-	function handlePermissionReturn(res) {
-		permissionRequestCount++;
-		var $dark = $('#darkenwrapper');
-
-		if (res.S_USER_WARNING) {
-			phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-			permissionSubmitFailed = true;
-		} else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
-			// Display success message at the end of submitting the form
-			if (permissionRequestCount >= permissionSubmitSize) {
-				var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
-				var $alertBoxLink = $alert.find('p.alert_text > a');
-
-				// Create form to submit instead of normal "Back to previous page" link
-				if ($alertBoxLink) {
-					// Remove forum_id[] from URL
-					$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
-					var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
-					$.each(forumIds, function (key, value) {
-						previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
-					});
-					previousPageForm += '</form>';
-
-					$alertBoxLink.on('click', function (e) {
-						var $previousPageForm = $(previousPageForm);
-						$('body').append($previousPageForm);
-						e.preventDefault();
-						$previousPageForm.submit();
-					});
-				}
-
-				// Do not allow closing alert
-				$dark.off('click');
-				$alert.find('.alert_close').hide();
-
-				if (typeof res.REFRESH_DATA !== 'undefined') {
-					setTimeout(function () {
-						// Create forum to submit using POST. This will prevent
-						// exceeding the maximum length of URLs
-						var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, '') + '" method="post">';
-						$.each(forumIds, function (key, value) {
-							form += '<input type="text" name="forum_id[]" value="' + value + '" />';
-						});
-						form += '</form>';
-						$form = $(form);
-						$('body').append($form);
-
-						// Hide the alert even if we refresh the page, in case the user
-						// presses the back button.
-						$dark.fadeOut(phpbb.alertTime, function () {
-							if (typeof $alert !== 'undefined') {
-								$alert.hide();
-							}
-						});
-
-						// Submit form
-						$form.submit();
-					}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
-				}
-			}
-		}
-	}
-
-	// Create AJAX request for each form data set
-	$.each(formDataSets, function (key, formData) {
-		$.ajax({
-			url: $form.action,
-			type: 'POST',
-			data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
-				'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
-				'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
-				'&' + $form.children('input[type=hidden]').serialize() +
-				'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
-			success: handlePermissionReturn,
-			error: handlePermissionReturn
-		});
-	});
-}
 
 $('[data-ajax]').each(function() {
 	var $this = $(this),
@@ -310,22 +83,6 @@ $('[data-ajax]').each(function() {
 */
 $(function() {
 	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
-
-	var $setPermissionsForm = $('form#set-permissions');
-	if ($setPermissionsForm.length) {
-		$setPermissionsForm.on('submit', function (e) {
-			submitPermissions();
-			e.preventDefault();
-		});
-		$setPermissionsForm.find('input[type=submit]').click(function() {
-			$('input[type=submit]', $(this).parents($('form#set-permissions'))).removeAttr('data-clicked');
-			$(this).attr('data-clicked', true);
-		});
-	}
-
-	if ($('#acp_help_phpbb')) {
-		phpbb.prepareSendStats();
-	}
 });
 
 

phpBB/adm/style/installer_footer.html

@@ -11,15 +11,6 @@
 	</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>

phpBB/adm/style/installer_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>

phpBB/adm/style/overall_header.html

@@ -2,12 +2,10 @@
 <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_FONT_AWESOME_LINK}" rel="stylesheet">
 <link href="style/admin.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen" />
 
 <script type="text/javascript">
@@ -54,7 +52,7 @@ function marklist(id, name, state)
 
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}

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 %}

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>
@@ -66,7 +65,7 @@ function marklist(id, name, state)
 	
 	for (var r = 0; r < rb.length; r++)
 	{
-		if (rb[r].name.substr(0, name.length) == name && rb[r].disabled !== true)
+		if (rb[r].name.substr(0, name.length) == name)
 		{
 			rb[r].checked = state;
 		}

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
@@ -211,23 +200,6 @@ $(function() {
 
 	// Prepare dropdown
 	phpbb.prepareRolesDropdown();
-
-	// Reset role drop-down on modifying permissions in advanced tab
-	$('div.permissions-switch > a').on('click', function () {
-		$.each($('input[type=radio][name^="setting["]'), function () {
-			var $this = $(this);
-			$this.on('click', function () {
-				var $rolesOptions = $this.closest('fieldset.permissions').find('.roles-options'),
-					rolesSelect = $rolesOptions.find('select > option')[0];
-
-				// Set selected setting
-				$rolesOptions.children('span')
-					.text(rolesSelect.text);
-				$rolesOptions.children('input[type=hidden]')
-					.val(rolesSelect.value);
-			});
-		});
-	});
 });
 
 })(jQuery); // Avoid conflicts with other libraries

phpBB/assets/cookieconsent/cookieconsent.min.css

@@ -1,6 +0,0 @@
-.cc-window{opacity:1;transition:opacity 1s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}.cc-grower{max-height:0;overflow:hidden;transition:max-height 1s}
-.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-static{position:static}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-banner .cc-btn:last-child{min-width:140px}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:focus,.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:focus,.cc-close:hover{opacity:1}
-.cc-revoke.cc-top{top:0;left:3em;border-bottom-left-radius:.5em;border-bottom-right-radius:.5em}.cc-revoke.cc-bottom{bottom:0;left:3em;border-top-left-radius:.5em;border-top-right-radius:.5em}.cc-revoke.cc-left{left:3em;right:unset}.cc-revoke.cc-right{right:3em;left:unset}.cc-top{top:1em}.cc-left{left:1em}.cc-right{right:1em}.cc-bottom{bottom:1em}.cc-floating>.cc-link{margin-bottom:1em}.cc-floating .cc-message{display:block;margin-bottom:1em}.cc-window.cc-floating .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-banner{-ms-flex-align:center;align-items:center}.cc-banner.cc-top{left:0;right:0;top:0}.cc-banner.cc-bottom{left:0;right:0;bottom:0}.cc-banner .cc-message{-ms-flex:1;flex:1}.cc-compliance{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:justify;align-content:space-between}.cc-compliance>.cc-btn{-ms-flex:1;flex:1}.cc-btn+.cc-btn{margin-left:.5em}
-@media print{.cc-revoke,.cc-window{display:none}}@media screen and (max-width:900px){.cc-btn{white-space:normal}}@media screen and (max-width:414px) and (orientation:portrait),screen and (max-width:736px) and (orientation:landscape){.cc-window.cc-top{top:0}.cc-window.cc-bottom{bottom:0}.cc-window.cc-banner,.cc-window.cc-left,.cc-window.cc-right{left:0;right:0}.cc-window.cc-banner{-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-floating{max-width:none}.cc-window .cc-message{margin-bottom:1em}.cc-window.cc-banner{-ms-flex-align:unset;align-items:unset}}
-.cc-floating.cc-theme-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-theme-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-theme-classic .cc-btn{border-radius:5px}.cc-theme-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-theme-classic .cc-btn{display:inline-block}
-.cc-theme-edgeless.cc-window{padding:0}.cc-floating.cc-theme-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-theme-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-theme-edgeless .cc-message{margin-left:1em}.cc-floating.cc-theme-edgeless .cc-btn+.cc-btn{margin-left:0}

phpBB/assets/javascript/core.js

@@ -36,27 +36,20 @@ phpbb.loadingIndicator = function() {
 
 	if (!$loadingIndicator.is(':visible')) {
 		$loadingIndicator.fadeIn(phpbb.alertTime);
-		// Wait 60 seconds and display an error if nothing has been returned by then.
+		// Wait fifteen seconds and display an error if nothing has been returned by then.
 		phpbb.clearLoadingTimeout();
 		phpbbAlertTimer = setTimeout(function() {
-			phpbb.showTimeoutMessage();
-		}, 60000);
+			var $alert = $('#phpbb_alert');
+
+			if ($loadingIndicator.is(':visible')) {
+				phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
+			}
+		}, 15000);
 	}
 
 	return $loadingIndicator;
 };
 
-/**
- * Show timeout message
- */
-phpbb.showTimeoutMessage = function () {
-	var $alert = $('#phpbb_alert');
-
-	if ($loadingIndicator.is(':visible')) {
-		phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
-	}
-};
-
 /**
  * Clear loading alert timeout
 */
@@ -1039,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');
@@ -1058,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) {
@@ -1548,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);
-		}
 	});
 };
 

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);
 

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');
@@ -331,63 +329,6 @@
 		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 +357,10 @@
 			$('#loading_indicator').css('display', 'none');
 			resetPolling();
 
-			var timeoutDetected = !transmissionOver;
-
 			if (refreshRequested) {
 				refreshRequested = false;
 				doRefresh();
 			}
-
-			if (timeoutDetected) {
-				statusCount = 0;
-				queryInstallerStatus();
-			}
 		}
 	}
 
@@ -486,7 +420,6 @@
 	 */
 	function startPolling(xhReq) {
 		resetPolling();
-		transmissionOver = false;
 		pollTimer = setInterval(function () {
 			pollContent(xhReq);
 		}, 250);

phpBB/bin/phpbbcli.php

@@ -42,7 +42,6 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 
 $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
 $phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file);
@@ -69,18 +68,17 @@ $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 \phpbb\language\language $language */
-$language = $phpbb_container->get('language');
-$language->add_lang(array('common', 'acp/common', 'cli'));
-
 /* @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');
 
-$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $language);
+/* @var $lang \phpbb\language\language */
+$lang = $phpbb_container->get('language');
+
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);
 $application->setDispatcher($phpbb_container->get('dispatcher'));
 $application->register_container_commands($phpbb_container->get('console.command_collection'));
 $application->run($input);

phpBB/common.php

@@ -12,7 +12,7 @@
 */
 
 /**
-* Minimum Requirement: PHP 5.4.0
+* Minimum Requirement: PHP 5.3.9
 */
 
 if (!defined('IN_PHPBB'))
@@ -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)
@@ -134,8 +128,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')));

phpBB/composer.json

@@ -25,51 +25,41 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.4",
+		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
 		"google/recaptcha": "~1.1",
-		"guzzlehttp/guzzle": "~5.3",
 		"lusitanian/oauth": "^0.8.1",
-		"marc1706/fast-image-size": "^1.1",
-		"paragonie/random_compat": "^1.4",
-		"patchwork/utf8": "^1.1",
-		"s9e/text-formatter": "~0.10.0",
-		"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/twig-bridge": "^2.8",
-		"symfony/yaml": "^2.8",
-		"twig/twig": "^1.0"
+		"marc1706/fast-image-size": "1.1.*",
+		"patchwork/utf8": "1.1.*",
+		"s9e/text-formatter": "^0.4.2",
+		"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/routing": "2.8.*",
+		"symfony/twig-bridge": "2.8.*",
+		"symfony/yaml": "2.8.*",
+		"twig/twig": "1.*"
 	},
 	"require-dev": {
 		"fabpot/goutte": "~2.0",
-		"facebook/webdriver": "~1.1",
-		"laravel/homestead": "~2.2",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
-		"phpunit/phpunit": "^4.1",
+		"phpunit/phpunit": "4.1.*",
 		"sami/sami": "1.*",
 		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "^2.8",
-		"symfony/css-selector": "^2.8",
-		"symfony/dom-crawler": "^2.8"
+		"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"
-		}
 	}
 }

phpBB/config/default/container/services.yml

@@ -108,7 +108,7 @@ services:
             - '%tables.ext%'
             - '%core.root_path%'
             - '%core.php_ext%'
-            - '@cache'
+            - '@cache.driver'
 
     file_downloader:
         class: phpbb\file_downloader
@@ -161,7 +161,7 @@ services:
 
     version_helper:
         class: phpbb\version_helper
-        shared: false
+        scope: prototype
         arguments:
             - '@cache'
             - '@config'

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'

phpBB/config/default/container/services_auth.yml

@@ -63,7 +63,6 @@ services:
             - '@auth.provider.oauth.service_collection'
             - '%tables.users%'
             - '@service_container'
-            - '@dispatcher'
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
@@ -100,11 +99,3 @@ services:
             - '@request'
         tags:
             - { name: auth.provider.oauth.service }
-
-    auth.provider.oauth.service.twitter:
-        class: phpbb\auth\provider\oauth\service\twitter
-        arguments:
-            - '@config'
-            - '@request'
-        tags:
-            - { name: auth.provider.oauth.service }

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:

phpBB/config/default/container/services_console.yml

@@ -111,7 +111,15 @@ services:
 
     console.command.db.revert:
         class: phpbb\console\command\db\revert
-        parent: console.command.db.migrate
+        arguments:
+            - '@user'
+            - '@language'
+            - '@migrator'
+            - '@ext.manager'
+            - '@config'
+            - '@cache'
+            - '@filesystem'
+            - '%core.root_path%'
         tags:
             - { name: console.command }
 
@@ -167,27 +175,6 @@ services:
         tags:
             - { name: console.command }
 
-    console.command.fixup.update_hashes:
-        class: phpbb\console\command\fixup\update_hashes
-        arguments:
-            - '@config'
-            - '@user'
-            - '@dbal.conn'
-            - '@passwords.manager'
-            - '@passwords.driver_collection'
-            - '%passwords.algorithms%'
-        tags:
-            - { name: console.command }
-
-    console.command.fixup.fix_left_right_ids:
-        class: phpbb\console\command\fixup\fix_left_right_ids
-        arguments:
-            - '@user'
-            - '@dbal.conn'
-            - '@cache.driver'
-        tags:
-            - { name: console.command }
-
     console.command.reparser.list:
         class: phpbb\console\command\reparser\list_all
         arguments:
@@ -232,63 +219,3 @@ services:
             - '@user'
         tags:
             - { name: console.command }
-
-    console.command.update.check:
-        class: phpbb\console\command\update\check
-        arguments:
-            - '@user'
-            - '@config'
-            - '@service_container'
-            - '@language'
-        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 }

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:
@@ -219,17 +218,3 @@ services:
             - [set_reparser, [text_reparser.user_signature]]
         tags:
             - { name: cron.task }
-
-    cron.task.core.update_hashes:
-        class: phpbb\cron\task\core\update_hashes
-        arguments:
-            - '@config'
-            - '@dbal.conn'
-            - '@passwords.update.lock'
-            - '@passwords.manager'
-            - '@passwords.driver_collection'
-            - '%passwords.algorithms%'
-        calls:
-            - [set_name, [cron.task.core.update_hashes]]
-        tags:
-            - { name: cron.task }

phpBB/config/default/container/services_db.yml

@@ -5,7 +5,9 @@ services:
             - '@service_container'
 
     dbal.conn.driver:
-        synthetic: true
+        class: '%dbal.driver.class%'
+        calls:
+            - [sql_connect, ['%dbal.dbhost%', '%dbal.dbuser%', '%dbal.dbpasswd%', '%dbal.dbname%', '%dbal.dbport%', false, '%dbal.new_link%']]
 
 # ----- DB Tools -----
     dbal.tools.factory:
@@ -29,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'
@@ -40,7 +42,7 @@ services:
 
     dbal.extractor.extractors.mysql_extractor:
         class: phpbb\db\extractor\mysql_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -48,7 +50,7 @@ services:
 
     dbal.extractor.extractors.oracle_extractor:
         class: phpbb\db\extractor\oracle_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -56,7 +58,7 @@ services:
 
     dbal.extractor.extractors.postgres_extractor:
         class: phpbb\db\extractor\postgres_extractor
-        shared: false
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'
@@ -64,7 +66,15 @@ services:
 
     dbal.extractor.extractors.sqlite3_extractor:
         class: phpbb\db\extractor\sqlite3_extractor
-        shared: false
+        scope: prototype
+        arguments:
+            - '%core.root_path%'
+            - '@request'
+            - '@dbal.conn.driver'
+
+    dbal.extractor.extractors.sqlite_extractor:
+        class: phpbb\db\extractor\sqlite_extractor
+        scope: prototype
         arguments:
             - '%core.root_path%'
             - '@request'

phpBB/config/default/container/services_feed.yml

@@ -11,7 +11,6 @@ services:
             - '@feed.helper'
             - '@user'
             - '@auth'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.helper:
@@ -24,7 +23,7 @@ services:
 
     feed.forum:
         class: phpbb\feed\forum
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -33,12 +32,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.forums:
         class: phpbb\feed\forums
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -47,12 +45,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.news:
         class: phpbb\feed\news
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -61,12 +58,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.overall:
         class: phpbb\feed\overall
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -75,12 +71,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topic:
         class: phpbb\feed\topic
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -89,12 +84,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics:
         class: phpbb\feed\topics
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -103,12 +97,11 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'
 
     feed.topics_active:
         class: phpbb\feed\topics_active
-        shared: false
+        scope: prototype
         arguments:
             - '@feed.helper'
             - '@config'
@@ -117,5 +110,4 @@ services:
             - '@user'
             - '@auth'
             - '@content.visibility'
-            - '@dispatcher'
             - '%core.php_ext%'

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'
@@ -37,8 +37,8 @@ services:
             - '@request'
 
     files.types.local:
-        class: phpbb\files\types\local
-        shared: false
+        class: phpbb\files\types\form
+        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'

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'

phpBB/config/default/container/services_password.yml

@@ -1,6 +1,3 @@
-parameters:
-    passwords.driver.bcrypt_cost: 10
-
 services:
 # ----- Password management -----
     passwords.manager:
@@ -32,7 +29,6 @@ services:
         arguments:
             - '@config'
             - '@passwords.driver_helper'
-            - '%passwords.driver.bcrypt_cost%'
         tags:
             - { name: passwords.driver }
 
@@ -41,7 +37,6 @@ services:
         arguments:
             - '@config'
             - '@passwords.driver_helper'
-            - '%passwords.driver.bcrypt_cost%'
         tags:
             - { name: passwords.driver }
 
@@ -127,10 +122,3 @@ services:
             - '@passwords.driver_helper'
         tags:
             - { name: passwords.driver }
-
-    passwords.update.lock:
-        class: phpbb\lock\db
-        arguments:
-            - update_hashes_lock
-            - '@config'
-            - '@dbal.conn'

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'

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

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
 

phpBB/config/default/container/services_text_reparser.yml

@@ -24,8 +24,6 @@ services:
         class: phpbb\textreparser\plugins\contact_admin_info
         arguments:
             - '@config_text'
-        calls:
-            - [set_name, [contact_admin_info]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -34,8 +32,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.forums%'
-        calls:
-            - [set_name, [forum_description]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -44,8 +40,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.forums%'
-        calls:
-            - [set_name, [forum_rules]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -54,8 +48,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.groups%'
-        calls:
-            - [set_name, [group_description]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -64,8 +56,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.privmsgs%'
-        calls:
-            - [set_name, [pm_text]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -73,8 +63,6 @@ services:
         class: phpbb\textreparser\plugins\poll_option
         arguments:
             - '@dbal.conn'
-        calls:
-            - [set_name, [poll_option]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -83,8 +71,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.topics%'
-        calls:
-            - [set_name, [poll_title]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -93,8 +79,6 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.posts%'
-        calls:
-            - [set_name, [post_text]]
         tags:
             - { name: text_reparser.plugin }
 
@@ -103,7 +87,5 @@ services:
         arguments:
             - '@dbal.conn'
             - '%tables.users%'
-        calls:
-            - [set_name, [user_signature]]
         tags:
             - { name: text_reparser.plugin }

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,17 +8,14 @@ services:
             - '@config'
             - '@filesystem'
             - '@path_helper'
+            - '@service_container'
             - '%core.template.cache_path%'
             - '@ext.manager'
             - '@template.twig.loader'
-            - '@dispatcher'
             - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer
-        lazy: true
         arguments:
             - '@template.twig.environment'
 

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,19 +79,11 @@ services:
             - '@config'
             - '@filesystem'
             - '@path_helper'
+            - '@service_container'
             - '%core.template.cache_path%'
             - null
             - '@template.twig.loader'
-            - null
             - []
-        calls:
-            - [setLexer, ['@template.twig.lexer']]
-
-    user:
-        class: phpbb\user
-        arguments:
-            - '@language'
-            - '%datetime.class%'
 
     console.exception_subscriber:
         class: phpbb\console\exception_subscriber

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 }

phpBB/config/installer/container/services_install_controller.yml

@@ -53,7 +53,6 @@ services:
     phpbb.installer.controller.convert:
         class: phpbb\convert\controller\convertor
         arguments:
-            - '@cache.driver'
             - '@installer.helper.container_factory'
             - '@installer.helper.database'
             - '@phpbb.installer.controller.helper'
@@ -65,9 +64,3 @@ services:
             - '@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%'

phpBB/config/installer/container/services_install_data.yml

@@ -23,22 +23,11 @@ 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:
             - { name: install_data_install, order: 30 }
 
-    installer.install_data.create_search_index:
-        class: phpbb\install\module\install_data\task\create_search_index
-        arguments:
-            - '@config'
-            - '@installer.helper.container_factory'
-            - '%core.root_path%'
-            - '%core.php_ext%'
-        tags:
-            - { name: install_data_install, order: 40 }
-
     installer.module.data_install_collection:
         class: phpbb\di\ordered_service_collection
         arguments:

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

phpBB/config/installer/container/services_install_finish.yml

@@ -2,21 +2,10 @@ 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 }
 
-    installer.install_finish.install_extensions:
-        class: phpbb\install\module\install_finish\task\install_extensions
-        arguments:
-            - '@installer.helper.container_factory'
-            - '@installer.helper.config'
-            - '@installer.helper.iohandler'
-            - '%core.root_path%'
-        tags:
-            - { name: install_finish, order: 20 }
-
     installer.install_finish.notify_user:
         class: phpbb\install\module\install_finish\task\notify_user
         arguments:
@@ -26,7 +15,7 @@ services:
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:
-            - { name: install_finish, order: 30 }
+            - { name: install_finish, order: 20 }
 
     installer.module.install_finish_collection:
         class: phpbb\di\ordered_service_collection
@@ -36,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'

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,7 +29,7 @@ services:
         class: phpbb\install\helper\navigation\update_navigation
         arguments:
             - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
         tags:
             - { name: installer.navigation }
 
@@ -37,6 +37,6 @@ services:
         class: phpbb\install\helper\navigation\convertor_navigation
         arguments:
             - '@installer.helper.install_helper'
-        shared: false
+        scope: prototype
         tags:
             - { name: installer.navigation }

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]]

phpBB/config/installer/container/services_update_database.yml

@@ -11,17 +11,6 @@ services:
         tags:
             - { name: update_database_task, order: 10 }
 
-    installer.update_database.update_extensions:
-        class: phpbb\install\module\update_database\task\update_extensions
-        arguments:
-            - '@installer.helper.container_factory'
-            - '@installer.helper.config'
-            - '@installer.helper.iohandler'
-            - '@installer.helper.update_helper'
-            - '%core.root_path%'
-        tags:
-            - { name: update_database_task, order: 20 }
-
     installer.module.update_database_collection:
         class: phpbb\di\ordered_service_collection
         arguments:

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%'

phpBB/config/installer/routing/installer.yml

@@ -43,7 +43,7 @@ phpbb_convert_intro:
         start_new: 0
 
 phpbb_convert_settings:
-    path: /convert/settings/{converter}
+    path: /convert/settings/{convertor}
     defaults:
         _controller: phpbb.installer.controller.convert:settings
     requirements:
@@ -60,8 +60,3 @@ 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

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);

phpBB/develop/add_permissions.php

@@ -379,6 +379,8 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 						$sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary));
 						break;
 
+					case 'mssql':
+					case 'sqlite':
 					case 'sqlite3':
 						$sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary));
 						break;

phpBB/develop/create_schema_files.php

@@ -49,7 +49,7 @@ $classes = $finder->core_path('phpbb/')
 	->directory('/db/migration/data')
 	->get_classes();
 
-$db = new \phpbb\db\driver\sqlite3();
+$db = new \phpbb\db\driver\sqlite();
 $factory = new \phpbb\db\tools\factory();
 $db_tools = $factory->get($db, true);
 

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,17 +49,9 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
-		<li><a href="#v320">Changes since 3.2.0</a></li>
-		<li><a href="#v320rc1">Changes since 3.2.0-RC1</a></li>
-		<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="#v3110">Changes since 3.1.10</a></li>
-		<li><a href="#v319">Changes since 3.1.9</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>
@@ -126,278 +117,6 @@
 		<div class="inner">
 
 		<div class="content">
-			<a name="v320"></a><h3>Changes since 3.2.0</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7336">PHPBB3-7336</a>] - Words in new topic title aren't found by search after topic is split</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11076">PHPBB3-11076</a>] - Update notification in ACP for minimum PHP version missing essential information</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11611">PHPBB3-11611</a>] - setup_github_network.php no longer creates a repository</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13250">PHPBB3-13250</a>] - File cache does not write entries starting with _ and containing a slash</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14732">PHPBB3-14732</a>] - Update/remove PHP Code syntax highlighting references</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14790">PHPBB3-14790</a>] - Nested color/list BBCode is not parsed correctly</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14938">PHPBB3-14938</a>] - Inconsistent data results from ext_mgr-&gt;all_available() vs ext_mgr-&gt;is_available()</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14967">PHPBB3-14967</a>] - Cookie Notice</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14971">PHPBB3-14971</a>] - PHP 7.1 warning on pagination</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14975">PHPBB3-14975</a>] - incorrect RTL style appearance </li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14984">PHPBB3-14984</a>] - wrong arrow direction in PM inbox</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14985">PHPBB3-14985</a>] - Plain text is stored as HTML and not decoded before usage</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14989">PHPBB3-14989</a>] - url bbcode does not support irc protocol</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14992">PHPBB3-14992</a>] - User notifications table allowing duplicate entries</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14999">PHPBB3-14999</a>] - Next PM icon pointing in wrong direction</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15002">PHPBB3-15002</a>] - Topic icons not showing in search results</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15003">PHPBB3-15003</a>] - When using mark all, disabled check boxes should not become checked</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15006">PHPBB3-15006</a>] - Permission inheritance with checkbox not working</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15008">PHPBB3-15008</a>] - Disable emoji when smilies are disabled</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15010">PHPBB3-15010</a>] - Crash on user profile custom field</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15011">PHPBB3-15011</a>] - Error not checked on metadata load failure</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15012">PHPBB3-15012</a>] - Invalid constructor in FTP file updater</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15015">PHPBB3-15015</a>] - phpbb 3.2.0 install error in the board-wide emails description...</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15016">PHPBB3-15016</a>] - Smilies that contain some characters cause an exception to be thrown</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15023">PHPBB3-15023</a>] - Undo and properly fix post row paging</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15025">PHPBB3-15025</a>] - Use SSL in version check for extension</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15035">PHPBB3-15035</a>] - Add phpinfo.php to 3.2.x install directory</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15036">PHPBB3-15036</a>] - Failure at board setup in functional tests with install_config present</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15044">PHPBB3-15044</a>] - Installation does not create search index</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15047">PHPBB3-15047</a>] - Error migrating from 3.0.12 to 3.2. MS SQL Server</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15050">PHPBB3-15050</a>] - Updater incorrectly adds files when new file already exists</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15056">PHPBB3-15056</a>] - Mark forums read does not update subforum icons</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15058">PHPBB3-15058</a>] - At new feature release phpBB's CSS files should carry information for cache busting</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15062">PHPBB3-15062</a>] - Update to Rhea version number the CSS files</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15079">PHPBB3-15079</a>] - MySql Error when saving draft with Emoji</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15083">PHPBB3-15083</a>] - emoji's not always size constrained</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15084">PHPBB3-15084</a>] - Wrong order of breadcrumbs in module management</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15090">PHPBB3-15090</a>] - Missing acp_send_statistics -&gt; Upgrading to 3.2.0 fails for phpBBs &lt; 3.0.6-rc1</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15102">PHPBB3-15102</a>] - Missing parameter calling version_check</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15103">PHPBB3-15103</a>] - JPEG dimensions undetectable when JFIF header is missing</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15118">PHPBB3-15118</a>] - HTML error/typo in jumpbox.html </li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15124">PHPBB3-15124</a>] - Navbar icon titles don't get hidden in responsive view</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15126">PHPBB3-15126</a>] - Incorrect links with clever quotes</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15135">PHPBB3-15135</a>] - Undefined $user in metadata manager</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15137">PHPBB3-15137</a>] - Global Announcements shouldn't always be never ending</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15150">PHPBB3-15150</a>] - Yabber SSL/TLS certification</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15152">PHPBB3-15152</a>] - Update Font Awesome</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15158">PHPBB3-15158</a>] - Facebook OAuth login results in fatal error</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15163">PHPBB3-15163</a>] - Braces in smilies &quot;emotion&quot; are not treated as literals</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15173">PHPBB3-15173</a>] - Resizing the posting editor's text area lags</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15180">PHPBB3-15180</a>] - Container broken because of template.twig.environment changes</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15186">PHPBB3-15186</a>] - The force_delete_allowed flag does not affect actual posts deletion ability</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15187">PHPBB3-15187</a>] - ACP Template files not purged during Extension Enable</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15198">PHPBB3-15198</a>] - Fix phpBB and PHP version info displayed in the ACP</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15202">PHPBB3-15202</a>] - Should not be possible to disable available extensions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15212">PHPBB3-15212</a>] - Code box has double horizontal scrollbars</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15217">PHPBB3-15217</a>] - Allow extension to overwrite user::format_date()</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15221">PHPBB3-15221</a>] - missing commas in language/en/install.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15222">PHPBB3-15222</a>] - Typo in generate_text_for_display_test.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15243">PHPBB3-15243</a>] - Check permissions before installing with SQLite</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15246">PHPBB3-15246</a>] - Memcache driver incorrectly handles Unix sockets</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15248">PHPBB3-15248</a>] - Event core.modify_posting_auth does not honor its parameters</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15252">PHPBB3-15252</a>] - Wrapping poll title and options text by extra &lt;t&gt; tags if edited a topic by user having no f_poll permission</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13603">PHPBB3-13603</a>] - New event upon index_body_online_block_after</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14557">PHPBB3-14557</a>] - Simplify updating overloaded events for extensions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14849">PHPBB3-14849</a>] - Add ACP extension event</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14928">PHPBB3-14928</a>] - Users will not understand the phrase '&quot;%s&quot; is not a valid stability.'</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14973">PHPBB3-14973</a>] - BC break with the rename of db/tools.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14974">PHPBB3-14974</a>] - Cookie notice link not configurable but links to english website</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15037">PHPBB3-15037</a>] - Make imageset retina capable</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15068">PHPBB3-15068</a>] - Add ability to retrieve template vars from the template object</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15097">PHPBB3-15097</a>] - Board statistics page should show PHP version</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15123">PHPBB3-15123</a>] - Check if extension was enabled/disabled before enable or disable</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15142">PHPBB3-15142</a>] - Extension Version Check Should Support Branches</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15157">PHPBB3-15157</a>] - Fix lack of proper font support</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15176">PHPBB3-15176</a>] - Add setting for the maximum number of posts a user must have to have his activity shown in profile</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15199">PHPBB3-15199</a>] - Add core event to the function send() in the messenger</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15200">PHPBB3-15200</a>] - Allow extensions using custom templates for help/faq controllers </li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15205">PHPBB3-15205</a>] - Add template events to forumlist_body.html</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15219">PHPBB3-15219</a>] - Add cron to update passwords hashes to bcrypt</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15226">PHPBB3-15226</a>] - Add index for latest topics query in feeds</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15227">PHPBB3-15227</a>] - Remove unused code in startup</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15237">PHPBB3-15237</a>] - Unguarded includes functions_user</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15238">PHPBB3-15238</a>] - Add console command to fix left/right IDs for the forums and modules</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15241">PHPBB3-15241</a>] - Add ACP template event acp_profile_contact_last</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15250">PHPBB3-15250</a>] - Add core event to MCP at the end of merge_posts</li>
-			</ul>
-			<h4>New Feature</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13730">PHPBB3-13730</a>] - [PHP] - core.delete_post_end</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14498">PHPBB3-14498</a>] - Not possible to deactivate display of &quot;who is online&quot; and birthdays for guests</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15040">PHPBB3-15040</a>] - Update s9e\TextFormatter to 0.9.1</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15045">PHPBB3-15045</a>] - Fix missing incorrect constructor for user object in version_test</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15086">PHPBB3-15086</a>] - Replace quote.gif with fontawesome icon</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15125">PHPBB3-15125</a>] - Remove the function play_qt_file in forum_fn.js</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15144">PHPBB3-15144</a>] - Bug - MCP Multiple attachments icon display</li>
-			</ul>
-
-			<a name="v320rc1"></a><h3>Changes since 3.2.0-RC1</h3>
-			<h4>Bug</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14588">PHPBB3-14588</a>] - RTL Search Bar</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14612">PHPBB3-14612</a>] - Double .panel class on confirmation page (ajax error?)</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14628">PHPBB3-14628</a>] - CLI installer doesn't support the translatable error messages</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14633">PHPBB3-14633</a>] - Creating a new topic leaves a white page</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14636">PHPBB3-14636</a>] - BC compatibility broken using request_var</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14640">PHPBB3-14640</a>] - Wrong link to documentation in language/en/install.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14660">PHPBB3-14660</a>] - Emails are being sent unparsed</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14663">PHPBB3-14663</a>] - Incorrect unicode chars handling in custom BBCode</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14665">PHPBB3-14665</a>] - Invalid syntax in report_id_auto_increment migration</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14684">PHPBB3-14684</a>] - Extension Sniff script should use NOTESTS</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14690">PHPBB3-14690</a>] - Email queue cron task never runs for phpBB 3.2</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14692">PHPBB3-14692</a>] - Duplicate subexpression in questionnaire.php</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14700">PHPBB3-14700</a>] - Updating from 3.1 to 3.2, just stops</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14706">PHPBB3-14706</a>] - nested BB-Code [list] - shows different behaviour between 3.1 and 3.2</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14709">PHPBB3-14709</a>] - Deleting posts from mcp_main causes missing post_id notice</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14714">PHPBB3-14714</a>] - Update composer dependencies to latest versions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14716">PHPBB3-14716</a>] - Impossible to install with open basedir restrictions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14717">PHPBB3-14717</a>] - Quote any scalar in yaml files</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14739">PHPBB3-14739</a>] - Remove old SQLite 2.8.х database driver</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14740">PHPBB3-14740</a>] - BBcodes with quotes dont get parsed correctly</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14742">PHPBB3-14742</a>] - Improvements to migrator</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14746">PHPBB3-14746</a>] - Don't depend on container in installer msg_handler</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14748">PHPBB3-14748</a>] - Modify tests to pass PHP 7.1 tests</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14763">PHPBB3-14763</a>] - Files services definition specifies form for local type</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14764">PHPBB3-14764</a>] - Incomplete update notification points to wrong update-link</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14765">PHPBB3-14765</a>] - Parameter vs requirement spelling mismatch in installer routing config</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14774">PHPBB3-14774</a>] - Content-Range only supported for resuming downloads</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14782">PHPBB3-14782</a>] - Quick Links &gt; Your Posts gives mysql error</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14788">PHPBB3-14788</a>] - Update developer list to reflect team changes</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14791">PHPBB3-14791</a>] - Trying to get form from wrong button in search test base</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14793">PHPBB3-14793</a>] - &quot;A non-numeric value encountered&quot; PHP warning on PHP 7.1+</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14794">PHPBB3-14794</a>] - Fix redirect behavior in according to parse_url() behavior changes in PHP 7.1+</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14797">PHPBB3-14797</a>] - Remove PHP 7.1 builds from allowed failures</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14799">PHPBB3-14799</a>] - purge_notifications() leaves open transaction for bad notification types.</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14813">PHPBB3-14813</a>] - functions_compatibility missing in phpbbcli</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14814">PHPBB3-14814</a>] - Text reparser reparses already correctly [re] -parsed objects</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14821">PHPBB3-14821</a>] - Do not expect parsed HTML in kernel subscriber output</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14846">PHPBB3-14846</a>] - Swapped variables in bbcode, first one doesn't get parsed</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14873">PHPBB3-14873</a>] - Missing width and height variables for smilies</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14875">PHPBB3-14875</a>] - Cannot use HTML entity type database passwords during installation</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14883">PHPBB3-14883</a>] - Text Reparser is Reparsing Empty Data</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14892">PHPBB3-14892</a>] - Assets paths broken on Windows instances</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14894">PHPBB3-14894</a>] - Update: download of conflict files offers .tar file without file extension</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14896">PHPBB3-14896</a>] - Link after installation fails at redirecting to ACP</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14897">PHPBB3-14897</a>] - IOHandler in the installer declares member variable only in the constructor</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14900">PHPBB3-14900</a>] - Disabled extension breakage in ACP</li>
-			</ul>
-			<h4>Improvement</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10961">PHPBB3-10961</a>] - &quot;You are not authorised...&quot; still sends HTTP status 200 instead of i.e. 403</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13709">PHPBB3-13709</a>] - Fallback to english in email templates by extensions</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14586">PHPBB3-14586</a>] - phpBB Oauth V1 Wrapper Support</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14595">PHPBB3-14595</a>] - smtp port</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14620">PHPBB3-14620</a>] - Update docs/ for 3.2.x</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14689">PHPBB3-14689</a>] - Build 3.2.x API docs</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14729">PHPBB3-14729</a>] - Report post controller and report helper require specific implementation of config class</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14734">PHPBB3-14734</a>] - Use SVG emoji</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14805">PHPBB3-14805</a>] - Allow building package for previous versions on PHP 7</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14867">PHPBB3-14867</a>] - INCLUDECSS Path broken</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14885">PHPBB3-14885</a>] - Migrator logs need line breaks</li>
-			</ul>
-			<h4>New Feature</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12610">PHPBB3-12610</a>] - Add a command to check if the board is up to date.</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14484">PHPBB3-14484</a>] - Support extensions in UI tests</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14492">PHPBB3-14492</a>] - Improve send stats page and include VigLink</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14547">PHPBB3-14547</a>] - Add Vagrant Support</li>
-			</ul>
-			<h4>Task</h4>
-			<ul>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10809">PHPBB3-10809</a>] - Remove PHP MSSQL Support</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13573">PHPBB3-13573</a>] - Investigate ability to use set_config() and similar compatibility functions.</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14671">PHPBB3-14671</a>] - Deduplicate database schema definiton</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14696">PHPBB3-14696</a>] - Fix email template test for '0' username</li>
-				<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14807">PHPBB3-14807</a>] - Updates dependencies</li>
-			</ul>
-
-			<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>
@@ -718,329 +437,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="v3110"></a><h3>Changes since 3.1.10</h3>
-
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7336">PHPBB3-7336</a>] - Words in new topic title aren't found by search after topic is split</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8116">PHPBB3-8116</a>] - Server timeout or browsercrash after viewing postdetails</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8301">PHPBB3-8301</a>] - admin log generate slow queries</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9590">PHPBB3-9590</a>] - Unable to update permissions for more than 6 forums at a time</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11076">PHPBB3-11076</a>] - Update notification in ACP for minimum PHP version missing essential information</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11483">PHPBB3-11483</a>] - Forced Activation needs looking at.</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11611">PHPBB3-11611</a>] - setup_github_network.php no longer creates a repository</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13247">PHPBB3-13247</a>] - Online indicator in post profile hides behind certain avatars</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13250">PHPBB3-13250</a>] - File cache does not write entries starting with _ and containing a slash</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13429">PHPBB3-13429</a>] - Changes tag in docblock of events should be unified</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13558">PHPBB3-13558</a>] -  Error - stream_socket_enable_crypto()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13757">PHPBB3-13757</a>] - Negative PM count</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14468">PHPBB3-14468</a>] - [php] - 'core.viewforum_modify_topics_data' add parameter forum_id</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14549">PHPBB3-14549</a>] - Correctly redirect back after topic merge in MCP</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14770">PHPBB3-14770</a>] - Plupload: WRONG_FILESIZE is used wrong</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14795">PHPBB3-14795</a>] - Topic merge bug</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14801">PHPBB3-14801</a>] - Search highlight option doesn't always highlight unicode strings</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14802">PHPBB3-14802</a>] - Empty/blank lines should not be additional poll options</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14806">PHPBB3-14806</a>] - Authentication for e-mail is not working</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14819">PHPBB3-14819</a>] - Soft deleted posts visible in topic review</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14821">PHPBB3-14821</a>] - Do not expect parsed HTML in kernel subscriber output</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14830">PHPBB3-14830</a>] - FORM_INVALID error on ACP search and CPF settings</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14831">PHPBB3-14831</a>] - Extension migration file fails</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14838">PHPBB3-14838</a>] - feeds.attachments_base - server 500 error for large attachment tables</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14844">PHPBB3-14844</a>] - BBcodes B and I return &lt;strong&gt; and &lt;em&gt; tags instead of CSS under inherited styles</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14859">PHPBB3-14859</a>] - PM report notifications only sent out to full Global Moderators</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14860">PHPBB3-14860</a>] - Broken link on subscriptions page on mobile devices</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14863">PHPBB3-14863</a>] - &quot;Array&quot; in message title when permanently deleting posts</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14864">PHPBB3-14864</a>] - ACP datefromat text input  still has 30 max length while dateformat field had been expanded to 64</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14876">PHPBB3-14876</a>] - Multibyte message is not displayed properly on exception</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14877">PHPBB3-14877</a>] - CSS error in &quot;.codebox code&quot; definition</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14881">PHPBB3-14881</a>] - Problems using EVENT (overall_footer_content_after)</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14888">PHPBB3-14888</a>] - Missing check for disabled profile field types</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14889">PHPBB3-14889</a>] - Missing method declaration in profile fields type interface</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14890">PHPBB3-14890</a>] - Wrong validation of input field in profile field type string</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14906">PHPBB3-14906</a>] - Duplicated sig key in user_cache_data array</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14923">PHPBB3-14923</a>] - SQL PostgreSQL blocking errors during DB update installation</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14938">PHPBB3-14938</a>] - Inconsistent data results from ext_mgr-&gt;all_available() vs ext_mgr-&gt;is_available()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14941">PHPBB3-14941</a>] - MySQL Fulltext search index creating still fails on InnoDB</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14943">PHPBB3-14943</a>] - Template loop access gives PHP error</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14953">PHPBB3-14953</a>] - Incorrect &quot;order by&quot; definition in ucp_pm_viewfolder</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14968">PHPBB3-14968</a>] - Version check marks 3.1.10 boards as outdated </li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14997">PHPBB3-14997</a>] - Bad Position for topiclist_row_topic_title_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14998">PHPBB3-14998</a>] - ACP Update link is incorrect!</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15003">PHPBB3-15003</a>] - When using mark all, disabled check boxes should not become checked</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15006">PHPBB3-15006</a>] - Permission inheritance with checkbox not working</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15011">PHPBB3-15011</a>] - Error not checked on metadata load failure</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15108">PHPBB3-15108</a>] - Duplicate code in request-&gt;overwrite</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15143">PHPBB3-15143</a>] - version check on branch is broken</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15146">PHPBB3-15146</a>] - Date profile field validation incorrect</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15150">PHPBB3-15150</a>] - Yabber SSL/TLS certification</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15186">PHPBB3-15186</a>] - The force_delete_allowed flag does not affect actual posts deletion ability</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15187">PHPBB3-15187</a>] - ACP Template files not purged during Extension Enable</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15246">PHPBB3-15246</a>] - Memcache driver incorrectly handles Unix sockets</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15248">PHPBB3-15248</a>] - Event core.modify_posting_auth does not honor its parameters</li>
-	</ul>
-	<h4>Improvement</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9211">PHPBB3-9211</a>] - List subforums-links separately in parent-forums' legend</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12749">PHPBB3-12749</a>] - core.submit_post_end add subject to the event data</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13457">PHPBB3-13457</a>] - New Hooks for ucp_main</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13459">PHPBB3-13459</a>] - New Template-Event in overall_header.html</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13479">PHPBB3-13479</a>] - Add hook for modifying highlighting on viewtopic</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13601">PHPBB3-13601</a>] - New event upon acl_clear_prefetch</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13603">PHPBB3-13603</a>] - New event upon index_body_online_block_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13605">PHPBB3-13605</a>] - New event upon ucp_pm_compose_predefined_message</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13608">PHPBB3-13608</a>] - New event upon ucp_restore_permissions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13609">PHPBB3-13609</a>] - New event upon ucp_switch_permissions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13845">PHPBB3-13845</a>] - Add event when user changes or delete avatar</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14119">PHPBB3-14119</a>] - [PHP] - (User) unban event request</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14239">PHPBB3-14239</a>] - [PHP] - Add event ucp_remind_modify_select_sql</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14331">PHPBB3-14331</a>] - Add rank calculation or result event access</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14520">PHPBB3-14520</a>] - [Template] - ucp_pm_viewmessage_message_body_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14522">PHPBB3-14522</a>] - [Template] - ucp_register_buttons_before</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14524">PHPBB3-14524</a>] - [PHP] - core.ucp_register_requests_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14733">PHPBB3-14733</a>] - Support increasing hashing cost factor</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14750">PHPBB3-14750</a>] - Fileupload form should not set invalid attributes for file input</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14758">PHPBB3-14758</a>] - ACP-Parameter &quot;Maximum thumbnail width in pixel&quot; should be &quot;Maximum thumbnail width/heigth in pixel:&quot;</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14759">PHPBB3-14759</a>] - Event core.mcp_main_modify_shadow_sql</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14760">PHPBB3-14760</a>] - Event core.mcp_main_modify_fork_sql</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14786">PHPBB3-14786</a>] - Add mcp_forum_actions_before/after events</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14804">PHPBB3-14804</a>] - Add core event to MCP after merging topics</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14805">PHPBB3-14805</a>] - Allow building package for previous versions on PHP 7</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14808">PHPBB3-14808</a>] - Add template event overall_header_searchbox_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14817">PHPBB3-14817</a>] - Add core event on includes/functions_download.php</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14825">PHPBB3-14825</a>] - Add OAuth events</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14827">PHPBB3-14827</a>] - Possibility to add multiple form keys</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14842">PHPBB3-14842</a>] - Avatar size 0 - unlimited</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14847">PHPBB3-14847</a>] - Add php event to add options in ACP Attachments</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14848">PHPBB3-14848</a>] - Add ACP template events after extensions list titles</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14849">PHPBB3-14849</a>] - Add ACP extension event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14850">PHPBB3-14850</a>] - Add core events for smilies</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14852">PHPBB3-14852</a>] - Add core event to the function build_header()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14853">PHPBB3-14853</a>] - Add core event to allow modifying PM attachments download auth</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14855">PHPBB3-14855</a>] - Update notifications and PM alert bubbles</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14870">PHPBB3-14870</a>] - Add php events to modify list of PMs</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14872">PHPBB3-14872</a>] - Remove count versus sizeof restriction in coding guidelines</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14874">PHPBB3-14874</a>] - Error on sending a .pak smiley</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14882">PHPBB3-14882</a>] - Add core event to MCP after move posts sync</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14887">PHPBB3-14887</a>] - ACP profile step 1 lang specific event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14918">PHPBB3-14918</a>] - Provide quick access to extension version metadata</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14940">PHPBB3-14940</a>] - Add ACP template event acp_ext_details_end</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14957">PHPBB3-14957</a>] - Do not cache database config</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14958">PHPBB3-14958</a>] - Twig extension function lang() performs redundant template data copying</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15020">PHPBB3-15020</a>] - Add Events for mcp_topic_postrow_post_subject</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15059">PHPBB3-15059</a>] - Do not wrap content in code box</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15081">PHPBB3-15081</a>] - Add ACP template event acp_ext_details_notice</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15107">PHPBB3-15107</a>] - Add additional vars to event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15131">PHPBB3-15131</a>] - Add variable to the 'core.mcp_main_modify_fork_sql' event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15142">PHPBB3-15142</a>] - Extension Version Check Should Support Branches</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15151">PHPBB3-15151</a>] - ACP Cookie settings should contain explanatory text for all fields</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15199">PHPBB3-15199</a>] - Add core event to the function send() in the messenger</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15200">PHPBB3-15200</a>] - Allow extensions using custom templates for help/faq controllers </li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15205">PHPBB3-15205</a>] - Add template events to forumlist_body.html</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15219">PHPBB3-15219</a>] - Add cron to update passwords hashes to bcrypt</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15226">PHPBB3-15226</a>] - Add index for latest topics query in feeds</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15237">PHPBB3-15237</a>] - Unguarded includes functions_user</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15238">PHPBB3-15238</a>] - Add console command to fix left/right IDs for the forums and modules</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15241">PHPBB3-15241</a>] - Add ACP template event acp_profile_contact_last</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15250">PHPBB3-15250</a>] - Add core event to MCP at the end of merge_posts</li>
-	</ul>
-	<h4>New Feature</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12545">PHPBB3-12545</a>] - new pre-posting event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13730">PHPBB3-13730</a>] - [PHP] - core.delete_post_end</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14390">PHPBB3-14390</a>] - [prosilver] - ucp_main_front_user_details_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14498">PHPBB3-14498</a>] - Not possible to deactivate display of &quot;who is online&quot; and birthdays for guests</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14662">PHPBB3-14662</a>] - [Template] - memberlist_team_username_prepend &amp; append</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14868">PHPBB3-14868</a>] - [Template] - mcp_forum_modify_select_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14996">PHPBB3-14996</a>] - [event] - Add Event search_results_topictitle_after</li>
-	</ul>
-	<h4>Sub-task</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13149">PHPBB3-13149</a>] - [Event] - core.phpbb_log_get_topic_auth_sql_before</li>
-	</ul>
-	<h4>Task</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15178">PHPBB3-15178</a>] - Update 3.1.x dependencies</li>
-	</ul>
-
-	<a name="v319"></a><h3>Changes since 3.1.9</h3>
-
-	<h4>Bug</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11446">PHPBB3-11446</a>] - Use sql_in_set as designed and consistent with the rest of phpBB code in phpbb_notification_manager</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12230">PHPBB3-12230</a>] - Do not auto remove user group when Newly Registered Users group was disabled</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12925">PHPBB3-12925</a>] - Use plural for permanent delete posts/topics confirmation</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14109">PHPBB3-14109</a>] - MySQL InnoDB does not support multiple index definitions on the same query.</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14291">PHPBB3-14291</a>] - Function send_file_to_browser() endlessly overwrites 'filesize' in ATTACHMENTS_TABLE</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14610">PHPBB3-14610</a>] - Q&amp;A CAPTCHA logs error when it has been solved</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14615">PHPBB3-14615</a>] - delete avatar triggers the new min max value in the HTML5 inputs</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14616">PHPBB3-14616</a>] - Auto-prune fails on large forums</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14631">PHPBB3-14631</a>] - 3.1.9 DB cli update crashes with PHP Fatal error: Call to undefined function phpbb\truncate_string()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14654">PHPBB3-14654</a>] - Imagemagick &gt; ImageMagick</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14661">PHPBB3-14661</a>] - Fix a typo in twig.php</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14673">PHPBB3-14673</a>] - Missing Language Variable</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14683">PHPBB3-14683</a>] - Typos in operators in some email templates</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14703">PHPBB3-14703</a>] - module.add adds a module to the wrong parent</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14704">PHPBB3-14704</a>] - Remove unused language files and corresponding  functions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14721">PHPBB3-14721</a>] - New registrants choosing old deleted usernames get linked to old accounts with namechange</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14742">PHPBB3-14742</a>] - Improvements to migrator</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14745">PHPBB3-14745</a>] - &quot;U_NOTIFICATION_SETTINGS&quot; contains an HTML entity but is printed in a plaintext email</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14755">PHPBB3-14755</a>] - Error in MCP Move posts</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14782">PHPBB3-14782</a>] - Quick Links &gt; Your Posts gives mysql error</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14788">PHPBB3-14788</a>] - Update developer list to reflect team changes</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14796">PHPBB3-14796</a>] - Log table is using constant in log delete method</li>
-	</ul>
-	<h4>Improvement</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13709">PHPBB3-13709</a>] - Fallback to english in email templates by extensions</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13716">PHPBB3-13716</a>] - Check phpBB version constant against config version</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13865">PHPBB3-13865</a>] - Complement core event search_modify_param</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14184">PHPBB3-14184</a>] - Missing info on SMTP mail function option</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14429">PHPBB3-14429</a>] - core.obtain_users_online_string_modify</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14466">PHPBB3-14466</a>] - Add an event to cron.php</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14469">PHPBB3-14469</a>] - [Template] - &lt;!-- EVENT viewforum_topicrow_before --&gt;</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14516">PHPBB3-14516</a>] - [Template] - memberlist_email_before</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14581">PHPBB3-14581</a>] - Add core events relating to soft delete</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14592">PHPBB3-14592</a>] - [PHP] - core.search_backend_search_after</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14596">PHPBB3-14596</a>] - Prevent installs of 3.1 on PHP 7</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14624">PHPBB3-14624</a>] - Add event to ucp_profile in signature section</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14630">PHPBB3-14630</a>] - Add event to ucp_pm_compose</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14638">PHPBB3-14638</a>] - [PHP] - multiple UCP subscription events for form data and template variables</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14643">PHPBB3-14643</a>] - Select newest file in restore list</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14652">PHPBB3-14652</a>] - Typo birthdays</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14664">PHPBB3-14664</a>] - Fix PHPDoc comment in cron manager</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14672">PHPBB3-14672</a>] - Add template event to viewforum</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14685">PHPBB3-14685</a>] - PHP event for altering announcements sql</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14687">PHPBB3-14687</a>] - Modify viewforum_modify_topicrow</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14688">PHPBB3-14688</a>] - Add core events to the feeds</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14689">PHPBB3-14689</a>] - Build 3.2.x API docs</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14695">PHPBB3-14695</a>] - Add posting_editor_subject_prepend/append template events</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14712">PHPBB3-14712</a>] - Add search.php core event to allow modifying the forum select list</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14713">PHPBB3-14713</a>] - Add core event to the admin function get_forum_list()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14715">PHPBB3-14715</a>] - Add template events in posting_topic_review &amp; mcp_topic</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14720">PHPBB3-14720</a>] - Add global javascript variable 'phpbb' to jshint settings</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14727">PHPBB3-14727</a>] - Event core.search_modify_submit_parameters</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14738">PHPBB3-14738</a>] - Add core events to improve modifying forum lists</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14747">PHPBB3-14747</a>] - Add topic_last_poster_id and topic_last_post_time to Event core.modify_posting_auth</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14762">PHPBB3-14762</a>] - Add core event to session.php to alter IP address</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14781">PHPBB3-14781</a>] - Add core event to the function group_user_attributes()</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14783">PHPBB3-14783</a>] - Event - ACP Posting Buttons Before Custom BBCodes</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14784">PHPBB3-14784</a>] - missing rewrite for lighttpd</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14785">PHPBB3-14785</a>] - [Template event] - overall_header_headerbar_append</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14787">PHPBB3-14787</a>] - Add more parameters to the core.search_modify_url_parameters event</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14789">PHPBB3-14789</a>] - Add missing link hash and form token checks to ACP</li>
-	</ul>
-	<h4>New Feature</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13978">PHPBB3-13978</a>] - [PHP] - User control panel - on signature change</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14484">PHPBB3-14484</a>] - Support extensions in UI tests</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14506">PHPBB3-14506</a>] - [Template] - mcp_move_before</li>
-	</ul>
-	<h4>Task</h4>
-	<ul>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12133">PHPBB3-12133</a>] - Update list of browsers supporting filename* in Content-Disposition</li>
-		<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-14598">PHPBB3-14598</a>] - Phing Sniffer Testing Use Statements in DocBlocks</li>
-		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14743">PHPBB3-14743</a>] - Remove PHP7 from test matrix in 3.1.x</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>

phpBB/docs/CREDITS.txt

@@ -1,6 +1,6 @@
 /**
 *
-* phpBB © Copyright phpBB Limited 2003-2016
+* phpBB © Copyright phpBB Limited 2003-2014
 * http://www.phpbb.com
 *
 * phpBB is free software. You can redistribute it and/or modify it
@@ -20,13 +20,14 @@
 
 phpBB Project Manager:   Marshalrusty (Yuriy Rusko)
 
-phpBB Product Manager:   naderman (Nils Adermann)
-
-phpBB Lead Developer:    Marc (Marc Alexander)
+phpBB Lead Developer:    naderman (Nils Adermann)
 
 phpBB Developers:        bantu (Andreas Fischer)
                          CHItA (Máté Bartus)
+                         dhruv.goel92 (Dhruv Goel)
                          Elsensee (Oliver Schramm)
+                         marc1706 (Marc Alexander)
+                         nickvergessen (Joas Schilling)
                          Nicofuma (Tristan Darricau)
                          prototech (Cesar Gallegos)
 
@@ -53,13 +54,11 @@ phpBB Developers:        A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                          ckwalsh (Cullen Walsh)        [01/2010 - 07/2011]
                          DavidMJ (David M.)            [12/2005 - 08/2009]
                          dhn (Dominik Dröscher)        [05/2007 - 01/2011]
-                         dhruv.goel92 (Dhruv Goel)     [04/2013 - 05/2016]
                          EXreaction (Nathan Guse)      [07/2012 - 05/2014]
                          GrahamJE (Graham Eames)       [09/2005 - 11/2006]
                          igorw (Igor Wiedler)          [08/2010 - 02/2013]
                          imkingdavid (David King)      [11/2012 - 06/2014]
                          kellanved (Henry Sudhof)      [04/2007 - 03/2011]
-                         nickvergessen (Joas Schilling)[04/2010 - 12/2015]
                          Oleg (Oleg Pudeyev)           [01/2011 - 05/2013]
                          rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
                          TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
@@ -75,7 +74,9 @@ Major contributions by:  leviatan21 (Gabriel Vazquez)
 
 Visual Confirmation:   Xore (Robert Hetzler)
 
+Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Limited
 prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
+subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
 
 phpBB contains code from the following applications:
 
@@ -97,5 +98,4 @@ Pear (c) 2001-2004 PHP Group, http://pear.php.net
 Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
 
 MIT licenced:
-Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/
-Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com
+Symfony2 (c) 2004-2011 Fabien Potencier, http://symfony.com/

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>
 
@@ -249,7 +248,7 @@ I want to sue you because i think you host an illegal board!</h2>
 
 		<div class="content">
 
-<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">online documentation</a>.</p>
+<p>Please read the paragraph about permissions in our extensive <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">online documentation</a>.</p>
 
 		</div>
 
@@ -305,7 +304,7 @@ I want to sue you because i think you host an illegal board!</h2>
 
 		<div class="content">
 
-<p>Please read our <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">extensive user documentation</a> first, it may just explain what you want to know.</p>
+<p>Please read our <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">extensive user documentation</a> first, it may just explain what you want to know.</p>
 
 <p>Feel free to search our community forum for the information you require. <strong>PLEASE DO NOT</strong> post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:</p>
 

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>
 
@@ -59,7 +58,7 @@
 	<li><a href="#quickinstall">Quick install</a></li>
 	<li><a href="#require">Requirements</a></li>
 	<li><a href="#install">New installation</a></li>
-	<li><a href="#update">Updating from stable releases of phpBB 3.2.x</a>
+	<li><a href="#update">Updating from stable releases of phpBB 3.1.x</a>
 	<ol style="list-style-type: lower-roman;">
 		<li><a href="#update_full">Full package</a></li>
 		<li><a href="#update_files">Changed files</a></li>
@@ -68,8 +67,8 @@
 		<li><a href="#update_all">All package types</a></li>
 	</ol>
 	</li>
-	<li><a href="#update30_31">Updating from phpBB 3.0.x/3.1.x to phpBB 3.2.x</a></li>
-	<li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.2.x</a>
+	<li><a href="#update30">Updating from phpBB 3.0.x to phpBB 3.1.x</a></li>
+	<li><a href="#convert">Conversion from phpBB 2.0.x to phpBB 3.1.x</a>
 	<ol style="list-style-type: lower-roman;">
 		<li><a href="#prereq">Requirements before converting</a></li>
 		<li><a href="#conversion">Converting</a></li>
@@ -109,7 +108,7 @@
 		<li>Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)</li>
 		<li>Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):<br />
 			<code>store/</code>, <code>cache/</code>, <code>files/</code> and <code>images/avatars/upload/</code>.</li>
-		<li>Point your web browser to the location where you uploaded the phpBB3 files with the addition of <code>install/app.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/app.php</code>, <code>http://www.example.com/forum/install/</code>.</li>
+		<li>Point your web browser to the location where you uploaded the phpBB3 files with the addition of <code>install/index.php</code> or simply <code>install/</code>, e.g. <code>http://www.example.com/phpBB3/install/index.php</code>, <code>http://www.example.com/forum/install/</code>.</li>
 		<li>Click the <strong><em>INSTALL</em></strong> tab, follow the steps and fill out all the requested information.</li>
 		<li>Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)</li>
 		<li>phpBB3 should now be available, please <strong>MAKE SURE</strong> you read at least <a href="#postinstall">Section 6</a> below for important, security related post-installation instructions, and also take note of <a href="#anti_spam">Section 7</a> regarding anti-spam measures.</li>
@@ -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>
@@ -142,12 +141,13 @@
 			<li>MySQL 3.23 or above (MySQLi supported)</li>
 			<li>MariaDB 5.1 or above</li>
 			<li>PostgreSQL 8.3+</li>
+			<li>SQLite 2.8.2+</li>
 			<li>SQLite 3.6.15+</li>
-			<li>MS SQL Server 2000 or above (via ODBC or the native adapter)</li>
+			<li>MS SQL Server 2000 or above (directly or via ODBC or the native adapter)</li>
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 5.4.0+</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 5.4.0+</strong> and <strong>PHP < 7.1</strong> with support for the database you intend to use.</li>
 		<li>The following PHP modules are required:
 		<ul>
 			<li>json</li>
@@ -159,13 +159,13 @@
 			<li>zlib Compression support</li>
 			<li>Remote FTP support</li>
 			<li>XML support</li>
-			<li>ImageMagick support</li>
+			<li>Imagemagick support</li>
 			<li>GD Support</li>
 		</ul>
 		</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>
 
@@ -191,7 +191,7 @@
 
 	<p>phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the <a href="README.html#i18n">README</a>.</p>
 
-	<p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB3</code> off your web root you would enter <code>http://www.example.com/phpBB3/install/</code> or (alternatively) <code>http://www.example.com/phpBB3/install/app.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p>
+	<p>Once all the files have been uploaded to your site, you should point your browser at this location with the addition of <code>/install/</code>. For example, if your domain name is <code>www.example.com</code> and you placed the phpBB files in the directory <code>/phpBB3</code> off your web root you would enter <code>http://www.example.com/phpBB3/install/</code> or (alternatively) <code>http://www.example.com/phpBB3/install/index.php</code> into your browser. When you have done this, you should see the <strong><em>phpBB Introduction</em></strong> screen appear.</p>
 
 	<h4>Introduction:</h4>
 
@@ -256,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">
@@ -265,45 +265,45 @@
 
 <p>If you are currently using a stable release of phpBB, updating to this version is straightforward. You would have downloaded one of four packages and your choice determines what you need to do. <strong>Note</strong>: Before updating, we heavily recommend you do a <em>full backup of your database and existing phpBB files</em>! If you are unsure how to achieve this please ask your hosting provider for advice.</p>
 
-<p><strong>Please make sure you update your phpBB source files too, even if you just run the database updater.</strong> If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+<p><strong>Please make sure you update your phpBB source files too, even if you run the <code>database_update.php</code> file.</strong> If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 <a name="update_full"></a><h3>4.i. Full package</h3>
 
 	<p>The full package is normally meant for new installations only, but if you want to replace all source files, this package comes in handy.</p>
 
-	<p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your <code>files/</code>, <code>images/</code> and <code>ext/</code> directories in place, otherwise you will lose your file attachments, uploaded images and get error due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
+	<p>First, you should make a copy of your existing <code>config.php</code> file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your <code>files/</code> and <code>images/</code> directories in place. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see <a href="#install">New installation</a> for details if necessary). Once complete, copy back your saved <code>config.php</code>, replacing the new one. Another method is to just <strong>replace</strong> the existing files with the files from the full package - though make sure you do <strong>not</strong> overwrite your config.php file.</p>
 
-	<p>You should now got to <code>/install/app.php/update</code> which will display a warning: <strong>No valid update directory was found, please make sure you uploaded the relevant files</strong>. Beneath that warning you will see a radion button <em>Update database only</em>, just click <strong>Submit</strong>. Depending on your previous version this will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>You should now run <code>install/database_update.php</code> which, depending on your previous version, will make a number of database changes. You may receive <em>FAILURES</em> during this procedure. They should not be a cause for concern unless you see an actual <em>ERROR</em>, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
-	<p>Once <code>/install/app.php/update</code> has completed, it displays the success message: <strong>The database update was successful</strong>. You may proceed to the Administration Control Panel and then remove the install directory as advised.</p>
+	<p>Once <code>install/database_update.php</code> has completed, you may proceed to the Administration Control Panel and then remove the install directory as advised.</p>
 
 <a name="update_files"></a><h3>4.ii. Changed files</h3>
 
 	<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>
 
-	<p>As for the other update procedures, you should go to <code>/install/app.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>As for the other update procedures, you should run <code>install/database_update.php</code> after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 <a name="update_patch"></a><h3>4.iii. Patch file</h3>
 
 	<p>The patch file package is for those wanting to update through the patch application, and should only be used by those who are comfortable with it.</p>
 
-	<p>The patch file is one solution for those with changes in to the phpBB core files and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
+	<p>The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
 
-	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.2.0</strong>, you need the <code>phpBB-3.2.1-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
+	<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.1.0</strong>, you need the <code>phpBB-3.1.1-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
 
 	<p>If you do get failures, you should look at using the <a href="#update_files">Changed Files</a> package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
 
-	<p>You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should navigate to <code>/install/app.php/update</code>, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
+	<p>You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should run <code>install/database_update.php</code> after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: <code>php bin/phpbbcli.php --safe-mode db:migrate</code>.</p>
 
 <a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
 
 	<p>This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.</p>
 
-	<p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.2.0</strong>, you need the <code>phpBB-3.2.0_to_3.2.1.zip/tar.bz2</code> file.</p>
+	<p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.1.5</strong>, you need the <code>phpBB-3.1.5_to_3.1.6.zip/tar.bz2</code> file.</p>
 
 	<p>To perform the update, either follow the instructions from the <strong>Administration Control Panel-&gt;System</strong> Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.</p>
 
@@ -332,16 +332,16 @@
 
 	<hr />
 
-	<a name="update30_31"></a><h2>5. Updating from phpBB 3.0.x/3.1x to phpBB 3.2.x</h2>
+	<a name="update30"></a><h2>5. Updating from phpBB 3.0.x to phpBB 3.1.x</h2>
 
 	<div class="paragraph">
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<div class="content">
 
-			<p>Updating from phpBB 3.0.x or 3.1.x to 3.2.x is just the same as <a href="#update">updating from stable releases of phpBB 3.2.x</a></p>
+			<p>Updating from phpBB 3.0.x to 3.1.x is just the same as <a href="#update">updating from stable releases of phpBB 3.1.x</a></p>
 
-			<p>However you can also start with a new set of phpBB 3.2.x files.</p>
+			<p>However you can also start with a new set of phpBB 3.1.x files.</p>
 
 			<ol>
 				<li>Delete all files <strong>EXCEPT</strong> for the following:
@@ -351,12 +351,10 @@
 					<li>The <code>images/</code> directory</li>
 					<li>The <code>files/</code> directory</li>
 					<li>The <code>store/</code> directory</li>
-					<li>(The <code>ext/</code> directory</li>
 				</ul></li>
 
-				<li>Upload the contents of the 3.2.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li>
-				<li>Browse to <code>/install/app.php/update</code></li>
-				<li>Read the notice <em>Update database only</em> and press <strong>Submit</strong></li>
+				<li>Upload the contents of the 3.1.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li>
+				<li>Browse to install/database_update.php</li>
 				<li>Delete the <code>install/</code> directory</li>
 			</ol>
 		</div>
@@ -368,7 +366,7 @@
 
 	<hr />
 
-	<a name="convert"></a><h2>6. Conversion from phpBB 2.0.x to phpBB 3.2.x</h2>
+	<a name="convert"></a><h2>6. Conversion from phpBB 2.0.x to phpBB 3.1.x</h2>
 
 	<div class="paragraph">
 		<div class="inner">
@@ -456,21 +454,9 @@
 
 <a name="webserver_configuration"></a><h3>6.ii. Webserver configuration</h3>
 
-	<p>Depending on your web server, you may have to configure your server to deny web access to the <code>cache/</code>, <code>files/</code>, <code>includes</code>, <code>phpbb</code>, <code>store/</code>, and <code>vendor</code> directories. This is to prevent users from accessing sensitive files.</p>
+	<p>Depending on your web server, you may have to configure your server to deny web access to the <code>cache/</code>, <code>files/</code>, <code>store/</code> and other directories. This is to prevent users from accessing sensitive files.</p>
 
-	<p>
-		For <strong>Apache</strong> there are <code>.htaccess</code> files already in place to do this for the most sensitive files and folders. We do however recommend to completely deny all access to the aforementioned folders and their respective subfolders in your Apache configuration.<br />
-		On Apache 2.4, denying access to the <code>phpbb</code> folder in a phpBB instance located at <code>/var/www/html/</code> would be accomplished by adding the following access rules to the Apache configuration file (typically apache.conf):
-		<pre>
-&lt;Directory /var/www/html/phpbb/*&gt;
-	Require all denied
-&lt;/Directory&gt;
-&lt;Directory /var/www/html/phpbb>
-	Require all denied
-&lt;/Directory&gt;</pre>
-		<br />
-	<p>The same settings can be applied to the other mentioned directories by replacing <code>phpbb</code> by the respective directory name. Please note that there are differences in syntax between Apache version <a href="https://httpd.apache.org/docs/2.2/howto/access.html">2.2</a> and <a href="https://httpd.apache.org/docs/2.4/howto/access.html">2.4</a>.</p>
-	<p>For <strong>Windows</strong> based servers using <strong>IIS</strong> there are <code>web.config</code> files already in place to do this for you. For other webservers, you will have to adjust the configuration yourself. Sample files for <strong>nginx</strong> and <strong>lighttpd</strong> to help you get started may be found in the <code>docs/</code> directory.</p>
+	<p>For <strong>Apache</strong> there are <code>.htaccess</code> files already in place to do this for you. Similarly, for <strong>Windows</strong> based servers using <strong>IIS</strong> there are <code>web.config</code> files already in place to do this for you. For other webservers, you will have to adjust the configuration yourself. Sample files for <strong>nginx</strong> and <strong>lighttpd</strong> to help you get started may be found in <code>docs/</code> directory.</p>
 
 		</div>
 

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>
 
@@ -91,23 +90,24 @@
 		<div class="content">
 	<p>Installation, update and conversion instructions can be found in the <a href="INSTALL.html">INSTALL</a> document in this directory. If you are intending on converting from a phpBB 2.0.x or 3.0.x installation we highly recommend that you backup any existing data before proceeding!</p>
 
-	<p>Users of phpBB 3.0, 3.1 and 3.2 Beta versions cannot directly update.</p>
+	<p>Users of phpBB 3.0 and 3.1 Beta versions cannot directly update.</p>
 
 	<p>Please note that we don't support the following installation types:</p>
 	<ul>
-		<li>Updates from phpBB Beta versions and lower to phpBB Release Candidates and higher</li>
-		<li>Conversions from phpBB 2.0.x to phpBB 3.0 Beta, 3.1 Beta and 3.2 Beta versions</li>
-		<li>phpBB 3.0 Beta, 3.1 Beta or 3.2 beta installations</li>
+		<li>Updates from phpBB 3.0 Beta versions to phpBB 3.0 RC1 and higher</li>
+		<li>Updates from phpBB 3.1 Beta versions to phpBB 3.1 RC1 and higher</li>
+		<li>Conversions from phpBB 2.0.x to phpBB 3.0 or 3.1 Beta versions</li>
+		<li>phpBB 3.0 or 3.1 Beta installations</li>
 	</ul>
 
 	<p>We give support for the following installation types:</p>
 
 	<ul>
-		<li>Updates from phpBB 3.0 RC1, 3.1 RC1 and 3.2 RC1 to the latest version</li>
+		<li>Updates from phpBB 3.0 RC1 and 3.1 RC1 to the latest version</li>
 		<li>Note: if using the <em>Automatic Update Package</em>, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.</li>
 		<li>Conversions from phpBB 2.0.x to the latest version</li>
+		<li>New installations of phpBB 3.0.x - only the latest released version</li>
 		<li>New installations of phpBB 3.1.x - only the latest released version</li>
-		<li>New installations of phpBB 3.2.x - only the latest released version</li>
 	</ul>
 
 		</div>
@@ -130,7 +130,7 @@
 
 	<a name="i18n"></a><h3>2.i. Languages (Internationalisation - i18n)</h3>
 
-	<p>A number of language packs with included style localisations are available. You can find them listed in the <a href="https://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="https://www.phpbb.com/customise/db/language_packs-25">Language Packs</a> section of the <a href="https://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
+	<p>A number of language packs with included style localisations are available. You can find them listed in the <a href="https://www.phpbb.com/languages/">Language Packs</a> pages of our downloads section or from the <a href="https://www.phpbb.com/customise/db/language_packs-25/">Language Packs</a> section of the <a href="https://www.phpbb.com/customise/db/">Customisation Database</a>.</p>
 
 	<p>For more information about language packs, please see: <a href="https://www.phpbb.com/languages/">https://www.phpbb.com/languages/</a></p>
 
@@ -138,7 +138,7 @@
 
 	<p>Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included <code>language</code> and <code>styles</code> folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: <code>Customise tab -&gt; Language management -&gt; Language packs</code>. A more detailed description of the process is in the Knowledge Base article, <a href="https://www.phpbb.com/kb/article/how-to-install-a-language-pack/">How to Install a Language Pack</a>.</p>
 
-	<p>If your language is not available, please visit our <a href="https://www.phpbb.com/community/viewforum.php?f=566">[3.2.x] Translations</a> forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can <a href="https://www.phpbb.com/languages/apply.php">Apply to become a translator</a>.</p>
+	<p>If your language is not available, please visit our <a href="https://www.phpbb.com/community/viewforum.php?f=491">[3.1.x] Translations</a> forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can <a href="https://www.phpbb.com/languages/apply.php">Apply to become a translator</a>.</p>
 
 	<a name="styles"></a><h3>2.ii. Styles</h3>
 
@@ -184,7 +184,7 @@
 
 	<p>Comprehensive documentation is now available on the phpBB website:</p>
 
-	<p><a href="https://www.phpbb.com/support/docs/en/3.2/ug/">https://www.phpbb.com/support/docs/en/3.2/ug/</a></p>
+	<p><a href="https://www.phpbb.com/support/docs/en/3.1/ug/">https://www.phpbb.com/support/docs/en/3.1/ug/</a></p>
 
 	<p>This covers everything from installation to setting permissions and managing users.</p>
 
@@ -224,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>
 
@@ -266,14 +266,14 @@
 	<ul>
 		<li>Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.</li>
 		<li>PHP version and mode of operation, e.g. PHP 5.4.0 as a module, PHP 5.4.0 running as CGI, etc.</li>
-		<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 (via ODBC), etc.</li>
+		<li>DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 SP1, etc.</li>
 	</ul>
 
 	<p>The relevant database type/version is listed within the administration control panel.</p>
 
 	<p>Please be as detailed as you can in your report, and if possible, list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request to our repository <a href="https://github.com/phpbb/phpbb">on GitHub</a>.</p>
 
-	<p>If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.2.x the coding guidelines may be found here: <a href="http://area51.phpbb.com/docs/32x/coding-guidelines.html">http://area51.phpbb.com/docs/32x/coding-guidelines.html</a></p>
+	<p>If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.1.x the coding guidelines may be found here: <a href="http://area51.phpbb.com/docs/31x/coding-guidelines.html">http://area51.phpbb.com/docs/31x/coding-guidelines.html</a></p>
 
 	<p>Once a bug has been submitted you will be emailed any follow up comments added to it. <strong>Please</strong> if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.</p>
 
@@ -323,11 +323,11 @@
 
 		<div class="content">
 
-	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is the latest stable version of PHP.</p>
+	<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is PHP 7.0.</p>
 
 	<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>
 
-	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 5.4.x above 5.6.x to 7.0.x without problem.</p>
+	<p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x to 5.6.x without problem.</p>
 
 <a name="phpsec"></a><h3>7.i. Notice on PHP security issues</h3>
 

phpBB/docs/assets/css/stylesheet.css

@@ -115,17 +115,6 @@ code {
 	padding: 0 4px;
 }
 
-pre {
-	color: #006600;
-	font-weight: normal;
-	font-family: 'Courier New', monospace;
-	border-color: #D1D7DC;
-	border-width: 1px;
-	border-style: solid;
-	background-color: #FAFAFA;
-	padding: 0 4px
-}
-
 #wrap {
 	padding: 0 20px;
 	min-width: 650px;

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>

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>
@@ -1122,6 +1121,9 @@ append_sid(&quot;{$phpbb_root_path}memberlist.$phpEx&quot;, 'mode=group&amp;amp;
 	<p>Some of these functions are only chosen over others because of personal preference and have no benefit other than maintaining consistency throughout the code.</p>
 
 	<ul>
+		<li>
+			<p>Use <code>sizeof</code> instead of <code>count</code></p>
+		</li>
 		<li>
 			<p>Use <code>strpos</code> instead of <code>strstr</code></p>
 		</li>
@@ -1184,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=
@@ -1674,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=
@@ -1722,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
@@ -1731,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
@@ -1740,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>

phpBB/docs/events.md

@@ -58,42 +58,6 @@ acp_email_options_after
 * Since: 3.1.2-RC1
 * Purpose: Add settings to mass email form
 
-acp_ext_details_end
-===
-* Location: adm/style/acp_ext_details.html
-* Since: 3.1.11-RC1
-* Purpose: Add more detailed information on extension after the available information.
-
-acp_ext_details_notice
-===
-* Location: adm/style/acp_ext_details.html
-* Since: 3.1.11-RC1
-* Purpose: Add extension detail notices after version check information.
-
-acp_ext_list_disabled_name_after
-===
-* Location: adm/style/acp_ext_list.html
-* Since: 3.1.11-RC1
-* Purpose: Add content after the name of disabled extensions in the list
-
-acp_ext_list_disabled_title_after
-===
-* Location: adm/style/acp_ext_list.html
-* Since: 3.1.11-RC1
-* Purpose: Add text after disabled extensions section title.
-
-acp_ext_list_enabled_name_after
-===
-* Location: adm/style/acp_ext_list.html
-* Since: 3.1.11-RC1
-* Purpose: Add content after the name of enabled extensions in the list
-
-acp_ext_list_enabled_title_after
-===
-* Location: adm/style/acp_ext_list.html
-* Since: 3.1.11-RC1
-* Purpose: Add text after enabled extensions section title.
-
 acp_forums_custom_settings
 ===
 * Location: adm/style/acp_forums.html
@@ -220,18 +184,6 @@ acp_groups_position_teampage_add_button_before
 * Since: 3.1.7-RC1
 * Purpose: Add content before adding group to teampage submit button
 
-acp_help_phpbb_stats_after
-===
-* Location: adm/style/acp_help_phpbb.html
-* Since: 3.2.0-RC2
-* Purpose: Add content after send statistics tile
-
-acp_help_phpbb_stats_before
-===
-* Location: adm/style/acp_help_phpbb.html
-* Since: 3.2.0-RC2
-* Purpose: Add content before send statistics tile
-
 acp_logs_quick_select_forum_button_append
 ===
 * Location: adm/style/acp_logs.html
@@ -391,13 +343,6 @@ acp_posting_buttons_before
 * Since: 3.1.0-b4
 * Purpose: Add content before BBCode posting buttons in the ACP
 
-acp_posting_buttons_custom_tags_before
-===
-* Locations:
-    + adm/style/acp_posting_buttons.html
-* Since: 3.1.10-RC1
-* Purpose: Add content before the custom BBCodes in the ACP
-
 acp_profile_contact_before
 ===
 * Locations:
@@ -405,20 +350,6 @@ acp_profile_contact_before
 * Since: 3.1.6-RC1
 * Purpose: Add extra options to custom profile field configuration in the ACP
 
-acp_profile_contact_last
-===
-* Locations:
-    + adm/style/acp_profile.html
-* Since: 3.1.11-RC1
-* Purpose: Add contact specific options to custom profile fields in the ACP
-
-acp_profile_step_one_lang_after
-===
-* Locations:
-    + adm/style/acp_profile.html
-* Since: 3.1.11-RC1
-* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP
-
 acp_prune_forums_append
 ===
 * Locations:
@@ -701,20 +632,6 @@ forumlist_body_last_post_title_prepend
 * Since: 3.1.0-a1
 * Purpose: Add content before the post title of the latest post in a forum on the forum list.
 
-forumlist_body_subforum_link_append
-===
-* Locations:
-    + styles/prosilver/template/forumlist_body.html
-* Since: 3.1.11-RC1
-* Purpose: Add content at the end of subforum link item.
-
-forumlist_body_subforum_link_prepend
-===
-* Locations:
-    + styles/prosilver/template/forumlist_body.html
-* Since: 3.1.11-RC1
-* Purpose: Add content at the start of subforum link item.
-
 forumlist_body_subforums_after
 ===
 * Locations:
@@ -736,13 +653,6 @@ forumlist_body_last_row_after
 * Since: 3.1.0-b2
 * Purpose: Add content after the very last row of the forum list.
 
-index_body_birthday_block_before
-===
-* Locations:
-    + styles/prosilver/template/index_body.html
-* Since: 3.1.11-RC1
-* Purpose: Add new statistic blocks before the Birthday block
-
 index_body_block_birthday_append
 ===
 * Locations:
@@ -848,27 +758,6 @@ mcp_ban_unban_before
 * Since: 3.1.0-RC3
 * Purpose: Add additional fields to the unban form in MCP
 
-mcp_forum_actions_after
-===
-* Locations:
-    + styles/prosilver/template/mcp_forum.html
-* Since: 3.1.11-RC1
-* Purpose: Add some information after actions fieldset
-
-mcp_forum_actions_append
-===
-* Locations:
-    + styles/prosilver/template/mcp_forum.html
-* Since: 3.1.11-RC1
-* Purpose: Add additional options to actions select
-
-mcp_forum_actions_before
-===
-* Locations:
-    + styles/prosilver/template/mcp_forum.html
-* Since: 3.1.11-RC1
-* Purpose: Add some information before actions fieldset
-
 mcp_forum_topic_title_before
 ===
 * Locations:
@@ -918,13 +807,6 @@ mcp_front_latest_unapproved_before
 * Since: 3.1.3-RC1
 * Purpose: Add content before latest unapproved posts list
 
-mcp_move_before
-===
-* Locations:
-    + styles/prosilver/template/mcp_move.html
-* Since: 3.1.10-RC1
-* Purpose: Add content before move topic/post form
-
 mcp_post_additional_options
 ===
 * Locations:
@@ -946,34 +828,6 @@ mcp_topic_options_before
 * Since: 3.1.6-RC1
 * Purpose: Add some options (field, checkbox, ...) before the subject field when split a subject
 
-mcp_topic_postrow_post_details_after
-===
-* Locations:
-    + styles/prosilver/template/mcp_topic.html
-* Since: 3.1.10-RC1
-* Purpose: Add content after post details in topic moderation
-
-mcp_topic_postrow_post_details_before
-===
-* Locations:
-    + styles/prosilver/template/mcp_topic.html
-* Since: 3.1.10-RC1
-* Purpose: Add content before post details in topic moderation
-
-mcp_topic_postrow_post_subject_after
-===
-* Locations:
-    + styles/prosilver/template/mcp_topic.html
-* Since: 3.1.11-RC1
-* Purpose: Add content after post subject in topic moderation
-
-mcp_topic_postrow_post_subject_before
-===
-* Locations:
-    + styles/prosilver/template/mcp_topic.html
-* Since: 3.1.11-RC1
-* Purpose: Add content before post subject in topic moderation
-
 mcp_topic_topic_title_after
 ===
 * Locations:
@@ -1048,13 +902,6 @@ memberlist_body_username_prepend
 * Purpose: Add information before every username in the memberlist. Works in
 all display modes (leader, group and normal memberlist).
 
-memberlist_email_before
-===
-* Locations:
-    + styles/prosilver/template/memberlist_email.html
-* Since: 3.1.10-RC1
-* Purpose: Allow adding customizations before the memberlist_email form.
-
 memberlist_search_fields_after
 ===
 * Locations:
@@ -1076,20 +923,6 @@ memberlist_search_sorting_options_before
 * Since: 3.1.2-RC1
 * Purpose: Add information before the search sorting options field.
 
-memberlist_team_username_append
-===
-* Locations:
-    + styles/prosilver/template/memberlist_team.html
-* Since: 3.1.11-RC1
-* Purpose: Append information to username of team member
-
-memberlist_team_username_prepend
-===
-* Locations:
-    + styles/prosilver/template/memberlist_team.html
-* Since: 3.1.11-RC1
-* Purpose: Add information before team user username
-
 memberlist_view_contact_after
 ===
 * Locations:
@@ -1104,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:
@@ -1132,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:
@@ -1188,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:
@@ -1405,20 +1196,6 @@ overall_header_head_append
 * Since: 3.1.0-a1
 * Purpose: Add asset calls directly before the `</head>` tag
 
-overall_header_headerbar_after
-===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-* Since: 3.1.10-RC1
-* Purpose: Add content at the end of the headerbar
-
-overall_header_headerbar_before
-===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-* Since: 3.1.10-RC1
-* Purpose: Add content at the beginning of the headerbar
-
 overall_header_navbar_before
 ===
 * Locations:
@@ -1461,13 +1238,6 @@ overall_header_page_body_before
 * Since: 3.1.0-b3
 * Purpose: Add content after the page-header, but before the page-body
 
-overall_header_searchbox_after
-===
-* Locations:
-    + styles/prosilver/template/overall_header.html
-* Since: 3.1.11-RC1
-* Purpose: Add content after the search box in the header
-
 overall_header_searchbox_before
 ===
 * Locations:
@@ -1560,13 +1330,6 @@ posting_editor_subject_after
 * Since: 3.1.0-a2
 * Purpose: Add field (e.g. textbox) to the posting screen after the subject
 
-posting_editor_subject_append
-===
-* Locations:
-    + styles/prosilver/template/posting_editor.html
-* Since: 3.1.10-RC1
-* Purpose: Add field, text, etc. to the posting after the subject text box
-
 posting_editor_subject_before
 ===
 * Locations:
@@ -1574,13 +1337,6 @@ posting_editor_subject_before
 * Since: 3.1.0-a2
 * Purpose: Add field (e.g. textbox) to the posting screen before the subject
 
-posting_editor_subject_prepend
-===
-* Locations:
-    + styles/prosilver/template/posting_editor.html
-* Since: 3.1.10-RC1
-* Purpose: Add field, text, etc. to the posting before the subject text box
-
 posting_editor_submit_buttons
 ===
 * Locations:
@@ -1637,20 +1393,6 @@ posting_preview_poll_after
 * Since: 3.1.7-RC1
 * Purpose: Add content after the poll preview block
 
-posting_topic_review_row_post_details_after
-===
-* Locations:
-    + styles/prosilver/template/posting_topic_review.html
-* Since: 3.1.10-RC1
-* Purpose: Add content after post details in topic review
-
-posting_topic_review_row_post_details_before
-===
-* Locations:
-    + styles/prosilver/template/posting_topic_review.html
-* Since: 3.1.10-RC1
-* Purpose: Add content before post details in topic review
-
 posting_topic_title_after
 ===
 * Locations:
@@ -1861,13 +1603,6 @@ search_results_topic_before
 * Since: 3.1.0-b4
 * Purpose: Add data before search result topics
 
-search_results_topic_title_after
-===
-* Locations:
-    + styles/prosilver/template/search_results.html
-* Since: 3.1.11-RC1
-* Purpose: Add data after search results topic title
-
 simple_footer_after
 ===
 * Locations:
@@ -1917,15 +1652,6 @@ topiclist_row_append
 * Changed: 3.1.6-RC1 Added event to mcp_forum.html
 * Purpose: Add content into topic rows (inside the elements containing topic titles)
 
-topiclist_row_topic_title_after
-===
-* Locations:
-    + styles/prosilver/template/search_results.html
-    + styles/prosilver/template/viewforum_body.html
-    + styles/prosilver/template/mcp_forum.html
-* Since: 3.1.10-RC1
-* Purpose: Add content into topic rows (after the elements containing the topic titles)
-
 ucp_agreement_terms_after
 ===
 * Locations:
@@ -1947,13 +1673,6 @@ ucp_main_front_user_activity_after
 * Since: 3.1.6-RC1
 * Purpose: Add content right after the user activity info viewing UCP front page
 
-ucp_main_front_user_activity_append
-===
-* Locations:
-    + styles/prosilver/template/ucp_main_front.html
-* Since: 3.1.11-RC1
-* Purpose: Add content after last user activity info viewing UCP front page
-
 ucp_main_front_user_activity_before
 ===
 * Locations:
@@ -1961,13 +1680,6 @@ ucp_main_front_user_activity_before
 * Since: 3.1.6-RC1
 * Purpose: Add content right before the user activity info viewing UCP front page
 
-ucp_main_front_user_activity_prepend
-===
-* Locations:
-    + styles/prosilver/template/ucp_main_front.html
-* Since: 3.1.11-RC1
-* Purpose: Add content before first user activity info viewing UCP front page
-
 ucp_pm_history_post_buttons_after
 ===
 * Locations:
@@ -2060,13 +1772,6 @@ ucp_pm_viewmessage_custom_fields_before
 * Purpose: Add data before the custom fields on the user profile when viewing
 a private message
 
-ucp_pm_viewmessage_options_before
-===
-* Locations:
-    + styles/prosilver/template/ucp_pm_viewmessage.html
-* Since: 3.1.11-RC1
-* Purpose: Add content right before display options
-
 ucp_pm_viewmessage_post_buttons_after
 ===
 * Locations:
@@ -2210,13 +1915,6 @@ ucp_profile_register_details_after
 * Since: 3.1.4-RC1
 * Purpose: Add options in profile page fieldset - after confirm password field.
 
-ucp_register_buttons_before
-===
-* Locations:
-    + styles/prosilver/template/ucp_register.html
-* Since: 3.1.11-RC1
-* Purpose: Add content before buttons in registration form.
-
 ucp_register_credentials_before
 ===
 * Locations:
@@ -2294,13 +1992,6 @@ viewforum_body_topic_row_prepend
 * Since: 3.1.7-RC1
 * Purpose: Add content at the end of the topic list item.
 
-viewforum_body_topicrow_row_before
-===
-* Locations:
-    + styles/prosilver/template/viewforum_body.html
-* Since: 3.1.10-RC1
-* Purpose: Add content before list of topics.
-
 viewforum_buttons_bottom_before
 ===
 * Locations:
@@ -2560,7 +2251,7 @@ 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 
+* Purpose: Add content to the post's bottom directly before the back to top link 
 
 viewtopic_body_postrow_back2top_before
 ===