From 042feffed86354687c29062d97c699dd9cbb3d47 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Thu, 2 Mar 2023 21:14:46 +0100 Subject: [PATCH] [ticket/17093] Depends_on to v3310 and reformat switch PHPBB3-17093 --- .../data/v33x/add_disable_board_access_config.php | 2 +- phpBB/phpbb/user.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php b/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php index f7db4a41b0..2cb580d532 100644 --- a/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php +++ b/phpBB/phpbb/db/migration/data/v33x/add_disable_board_access_config.php @@ -18,7 +18,7 @@ class add_disable_board_access_config extends \phpbb\db\migration\migration static public function depends_on() { return [ - '\phpbb\db\migration\data\v33x\v339', + '\phpbb\db\migration\data\v33x\v3310', ]; } diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 47fba882bd..e84cb13afd 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -379,14 +379,17 @@ class user extends \phpbb\session { case 0: $access_disabled_board = $auth->acl_gets('a_'); - break; + break; + case 1: $access_disabled_board = $auth->acl_gets('a_', 'm_'); - break; - default: + break; + case 2: + default: $access_disabled_board = $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'); - break; + break; + } if ($config['board_disable'] && !defined('IN_INSTALL') && !defined('IN_LOGIN') && !defined('SKIP_CHECK_DISABLED') && !$access_disabled_board)