diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-11-18 15:28:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-11-18 15:28:37 +0100 |
| commit | c2a19235ebcbaa7007a6b801f739b24c206056a1 (patch) | |
| tree | bff0a2d50d42fe7f32bf3a53e8c30fd24c32161e /phpBB/includes/functions.php | |
| parent | ff91c037c9ff575a6085c43406fa68f351842792 (diff) | |
| parent | a7d7083d75bc20f5d80bd560fd95646b9ec4c099 (diff) | |
| download | forums-c2a19235ebcbaa7007a6b801f739b24c206056a1.tar forums-c2a19235ebcbaa7007a6b801f739b24c206056a1.tar.gz forums-c2a19235ebcbaa7007a6b801f739b24c206056a1.tar.bz2 forums-c2a19235ebcbaa7007a6b801f739b24c206056a1.tar.xz forums-c2a19235ebcbaa7007a6b801f739b24c206056a1.zip | |
Merge branch 'develop-olympus' into develop
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 49574d66ce..92273bf08c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1654,7 +1654,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s */ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false) { - global $db, $tracking_topics, $user, $config, $request; + global $db, $tracking_topics, $user, $config, $auth, $request; // Determine the users last forum mark time if not given. if ($mark_time_forum === false) @@ -1677,6 +1677,10 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti } } + // Handle update of unapproved topics info. + // Only update for moderators having m_approve permission for the forum. + $sql_update_unapproved = ($auth->acl_get('m_approve', $forum_id)) ? '': 'AND t.topic_approved = 1'; + // Check the forum for any left unread topics. // If there are none, we mark the forum as read. if ($config['load_db_lastread'] && $user->data['is_registered']) @@ -1692,7 +1696,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ') WHERE t.forum_id = ' . $forum_id . ' AND t.topic_last_post_time > ' . $mark_time_forum . ' - AND t.topic_moved_id = 0 + AND t.topic_moved_id = 0 ' . + $sql_update_unapproved . ' AND (tt.topic_id IS NULL OR tt.mark_time < t.topic_last_post_time) GROUP BY t.forum_id'; $result = $db->sql_query_limit($sql, 1); @@ -1716,7 +1721,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti FROM ' . TOPICS_TABLE . ' WHERE forum_id = ' . $forum_id . ' AND topic_last_post_time > ' . $mark_time_forum . ' - AND topic_moved_id = 0'; + AND topic_moved_id = 0 ' . + $sql_update_unapproved; $result = $db->sql_query($sql); $check_forum = $tracking_topics['tf'][$forum_id]; |