[prep-release-3.1.7] Add changelog for 3.1.7-pl1

[prep-release-3.1.7] Add migration for 3.1.7-pl1
[prep-release-3.1.7] Update version to 3.1.7-pl1
2025-09-21 05:21:33 +02:00 · 2016-01-09 09:46:32 +01:00 · 2016-01-09 09:35:53 +01:00 · 2016-01-09 09:35:03 +01:00 · 2016-01-09 09:13:50 +01:00 · 2016-01-09 09:13:20 +01:00
50 changed files with 1001 additions and 266 deletions
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@

 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.7-dev" />
+	<property name="newversion" value="3.1.7-pl1" />
 	<property name="prevversion" value="3.1.6" />
-	<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5" />
+	<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.7-RC1, 3.1.7" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -52,7 +52,7 @@
 	<legend>{L_TITLE}</legend>
 <dl>
 	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
-	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
+	<dd><!-- EVENT acp_ban_cell_prepend --><textarea name="ban" cols="40" rows="3" id="ban"></textarea><!-- EVENT acp_ban_cell_append --></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -19,12 +19,14 @@
 	<legend>{L_COMPOSE}</legend>
 <dl>
 	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
+	<!-- EVENT acp_email_group_options_prepend -->
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+	<!-- EVENT acp_email_group_options_append -->
 </dl>
 <dl>
 	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_email_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_email_find_username_append --></dd>
 </dl>
 <dl>
 	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -498,7 +498,7 @@
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>

-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_forums_quick_select_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_forums_quick_select_button_append -->
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -236,7 +236,7 @@
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>

 	<p class="quick">
@@ -265,6 +265,7 @@

 	<form id="acp_groups" method="post" action="{U_ACTION}">

+	<!-- EVENT acp_groups_manage_before -->
 	<table class="table1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
@@ -285,6 +286,7 @@
 		<!-- ENDIF -->
 	</tbody>
 	</table>
+	<!-- EVENT acp_groups_manage_after -->

 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -65,8 +65,10 @@
 					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
 				<!-- END add_legend -->
 			</select>
+			<!-- EVENT acp_groups_position_legend_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_legend_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
@@ -162,8 +164,10 @@
 					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
 				<!-- END add_teampage -->
 			</select>
+			<!-- EVENT acp_groups_position_teampage_add_button_before -->
 			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
 			<input type="hidden" name="action" value="add" />
+			<!-- EVENT acp_groups_position_teampage_add_button_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	</form>
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -73,7 +73,7 @@
 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
 		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
-		<input class="button2" type="submit" value="{L_GO}" />
+		<!-- EVENT acp_logs_quick_select_forum_button_prepend --><input class="button2" type="submit" value="{L_GO}" /><!-- EVENT acp_logs_quick_select_forum_button_append -->
 	</fieldset>
 <!-- ENDIF -->

--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -146,7 +146,7 @@
 	<!-- IF S_VERSIONCHECK -->
 		<td>{L_BOARD_VERSION}{L_COLON} </td>
 		<td>
-			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
+			<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 -->
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_multiple_forum_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_multiple_forum_append --></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+				<dt><!-- EVENT acp_permissions_select_forum_prepend --><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_permissions_select_forum_append --></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>

@@ -95,7 +95,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_GROUP}</legend>
 		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+			<dt><!-- EVENT acp_permissions_select_group_prepend --><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label><!-- EVENT acp_permissions_select_group_append --></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>

@@ -140,7 +140,7 @@
 				<p>{L_USERNAMES_EXPLAIN}</p>
 			<dl>
 				<dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd>
-				<dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
+				<dd class="full" style="text-align: left;"><!-- EVENT acp_permissions_find_username_prepend --><div style="float: {S_CONTENT_FLOW_END};">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</div><!-- EVENT acp_permissions_find_username_append --><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
 			</dl>
 			</fieldset>

@@ -183,7 +183,7 @@
 			<fieldset>
 				<legend>{L_ADD_GROUPS}</legend>
 			<dl>
-				<dd class="full"><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<dd class="full"><!-- EVENT acp_permissions_add_group_options_prepend --><select name="group_id[]" style="width: 100%; height: 107px;" multiple="multiple">{S_ADD_GROUP_OPTIONS}</select><!-- EVENT acp_permissions_add_group_options_append --></dd>
 			</dl>
 			</fieldset>

@@ -267,7 +267,9 @@
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
 				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+				<!-- EVENT acp_permissions_select_group_before -->
 				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
+				<!-- EVENT acp_permissions_select_group_after -->
 				<dd>&nbsp;</dd>
 			</dl>
 			</fieldset>
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+		<dt><!-- EVENT acp_prune_forums_prepend --><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label><!-- EVENT acp_prune_forums_append --></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -50,7 +50,7 @@
 <dl>
 	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
-	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+	<dd><!-- EVENT acp_prune_users_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_prune_users_find_username_append --></dd>
 </dl>
 </fieldset>

--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -146,7 +146,9 @@

 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
+			<!-- EVENT acp_users_select_group_before -->
 			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			<!-- EVENT acp_users_select_group_after -->
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
--- a/phpBB/adm/style/permission_forum_copy.html
+++ b/phpBB/adm/style/permission_forum_copy.html
@@ -12,7 +12,7 @@
 		<legend>{L_LOOK_UP_FORUM}</legend>

 		<dl>
-			<dt><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_src_forum_prepend --><label for="src_forum">{L_COPY_PERMISSIONS_FROM}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_FROM_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_src_forum_append --></dt>
 			<dd><select id="src_forum" name="src_forum_id"><option value="0">{L_SELECT_FORUM}</option><option value="-1">------------------</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
@@ -22,7 +22,7 @@
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>

 		<dl>
-			<dt><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span></dt>
+			<dt><!-- EVENT acp_permission_forum_copy_dest_forum_prepend --><label for="dest_forums">{L_COPY_PERMISSIONS_TO}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_FORUM_TO_EXPLAIN}</span><!-- EVENT acp_permission_forum_copy_dest_forum_append --></dt>
 			<dd><select id="dest_forums" name="dest_forum_ids[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	</fieldset>
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -303,6 +303,10 @@ phpbb.ajaxify = function(options) {
 					alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
 				} else {
 					$dark.fadeOut(phpbb.alertTime);
+
+					if ($loadingIndicator) {
+						$loadingIndicator.fadeOut(phpbb.alertTime);
+					}
 				}

 				if (typeof phpbb.ajaxCallbacks[callback] === 'function') {
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -25,7 +25,7 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": ">=5.3.3",
+		"php": ">=5.3.3,<7.0",
 		"lusitanian/oauth": "0.2.*",
 		"symfony/config": "2.3.*",
 		"symfony/console": "2.3.*",
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -109,26 +109,23 @@
        },
        {
            "name": "symfony/config",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Config",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "75ab3b117c690d4421d9e83f87df89755778d788"
+                "url": "https://github.com/symfony/config.git",
+                "reference": "665b906c22103bb36eaeff31cc3063b53ed4eae5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/75ab3b117c690d4421d9e83f87df89755778d788",
-                "reference": "75ab3b117c690d4421d9e83f87df89755778d788",
+                "url": "https://api.github.com/repos/symfony/config/zipball/665b906c22103bb36eaeff31cc3063b53ed4eae5",
+                "reference": "665b906c22103bb36eaeff31cc3063b53ed4eae5",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
                "symfony/filesystem": "~2.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -138,7 +135,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Config\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -156,29 +156,28 @@
            ],
            "description": "Symfony Config Component",
            "homepage": "https://symfony.com",
-            "time": "2015-07-15 17:51:32"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/console",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Console",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "cb9006df9d50f1dd7b9dfa3e4ad8942acde9f76c"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "ed9c6cad324afb02672fa8ebf55fe0feb1659067"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/cb9006df9d50f1dd7b9dfa3e4ad8942acde9f76c",
-                "reference": "cb9006df9d50f1dd7b9dfa3e4ad8942acde9f76c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ed9c6cad324afb02672fa8ebf55fe0feb1659067",
+                "reference": "ed9c6cad324afb02672fa8ebf55fe0feb1659067",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/event-dispatcher": "~2.1"
            },
            "suggest": {
                "symfony/event-dispatcher": ""
@@ -192,7 +191,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Console\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -210,21 +212,21 @@
            ],
            "description": "Symfony Console Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-31 12:48:21"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/debug",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Debug",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Debug.git",
-                "reference": "77d632fd7265fe55bd20882685998ec1f3415a64"
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "c0f543d3c40f5b885a68bc87ef1f2f8aec8e0424"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/77d632fd7265fe55bd20882685998ec1f3415a64",
-                "reference": "77d632fd7265fe55bd20882685998ec1f3415a64",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/c0f543d3c40f5b885a68bc87ef1f2f8aec8e0424",
+                "reference": "c0f543d3c40f5b885a68bc87ef1f2f8aec8e0424",
                "shasum": ""
            },
            "require": {
@@ -235,8 +237,7 @@
            },
            "require-dev": {
                "symfony/http-foundation": "~2.1",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
            },
            "suggest": {
                "symfony/class-loader": "",
@@ -252,7 +253,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Debug\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -270,21 +274,21 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
-            "time": "2015-07-28 12:38:40"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/DependencyInjection",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "3f85e842b92c552f520ae2ea628be4aab2810fdb"
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "d3c6bcab8f626c32e687f8b77d683f8a9f1f4be3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/3f85e842b92c552f520ae2ea628be4aab2810fdb",
-                "reference": "3f85e842b92c552f520ae2ea628be4aab2810fdb",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3c6bcab8f626c32e687f8b77d683f8a9f1f4be3",
+                "reference": "d3c6bcab8f626c32e687f8b77d683f8a9f1f4be3",
                "shasum": ""
            },
            "require": {
@@ -292,7 +296,6 @@
            },
            "require-dev": {
                "symfony/config": "~2.2",
-                "symfony/phpunit-bridge": "~2.7",
                "symfony/yaml": "~2.1"
            },
            "suggest": {
@@ -309,7 +312,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\DependencyInjection\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -327,29 +333,28 @@
            ],
            "description": "Symfony DependencyInjection Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-01 07:45:23"
