[ticket/11717] Add 'has' to boolean variable and reduce line length

PHPBB3-11717
This commit is contained in:
Marc Alexander 2013-07-22 10:42:46 +02:00
parent 603dc1f786
commit effafa4b4d

View file

@ -1995,9 +1995,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
} }
} }
$first_post_topic_info = ($post_mode == 'edit_first_post' && (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) || $first_post_has_topic_info = ($post_mode == 'edit_first_post' &&
($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) || (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) ||
($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1))); ($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) ||
($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1)));
// Fix the post's and topic's visibility and first/last post information, when the post is edited // Fix the post's and topic's visibility and first/last post information, when the post is edited
if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility) if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility)
{ {
@ -2010,7 +2011,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
$phpbb_content_visibility = $phpbb_container->get('content.visibility'); $phpbb_content_visibility = $phpbb_container->get('content.visibility');
$phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest); $phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
} }
else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_topic_info) else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_has_topic_info)
{ {
if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility) if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility)
{ {