1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

[ticket/13264] Don't force approved state if post visibility is known (3.2)

The previous PR broke 3.2 because of different variable names

PHPBB3-13264
This commit is contained in:
Máté Bartus 2016-03-09 20:25:27 +01:00
parent 0251a02896
commit 0e49dc4409

View File

@ -1492,9 +1492,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
break;
}
}
else if (isset($data['post_visibility']) && $data['post_visibility'] !== false)
else if (isset($data_ary['post_visibility']) && $data_ary['post_visibility'] !== false)
{
$post_visibility = $data['post_visibility'];
$post_visibility = $data_ary['post_visibility'];
}
// MODs/Extensions are able to force any visibility on posts
@ -2304,8 +2304,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
$params = $add_anchor = '';
if ($post_visibility == ITEM_APPROVED ||
($auth->acl_get('m_softdelete', $data['forum_id']) && $post_visibility == ITEM_DELETED) ||
($auth->acl_get('m_approve', $data['forum_id']) && in_array($post_visibility, array(ITEM_UNAPPROVED, ITEM_REAPPROVE))))
($auth->acl_get('m_softdelete', $data_ary['forum_id']) && $post_visibility == ITEM_DELETED) ||
($auth->acl_get('m_approve', $data_ary['forum_id']) && in_array($post_visibility, array(ITEM_UNAPPROVED, ITEM_REAPPROVE))))
{
$params .= '&t=' . $data_ary['topic_id'];