From cf9e42ffd88aa76c559a43f9a68f736a2367b9cf Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 30 Nov 2009 00:06:15 +0000 Subject: Fix Bug #53025 - Correctly show topic ATOM feed link when only post id is specified. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10295 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7fb954017d..a114940449 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1726,6 +1726,12 @@ if (empty($_REQUEST['f'])) $_REQUEST['f'] = $forum_id; } +// We need to do the same with the topic_id. See #53025. +if (empty($_REQUEST['t']) && !empty($topic_id)) +{ + $_REQUEST['t'] = $topic_id; +} + // Output the page page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id); -- cgit v1.2.1 From f8178778f83bf388af3426f952b5d7ed336b0e81 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 17 Jan 2010 16:30:33 +0000 Subject: Bug #56235 - Do not unsubscribe users from topics replying with quickreply. Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10408 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a114940449..93c1f99f0e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1690,7 +1690,7 @@ if ($s_can_vote || $s_quick_reply) $s_attach_sig = $config['allow_sig'] && $user->optionget('attachsig') && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig'); $s_smilies = $config['allow_smilies'] && $user->optionget('smilies') && $auth->acl_get('f_smilies', $forum_id); $s_bbcode = $config['allow_bbcode'] && $user->optionget('bbcode') && $auth->acl_get('f_bbcode', $forum_id); - $s_notify = $config['allow_topic_notify'] && $user->data['user_notify']; + $s_notify = $config['allow_topic_notify'] && ($user->data['user_notify'] || $s_watching_topic['is_watching']); $qr_hidden_fields = array( 'topic_cur_post_id' => (int) $topic_data['topic_last_post_id'], -- cgit v1.2.1 From f7575b3a0ce73157b4e2d14c07f4e99b53aade27 Mon Sep 17 00:00:00 2001 From: Ruslan Uzdenov Date: Sun, 17 Jan 2010 16:49:23 +0000 Subject: Fix bug #56555 - Quick reply + posting permission Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10414 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 93c1f99f0e..8f42342a87 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1678,8 +1678,12 @@ else if (!$all_marked_read) } // let's set up quick_reply -$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); +$s_quick_reply = false; +if ($user->data['is_registered'] && $config['allow_quick_reply'] && ($topic_data['forum_flags'] & FORUM_FLAG_QUICK_REPLY) && $auth->acl_get('f_reply', $forum_id)) +{ + // Quick reply enabled forum + $s_quick_reply = (($topic_data['forum_status'] == ITEM_UNLOCKED && $topic_data['topic_status'] == ITEM_UNLOCKED) || $auth->acl_get('m_edit', $forum_id)) ? true : false; +} if ($s_can_vote || $s_quick_reply) { -- cgit v1.2.1