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 @@
- - cecked="checked" />
+ - checked="checked" />
@@ -254,7 +254,7 @@
{L_ALLOWED_FORUMS_EXPLAIN}
- - checked="checked" class="radio" /> {L_ALLOW_ALL_FORUMS} checked="checked" class="radio" /> {L_ALLOW_SELECTED_FORUMS}
+ - checked="checked" /> {L_ALLOW_ALL_FORUMS} checked="checked" /> {L_ALLOW_SELECTED_FORUMS}
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']]);
}