+            "time": "2015-11-19 14:08:33"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/EventDispatcher",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "af8fba40bdab97fc666173a8c2087e02445c231c"
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "08564581a8444035d0874efc35a6366be8c0af9e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/af8fba40bdab97fc666173a8c2087e02445c231c",
-                "reference": "af8fba40bdab97fc666173a8c2087e02445c231c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/08564581a8444035d0874efc35a6366be8c0af9e",
+                "reference": "08564581a8444035d0874efc35a6366be8c0af9e",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "symfony/dependency-injection": "~2.0,>=2.0.5",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/dependency-injection": "~2.0,>=2.0.5"
            },
            "suggest": {
                "symfony/dependency-injection": "",
@@ -364,7 +369,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -382,29 +390,26 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2015-05-15 13:28:34"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Filesystem",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "2d4e4e21e2b5e4720555811fe8f4a8873cfa0f0f"
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "d72d4b276921c2388ac09a5a6716e10d57a6e89b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d4e4e21e2b5e4720555811fe8f4a8873cfa0f0f",
-                "reference": "2d4e4e21e2b5e4720555811fe8f4a8873cfa0f0f",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d72d4b276921c2388ac09a5a6716e10d57a6e89b",
+                "reference": "d72d4b276921c2388ac09a5a6716e10d57a6e89b",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -414,7 +419,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Filesystem\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -432,29 +440,26 @@
            ],
            "description": "Symfony Filesystem Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-29 10:34:03"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/HttpFoundation",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "fd351e4abb56b05ba05023f6ae4185873978da10"
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "2242d5d7b12ee2291bbaac161d94ea312a9c0d1f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/fd351e4abb56b05ba05023f6ae4185873978da10",
-                "reference": "fd351e4abb56b05ba05023f6ae4185873978da10",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2242d5d7b12ee2291bbaac161d94ea312a9c0d1f",
+                "reference": "2242d5d7b12ee2291bbaac161d94ea312a9c0d1f",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -467,6 +472,9 @@
                },
                "classmap": [
                    "Symfony/Component/HttpFoundation/Resources/stubs"
+                ],
+                "exclude-from-classmap": [
+                    "/Tests/"
                ]
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -485,21 +493,21 @@
            ],
            "description": "Symfony HttpFoundation Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-25 21:41:39"
+            "time": "2015-11-19 16:24:57"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/HttpKernel",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "15604f5b95a72ccdc38c318e14e9147e2e51bfa2"
+                "url": "https://github.com/symfony/http-kernel.git",
+                "reference": "a79bd3b40c73fd504d1e66ab6c40cdede509c600"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/15604f5b95a72ccdc38c318e14e9147e2e51bfa2",
-                "reference": "15604f5b95a72ccdc38c318e14e9147e2e51bfa2",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a79bd3b40c73fd504d1e66ab6c40cdede509c600",
+                "reference": "a79bd3b40c73fd504d1e66ab6c40cdede509c600",
                "shasum": ""
            },
            "require": {
@@ -518,7 +526,6 @@
                "symfony/dependency-injection": "~2.2",
                "symfony/dom-crawler": "~2.0,>=2.0.5",
                "symfony/finder": "~2.0,>=2.0.5",
-                "symfony/phpunit-bridge": "~2.7",
                "symfony/process": "~2.0,>=2.0.5",
                "symfony/routing": "~2.2",
                "symfony/stopwatch": "~2.3",
@@ -541,7 +548,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\HttpKernel\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -559,21 +569,21 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "https://symfony.com",
-            "time": "2015-09-01 15:40:52"
+            "time": "2015-11-23 10:44:06"
        },
        {
            "name": "symfony/routing",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Routing",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Routing.git",
-                "reference": "fbadda8d2a35bdec8187bd54f698b8b704649721"
+                "url": "https://github.com/symfony/routing.git",
+                "reference": "08a4065c47b45a1785101aabb29082fe415cec6c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/fbadda8d2a35bdec8187bd54f698b8b704649721",
-                "reference": "fbadda8d2a35bdec8187bd54f698b8b704649721",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/08a4065c47b45a1785101aabb29082fe415cec6c",
+                "reference": "08a4065c47b45a1785101aabb29082fe415cec6c",
                "shasum": ""
            },
            "require": {
@@ -584,7 +594,6 @@
                "psr/log": "~1.0",
                "symfony/config": "~2.2",
                "symfony/http-foundation": "~2.3",
-                "symfony/phpunit-bridge": "~2.7",
                "symfony/yaml": "~2.0,>=2.0.5"
            },
            "suggest": {
@@ -601,7 +610,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Routing\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -619,29 +631,26 @@
            ],
            "description": "Symfony Routing Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-01 19:33:42"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/yaml",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Yaml",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "162a8860e58bcd9d316e04e3af8ff96e63cb1cdb"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "6d7a3b7cfdd5095e5f4318ad4c2ed20c71c74764"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/162a8860e58bcd9d316e04e3af8ff96e63cb1cdb",
-                "reference": "162a8860e58bcd9d316e04e3af8ff96e63cb1cdb",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/6d7a3b7cfdd5095e5f4318ad4c2ed20c71c74764",
+                "reference": "6d7a3b7cfdd5095e5f4318ad4c2ed20c71c74764",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -651,7 +660,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Yaml\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -669,7 +681,7 @@
            ],
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-11 07:25:28"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "twig/twig",
@@ -828,6 +840,7 @@
                "event",
                "exception"
            ],
+            "abandoned": "guzzle/guzzle",
            "time": "2013-09-08 21:09:18"
        },
        {
@@ -885,6 +898,7 @@
                "http",
                "http client"
            ],
+            "abandoned": "guzzle/guzzle",
            "time": "2013-09-06 11:34:26"
        },
        {
@@ -929,6 +943,7 @@
                "message",
                "url"
            ],
+            "abandoned": "guzzle/guzzle",
            "time": "2013-07-11 22:46:03"
        },
        {
@@ -982,6 +997,7 @@
                "component",
                "stream"
            ],
+            "abandoned": "guzzle/guzzle",
            "time": "2013-07-30 22:07:23"
        },
        {
@@ -1891,7 +1907,8 @@
                },
                {
                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
+                    "email": "aharvey@php.net",
+                    "role": "Lead"
                },
                {
                    "name": "Bernhard Schussek",
@@ -2017,17 +2034,17 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/BrowserKit",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/BrowserKit.git",
-                "reference": "85afdbfbc789709192a9c5f37268063b18fc861d"
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "65576a393a8372e68ffe57706c1c9eb93e2aac98"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/85afdbfbc789709192a9c5f37268063b18fc861d",
-                "reference": "85afdbfbc789709192a9c5f37268063b18fc861d",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/65576a393a8372e68ffe57706c1c9eb93e2aac98",
+                "reference": "65576a393a8372e68ffe57706c1c9eb93e2aac98",
                "shasum": ""
            },
            "require": {
@@ -2036,8 +2053,7 @@
            },
            "require-dev": {
                "symfony/css-selector": "~2.0,>=2.0.5",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/process": "~2.0,>=2.0.5"
+                "symfony/process": "~2.3.34|~2.7,>=2.7.6"
            },
            "suggest": {
                "symfony/process": ""
@@ -2051,7 +2067,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\BrowserKit\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2069,29 +2088,26 @@
            ],
            "description": "Symfony BrowserKit Component",
            "homepage": "https://symfony.com",
-            "time": "2015-07-05 14:01:47"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/css-selector",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/CssSelector",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "75cc67b407df5617fd58c40caa872e9d81de38cc"
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "93cccf44bf22103694611dc1802714d2cd36f5fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/75cc67b407df5617fd58c40caa872e9d81de38cc",
-                "reference": "75cc67b407df5617fd58c40caa872e9d81de38cc",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/93cccf44bf22103694611dc1802714d2cd36f5fb",
+                "reference": "93cccf44bf22103694611dc1802714d2cd36f5fb",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -2101,7 +2117,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\CssSelector\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2123,29 +2142,28 @@
            ],
            "description": "Symfony CssSelector Component",
            "homepage": "https://symfony.com",
-            "time": "2015-05-15 13:28:34"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/DomCrawler",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/DomCrawler.git",
-                "reference": "da19f268a3f6ec68b77706c06fd874ddbb073011"
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "be39e9bc2a3ae45a876174e8a2c49e263541a754"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/da19f268a3f6ec68b77706c06fd874ddbb073011",
-                "reference": "da19f268a3f6ec68b77706c06fd874ddbb073011",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/be39e9bc2a3ae45a876174e8a2c49e263541a754",
+                "reference": "be39e9bc2a3ae45a876174e8a2c49e263541a754",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
            "require-dev": {
-                "symfony/css-selector": "~2.0,>=2.0.5",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/css-selector": "~2.0,>=2.0.5"
            },
            "suggest": {
                "symfony/css-selector": ""
@@ -2159,7 +2177,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\DomCrawler\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2177,29 +2198,26 @@
            ],
            "description": "Symfony DomCrawler Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-25 21:41:39"
