diff options
| author | Ruslan Uzdenov <rxu@mail.ru> | 2009-08-17 13:32:41 +0000 |
|---|---|---|
| committer | Ruslan Uzdenov <rxu@mail.ru> | 2009-08-17 13:32:41 +0000 |
| commit | 6262263aefe4857d1c7af3ee68ed7c6a1e91e196 (patch) | |
| tree | 9a9ebecbb8f51a7d759f549f152c6922e89235c5 /phpBB | |
| parent | 45f570038426f36d547dcdc23ef631bd48a7dc6e (diff) | |
| download | forums-6262263aefe4857d1c7af3ee68ed7c6a1e91e196.tar forums-6262263aefe4857d1c7af3ee68ed7c6a1e91e196.tar.gz forums-6262263aefe4857d1c7af3ee68ed7c6a1e91e196.tar.bz2 forums-6262263aefe4857d1c7af3ee68ed7c6a1e91e196.tar.xz forums-6262263aefe4857d1c7af3ee68ed7c6a1e91e196.zip | |
Fix bug #43295 - Moved topics show unapproved even without permissions in the new forum
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10006 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6182711169..9fec6f73c1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -195,6 +195,7 @@ <li>[Fix] Fixed incorrect "topic does not exist" when unapproved posts were visited without global moderator permissions. (Bug #47795)</li> <li>[Fix] Prevent style switcher from blocking the tab key. (Bug #49335)</li> <li>[Fix] Correctly redirect on MCP main page after posts approval/disapproval from it. (Bug #49625)</li> + <li>[Fix] Do not display topic approval status image for shadow topic if a user is not a moderator in the forum the topic has been moved to. (Bug #43295)</li> <li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 6e76cec051..09bbd84c4f 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -620,8 +620,8 @@ if (sizeof($topic_list)) $view_topic_url_params = 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id; $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params); - $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; - $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; + $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', (($row['forum_id']) ? $row['forum_id'] : $forum_id))) ? true : false; + $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', (($row['forum_id']) ? $row['forum_id'] : $forum_id))) ? true : false; $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : ''; // Send vars to template |