diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-04 14:47:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-05-04 14:47:49 +0000 |
| commit | eb664ddafba53883666e4755afb7eca51ef89cf5 (patch) | |
| tree | a40f2b1ef829f8975f1ef5122d3158feece75862 /phpBB/includes/functions_admin.php | |
| parent | 771fd3696d2f729476399d5acf92a68dd154d78d (diff) | |
| download | forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.gz forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.bz2 forums-eb664ddafba53883666e4755afb7eca51ef89cf5.tar.xz forums-eb664ddafba53883666e4755afb7eca51ef89cf5.zip | |
some missing merges...
git-svn-id: file:///svn/phpbb/trunk@8545 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 1e85adff9b..52e266befb 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1536,7 +1536,8 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, $sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' - AND t.topic_approved = 1'; + AND t.topic_approved = 1 + AND t.topic_status <> ' . ITEM_MOVED; } else { @@ -1544,6 +1545,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' AND t.topic_approved = 1 + AND t.topic_status <> ' . ITEM_MOVED . ' GROUP BY t.forum_id'; } |