diff options
| author | David M <davidmj@users.sourceforge.net> | 2008-04-20 04:47:37 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2008-04-20 04:47:37 +0000 |
| commit | 3e64e9b8999e6c4c004e1cb0721c76ee6b612d53 (patch) | |
| tree | 86e2a220cab05591c7ab68850ed58c9d683dcdc7 | |
| parent | 79c72890e67dbd0a67bb85466886e4dd7e86a6f5 (diff) | |
| download | forums-3e64e9b8999e6c4c004e1cb0721c76ee6b612d53.tar forums-3e64e9b8999e6c4c004e1cb0721c76ee6b612d53.tar.gz forums-3e64e9b8999e6c4c004e1cb0721c76ee6b612d53.tar.bz2 forums-3e64e9b8999e6c4c004e1cb0721c76ee6b612d53.tar.xz forums-3e64e9b8999e6c4c004e1cb0721c76ee6b612d53.zip | |
#14648
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8506 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9a5a2cadd2..067a2c88e4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -88,6 +88,7 @@ <li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li> <li>[Fix] Fixed blank style on setups having no username defined within config.php (Bug #25065)</li> <li>[Fix] Made the compress_tar class tolerate archives that do not properly have their archived contents listed (Bug #14429 / thanks to JRSweets for his patch)</li> + <li>[Fix] Moved topics should not count towards the number of topics in a forum (Bug #14648 / thanks to Schumi for his patch)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index afaf165d66..6a4b6008bd 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1545,7 +1545,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 { @@ -1553,6 +1554,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'; } |