diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-25 21:06:54 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-25 21:06:54 +0100 |
| commit | e487ef42a2f04bae3ac6e919fcddb112852822c4 (patch) | |
| tree | c977575e1a707395f77f39c57e01e7a37756a8bc /phpBB/viewtopic.php | |
| parent | 797b0c4058531d6434134a27019b7aa9e008b172 (diff) | |
| parent | ea9b97c8a1db1a287fea2d4dda97acb3b753a4cf (diff) | |
| download | forums-e487ef42a2f04bae3ac6e919fcddb112852822c4.tar forums-e487ef42a2f04bae3ac6e919fcddb112852822c4.tar.gz forums-e487ef42a2f04bae3ac6e919fcddb112852822c4.tar.bz2 forums-e487ef42a2f04bae3ac6e919fcddb112852822c4.tar.xz forums-e487ef42a2f04bae3ac6e919fcddb112852822c4.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 8be23def00..7c9d938eba 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1824,6 +1824,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) |