+            "time": "2015-11-02 18:22:02"
        },
        {
            "name": "symfony/finder",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Finder",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "87a0f52f6ec3061499a71e225145a031afa22511"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "5baf7b74657db10c4ad8ca0934be74151268b741"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/87a0f52f6ec3061499a71e225145a031afa22511",
-                "reference": "87a0f52f6ec3061499a71e225145a031afa22511",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5baf7b74657db10c4ad8ca0934be74151268b741",
+                "reference": "5baf7b74657db10c4ad8ca0934be74151268b741",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -2209,7 +2227,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Finder\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2227,29 +2248,26 @@
            ],
            "description": "Symfony Finder Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-26 16:41:06"
+            "time": "2015-11-18 08:19:46"
        },
        {
            "name": "symfony/process",
-            "version": "v2.3.32",
+            "version": "v2.3.35",
            "target-dir": "Symfony/Component/Process",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Process.git",
-                "reference": "55aec78e1ff04c40ca2cbcb7a119581cdf4e5d82"
+                "url": "https://github.com/symfony/process.git",
+                "reference": "4d0eaad4b1153174dce6db15e26764de20e7b43d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/55aec78e1ff04c40ca2cbcb7a119581cdf4e5d82",
-                "reference": "55aec78e1ff04c40ca2cbcb7a119581cdf4e5d82",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4d0eaad4b1153174dce6db15e26764de20e7b43d",
+                "reference": "4d0eaad4b1153174dce6db15e26764de20e7b43d",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3"
            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
@@ -2259,7 +2277,10 @@
            "autoload": {
                "psr-0": {
                    "Symfony\\Component\\Process\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@@ -2277,7 +2298,7 @@
            ],
            "description": "Symfony Process Component",
            "homepage": "https://symfony.com",
-            "time": "2015-08-25 21:41:39"
+            "time": "2015-11-19 12:49:26"
        }
    ],
    "aliases": [],
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -49,6 +49,8 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v317">Changes since 3.1.7</a></li>
+		<li><a href="#v316">Changes since 3.1.6</a></li>
 		<li><a href="#v315">Changes since 3.1.5</a></li>
 		<li><a href="#v314">Changes since 3.1.4</a></li>
 		<li><a href="#v313">Changes since 3.1.3</a></li>
@@ -113,6 +115,124 @@

 		<div class="content">

+			<a name="v317"></a><h3>Changes since 3.1.7</h3>
+
+	<h4>Security Issue</h4>
+	<ul>
+		<li>[SECURITY-188] - Check form key in acp_bbcodes</li>
+	</ul>
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Undefined variable $phpbb_dispatcher when (un-)locking a topic or post</li>
+	</ul>
+
+			<a name="v316"></a><h3>Changes since 3.1.6</h3>
+
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8839">PHPBB3-8839</a>] - Wrong new status of subforumlink on index</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8920">PHPBB3-8920</a>] - PM-Report for every moderator</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9153">PHPBB3-9153</a>] - New member can delete pm just in one way</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9252">PHPBB3-9252</a>] - Conflict when (dis)approving a post by two moderators at the same time</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11468">PHPBB3-11468</a>] - Controllers can not set additional parameters of page_header()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11971">PHPBB3-11971</a>] - Validating not correctly in Spambot countermeasures</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12616">PHPBB3-12616</a>] - Report notification is not removed when post is disapproved or deleted</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13202">PHPBB3-13202</a>] - dead code in sessions.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13423">PHPBB3-13423</a>] - Driver sqlite3 failed periodically</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13636">PHPBB3-13636</a>] - Unexpect return to previous page behaviour</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13656">PHPBB3-13656</a>] - database_upgrade.php fails when database password contains a % character</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13748">PHPBB3-13748</a>] - Wrong tooltip after poll vote change</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13759">PHPBB3-13759</a>] - submit_post doesn't take $data['post_time'] - into account</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13799">PHPBB3-13799</a>] - Avatar gallery subfolders paths are handled incorrectly</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13831">PHPBB3-13831</a>] - Post deletion reason is not appearing on moderation logs</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13835">PHPBB3-13835</a>] - File upload of large files where filename contains umlauts fails</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13846">PHPBB3-13846</a>] - Permissions around soft deleting are inconsistently handled</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13851">PHPBB3-13851</a>] - &quot;Can ignore flood limit&quot; permission not taking effect</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13892">PHPBB3-13892</a>] - &quot;Someone reports a post&quot; notification setting has no effect</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13945">PHPBB3-13945</a>] - Account re-activation does not create a notification</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13950">PHPBB3-13950</a>] - If disabled extension - no hidden permission set</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13960">PHPBB3-13960</a>] - Profile field validation may break</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13976">PHPBB3-13976</a>] - Fix comment typo in salted_md5 driver</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13988">PHPBB3-13988</a>] - Atom feeds use relative links for image attachments</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13992">PHPBB3-13992</a>] - Fix html5 error from output on w3.org its new validator</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14058">PHPBB3-14058</a>] - subsilver2 Contact us form doesn't have an email subject field</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14070">PHPBB3-14070</a>] - Disabled avatar types is still displayed on the forum</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14106">PHPBB3-14106</a>] - Sorting is unworkable while moderating forum (merge topics)</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14114">PHPBB3-14114</a>] - Inconsistency in install.html in 3.1.x Automatic uopdate package</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14127">PHPBB3-14127</a>] - Error in the BBCode FAQ in 'Linking to another site'</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14142">PHPBB3-14142</a>] - Remove unused ignore_configs from avatar drivers</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14143">PHPBB3-14143</a>] - Flush the in-memory mail queue when writing it to the disk</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14153">PHPBB3-14153</a>] - Notifications dropdown header doesn't clear floats</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14159">PHPBB3-14159</a>] - Not accessible link on main ACP page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14161">PHPBB3-14161</a>] - The core.download_file_send_to_browser_before - $vars - 'extension' it does not exist</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14163">PHPBB3-14163</a>] - Select All in code bug in Edge</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14181">PHPBB3-14181</a>] - Custom report/denial reason not shown in user notifications</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14186">PHPBB3-14186</a>] - Incorrect string concatenation in phpbb_mcp_sorting()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14200">PHPBB3-14200</a>] - Allow hidden users to see theself on viewonline</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14215">PHPBB3-14215</a>] - [ticket/14212] - Adding event after users have been removed to a group</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14217">PHPBB3-14217</a>] - [ticket/13591] - Change SQL query into array to allow</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14224">PHPBB3-14224</a>] - Fix trailing whitespaces</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14228">PHPBB3-14228</a>] - Vertical align of numbers in polls</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14236">PHPBB3-14236</a>] - Race condition in the functional tests</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14242">PHPBB3-14242</a>] - Fix on memberlist the sort method.</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14249">PHPBB3-14249</a>] - Online list isn't sorted anymore</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14258">PHPBB3-14258</a>] - Add event in auth::Login</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14271">PHPBB3-14271</a>] - Update nginx sample config</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14276">PHPBB3-14276</a>] - Function get_folder_status not setup for use of plurals</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14287">PHPBB3-14287</a>] - Loading indicator not removed after confirming action that does not produce a message</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14297">PHPBB3-14297</a>] - Uppercase and lowercase when sorting topics</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14334">PHPBB3-14334</a>] - Do not use deprecated function get_user_avatar() in user_loader</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14339">PHPBB3-14339</a>] - State support for PHP 7.0 in docs</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14346">PHPBB3-14346</a>] - Improve version check output when phpbb.com is unreachable</li>
+	</ul>
+	<h4>Improvement</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-7362">PHPBB3-7362</a>] - Title/Post Icons Need Attribute Text</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8800">PHPBB3-8800</a>] - Add &quot;mark topics read&quot; link to &quot;View unread posts&quot;</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10343">PHPBB3-10343</a>] - ACP: searching for users does not show inactive accounts</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13684">PHPBB3-13684</a>] - Only resize attached file comments vertically</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13934">PHPBB3-13934</a>] - Enctype clause for forms may be needed for profile fields</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14066">PHPBB3-14066</a>] - Add template events to search_body.html</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14073">PHPBB3-14073</a>] - Add core events to the several places in includes/functions_admin.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14075">PHPBB3-14075</a>] - Event in posting preview</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14080">PHPBB3-14080</a>] - Add template events to viewforum_body.html before/after/append/prepend the topic row</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14088">PHPBB3-14088</a>] - Add core events to the search.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14089">PHPBB3-14089</a>] - [Template] - posting_topic_title_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14098">PHPBB3-14098</a>] - Add core events to the search backends (fulltext_*.php)</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14102">PHPBB3-14102</a>] - Add core event to the mcp_topic.php</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14113">PHPBB3-14113</a>] - Add core events to the memberlist.php for customizing members search</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14117">PHPBB3-14117</a>] - Add core events to index.php to allow modifying birthdays list</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14123">PHPBB3-14123</a>] - Add more descriptive help to the CLI commands</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14126">PHPBB3-14126</a>] - Add viewtopic_topic_title_after template event</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14133">PHPBB3-14133</a>] - Comment fix for phpbb_get_user_rank()</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14154">PHPBB3-14154</a>] - Include &quot;Clean Name&quot; for disabled Extensions</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14155">PHPBB3-14155</a>] - Add row highlighting to extensions and style management</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14156">PHPBB3-14156</a>] - Add the Symfony ResponseListener</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14164">PHPBB3-14164</a>] - Helpful instructions for database updates</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14170">PHPBB3-14170</a>] - Fix mcp_change_poster_after event</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14201">PHPBB3-14201</a>] - Add ACP template events</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14213">PHPBB3-14213</a>] - [PHP] - core.group_add_user_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14219">PHPBB3-14219</a>] - Add email address into inactive user display in ACP</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14261">PHPBB3-14261</a>] - Pages served from app.php can't disable the update of session_page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14283">PHPBB3-14283</a>] - Add a &quot;Manage Group&quot; link on a group page</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14313">PHPBB3-14313</a>] - Don't display quote button on unapproved posts</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Add event when locking/unlocking posts/topics</li>
+	</ul>
+	<h4>New Feature</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14144">PHPBB3-14144</a>] - [Template] - quickreply_editor_subject_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14146">PHPBB3-14146</a>] - [Template] - viewtopic_body_post_subject_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14187">PHPBB3-14187</a>] - [ACP Template] - acp_styles_before_table</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14188">PHPBB3-14188</a>] - [PHP] - core.acp_styles_action_before</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14191">PHPBB3-14191</a>] - [PHP] - core.get_gravatar_url_after</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14192">PHPBB3-14192</a>] - [PHP] - core.memberlist_memberrow_before</li>
+	</ul>
+	<h4>Task</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14140">PHPBB3-14140</a>] - Update Symfony to benefit from improvement to the console component</li>
+	</ul>
+
+
 			<a name="v315"></a><h3>Changes since 3.1.5</h3>

 	<h4>Bug</h4>
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -147,7 +147,7 @@
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 5.3.3+</strong> with support for the database you intend to use.</li>
+		<li><strong>PHP 5.3.3+</strong> and <strong>PHP < 7.0</strong> with support for the database you intend to use.</li>
 		<li>The following PHP modules are required:
 		<ul>
 			<li>json</li>
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -323,7 +323,7 @@

 		<div class="content">

