diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 09:28:12 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 09:28:12 +0000 |
| commit | 0a4c62f12e9cfea1215150a580ca76961e1ac7f1 (patch) | |
| tree | 94bc4587549b15523175cb29925b0145e9ab7e98 /phpBB/includes | |
| parent | 1cc419fb4cb771e218e2b0c1a65c26b768b1da13 (diff) | |
| download | forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.gz forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.bz2 forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.xz forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.zip | |
Merge in r8924, r8925, r8926, r8936, r8938
git-svn-id: file:///svn/phpbb/trunk@8939 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_display.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 480d82e5f6..53aaea443d 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -313,7 +313,12 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod { foreach ($subforum_row['children'] as $child_id) { - $subforum_unread = (isset($forum_tracking_info[$child_id]) && $subforums[$forum_id][$child_id]['orig_forum_last_post_time'] > $forum_tracking_info[$child_id]) ? true : false; + if (isset($forum_tracking_info[$child_id]) && $subforums[$forum_id][$child_id]['orig_forum_last_post_time'] > $forum_tracking_info[$child_id]) + { + // Once we found an unread child forum, we can drop out of this loop + $subforum_unread = true; + break; + } } } diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 3fa03df86c..7cf58c2f50 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -226,7 +226,7 @@ function mcp_topic_view($id, $mode, $action) 'S_POST_REPORTED' => ($row['post_reported']) ? true : false, 'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true, - 'S_CHECKED' => (!$submitted_id_list || !in_array(intval($row['post_id']), $submitted_id_list) || in_array(intval($row['post_id']), $checked_ids)) ? true : false, + 'S_CHECKED' => (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false, 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, 'U_POST_DETAILS' => "$url&i=$id&p={$row['post_id']}&mode=post_details" . (($forum_id) ? "&f=$forum_id" : ''), diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index ddec64ffb8..923d36c2ac 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -24,6 +24,10 @@ function compose_pm($id, $mode, $action) { global $template, $db, $auth, $user, $config; + // Damn php and globals - i know, this is horrible + // Needed for handle_message_list_actions() + global $refresh, $submit, $preview; + include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT); include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT); include(PHPBB_ROOT_PATH . 'includes/message_parser.' . PHP_EXT); |