diff options
| -rw-r--r-- | phpBB/includes/functions_convert.php | 4 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 64cb63de3a..01ca16d1e8 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -34,10 +34,10 @@ function still_on_time() // If zero, then set to something higher to not let the user catch the ten seconds barrier. if ($max_execution_time === 0) { - $max_execution_time = 250; + $max_execution_time = 65; } - $max_execution_time = min(max(10, ($max_execution_time - 15)), 250); + $max_execution_time = min(max(10, ($max_execution_time - 15)), 50); // For debugging purposes // $max_execution_time = 10; diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 7610c4725d..eb660f84d0 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -900,6 +900,7 @@ function phpbb_convert_authentication($mode) if ($row['parent_id'] == 0) { mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL'); + mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL'); $parent_forums[] = $row; } else @@ -936,6 +937,20 @@ function phpbb_convert_authentication($mode) { mass_auth('group', $row['forum_id'], 'guests', 'f_list', ACL_YES); mass_auth('group', $row['forum_id'], 'registered', 'f_list', ACL_YES); + mass_auth('group', $row['forum_id'], 'registered_coppa', 'f_list', ACL_YES); + mass_auth('group', $row['forum_id'], 'bots', 'f_list', ACL_YES); + } + else + { + // Now make sure the user is able to read these forums + $hold_ary = $auth->acl_group_raw_data(get_group_id('registered'), 'f_list', $forum_ids); + + if (!empty($hold_ary)) + { + mass_auth('group', $row['forum_id'], 'registered', 'f_list', ACL_YES); + mass_auth('group', $row['forum_id'], 'registered_coppa', 'f_list', ACL_YES); + mass_auth('group', $row['forum_id'], 'bots', 'f_list', ACL_YES); + } } } } |