-	<p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.3.</p>
+	<p>phpBB 3.1.x takes advantage of new features added in PHP 5.3. We recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 5.3.3 and the maximum supported version is any version prior to 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>

--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1,3 +1,15 @@
+acp_ban_cell_append
+===
+* Location: adm/style/acp_ban.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the ban cell area
+
+acp_ban_cell_prepend
+===
+* Location: adm/style/acp_ban.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the ban cell area
+
 acp_bbcodes_actions_append
 ===
 * Location: adm/style/acp_bbcodes.html
@@ -16,6 +28,30 @@ acp_bbcodes_edit_fieldsets_after
 * Since: 3.1.0-a3
 * Purpose: Add settings to BBCode add/edit form

+acp_email_group_options_append
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the group options select box 
+
+acp_email_group_options_prepend
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the group options select box 
+
+acp_email_find_username_append
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the fimd username link
+
+acp_email_find_username_prepend
+===
+* Location: adm/style/acp_email.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the fimd username link
+
 acp_email_options_after
 ===
 * Location: adm/style/acp_email.html
@@ -64,6 +100,18 @@ acp_forums_prune_settings_prepend
 * Since: 3.1.2-RC1
 * Purpose: Add settings to forums before prune settings section

+acp_forums_quick_select_button_append
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the quick select forum submit button
+
+acp_forums_quick_select_button_prepend
+===
+* Location: adm/style/acp_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the quick select forum submit button
+
 acp_forums_rules_settings_append
 ===
 * Location: adm/style/acp_forums.html
@@ -88,6 +136,66 @@ acp_group_options_after
 * Since: 3.1.0-b4
 * Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM)

+acp_groups_find_username_append
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the end of the find username link
+
+acp_groups_find_username_prepend
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content at the start of the find username link
+
+acp_groups_manage_after
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the manage groups table
+
+acp_groups_manage_before
+===
+* Location: adm/style/acp_groups.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the manage groups table
+
+acp_groups_position_legend_add_button_after
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after adding group to legend submit button
+
+acp_groups_position_legend_add_button_before
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before adding group to legend submit button
+
+acp_groups_position_teampage_add_button_after
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after adding group to teampage submit button
+
+acp_groups_position_teampage_add_button_before
+===
+* Location: adm/style/acp_groups_position.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before adding group to teampage submit button
+
+acp_logs_quick_select_forum_button_append
+===
+* Location: adm/style/acp_logs.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the quick forum select form submit button
+
+acp_logs_quick_select_forum_button_prepend
+===
+* Location: adm/style/acp_logs.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the quick forum select form submit button
+
 acp_main_actions_append
 ===
 * Location: adm/style/acp_main.html
@@ -125,6 +233,102 @@ acp_overall_header_stylesheets_after
 * Purpose: Add assets after stylesheets within the `<head>` tags in the ACP.
 Note that INCLUDECSS will not work with this event.

+acp_permission_forum_copy_src_forum_append
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the sourse forum select form
+
+acp_permission_forum_copy_src_forum_prepend
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the sourse forum select form
+
+acp_permission_forum_copy_dest_forum_append
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the destiny forum select form
+
+acp_permission_forum_copy_dest_forum_prepend
+===
+* Location: adm/style/permission_forum_copy.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the destiny forum select form
+
+acp_permissions_add_group_options_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group multiple select form
+
+acp_permissions_add_group_options_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group multiple select form
+
+acp_permissions_find_username_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the find username link
+
+acp_permissions_find_username_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the find username link
+
+acp_permissions_select_forum_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum select form label
+
+acp_permissions_select_forum_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum select form label
+
+acp_permissions_select_group_after
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group select form in usergroup view
+
+acp_permissions_select_group_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the group select form label
+
+acp_permissions_select_group_before
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group select form in usergroup view
+
+acp_permissions_select_group_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the group select form label
+
+acp_permissions_select_multiple_forum_append
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum multiple select form label
+
+acp_permissions_select_multiple_forum_prepend
+===
+* Location: adm/style/acp_permissions.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum multiple select form label
+
 acp_posting_buttons_after
 ===
 * Locations:
@@ -146,6 +350,34 @@ acp_profile_contact_before
 * Since: 3.1.6-RC1
 * Purpose: Add extra options to custom profile field configuration in the ACP

+acp_prune_forums_append
+===
+* Locations:
+    + adm/style/acp_prune_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the forum select form label
+
+acp_prune_forums_prepend
+===
+* Locations:
+    + adm/style/acp_prune_forums.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the forum select form label
+
+acp_prune_users_find_username_append
+===
+* Locations:
+    + adm/style/acp_prune_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the find username link
+
+acp_prune_users_find_username_prepend
+===
+* Locations:
+    + adm/style/acp_prune_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the find username link
+
 acp_ranks_edit_after
 ===
 * Locations:
@@ -297,6 +529,18 @@ acp_users_prefs_view_prepend
 * Since: 3.1.0-b3
 * Purpose: Add user options fieldset to the top of ACP users view prefs settings

+acp_users_select_group_after
+===
+* Location: adm/style/acp_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after group select form
+
+acp_users_select_group_before
+===
+* Location: adm/style/acp_users.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before group select form
+
 attachment_file_after
 ===
 * Locations:
@@ -1306,6 +1550,14 @@ quickreply_editor_subject_before
 * Since: 3.1.7-RC1
 * Purpose: Add content before the quick reply subject textbox

+search_body_form_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search form
+
 search_body_form_before
 ===
 * Locations:
@@ -1314,6 +1566,102 @@ search_body_form_before
 * Since: 3.1.5-RC1
 * Purpose: Add content before the search form

+search_body_recent_search_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the recent search queries list
+
+search_body_recent_search_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the recent search queries list
+
+search_body_search_display_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query display options fields set
+
+search_body_search_display_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query display options fields set
+
+search_body_search_options_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query options fields set
+
+search_body_search_options_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query options fields set
+
+search_body_search_options_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query options fields set
+
+search_body_search_options_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query options fields set
+
+search_body_search_query_after
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content after the search query fields set
+
+search_body_search_query_append
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the bottom of the search query fields set
+
+search_body_search_query_before
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add content before the search query fields set
+
+search_body_search_query_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_body.html
+    + styles/subsilver2/template/search_body.html
+* Since: 3.1.7-RC1
+* Purpose: Put content at the top of the search query fields set
+
 search_results_header_after
 ===
 * Locations:
@@ -2085,6 +2433,14 @@ viewtopic_body_post_buttons_list_before
 * Purpose: Add post button custom list to posts (next to edit, quote etc),
 before the original list.

+viewtopic_body_post_subject_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+    + styles/subsilver2/template/viewtopic_body.html
+* Since: 3.1.7-RC1
+* Purpose: Add data before post icon and subject
+
 viewtopic_body_postrow_custom_fields_after
 ===
 * Locations:
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -64,6 +64,11 @@ http {
        location / {
            # phpbb uses index.htm
            index index.php index.html index.htm;
+            try_files $uri $uri/ @rewriteapp;
+        }
+
+        location @rewriteapp {
+            rewrite ^(.*)$ /app.php/$1 last;
        }

        # Deny access to internal phpbb files.
@@ -75,12 +80,16 @@ http {
        }

        # Pass the php scripts to fastcgi server specified in upstream declaration.
-        location ~ \.php$ {
-            fastcgi_pass php;
-            # Necessary for php.
-            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+        location ~ \.php(/|$) {
            # Unmodified fastcgi_params from nginx distribution.
            include fastcgi_params;
+            # Necessary for php.
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+            fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            try_files $uri $uri/ /app.php$is_args$args;
+            fastcgi_pass php;
        }

        # Deny access to version control system directories.
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -33,6 +33,7 @@ class acp_bbcodes
 		// Set up general vars
 		$action	= request_var('action', '');
 		$bbcode_id = request_var('bbcode', 0);
+		$submit = $request->is_set_post('submit');

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

 		add_form_key($form_key);

+		if ($submit && !check_form_key($form_key))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		// Set up mode-specific vars
 		switch ($action)
 		{
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -121,8 +121,6 @@ class acp_extensions
 					'U_ACTION' 				=> $this->u_action,
 				));

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

--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */

 // phpBB Version
-define('PHPBB_VERSION', '3.1.7-dev');
+define('PHPBB_VERSION', '3.1.7-pl1');

 // QA-related
 // define('PHPBB_QA', 1);
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5395,6 +5395,8 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
 		return;
 	}

