1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 08:12:17 +02:00

Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-11-25 21:06:54 +01:00
commit e487ef42a2

View File

@ -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)