diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-03-29 00:51:38 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-03-29 00:51:38 +0000 |
| commit | 2678cb904f52cf6f86d08a50765f76ec54660095 (patch) | |
| tree | e7f531a00efec3ce71e8d24ade878f240e8d6e03 /phpBB/viewforum.php | |
| parent | 213beefc17427378295c64b2d0ff11640fe21689 (diff) | |
| download | forums-2678cb904f52cf6f86d08a50765f76ec54660095.tar forums-2678cb904f52cf6f86d08a50765f76ec54660095.tar.gz forums-2678cb904f52cf6f86d08a50765f76ec54660095.tar.bz2 forums-2678cb904f52cf6f86d08a50765f76ec54660095.tar.xz forums-2678cb904f52cf6f86d08a50765f76ec54660095.zip | |
Fixed topic count for users who can view unapproved items
git-svn-id: file:///svn/phpbb/trunk@3741 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index ee05349fbf..9f036d85bf 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -191,7 +191,8 @@ if ($forum_data['forum_postable']) // ref type on as rows as topics ... also not great $sql = "SELECT COUNT(topic_id) AS forum_topics FROM " . TOPICS_TABLE . " - WHERE forum_id = $forum_id + WHERE forum_id = $forum_id + " . (($auth->acl_gets('m_approve', 'a_', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " AND topic_last_post_time >= $min_topic_time AND topic_type <> " . POST_ANNOUNCE; $result = $db->sql_query($sql); @@ -202,7 +203,14 @@ if ($forum_data['forum_postable']) } else { - $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1; + if ($auth->acl_get('m_approve', $forum_id)) + { + $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1; + } + else + { + $topics_count = ($forum_data['forum_topics_real']) ? $forum_data['forum_topics_real'] : 1; + } $limit_topics_time = ''; } |