+	$user->update_session_infos();
+
 	phpbb_check_and_display_sql_report($request, $auth, $db);

 	$template->assign_vars(array(
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -164,6 +164,8 @@ function adm_page_footer($copyright_html = true)
 		return;
 	}

+	$user->update_session_infos();
+
 	phpbb_check_and_display_sql_report($request, $auth, $db);

 	$template->assign_vars(array(
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1594,7 +1594,7 @@ function get_folder_status($folder_id, $folder)
 		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? floor(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
 	);

-	$return['message']	= $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), $return['cur'], $return['percent']);
+	$return['message']	= $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), (int) $return['cur'], $return['percent']);

 	return $return;
 }
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2698,7 +2698,7 @@ function group_delete($group_id, $group_name = false)
 */
 function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0, $pending = 0, $group_attributes = false)
 {
-	global $db, $auth, $phpbb_container;
+	global $db, $auth, $phpbb_container, $phpbb_dispatcher;

 	// We need both username and user_id info
 	$result = user_get_id_name($user_id_ary, $username_ary);
@@ -2775,6 +2775,26 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 	// Clear permissions cache of relevant users
 	$auth->acl_clear_prefetch($user_id_ary);

+	/**
+	* Event after users are added to a group
+	*
+	* @event core.group_add_user_after
+	* @var	int	group_id		ID of the group to which users are added
+	* @var	string group_name		Name of the group
+	* @var	array	user_id_ary		IDs of the users which are added
+	* @var	array	username_ary	names of the users which are added
+	* @var	int		pending			Pending setting, 1 if user(s) added are pending
+	* @since 3.1.7-RC1
+	*/
+	$vars = array(
+		'group_id',
+		'group_name',
+		'user_id_ary',
+		'username_ary',
+		'pending',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.group_add_user_after', compact($vars)));
+
 	if (!$group_name)
 	{
 		$group_name = get_group_name($group_id);
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -262,7 +262,7 @@ class mcp_main
 */
 function lock_unlock($action, $ids)
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_dispatcher;

 	if ($action == 'lock' || $action == 'unlock')
 	{
@@ -322,6 +322,22 @@ function lock_unlock($action, $ids)
 			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_' . strtoupper($action), $row['topic_title']);
 		}

+		/**
+		 * Perform additional actions after locking/unlocking posts/topics
+		 *
+		 * @event core.mcp_lock_unlock_after
+		 * @var	string	action				Variable containing the action we perform on the posts/topics ('lock', 'unlock', 'lock_post' or 'unlock_post')
+		 * @var	array	ids					Array containing the post/topic IDs that have been locked/unlocked
+		 * @var	array	data				Array containing posts/topics data
+		 * @since 3.1.7-RC1
+		 */
+		$vars = array(
+			'action',
+			'ids',
+			'data',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.mcp_lock_unlock_after', compact($vars)));
+
 		$success_msg = $l_prefix . ((sizeof($ids) == 1) ? '' : 'S') . '_' . (($action == 'lock' || $action == 'lock_post') ? 'LOCKED' : 'UNLOCKED') . '_SUCCESS';

 		meta_refresh(2, $redirect);
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -549,6 +549,18 @@ function change_poster(&$post_info, $userdata)
 	$from_username = $post_info['username'];
 	$to_username = $userdata['username'];

+	/**
+	* This event allows you to perform additional tasks after changing a post's poster
+	*
+	* @event core.mcp_change_poster_after
+	* @var	array	userdata	Information on a post's new poster
+	* @var	array	post_info	Information on the affected post
+	* @since 3.1.6-RC1
+	* @changed 3.1.7-RC1		Change location to prevent post_info from being set to the new post information
+	*/
+	$vars = array('userdata', 'post_info');
+	extract($phpbb_dispatcher->trigger_event('core.mcp_change_poster_after', compact($vars)));
+
 	// Renew post info
 	$post_info = phpbb_get_post_data(array($post_id), false, true);

@@ -559,17 +571,6 @@ function change_poster(&$post_info, $userdata)

 	$post_info = $post_info[$post_id];

-	/**
-	* This event allows you to perform additional tasks after changing a post's poster
-	*
-	* @event core.mcp_change_poster_after
-	* @var	array	userdata	Information on a post's new poster
-	* @var	array	post_info	Information on the affected post
-	* @since 3.1.6-RC1
-	*/
-	$vars = array('userdata', 'post_info');
-	extract($phpbb_dispatcher->trigger_event('core.mcp_change_poster_after', compact($vars)));
-
 	// Now add log entry
 	add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username);
 }
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -119,7 +119,7 @@ $db->sql_freeresult($result);
 $legend = implode($user->lang['COMMA_SEPARATOR'], $legend);

 // Generate birthday list if required ...
-$birthday_list = array();
+$birthdays = $birthday_list = array();
 if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel'))
 {
 	$time = $user->create_datetime();
@@ -132,33 +132,66 @@ if ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('
 		$leap_year_birthdays = " OR u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'";
 	}

-	$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday
-		FROM ' . USERS_TABLE . ' u
-		LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
-		WHERE (b.ban_id IS NULL
-			OR b.ban_exclude = 1)
+	$sql_ary = array(
+		'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday',
+		'FROM' => array(
+			USERS_TABLE => 'u',
+		),
+		'LEFT_JOIN' => array(
+			array(
+				'FROM' => array(BANLIST_TABLE => 'b'),
+				'ON' => 'u.user_id = b.ban_userid',
+			),
+		),
+		'WHERE' => "(b.ban_id IS NULL OR b.ban_exclude = 1)
 			AND (u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)
-			AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
-	$result = $db->sql_query($sql);
+			AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')',
+	);

-	while ($row = $db->sql_fetchrow($result))
+	/**
+	* Event to modify the SQL query to get birthdays data
+	*
+	* @event core.index_modify_birthdays_sql
+	* @var	array	now			The assoc array with the 'now' local timestamp data
+	* @var	array	sql_ary		The SQL array to get the birthdays data
+	* @var	object	time		The user related Datetime object
+	* @since 3.1.7-RC1
+	*/
+	$vars = array('now', 'sql_ary', 'time');
+	extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_sql', compact($vars)));
+
+	$sql = $db->sql_build_query('SELECT', $sql_ary);
+	$result = $db->sql_query($sql);
+	$rows = $db->sql_fetchrowset($result);
+	$db->sql_freeresult($result);
+
+	foreach ($rows as $row)
 	{
 		$birthday_username	= get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
 		$birthday_year		= (int) substr($row['user_birthday'], -4);
 		$birthday_age		= ($birthday_year) ? max(0, $now['year'] - $birthday_year) : '';

-		$template->assign_block_vars('birthdays', array(
+		$birthdays[] = array(
 			'USERNAME'	=> $birthday_username,
 			'AGE'		=> $birthday_age,
-		));
+		);

 		// For 3.0 compatibility
-		if ($age = (int) substr($row['user_birthday'], -4))
-		{
-			$birthday_list[] = $birthday_username . (($birthday_year) ? ' (' . $birthday_age . ')' : '');
-		}
+		$birthday_list[] = $birthday_username . (($birthday_age) ? " ({$birthday_age})" : '');
 	}
-	$db->sql_freeresult($result);
+
+	/**
+	* Event to modify the birthdays list
+	*
+	* @event core.index_modify_birthdays_list
+	* @var	array	birthdays		Array with the users birhtdays data
+	* @var	array	rows			Array with the birhtdays SQL query result
+	* @since 3.1.7-RC1
+	*/
+	$vars = array('birthdays', 'rows');
+	extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_list', compact($vars)));
+
+	$template->assign_block_vars_array('birthdays', $birthdays);
 }

 // Assign index specific vars
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.1.6',
+	'phpbb_version'	=> '3.1.7',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Limited</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.7-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.7-pl1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');

--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -101,6 +101,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
 	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',

+	'MANAGE_GROUP'			=> 'Manage Group',
 	'MORE_THAN'				=> 'More than',

 	'NO_CONTACT_FORM'		=> 'The board administrator contact form has been disabled.',
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1088,7 +1088,7 @@ switch ($mode)
 		if ($mode == 'group')
 		{
 			// We JOIN here to save a query for determining membership for hidden groups. ;)
-			$sql = 'SELECT g.*, ug.user_id
+			$sql = 'SELECT g.*, ug.user_id, ug.group_leader
 				FROM ' . GROUPS_TABLE . ' g
 				LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.user_pending = 0 AND ug.user_id = ' . $user->data['user_id'] . " AND ug.group_id = $group_id)
 				WHERE g.group_id = $group_id";
@@ -1147,6 +1147,24 @@ switch ($mode)
 					$user_rank_data['img'] .= '<br />';
 				}
 			}
+			// include modules for manage groups link display or not
+			// need to ensure the module is active
+			$can_manage_group = false;
+			if ($user->data['is_registered'] && $group_row['group_leader'])
+			{
+				if (!class_exists('p_master'))
+				{
+					include($phpbb_root_path . 'includes/functions_module.' . $phpEx);
+				}
+				$module = new p_master;
+				$module->list_modules('ucp');
+
+				if ($module->is_active('ucp_groups', 'manage'))
+				{
+					$can_manage_group = true;
+				}
+				unset($module);
+			}

 			$template->assign_vars(array(
 				'GROUP_DESC'	=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
@@ -1159,7 +1177,8 @@ switch ($mode)
 				'RANK_IMG'		=> $user_rank_data['img'],
 				'RANK_IMG_SRC'	=> $user_rank_data['img_src'],

-				'U_PM'			=> ($auth->acl_get('u_sendpm') && $auth->acl_get('u_masspm_group') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',)
+				'U_PM'			=> ($auth->acl_get('u_sendpm') && $auth->acl_get('u_masspm_group') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',
+				'U_MANAGE'		=> ($can_manage_group) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_groups&amp;mode=manage') : false,)
 			);

 			$sql_select = ', ug.group_leader';
@@ -1571,12 +1590,12 @@ switch ($mode)
 			'U_HIDE_FIND_MEMBER'	=> ($mode == 'searchuser' || ($mode == '' && $submit)) ? $u_hide_find_member : '',
 			'U_LIVE_SEARCH'			=> ($config['allow_live_searches']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=livesearch') : false,
 			'U_SORT_USERNAME'		=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_JOINED'			=> $sort_url . '&amp;sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_POSTS'			=> $sort_url . '&amp;sk=d&amp;sd=' . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_EMAIL'			=> $sort_url . '&amp;sk=e&amp;sd=' . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_SORT_ACTIVE'			=> ($auth->acl_get('u_viewonline')) ? $sort_url . '&amp;sk=l&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '',
-			'U_SORT_RANK'			=> $sort_url . '&amp;sk=m&amp;sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'),
-			'U_LIST_CHAR'			=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'),
+			'U_SORT_JOINED'			=> $sort_url . '&amp;sk=c&amp;sd=' . (($sort_key == 'c' && $sort_dir == 'd') ? 'a' : 'd'),
+			'U_SORT_POSTS'			=> $sort_url . '&amp;sk=d&amp;sd=' . (($sort_key == 'd' && $sort_dir == 'd') ? 'a' : 'd'),
+			'U_SORT_EMAIL'			=> $sort_url . '&amp;sk=e&amp;sd=' . (($sort_key == 'e' && $sort_dir == 'd') ? 'a' : 'd'),
+			'U_SORT_ACTIVE'			=> ($auth->acl_get('u_viewonline')) ? $sort_url . '&amp;sk=l&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd') : '',
+			'U_SORT_RANK'			=> $sort_url . '&amp;sk=m&amp;sd=' . (($sort_key == 'm' && $sort_dir == 'd') ? 'a' : 'd'),
+			'U_LIST_CHAR'			=> $sort_url . '&amp;sk=a&amp;sd=' . (($sort_key == 'l' && $sort_dir == 'd') ? 'a' : 'd'),

 			'S_SHOW_GROUP'		=> ($mode == 'group') ? true : false,
 			'S_VIEWONLINE'		=> $auth->acl_get('u_viewonline'),
--- a/phpBB/phpbb/db/migration/data/v31x/v317.php
+++ b/phpBB/phpbb/db/migration/data/v31x/v317.php
@@ -0,0 +1,31 @@
+<?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.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class v317 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\v317rc1',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.7')),
+		);
+	}
+}
--- a/phpBB/phpbb/db/migration/data/v31x/v317pl1.php
+++ b/phpBB/phpbb/db/migration/data/v31x/v317pl1.php
@@ -0,0 +1,31 @@
+<?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.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class v317pl1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\v317',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.7-pl1')),
+		);
+	}
+}
--- a/phpBB/phpbb/db/migration/data/v31x/v317rc1.php
+++ b/phpBB/phpbb/db/migration/data/v31x/v317rc1.php
@@ -0,0 +1,32 @@
+<?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.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class v317rc1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\m_pm_report',
+			'\phpbb\db\migration\data\v31x\v316',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.7-RC1')),
+		);
+	}
+}
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -446,39 +446,6 @@ class session

 					if (!$session_expired)
 					{
-						// Only update session DB a minute or so after last update or if page changes
-						if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
-						{
-							$sql_ary = array('session_time' => $this->time_now);
-
-							// Do not update the session page for ajax requests, so the view online still works as intended
-							if ($this->update_session_page && !$request->is_ajax())
-							{
-								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
-								$sql_ary['session_forum_id'] = $this->page['forum'];
-							}
-
-							$db->sql_return_on_error(true);
-
-							$this->update_session($sql_ary);
-
-							$db->sql_return_on_error(false);
-
-							// If the database is not yet updated, there will be an error due to the session_forum_id
-							// @todo REMOVE for 3.0.2
-							if ($result === false)
-							{
-								unset($sql_ary['session_forum_id']);
-
-								$this->update_session($sql_ary);
-							}
-
-							if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])
-							{
-								$this->leave_newly_registered();
-							}
-						}
-
 						$this->data['is_registered'] = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false;
 						$this->data['is_bot'] = (!$this->data['is_registered'] && $this->data['user_id'] != ANONYMOUS) ? true : false;
 						$this->data['user_lang'] = basename($this->data['user_lang']);
