Merge branch '3.3.x'

build/build.xml

@@ -3,8 +3,8 @@
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
 	<property name="newversion" value="4.0.0-a1-dev" />
-	<property name="prevversion" value="3.3.6" />
+	<property name="prevversion" value="3.3.7" />
-	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5" />
+	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />

build/generate_package_json.php

@@ -84,7 +84,7 @@ foreach ($older_verions as $version)
 		'phpBB ' . $version . ' to ' . $current_version . ' Update Package',
 		'phpBB-' . $version . '_to_' . $current_version,
 		'update',
-		'update',
+		'advanced_update',
 		$version
 	);
 }

phpBB/docs/CHANGELOG.html

@@ -50,6 +50,7 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v336">Changes since 3.3.6</a></li>
 		<li><a href="#v336rc1">Changes since 3.3.6-RC1</a></li>
 		<li><a href="#v335">Changes since 3.3.5</a></li>
 		<li><a href="#v335rc1">Changes since 3.3.5-RC1</a></li>
@@ -160,6 +161,16 @@
 		<div class="inner">
 
 		<div class="content">
+			<a name="v336"></a><h3>Changes since 3.3.6</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16973">PHPBB3-16973</a>] - Remove orphaned roles migration may incorrectly remove role-based group permissions</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16972">PHPBB3-16972</a>] - Rename subtype to advanced_update in package.json generation</li>
+			</ul>
+
 			<a name="v336rc1"></a><h3>Changes since 3.3.6-RC1</h3>
 			<h4>Bug</h4>
 			<ul>

phpBB/phpbb/db/migration/data/v33x/remove_orphaned_roles.php

@@ -30,13 +30,17 @@ class remove_orphaned_roles extends \phpbb\db\migration\migration
 	public function acl_remove_orphaned_roles()
 	{
 		$role_ids = [];
+		$auth_role_ids = [];
 
 		$sql = 'SELECT auth_role_id
 			FROM ' . ACL_GROUPS_TABLE . '
 			WHERE auth_role_id <> 0
 				AND forum_id = 0';
 		$result = $this->db->sql_query($sql);
-		$auth_role_ids = array_keys($this->db->sql_fetchrowset($result));
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_role_ids[] = $row['auth_role_id'];
+		}
 		$this->db->sql_freeresult($result);
 
 		if (count($auth_role_ids))
@@ -45,7 +49,10 @@ class remove_orphaned_roles extends \phpbb\db\migration\migration
 				FROM ' . ACL_ROLES_TABLE . '
 				WHERE ' . $this->db->sql_in_set('role_id', $auth_role_ids);
 			$result = $this->db->sql_query($sql);
-			$role_ids = array_keys($this->db->sql_fetchrowset($result));
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$role_ids[] = $row['role_id'];
+			}
 			$this->db->sql_freeresult($result);
 		}
 

phpBB/phpbb/db/migration/data/v33x/v337.php

@@ -0,0 +1,36 @@
+<?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\v33x;
+
+class v337 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.7', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v336',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.7']],
+		];
+	}
+}