aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-09-06 03:15:06 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-09-06 03:15:06 +0000
commit3af602fca429db22bb69f2254fb195e2b248a5b8 (patch)
tree0049c8c969237f77de470fc717665cf8b0e7b78d /phpBB
parentd65ee9f71ac1b6bf87cf8137e9fc38fc0c25a8ca (diff)
downloadforums-3af602fca429db22bb69f2254fb195e2b248a5b8.tar
forums-3af602fca429db22bb69f2254fb195e2b248a5b8.tar.gz
forums-3af602fca429db22bb69f2254fb195e2b248a5b8.tar.bz2
forums-3af602fca429db22bb69f2254fb195e2b248a5b8.tar.xz
forums-3af602fca429db22bb69f2254fb195e2b248a5b8.zip
I take it back!
git-svn-id: file:///svn/phpbb/trunk@8081 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_admin.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 975dc6c8e5..84a8946e06 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -201,7 +201,6 @@ p a {
<li>[Change] Moved note about dns_get_record function for using GTalk (Jabber) from Jabber log to Jabber ACP panel</li>
<li>[Fix] Do not use register_shutdown_function within cron.php if handling the queue and the mail function being used (Bug #14321)</li>
<li>[Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)</li>
- <li>[Fix] Properly sync calls to move_posts() (Bug #14370)</li>
</ul>
</div>
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 411d93ba25..4dfd58e28c 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -504,7 +504,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
sync('topic_reported', 'topic_id', $topic_ids);
sync('topic_attachment', 'topic_id', $topic_ids);
- sync('topic', 'topic_id', $topic_ids, true, true);
+ sync('topic', 'topic_id', $topic_ids, true);
sync('forum', 'forum_id', $forum_ids, true, true);
}