@@ -734,18 +701,6 @@ class session
 				// Only update session DB a minute or so after last update or if page changes
 				if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
 				{
-					$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
-
-					$sql_ary = array('session_time' => $this->time_now, 'session_last_visit' => $this->time_now, 'session_admin' => 0);
-
-					if ($this->update_session_page)
-					{
-						$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
-						$sql_ary['session_forum_id'] = $this->page['forum'];
-					}
-
-					$this->update_session($sql_ary);
-
 					// Update the last visit time
 					$sql = 'UPDATE ' . USERS_TABLE . '
 						SET user_lastvisit = ' . (int) $this->data['session_time'] . '
@@ -1599,4 +1554,39 @@ class session
 		$vars = array('session_data', 'session_id');
 		extract($phpbb_dispatcher->trigger_event('core.update_session_after', compact($vars)));
 	}
+
+	public function update_session_infos()
+	{
+		global $db, $request;
+
+		// No need to update if it's a new session. Informations are already inserted by session_create()
+		if (isset($this->data['session_created']) && $this->data['session_created'])
+		{
+			return;
+		}
+
+		// Only update session DB a minute or so after last update or if page changes
+		if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
+		{
+			$sql_ary = array('session_time' => $this->time_now);
+
+			// Do not update the session page for ajax requests, so the view online still works as intended
+			if ($this->update_session_page && !$request->is_ajax())
+			{
+				$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
+				$sql_ary['session_forum_id'] = $this->page['forum'];
+			}
+
+			$db->sql_return_on_error(true);
+
+			$this->update_session($sql_ary);
+
+			$db->sql_return_on_error(false);
+
+			if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])
+			{
+				$this->leave_newly_registered();
+			}
+		}
+	}
 }
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -189,12 +189,7 @@ class user_loader
 			return '';
 		}

