From bc677ae3adb353be88696ade0e27cf1668657763 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 18 Sep 2009 14:28:45 +0000 Subject: Fix Bug #51375 - Do not show QR in closed topics/forums Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10161 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index e7522841e3..236c018afe 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1678,7 +1678,8 @@ else if (!$all_marked_read) } // let's set up quick_reply -$s_quick_reply = $user->data['is_registered'] && $config['allow_quick_reply'] && ($topic_data['forum_flags'] & FORUM_FLAG_QUICK_REPLY) && $auth->acl_get('f_reply', $forum_id); +$s_allowed_reply = ((!$auth->acl_get('f_reply', $forum_id) || ($topic_data['forum_status'] == ITEM_LOCKED) || ($topic_data['topic_status'] == ITEM_LOCKED)) && !$auth->acl_get('m_edit', $forum_id)) ? false : true; +$s_quick_reply = $s_allowed_reply && $user->data['is_registered'] && $config['allow_quick_reply'] && ($topic_data['forum_flags'] & FORUM_FLAG_QUICK_REPLY); if ($s_can_vote || $s_quick_reply) { -- cgit v1.2.1 From 87eb1d9f20d2c534b20baed199e0b96f1f9df98d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 23 Sep 2009 08:19:22 +0000 Subject: Fix Bug #51775 - Do not unlock topics with QuickReply Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10179 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 236c018afe..7fb954017d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1705,6 +1705,7 @@ if ($s_can_vote || $s_quick_reply) (!$config['allow_post_links']) ? $qr_hidden_fields['disable_magic_url'] = 1 : true; ($s_attach_sig) ? $qr_hidden_fields['attach_sig'] = 1 : true; ($s_notify) ? $qr_hidden_fields['notify'] = 1 : true; + ($topic_data['topic_status'] == ITEM_LOCKED) ? $qr_hidden_fields['lock_topic'] = 1 : true; $template->assign_vars(array( 'S_QUICK_REPLY' => true, -- cgit v1.2.1