diff --git a/build/build.xml b/build/build.xml index 9e1617ba50..fb6077668e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/build/generate_package_json.php b/build/generate_package_json.php index 152f38958a..fc67485136 100644 --- a/build/generate_package_json.php +++ b/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 ); } diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 50816127e9..08fa1cd0f5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.6
    • Changes since 3.3.6-RC1
    • Changes since 3.3.5
    • Changes since 3.3.5-RC1
      • @@ -160,6 +161,16 @@
      +

      Changes since 3.3.6

      +

      Bug

      +
        +
      • [PHPBB3-16973] - Remove orphaned roles migration may incorrectly remove role-based group permissions
        • +
      +

      Task

      +
        +
      • [PHPBB3-16972] - Rename subtype to advanced_update in package.json generation
        • +
      +

      Changes since 3.3.6-RC1

      Bug

        diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 01132793ea..ec44fdd24f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.3.7-dev'); +@define('PHPBB_VERSION', '3.3.8-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index a380431f87..11b1c5308b 100644 --- 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.3.6', + 'phpbb_version' => '3.3.7', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 313280d228..89ced71b7e 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.6'); +define('PHPBB_VERSION', '3.3.7'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 0d9942016a..b9e37fb354 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock 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.3.7-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.8-dev'); 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'); diff --git a/phpBB/phpbb/db/migration/data/v33x/remove_orphaned_roles.php b/phpBB/phpbb/db/migration/data/v33x/remove_orphaned_roles.php index 4f2bfe90cc..67f6b1f875 100644 --- a/phpBB/phpbb/db/migration/data/v33x/remove_orphaned_roles.php +++ b/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); } diff --git a/phpBB/phpbb/db/migration/data/v33x/v337.php b/phpBB/phpbb/db/migration/data/v33x/v337.php new file mode 100644 index 0000000000..6398f71d8e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v337.php @@ -0,0 +1,36 @@ + + * @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']], + ]; + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 319ba4431b..3c19d12744 100644 --- 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.3.6 -phpbb_version = 3.3.6 +style_version = 3.3.7 +phpbb_version = 3.3.7 # Defining a different template bitfield # template_bitfield = //g=