diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-23 18:47:10 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-23 18:47:10 +0000 |
| commit | c0214e35e13bcd8c62536c93590a96c580bc6773 (patch) | |
| tree | e869b8f8641dc8d97c892b5e800ef11832edfff8 | |
| parent | 4b08c14417d716c6186250d54ed35d578c074707 (diff) | |
| download | forums-c0214e35e13bcd8c62536c93590a96c580bc6773.tar forums-c0214e35e13bcd8c62536c93590a96c580bc6773.tar.gz forums-c0214e35e13bcd8c62536c93590a96c580bc6773.tar.bz2 forums-c0214e35e13bcd8c62536c93590a96c580bc6773.tar.xz forums-c0214e35e13bcd8c62536c93590a96c580bc6773.zip | |
- fix minor bugs
git-svn-id: file:///svn/phpbb/trunk@5490 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/acp_attachments.html | 4 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_main.php | 13 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
5 files changed, 13 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index ba29e4852c..a08a0f3d85 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -226,7 +226,7 @@ </dl> <dl> <dt><label for="allowed">{L_ALLOWED}:</label></dt> - <dd><input type="checkbox" id="allowed" name="allow_group" value="{GROUP_ID}"<!-- IF ALLOW_GROUP --> cecked="checked"<!-- ENDIF --> /></dd> + <dd><input type="checkbox" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd> </dl> <dl> <dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt> @@ -254,7 +254,7 @@ </dl> <dl> <dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt> - <dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ALLOW_ALL_FORUMS} <input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ALLOW_SELECTED_FORUMS}</dd> + <dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS} <input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</dd> <dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> </dl> </fieldset> diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php index 3f9e3fa60f..679998938f 100644 --- a/phpBB/includes/acm/acm_main.php +++ b/phpBB/includes/acm/acm_main.php @@ -217,18 +217,19 @@ class cache extends acm if (is_array($check)) { - // Check for private messaging + // Check for private messaging AND all forums allowed if (sizeof($check) == 1 && $check[0] == 0) { $allowed = true; - continue; } - - $allowed = (!in_array($forum_id, $check)) ? false : true; + else + { + $allowed = (!in_array($forum_id, $check)) ? false : true; + } } else { - $allowed = ($forum_id == 0) ? false : true; + $allowed = ($forum_id === 0) ? false : true; } if ($allowed) @@ -315,7 +316,7 @@ class cache extends acm continue; } - if (!isset($parsed_array[$theme[$key . '_id']]) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime']))) + if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime']))) { $reparse = true; } diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 1dbd001cb6..704c9bc421 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -435,6 +435,7 @@ class acp_attachments $allow_in_pm = isset($_POST['allow_in_pm']) ? true : false; $max_filesize = request_var('max_filesize', 0); $max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize); + $allow_group = (isset($_POST['allow_group'])) ? 1 : 0; if ($max_filesize == $config['max_filesize']) { @@ -449,7 +450,7 @@ class acp_attachments $group_ary = array( 'group_name' => $group_name, 'cat_id' => request_var('special_category', ATTACHMENT_CATEGORY_NONE), - 'allow_group' => (isset($_POST['allow_group'])) ? 1 : 0, + 'allow_group' => $allow_group, 'download_mode' => request_var('download_mode', INLINE_LINK), 'upload_icon' => ($upload_icon == 'no_image') ? '' : $upload_icon, 'max_filesize' => $max_filesize, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ae197be1c7..c43ca7f028 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1479,7 +1479,7 @@ function extension_allowed($forum_id, $extension, &$extensions) if (is_array($check)) { - // Check for private messaging + // Check for private messaging AND all forums allowed if (sizeof($check) == 1 && $check[0] == 0) { return true; diff --git a/phpBB/posting.php b/phpBB/posting.php index 99baa6a1b8..e1867cd953 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1771,7 +1771,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u } $update_sql = update_post_information('topic', $data['topic_id'], true); - if (sizeof($update)) + if (sizeof($update_sql)) { $sql_data[TOPICS_TABLE]['stat'][] = implode(', ', $update_sql[$data['topic_id']]); } |