aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-11-25 21:06:50 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-11-25 21:06:50 +0100
commitea9b97c8a1db1a287fea2d4dda97acb3b753a4cf (patch)
treed19252ba462d11b347cd56c20c0d33b4684dc6b5
parentdf223eac65a2405b2d765ace533e976fcd7c64c3 (diff)
parent4ea325029b01d97aae19c33ed25d08f014cce20d (diff)
downloadforums-ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf.tar
forums-ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf.tar.gz
forums-ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf.tar.bz2
forums-ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf.tar.xz
forums-ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf.zip
Merge pull request #4044 from RMcGirr83/ticket_14313
[ticket/14313] Don't display quote button on unapproved posts
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 4220eabe06..2e59ed1b45 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1821,6 +1821,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
($user->data['user_id'] == ANONYMOUS || $auth->acl_get('f_reply', $forum_id))
);
+ // Only display the quote button if the post is quotable. Posts not approved are not quotable.
+ $quote_allowed = ($quote_allowed && $row['post_visibility']) ? true : false;
+
$delete_allowed = $force_delete_allowed || ($user->data['is_registered'] && (
($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('m_softdelete', $forum_id) && $row['post_visibility'] != ITEM_DELETED)) ||
(!$s_cannot_delete && !$s_cannot_delete_lastpost && !$s_cannot_delete_time && !$s_cannot_delete_locked)