diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-03-02 23:16:35 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-03-02 23:16:35 +0000 |
| commit | aef857c98d518260ba428dd31c054e910f6f54fc (patch) | |
| tree | 8a8ead9c29106d1483c53fa28b158130cf278617 | |
| parent | 67537911a4ccf270c1c438ce88aae05763983647 (diff) | |
| download | forums-aef857c98d518260ba428dd31c054e910f6f54fc.tar forums-aef857c98d518260ba428dd31c054e910f6f54fc.tar.gz forums-aef857c98d518260ba428dd31c054e910f6f54fc.tar.bz2 forums-aef857c98d518260ba428dd31c054e910f6f54fc.tar.xz forums-aef857c98d518260ba428dd31c054e910f6f54fc.zip | |
Fixed bug # 41435
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9356 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 3 |
2 files changed, 3 insertions, 1 deletions
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 @@ <li>[Fix] Removed redundant code and unnecessary queries in forum management. (Bug #42265 - Patch by nickvergessen)</li> <li>[Fix] Correct mbstring regular expression for the allowable username characters, only affects <code>USERNAME_LETTER_NUM_SPACERS</code>. (Bug #42325)</li> <li>[Fix] Fix infinite loop in message handler if cache directory is not writable. (Bug #38675)</li> + <li>[Fix] While post is awaiting approval it can still be edited even though it can not be seen (Bug #41435 - Patch by TerraFrost)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> 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': |