mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
- the same procedure as every... oh. this is taken.
- also including the first bugfix within beta4, just noticed at area51 that quicktools are not working in global announcements. :D git-svn-id: file:///svn/phpbb/trunk@6681 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3041ca4ed7
commit
bb718d8406
2 changed files with 11 additions and 1 deletions
|
@ -223,6 +223,16 @@ class auth
|
||||||
{
|
{
|
||||||
$allowed = false;
|
$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]))
|
if (isset($this->acl_options['local'][$opt]))
|
||||||
{
|
{
|
||||||
foreach ($this->acl as $f => $bitstring)
|
foreach ($this->acl as $f => $bitstring)
|
||||||
|
|
|
@ -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 ('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_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 ('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_expire_days', '90');
|
||||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue