diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-05-16 02:20:46 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-05-16 02:20:46 +0000 |
| commit | 09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875 (patch) | |
| tree | 1f676e5fe549d3248c9e5107f699f75b30955d9d /phpBB | |
| parent | 0a4b632bcb7bdb3a30f2291e8672412656adca40 (diff) | |
| download | forums-09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875.tar forums-09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875.tar.gz forums-09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875.tar.bz2 forums-09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875.tar.xz forums-09ebdb68787c8b29a7a657e4ed5faf3f6d5e9875.zip | |
*** empty log message ***
git-svn-id: file:///svn/phpbb/trunk@7598 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 4230e41aec..b35bfde649 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -140,7 +140,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $sql = "SELECT t.*$read_tracking_select FROM " . TOPICS_TABLE . " t $read_tracking_join - WHERE (t.forum_id = $forum_id OR t.forum_id = 0) + WHERE t.forum_id IN($forum_id, 0) " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " $limit_time_sql ORDER BY t.topic_type DESC, $sort_order_sql"; |