-		if (!function_exists('get_user_avatar'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
-		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], 'USER_AVATAR', false, $lazy);
+		return phpbb_get_avatar(\phpbb\avatar\manager::clean_row($user, 'user'), 'USER_AVATAR', false, $lazy);
 	}

 	/**
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = prosilver
 copyright = © phpBB Limited, 2007
-style_version = 3.1.6
-phpbb_version = 3.1.6
+style_version = 3.1.7
+phpbb_version = 3.1.7

 # Defining a different template bitfield
 # template_bitfield = lNg=
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -14,7 +14,11 @@

 	<!-- IF S_SHOW_GROUP -->
 		<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
+		<!-- IF U_MANAGE -->
+			<p class="right responsive-center manage rightside"><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a></p>
+		<!-- ENDIF -->
 		<p>{GROUP_DESC} {GROUP_TYPE}</p>
+
 		<p>
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -9,7 +9,9 @@
 	<div class="inner">
 	<h3>{L_SEARCH_QUERY}</h3>

+	<!-- EVENT search_body_search_query_before -->
 	<fieldset>
+	<!-- EVENT search_body_search_query_prepend -->
 	<dl>
 		<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
 		<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
@@ -20,7 +22,9 @@
 		<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
 		<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
 	</dl>
+	<!-- EVENT search_body_search_query_append -->
 	</fieldset>
+	<!-- EVENT search_body_search_query_after -->

 	</div>
 </div>
@@ -30,7 +34,9 @@

 	<h3>{L_SEARCH_OPTIONS}</h3>

+	<!-- EVENT search_body_search_options_before -->
 	<fieldset>
+	<!-- EVENT search_body_search_options_prepend -->
 	<dl>
 		<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
 		<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
@@ -49,9 +55,11 @@
 		<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
 		<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_FIRST_POST}</label></dd>
 	</dl>
+	<!-- EVENT search_body_search_options_append -->

 	<hr class="dashed" />

+	<!-- EVENT search_body_search_display_options_prepend -->
 	<dl>
 		<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>
 		<dd>
@@ -74,7 +82,9 @@
 		<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>
 		<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>
 	</dl>
+	<!-- EVENT search_body_search_display_options_append -->
 	</fieldset>
+	<!-- EVENT search_body_search_options_after -->

 	</div>
 </div>
@@ -91,7 +101,9 @@
 </div>

 </form>
+<!-- EVENT search_body_form_after -->

+<!-- EVENT search_body_recent_search_before -->
 <!-- IF .recentsearch -->
 <div class="forumbg forumbg-table">
 	<div class="inner">
@@ -119,5 +131,6 @@
 	</div>
 </div>
 <!-- ENDIF -->
+<!-- EVENT search_body_recent_search_after -->

 <!-- INCLUDE overall_footer.html -->
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -216,6 +216,7 @@
 			<!-- ENDIF -->
 			<div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->>

+			<!-- EVENT viewtopic_body_post_subject_before -->
 			<h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3>

 		<!-- DEFINE $SHOW_POST_BUTTONS = (postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE) -->
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = subsilver2
 copyright = © 2005 phpBB Limited
-style_version = 3.1.6
-phpbb_version = 3.1.6
+style_version = 3.1.7
+phpbb_version = 3.1.7

 # Defining a different template bitfield
 # template_bitfield = lNg=
--- a/phpBB/styles/subsilver2/template/memberlist_group.html
+++ b/phpBB/styles/subsilver2/template/memberlist_group.html
@@ -5,7 +5,7 @@
 </tr>
 <tr> 
 	<td class="row1" width="20%"><b class="genmed">{L_GROUP_NAME}{L_COLON}</b></td>
-	<td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b></td>
+	<td class="row2"><b class="gen"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR}"<!-- ENDIF -->>{GROUP_NAME}</b> <!-- IF U_MANAGE --><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a><!-- ENDIF --></td>
 <!-- IF AVATAR_IMG or RANK_IMG or GROUP_RANK or U_PM -->
 	<td class="row1" width="33%" rowspan="2" align="center"><!-- IF AVATAR_IMG -->{AVATAR_IMG}<br /><!-- ENDIF --><!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --><!-- IF GROUP_RANK --><span class="gensmall">{GROUP_RANK}</span><br /><br /><!-- ENDIF --><!-- IF U_PM --><a href="{U_PM}" class="imageset">{PM_IMG}</a><!-- ENDIF --></td>
 <!-- ENDIF -->
--- a/phpBB/styles/subsilver2/template/search_body.html
+++ b/phpBB/styles/subsilver2/template/search_body.html
@@ -6,9 +6,12 @@
 	<form method="get" action="{S_SEARCH_ACTION}">
 	
 	<table class="tablebg" width="100%" cellspacing="1">
+	<!-- DEFINE $COLSPAN = 4 -->
+	<!-- EVENT search_body_search_query_before -->
 	<tr>
-		<th colspan="4">{L_SEARCH_QUERY}</th>
+		<th colspan="{$COLSPAN}">{L_SEARCH_QUERY}</th>
 	</tr>
+	<!-- EVENT search_body_search_query_prepend -->
 	<tr>
 		<td class="row1" colspan="2" width="50%"><b class="genmed">{L_SEARCH_KEYWORDS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
 		<td class="row2" colspan="2" valign="top"><input type="text" style="width: 300px" class="post" name="keywords" size="30" /><br /><input type="radio" class="radio" name="terms" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_ALL_TERMS}</span><br /><input type="radio" class="radio" name="terms" value="any" /> <span class="genmed">{L_SEARCH_ANY_TERMS}</span></td>
@@ -21,15 +24,21 @@
 		<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}{L_COLON} </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td>
 		<td class="row2" colspan="2"><select name="fid[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td>
 	</tr>
+	<!-- EVENT search_body_search_query_append -->
+	<!-- EVENT search_body_search_query_after -->
+	<!-- EVENT search_body_search_options_before -->
 	<tr>
-		<th colspan="4">{L_SEARCH_OPTIONS}</th>
+		<th colspan="{$COLSPAN}">{L_SEARCH_OPTIONS}</th>
 	</tr>
+	<!-- EVENT search_body_search_options_prepend -->
 	<tr>
 		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}{L_COLON} </b></td>
 		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sc" value="1" checked="checked" /> <span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="sc" value="0" /> <span class="genmed">{L_NO}</span></td>
 		<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}{L_COLON} </b></td>
 		<td class="row2" width="25%" nowrap="nowrap"><input type="radio" class="radio" name="sf" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" class="radio" name="sf" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span> <br /><input type="radio" class="radio" name="sf" value="firstpost" /> <span class="genmed">{L_SEARCH_FIRST_POST}</span></td>
 	</tr>
+	<!-- EVENT search_body_search_options_append -->
+	<!-- EVENT search_body_search_display_options_prepend -->
 	<tr>
 		<td class="row1"><b class="genmed">{L_RESULT_SORT}{L_COLON} </b></td>
 		<td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" class="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" class="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td>
@@ -42,15 +51,19 @@
 		<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}{L_COLON} </b></td>
 		<td class="row2" nowrap="nowrap"><select name="ch">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td>
 	</tr>
+	<!-- EVENT search_body_search_display_options_append -->
+	<!-- EVENT search_body_search_options_after -->
 	<tr>
-		<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" name="submit" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
+		<td class="cat" colspan="{$COLSPAN}" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" name="submit" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 	</tr>
 	</table>
 	
 	</form>
+	<!-- EVENT search_body_form_after -->

 	<br clear="all" />

+	<!-- EVENT search_body_recent_search_before -->
 	<!-- IF .recentsearch -->
 	<table class="tablebg" width="100%" cellspacing="1">
 	<tr>
@@ -67,6 +80,7 @@

 	<br clear="all" />
 	<!-- ENDIF -->
+	<!-- EVENT search_body_recent_search_after -->

 	</div>

--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -171,6 +171,7 @@
 				<!-- EVENT viewtopic_body_post_author_after -->
 			</td>
 			<!-- EVENT viewtopic_body_postrow_post_details_before -->
+			<!-- EVENT viewtopic_body_post_subject_before -->
 			<td width="100%" height="25">
 				<table width="100%" cellspacing="0">
 				<tr>
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -264,7 +264,7 @@ gen_forum_auth_level('forum', $forum_id, $forum_data['forum_status']);
 $limit_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);

 $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
-$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => array('t.topic_last_post_time', 't.topic_last_post_id'), 'r' => (($auth->acl_get('m_approve', $forum_id)) ? 't.topic_posts_approved + t.topic_posts_unapproved + t.topic_posts_softdeleted' : 't.topic_posts_approved'), 's' => 't.topic_title', 'v' => 't.topic_views');
+$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => array('t.topic_last_post_time', 't.topic_last_post_id'), 'r' => (($auth->acl_get('m_approve', $forum_id)) ? 't.topic_posts_approved + t.topic_posts_unapproved + t.topic_posts_softdeleted' : 't.topic_posts_approved'), 's' => 'LOWER(t.topic_title)', 'v' => 't.topic_views');

 $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
 gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir);
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1821,6 +1821,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		($user->data['user_id'] == ANONYMOUS || $auth->acl_get('f_reply', $forum_id))
 	);

+	// Only display the quote button if the post is quotable.  Posts not approved are not quotable.
+	$quote_allowed = ($quote_allowed && $row['post_visibility'] == ITEM_APPROVED) ? true : false;
+
 	$delete_allowed = $force_delete_allowed || ($user->data['is_registered'] && (
 		($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('m_softdelete', $forum_id) && $row['post_visibility'] != ITEM_DELETED)) ||
 		(!$s_cannot_delete && !$s_cannot_delete_lastpost && !$s_cannot_delete_time && !$s_cannot_delete_locked)
Author	SHA1	Message	Date
Joas Schilling	85e98a9d70	[prep-release-3.1.7] Add changelog for 3.1.7-pl1	2016-01-09 09:46:32 +01:00
Joas Schilling	29a239a4db	[prep-release-3.1.7] Add migration for 3.1.7-pl1	2016-01-09 09:35:53 +01:00
Joas Schilling	89da4e8bf7	[prep-release-3.1.7] Update version to 3.1.7-pl1	2016-01-09 09:35:03 +01:00
Joas Schilling	c2d59b3352	Merge pull request #24 from phpbb/ticket/security-188 [ticket/security-188] Check form key in acp_bbcodes	2016-01-09 09:13:50 +01:00
kasimi	80c32fb7ef	[ticket/14343] Added missing $phpbb_dispatcher PHPBB3-14343	2016-01-09 09:13:20 +01:00
Marc Alexander	87345807de	[ticket/security-188] Remove unused form key from acp_extensions SECURITY-188	2015-12-23 17:32:31 +01:00
Marc Alexander	18abef716e	[ticket/security-188] Check form key in acp_bbcodes SECURITY-188	2015-12-23 17:31:43 +01:00
Joas Schilling	e3acdfed92	[prep-release-3.1.7] Add migration to update the version	2015-12-19 12:21:25 +01:00
Joas Schilling	4ec32592a4	[prep-release-3.1.7] Increase version to 3.1.7	2015-12-19 12:21:04 +01:00
Joas Schilling	099a1b5f75	[prep-release-3.1.7] Add changelog for 3.1.7-RC1	2015-12-12 01:37:56 +01:00
Joas Schilling	69cf32613d	[prep-release-3.1.7] Add migration for 3.1.7-RC1	2015-12-12 01:35:05 +01:00
Joas Schilling	d2acccf92c	[prep-release-3.1.7] Update version to 3.1.7-RC1	2015-12-12 01:31:31 +01:00
Tristan Darricau	901785bc5e	Merge pull request #4018 from marc1706/ticket/14271 [ticket/14271] Update sample config * marc1706/ticket/14271: [ticket/14271] Properly use try_files in nginx sample config [ticket/14271] Improve try_files and use split path info [ticket/14271] Update sample config	2015-12-08 19:48:02 +01:00
Tristan Darricau	81b3b38795	Merge pull request #4071 from marc1706/ticket/14213 [ticket/14213] Adding event after users have been added to a group * marc1706/ticket/14213: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group	2015-12-08 19:46:34 +01:00
Marc Alexander	d37d3ed3ed	[ticket/14213] Add pending to core.group_add_user_after PHPBB3-14213	2015-12-08 15:32:45 +01:00
Wardormeur	e6d3ed5529	[ticket/14213] Mv event group_add_user_after after cache cleaning In order to match with the rest of the event and to have appropriate info state PHPBB3-14213	2015-12-07 22:35:08 +01:00
Wardormeur	ffbc2d02d7	[ticket/14213] Fix version number for core.group_add_user_after event PHPBB3-14213	2015-12-07 22:35:04 +01:00
Wardormeur	2419f63aab	[ticket/14213] Adding missing reference to event dispatcher Required to dispatch event, wasn't included into global PHPBB3-14213	2015-12-07 22:34:59 +01:00
Wardormeur	20e26a3920	[ticket/14213] Adding event after users have been added to a group Allow mapping with others CMS by exposing user configuration & changes PHPBB3-14213	2015-12-07 22:34:25 +01:00
Tristan Darricau	4989df66a2	Merge pull request #4008 from Zoddo/ticket/14261 [ticket/14261] Move the update of session informations to page_footer() * Zoddo/ticket/14261: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()	2015-12-07 21:52:17 +01:00
Tristan Darricau	a4c1daa259	Merge pull request #4069 from marc1706/ticket/14346 [ticket/14346] Do not turn version red if update status is unknown * marc1706/ticket/14346: [ticket/14346] Do not turn version red if update status is unknown	2015-12-07 21:42:13 +01:00
Tristan Darricau	ab8dc92d26	Merge pull request #4063 from marc1706/ticket/14339 [ticket/14339] Properly state PHP version support * marc1706/ticket/14339: [ticket/14339] Properly state PHP version support	2015-12-07 21:38:37 +01:00
Tristan Darricau	07ae3e997c	Merge pull request #4066 from kasimi/ticket/14343 [ticket/14343] Add event when locking/unlocking posts/topics * kasimi/ticket/14343: [ticket/14343] Add event when locking/unlocking posts/topics	2015-12-07 21:06:22 +01:00
Marc Alexander	4a92b85cad	[ticket/14346] Do not turn version red if update status is unknown PHPBB3-14346	2015-12-07 20:00:13 +01:00
kasimi	94c073672d	[ticket/14343] Add event when locking/unlocking posts/topics PHPBB3-14343	2015-12-06 20:05:27 +01:00
Marc Alexander	e8247faacc	[ticket/14339] Properly state PHP version support PHPBB3-14339	2015-12-05 13:54:39 +01:00
Tristan Darricau	7eef7b2ea2	Merge pull request #4057 from marc1706/ticket/14334 [ticket/14334] Use phpbb_get_avatar() in user_loader * marc1706/ticket/14334: [ticket/14334] Use phpbb_get_avatar() in user_loader	2015-12-05 11:02:55 +01:00
Marc Alexander	91869cc43c	[ticket/14334] Use phpbb_get_avatar() in user_loader PHPBB3-14334	2015-12-03 16:43:00 +01:00
Marc Alexander	8899829752	Merge pull request #4030 from RMcGirr83/ticket_14283 [ticket/14283] Add a Manage Group link on a group page	2015-11-26 14:44:51 +01:00
Marc Alexander	1a367062d3	Merge pull request #4045 from RMcGirr83/ticket_14313 [ticket/14313] Check for item approved explicitly	2015-11-26 14:27:54 +01:00
Richard McGirr	4966d6c913	[ticket/14313] Check for item approved explicitly PHPBB3-14313	2015-11-26 05:23:18 -05:00
Marc Alexander	ea9b97c8a1	Merge pull request #4044 from RMcGirr83/ticket_14313 [ticket/14313] Don't display quote button on unapproved posts	2015-11-25 21:06:50 +01:00
RMcGirr83	4ea325029b	[ticket/14313] Don't display quote button on unapproved posts PHPBB3-14313	2015-11-25 14:29:46 -05:00
Richard McGirr	31510c0ae7	[ticket/14283] Check for user being group leader PHPBB3-14283	2015-11-25 06:33:07 -05:00
Marc Alexander	df223eac65	Merge pull request #4040 from Nicofuma/ticket/13656 [ticket/13656] Updates Symfony to fix the DB password issue	2015-11-25 09:30:56 +01:00
Tristan Darricau	0bff95488b	[ticket/13656] Updates Symfony to fix the DB password issue PHPBB3-13656	2015-11-25 00:04:48 +01:00
Marc Alexander	8489cb6f40	Merge pull request #4033 from tas2580/ticket/14297 [ticket/14297] Uppercase and lowercase when sorting topics	2015-11-24 21:45:53 +01:00
Richard McGirr	3a55cead92	[ticket/14283] Remove group founder and free up memory PHPBB3-14283	2015-11-18 06:29:23 -05:00
Tobi Schäfer	f4f6a4f810	[ticket/14297] Uppercase and lowercase when sorting topics PHPBB3-14297 Ticket: https://tracker.phpbb.com/browse/PHPBB3-14297	2015-11-16 21:01:32 +01:00
Marc Alexander	e3f1cca911	Merge pull request #3888 from Senky/ticket/14146 [ticket/14146] Add viewtopic_body_post_subject_before event	2015-11-15 19:48:50 +01:00
Richard McGirr	df9443a3c6	[ticket/14283] Fix spelling of the word module PHPBB3-14283	2015-11-14 14:48:54 -05:00
Richard McGirr	03662d5a89	[ticket/14283] Add a Manage Group link on a group page PHPBB3-14283	2015-11-14 06:10:41 -05:00
Marc Alexander	8bb4af6271	Merge pull request #3805 from rxu/ticket/14066 [ticket/14066] Add template events to search_body.html	2015-11-13 09:34:25 +01:00
Marc Alexander	27cf9e490b	Merge pull request #3996 from RMcGirr83/ticket_14242 [ticket/14242] Fix memberlist sort method	2015-11-13 09:23:34 +01:00
Marc Alexander	d53c5b7e2a	Merge pull request #4028 from prototech/ticket/14287 [ticket/14287] Always remove loading indicator after confirming action.	2015-11-12 17:56:59 +01:00
Cesar G	da6ce7a668	[ticket/14287] Always remove loading indicator after confirming action. If there is no success message after the action is confirmed, the indicator is not currently removed. PHPBB3-14287	2015-11-12 07:58:18 -08:00
rxu	19c84dabe1	[ticket/14066] Change the events listing order in events.md. PHPBB3-14066	2015-11-12 20:53:36 +07:00
rxu	9ef06d67e6	[ticket/14066] Add template events to search_body.html PHPBB3-14066	2015-11-12 20:53:35 +07:00
Marc Alexander	224efba459	Merge pull request #3850 from rxu/ticket/14117 [ticket/14117] Add core events to index.php to allow modifying birthdays list	2015-11-12 09:11:32 +01:00
Marc Alexander	8398e0700a	Merge pull request #3910 from kinerity/ticket/14170 [ticket/14170] Fix mcp_change_poster_after event	2015-11-12 08:50:18 +01:00
Marc Alexander	13133b359b	Merge pull request #4022 from RMcGirr83/3.1.x [ticket/14276] Adjust function get_folder_status	2015-11-12 08:46:05 +01:00
Marc Alexander	1c1fe43e16	Merge pull request #3930 from rxu/ticket/14201 [ticket/14201] Add multiple ACP template events	2015-11-10 17:40:04 +01:00
Marc Alexander	966c34d0ad	[ticket/14271] Properly use try_files in nginx sample config PHPBB3-14271	2015-11-10 08:32:51 +01:00
Marc Alexander	b27be0b857	[ticket/14271] Improve try_files and use split path info PHPBB3-14271	2015-11-09 09:26:05 +01:00
Richard McGirr	865c16cf26	[ticket/14276] Adjust function get_folder_status PHPBB3-14276	2015-11-07 15:33:24 -05:00
Marc Alexander	27e95864a8	[ticket/14271] Update sample config PHPBB3-14271	2015-11-05 16:55:19 +01:00
RMcGirr83	21aa6cc120	[ticket/14242] Revert some changes PHPBB3-14242	2015-10-30 13:09:55 -04:00
Zoddo	fbacd1df16	[ticket/14261] Fix tests by removing old code. This will obselete GH-4007 PHPBB3-14261 PHPBB3-13202	2015-10-28 12:32:24 +01:00
Zoddo	88dd8a4849	[ticket/14261] Move the update of session informations to page_footer() Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261	2015-10-27 17:26:18 +01:00
Richard McGirr	c1d47d9e16	[ticket/14242] Fix u_sort_posts to use correct sort key PHPBB3-14242	2015-10-26 06:42:33 -04:00
RMcGirr83	b23c0f1442	[ticket/14242] Fix memberlist sort method PHPBB3-14242	2015-10-19 09:53:43 -04:00
Kailey Truscott	08739751b2	[ticket/14170] Revert mcp_change_poster_after @since change Revert the @since change back to 3.1.6-RC1. Add @changed line 3.1.7-RC1 and description. PHPBB3-14170	2015-10-13 21:26:24 -04:00
Jakub Senko	d507bce98a	[ticket/14146] Add viewtopic_body_post_subject_before event PHPBB3-14146	2015-10-12 20:05:48 +02:00
rxu	b7bd210f41	[ticket/14117] Add core events to index.php to allow modifying birthdays list PHPBB3-14117	2015-10-12 22:14:57 +07:00
rxu	1260f92813	[ticket/14201] Add events.md descriptions, fix accidentally swapped events PHPBB3-14201	2015-10-12 21:31:09 +07:00
rxu	2642cfe298	[ticket/14201] Add more template events to ACP PHPBB3-14201	2015-09-26 23:58:59 +07:00
rxu	3672df0bc2	[ticket/14201] Add events to acp_users.html, permission_forum_copy.html PHPBB3-14201	2015-09-26 22:36:38 +07:00
rxu	098c8e1fe9	[ticket/14201] Add template events to acp_permissions.html PHPBB3-14201	2015-09-26 22:20:52 +07:00
Kailey Truscott	07b55530ec	[ticket/14170] Fix mcp_change_poster_after event Move the mcp_change_poster_after event to before renewing $post_info. I changed the "since" version as this would be fixed in 3.1.7-RC1. PHPBB3-14170	2015-09-16 22:49:06 -04:00