diff options
| -rw-r--r-- | phpBB/includes/auth.php | 10 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index c174fc6769..70a3ccb046 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -223,6 +223,16 @@ class auth { $allowed = false; + if (is_array($opt)) + { + foreach ($opt as $check_option) + { + $allowed |= $this->acl_getf_global($check_option); + } + + return $allowed; + } + if (isset($this->acl_options['local'][$opt])) { foreach ($this->acl as $f => $bitstring) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c3a438e0de..0cea5a5f72 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -199,7 +199,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', 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 ('version', '3.0.B4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.B5-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'); |