From aef857c98d518260ba428dd31c054e910f6f54fc Mon Sep 17 00:00:00 2001 From: Jim Wigginton Date: Mon, 2 Mar 2009 23:16:35 +0000 Subject: [PATCH] Fixed bug # 41435 Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9356 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/posting.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ea4846f8ea..0a90f4f5f3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -111,6 +111,7 @@
  • [Fix] Removed redundant code and unnecessary queries in forum management. (Bug #42265 - Patch by nickvergessen)
  • [Fix] Correct mbstring regular expression for the allowable username characters, only affects USERNAME_LETTER_NUM_SPACERS. (Bug #42325)
  • [Fix] Fix infinite loop in message handler if cache directory is not writable. (Bug #38675)
    • +
  • [Fix] While post is awaiting approval it can still be edited even though it can not be seen (Bug #41435 - Patch by TerraFrost)
  • [Change] Allow download of conflicting file for later reference in automatic updater
  • [Change] Default difference view is now 'inline' instead of 'side by side'
  • [Change] Added new option for merging differences to conflicting files in automatic updater
    • diff --git a/phpBB/posting.php b/phpBB/posting.php index 1666342c9b..601bc2ab26 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -96,7 +96,8 @@ switch ($mode) AND t.topic_id = p.topic_id AND u.user_id = p.poster_id AND (f.forum_id = t.forum_id - OR f.forum_id = $forum_id)"; + OR f.forum_id = $forum_id)" . + (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1'); break; case 'smilies':