mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.3.7' into 3.3.x

Browse Source
This commit is contained in:
Marc Alexander
2022-03-17 21:46:31 +01:00
parent 5a3a91b464 19aadeefda
commit 4ed0201ffe
10 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/db/migration/data/v33x/remove_orphaned_roles.php
View File

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

36
phpBB/phpbb/db/migration/data/v33x/v337.php Normal file
View File

@@ -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']],
];
}
}