aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-10-20 07:53:48 +0000
committerChris Smith <toonarmy@phpbb.com>2008-10-20 07:53:48 +0000
commit9b5064b640ecc19e7989b988b28b9c86b14cde66 (patch)
tree6c401353fdb246ae8a0dfc1df129a652641aee0a
parentc97ff6352de27f09a52a4a6245f9462c991f7cd6 (diff)
downloadforums-9b5064b640ecc19e7989b988b28b9c86b14cde66.tar
forums-9b5064b640ecc19e7989b988b28b9c86b14cde66.tar.gz
forums-9b5064b640ecc19e7989b988b28b9c86b14cde66.tar.bz2
forums-9b5064b640ecc19e7989b988b28b9c86b14cde66.tar.xz
forums-9b5064b640ecc19e7989b988b28b9c86b14cde66.zip
Revert broken fix in r9014
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9031 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_posting.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4deee5074f..d26977e407 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -145,7 +145,6 @@
<li>[Fix] Round the displayed percentages in polls. (Bug #32375)</li>
<li>[Fix] Disable mass e-mail when e-mail is disabled. (Bug #27385)</li>
<li>[Fix] Display coloured poster username of queued posts displayed on the front of the MCP.</li>
- <li>[Fix] Forum last post information is now correctly updated when a topic/post is disapproved due to editing. (Bug #24475)</li>
<li>[Fix] Moderators can only see reports/queue/logs from forums they can actually read. (Bug #31085)</li>
<li>[Fix] Correctly display topic when start parameter is equal to the number of posts.</li>
<li>[Fix] Correctly display topic in MCP when start parameter is equal to or greater than the number of posts. (Bug #30525)</li>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d62cc7d699..eaa3ab0cd3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2106,7 +2106,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
// we need to update the last forum information
// only applicable if the topic is not global and it is approved
// we also check to make sure we are not dealing with globaling the latest topic (pretty rare but still needs to be checked)
- if ($topic_type != POST_GLOBAL && !$make_global && ($post_approved != $data['post_approved']))
+ if ($topic_type != POST_GLOBAL && !$make_global && ($post_approved || !$data['post_approved']))
{
// the last post makes us update the forum table. This can happen if...
// We make a new topic