ntwb / wordpress

src/wp-admin/includes/class-wp-post-comments-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		// todo: remove and add CSS for .themes

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Post_Comments_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * List Table API: WP_Post_Comments_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement displaying post comments in a list table.

Spacing +8 added lines, -8 removed lines

@@ -24,8 +24,8 @@ 
 	protected function get_column_info() {
 		return array(
 			array(
-				'author'   => __( 'Author' ),
-				'comment'  => _x( 'Comment', 'column name' ),
+				'author'   => __('Author'),
+				'comment'  => _x('Comment', 'column name'),
 			),
 			array(),
 			array(),
@@ -48,17 +48,17 @@ 
 	 *
 	 * @param bool $output_empty
 	 */
-	public function display( $output_empty = false ) {
+	public function display($output_empty = false) {
 		$singular = $this->_args['singular'];
 
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 ?>
-<table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" style="display:none;">
+<table class="<?php echo implode(' ', $this->get_table_classes()); ?>" style="display:none;">
 	<tbody id="the-comment-list"<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		} ?>>
-		<?php if ( ! $output_empty ) {
+		<?php if ( ! $output_empty) {
 			$this->display_rows_or_placeholder();
 		} ?>
 	</tbody>
@@ -71,7 +71,7 @@ 
 	 * @param bool $comment_status
 	 * @return int
 	 */
-	public function get_per_page( $comment_status = false ) {
+	public function get_per_page($comment_status = false) {
 		return 10;
 	}
 }

src/wp-admin/includes/class-wp-posts-list-table.php

Doc Comments +2 added lines, -2 removed lines

@@ -484,7 +484,7 @@ 
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
@@ -1162,7 +1162,7 @@ 
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $post        Post being acted upon.
+	 * @param WP_Post $post        Post being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.

Indentation +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * List Table API: WP_Posts_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Posts_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying posts in a list table.
@@ -1131,10 +1131,10 @@ 
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-'. $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1508,7 +1508,7 @@ 
     				<?php
 					/** This filter is documented in wp-admin/includes/meta-boxes.php */
 					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-    				?>
+					?>
 					<option value="default"><?php echo esc_html( $default_title ); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>

Spacing +419 added lines, -419 removed lines

@@ -77,35 +77,35 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type_object, $wpdb;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'posts',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$post_type        = $this->screen->post_type;
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type_object = get_post_type_object($post_type);
 
-		$exclude_states   = get_post_stati( array(
+		$exclude_states   = get_post_stati(array(
 			'show_in_admin_all_list' => false,
-		) );
-		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+		));
+		$this->user_posts_count = intval($wpdb->get_var($wpdb->prepare("
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			WHERE post_type = %s
-			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
+			AND post_status NOT IN ( '".implode("','", $exclude_states)."' )
 			AND post_author = %d
-		", $post_type, get_current_user_id() ) ) );
+		", $post_type, get_current_user_id())));
 
-		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+		if ($this->user_posts_count && ! current_user_can($post_type_object->cap->edit_others_posts) && empty($_REQUEST['post_status']) && empty($_REQUEST['all_posts']) && empty($_REQUEST['author']) && empty($_REQUEST['show_sticky'])) {
 			$_GET['author'] = get_current_user_id();
 		}
 
-		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
-			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
-			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
+		if ('post' === $post_type && $sticky_posts = get_option('sticky_posts')) {
+			$sticky_posts = implode(', ', array_map('absint', (array) $sticky_posts));
+			$this->sticky_posts_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type));
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 *
 	 * @param bool $display Whether the table layout should be hierarchical.
 	 */
-	public function set_hierarchical_display( $display ) {
+	public function set_hierarchical_display($display) {
 		$this->hierarchical_display = $display;
 	}
 
@@ -125,7 +125,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
+		return current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_posts);
 	}
 
 	/**
@@ -141,50 +141,50 @@ 
 		// is going to call wp()
 		$avail_post_stati = wp_edit_posts_query();
 
-		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
+		$this->set_hierarchical_display(is_post_type_hierarchical($this->screen->post_type) && 'menu_order title' === $wp_query->query['orderby']);
 
 		$post_type = $this->screen->post_type;
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+		$per_page = $this->get_items_per_page('edit_'.$post_type.'_per_page');
 
 		/** This filter is documented in wp-admin/includes/post.php */
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+ 		$per_page = apply_filters('edit_posts_per_page', $per_page, $post_type);
 
-		if ( $this->hierarchical_display ) {
+		if ($this->hierarchical_display) {
 			$total_items = $wp_query->post_count;
-		} elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+		} elseif ($wp_query->found_posts || $this->get_pagenum() === 1) {
 			$total_items = $wp_query->found_posts;
 		} else {
-			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
+			$post_counts = (array) wp_count_posts($post_type, 'readable');
 
-			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
-				$total_items = $post_counts[ $_REQUEST['post_status'] ];
-			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+			if (isset($_REQUEST['post_status']) && in_array($_REQUEST['post_status'], $avail_post_stati)) {
+				$total_items = $post_counts[$_REQUEST['post_status']];
+			} elseif (isset($_REQUEST['show_sticky']) && $_REQUEST['show_sticky']) {
 				$total_items = $this->sticky_posts_count;
-			} elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+			} elseif (isset($_GET['author']) && $_GET['author'] == get_current_user_id()) {
 				$total_items = $this->user_posts_count;
 			} else {
-				$total_items = array_sum( $post_counts );
+				$total_items = array_sum($post_counts);
 
 				// Subtract post types that are not included in the admin all list.
-				foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
-					$total_items -= $post_counts[ $state ];
+				foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
+					$total_items -= $post_counts[$state];
 				}
 			}
 		}
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'posts_list_mode', $mode );
+			set_user_setting('posts_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'posts_list_mode', 'list' );
+			$mode = get_user_setting('posts_list_mode', 'list');
 		}
 
-		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
+		$this->is_trash = isset($_REQUEST['post_status']) && $_REQUEST['post_status'] === 'trash';
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		if (isset($_REQUEST['post_status']) && 'trash' === $_REQUEST['post_status'])
+			echo get_post_type_object($this->screen->post_type)->labels->not_found_in_trash;
 		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+			echo get_post_type_object($this->screen->post_type)->labels->not_found;
 	}
 
 	/**
@@ -214,15 +214,15 @@ 
 	 */
 	protected function is_base_request() {
 		$vars = $_GET;
-		unset( $vars['paged'] );
+		unset($vars['paged']);
 
-		if ( empty( $vars ) ) {
+		if (empty($vars)) {
 			return true;
-		} elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
+		} elseif (1 === count($vars) && ! empty($vars['post_type'])) {
 			return $this->screen->post_type === $vars['post_type'];
 		}
 
-		return 1 === count( $vars ) && ! empty( $vars['mode'] );
+		return 1 === count($vars) && ! empty($vars['mode']);
 	}
 
 	/**
@@ -236,20 +236,20 @@ 
 	 * @param string $class Optional. Class attribute. Default empty string.
 	 * @return string The formatted link string.
 	 */
-	protected function get_edit_link( $args, $label, $class = '' ) {
-		$url = add_query_arg( $args, 'edit.php' );
+	protected function get_edit_link($args, $label, $class = '') {
+		$url = add_query_arg($args, 'edit.php');
 
 		$class_html = '';
-		if ( ! empty( $class ) ) {
+		if ( ! empty($class)) {
 			 $class_html = sprintf(
 				' class="%s"',
-				esc_attr( $class )
+				esc_attr($class)
 			);
 		}
 
 		return sprintf(
 			'<a href="%s"%s>%s</a>',
-			esc_url( $url ),
+			esc_url($url),
 			$class_html,
 			$label
 		);
@@ -266,25 +266,25 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
+		if ( ! empty($locked_post_status))
 			return array();
 
 		$status_links = array();
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
+		$num_posts = wp_count_posts($post_type, 'readable');
+		$total_posts = array_sum((array) $num_posts);
 		$class = '';
 
 		$current_user_id = get_current_user_id();
-		$all_args = array( 'post_type' => $post_type );
+		$all_args = array('post_type' => $post_type);
 		$mine = '';
 
 		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+		foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
 			$total_posts -= $num_posts->$state;
 		}
 
-		if ( $this->user_posts_count && $this->user_posts_count !== $total_posts ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+		if ($this->user_posts_count && $this->user_posts_count !== $total_posts) {
+			if (isset($_GET['author']) && ($_GET['author'] == $current_user_id)) {
 				$class = 'current';
 			}
 
@@ -300,16 +300,16 @@ 
 					$this->user_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->user_posts_count )
+				number_format_i18n($this->user_posts_count)
 			);
 
-			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
+			$mine = $this->get_edit_link($mine_args, $mine_inner_html, $class);
 
 			$all_args['all_posts'] = 1;
 			$class = '';
 		}
 
-		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
+		if (empty($class) && ($this->is_base_request() || isset($_REQUEST['all_posts']))) {
 			$class = 'current';
 		}
 
@@ -320,24 +320,24 @@ 
 				$total_posts,
 				'posts'
 			),
-			number_format_i18n( $total_posts )
+			number_format_i18n($total_posts)
 		);
 
-		$status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
-		if ( $mine ) {
+		$status_links['all'] = $this->get_edit_link($all_args, $all_inner_html, $class);
+		if ($mine) {
 			$status_links['mine'] = $mine;
 		}
 
-		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+		foreach (get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status) {
 			$class = '';
 
 			$status_name = $status->name;
 
-			if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
+			if ( ! in_array($status_name, $avail_post_stati) || empty($num_posts->$status_name)) {
 				continue;
 			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+			if (isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status']) {
 				$class = 'current';
 			}
 
@@ -347,15 +347,15 @@ 
 			);
 
 			$status_label = sprintf(
-				translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
-				number_format_i18n( $num_posts->$status_name )
+				translate_nooped_plural($status->label_count, $num_posts->$status_name),
+				number_format_i18n($num_posts->$status_name)
 			);
 
-			$status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
+			$status_links[$status_name] = $this->get_edit_link($status_args, $status_label, $class);
 		}
 
-		if ( ! empty( $this->sticky_posts_count ) ) {
-			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
+		if ( ! empty($this->sticky_posts_count)) {
+			$class = ! empty($_REQUEST['show_sticky']) ? 'current' : '';
 
 			$sticky_args = array(
 				'post_type'	=> $post_type,
@@ -369,16 +369,16 @@ 
 					$this->sticky_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->sticky_posts_count )
+				number_format_i18n($this->sticky_posts_count)
 			);
 
 			$sticky_link = array(
-				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+				'sticky' => $this->get_edit_link($sticky_args, $sticky_inner_html, $class)
 			);
 
 			// Sticky comes after Publish, or if not listed, after All.
-			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
-			$status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
+			$split = 1 + array_search((isset($status_links['publish']) ? 'publish' : 'all'), array_keys($status_links));
+			$status_links = array_merge(array_slice($status_links, 0, $split), $sticky_link, array_slice($status_links, $split));
 		}
 
 		return $status_links;
@@ -390,21 +390,21 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$post_type_obj = get_post_type_object( $this->screen->post_type );
+		$post_type_obj = get_post_type_object($this->screen->post_type);
 
-		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
+		if (current_user_can($post_type_obj->cap->edit_posts)) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
 			} else {
-				$actions['edit'] = __( 'Edit' );
+				$actions['edit'] = __('Edit');
 			}
 		}
 
-		if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
-			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (current_user_can($post_type_obj->cap->delete_posts)) {
+			if ($this->is_trash || ! EMPTY_TRASH_DAYS) {
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = __( 'Move to Trash' );
+				$actions['trash'] = __('Move to Trash');
 			}
 		}
 
@@ -415,18 +415,18 @@ 
 	 * @global int $cat
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat;
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which && !is_singular() ) {
+		if ('top' === $which && ! is_singular()) {
 
-			$this->months_dropdown( $this->screen->post_type );
+			$this->months_dropdown($this->screen->post_type);
 
-			if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
+			if (is_object_in_taxonomy($this->screen->post_type, 'category')) {
 				$dropdown_options = array(
-					'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
+					'show_option_all' => get_taxonomy('category')->labels->all_items,
 					'hide_empty' => 0,
 					'hierarchical' => 1,
 					'show_count' => 0,
@@ -434,8 +434,8 @@ 
 					'selected' => $cat
 				);
 
-				echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
-				wp_dropdown_categories( $dropdown_options );
+				echo '<label class="screen-reader-text" for="cat">'.__('Filter by category').'</label>';
+				wp_dropdown_categories($dropdown_options);
 			}
 
 			/**
@@ -449,13 +449,13 @@ 
 			 *
 			 * @param string $post_type The post type slug.
 			 */
-			do_action( 'restrict_manage_posts', $this->screen->post_type );
+			do_action('restrict_manage_posts', $this->screen->post_type);
 
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 		}
 
-		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_others_posts)) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		}
 ?>
 		</div>
@@ -468,7 +468,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_posts_extra_tablenav', $which );
+		do_action('manage_posts_extra_tablenav', $which);
 	}
 
 	/**
@@ -476,7 +476,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -487,7 +487,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
+		return array('widefat', 'fixed', 'striped', is_post_type_hierarchical($this->screen->post_type) ? 'pages' : 'posts');
 	}
 
 	/**
@@ -502,14 +502,14 @@ 
 		$posts_columns['cb'] = '<input type="checkbox" />';
 
 		/* translators: manage posts column name */
-		$posts_columns['title'] = _x( 'Title', 'column name' );
+		$posts_columns['title'] = _x('Title', 'column name');
 
-		if ( post_type_supports( $post_type, 'author' ) ) {
-			$posts_columns['author'] = __( 'Author' );
+		if (post_type_supports($post_type, 'author')) {
+			$posts_columns['author'] = __('Author');
 		}
 
-		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_object_taxonomies($post_type, 'objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filter the taxonomy columns in the Posts list table.
@@ -522,27 +522,27 @@ 
 		 * @param array  $taxonomies Array of taxonomies to show columns for.
 		 * @param string $post_type  The post type.
 		 */
-		$taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters("manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type);
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy)
 				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
+			elseif ('post_tag' === $taxonomy)
 				$column_key = 'tags';
 			else
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
-		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		$post_status = ! empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
+		if (post_type_supports($post_type, 'comments') && ! in_array($post_status, array('pending', 'draft', 'future')))
+			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 
-		$posts_columns['date'] = __( 'Date' );
+		$posts_columns['date'] = __('Date');
 
-		if ( 'page' === $post_type ) {
+		if ('page' === $post_type) {
 
 			/**
 			 * Filter the columns displayed in the Pages list table.
@@ -551,7 +551,7 @@ 
 			 *
 			 * @param array $post_columns An array of column names.
 			 */
-			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+			$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
 		} else {
 
 			/**
@@ -562,7 +562,7 @@ 
 			 * @param array  $posts_columns An array of column names.
 			 * @param string $post_type     The post type slug.
 			 */
-			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+			$posts_columns = apply_filters('manage_posts_columns', $posts_columns, $post_type);
 		}
 
 		/**
@@ -574,7 +574,7 @@ 
 		 *
 		 * @param array $post_columns An array of column names.
 		 */
-		return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
+		return apply_filters("manage_{$post_type}_posts_columns", $posts_columns);
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 			'title'    => 'title',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true )
+			'date'     => array('date', true)
 		);
 	}
 
@@ -596,18 +596,18 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	public function display_rows( $posts = array(), $level = 0 ) {
+	public function display_rows($posts = array(), $level = 0) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
+		if (empty($posts))
 			$posts = $wp_query->posts;
 
-		add_filter( 'the_title', 'esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		if ( $this->hierarchical_display ) {
-			$this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
+		if ($this->hierarchical_display) {
+			$this->_display_rows_hierarchical($posts, $this->get_pagenum(), $per_page);
 		} else {
-			$this->_display_rows( $posts, $level );
+			$this->_display_rows($posts, $level);
 		}
 	}
 
@@ -615,17 +615,17 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	private function _display_rows( $posts, $level = 0 ) {
+	private function _display_rows($posts, $level = 0) {
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
+		foreach ($posts as $a_post)
 			$post_ids[] = $a_post->ID;
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ($posts as $post)
+			$this->single_row($post, $level);
 	}
 
 	/**
@@ -635,15 +635,15 @@ 
 	 * @param int $pagenum
 	 * @param int $per_page
 	 */
-	private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+	private function _display_rows_hierarchical($pages, $pagenum = 1, $per_page = 20) {
 		global $wpdb;
 
 		$level = 0;
 
-		if ( ! $pages ) {
-			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+		if ( ! $pages) {
+			$pages = get_pages(array('sort_column' => 'menu_order'));
 
-			if ( ! $pages )
+			if ( ! $pages)
 				return;
 		}
 
@@ -654,56 +654,56 @@ 
 		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
 		 * If searching, ignore hierarchy and treat everything as top level
 		 */
-		if ( empty( $_REQUEST['s'] ) ) {
+		if (empty($_REQUEST['s'])) {
 
 			$top_level_pages = array();
 			$children_pages = array();
 
-			foreach ( $pages as $page ) {
+			foreach ($pages as $page) {
 
 				// Catch and repair bad pages.
-				if ( $page->post_parent == $page->ID ) {
+				if ($page->post_parent == $page->ID) {
 					$page->post_parent = 0;
-					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
-					clean_post_cache( $page );
+					$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
+					clean_post_cache($page);
 				}
 
-				if ( 0 == $page->post_parent )
+				if (0 == $page->post_parent)
 					$top_level_pages[] = $page;
 				else
-					$children_pages[ $page->post_parent ][] = $page;
+					$children_pages[$page->post_parent][] = $page;
 			}
 
 			$pages = &$top_level_pages;
 		}
 
 		$count = 0;
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 		$to_display = array();
 
-		foreach ( $pages as $page ) {
-			if ( $count >= $end )
+		foreach ($pages as $page) {
+			if ($count >= $end)
 				break;
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if (isset($children_pages))
+				$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
-		if ( isset( $children_pages ) && $count < $end ){
-			foreach ( $children_pages as $orphans ){
-				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
+		if (isset($children_pages) && $count < $end) {
+			foreach ($children_pages as $orphans) {
+				foreach ($orphans as $op) {
+					if ($count >= $end)
 						break;
 
-					if ( $count >= $start ) {
+					if ($count >= $start) {
 						$to_display[$op->ID] = 0;
 					}
 
@@ -712,16 +712,16 @@ 
 			}
 		}
 
-		$ids = array_keys( $to_display );
-		_prime_post_caches( $ids );
+		$ids = array_keys($to_display);
+		_prime_post_caches($ids);
 
-		if ( ! isset( $GLOBALS['post'] ) ) {
-			$GLOBALS['post'] = reset( $ids );
+		if ( ! isset($GLOBALS['post'])) {
+			$GLOBALS['post'] = reset($ids);
 		}
 
-		foreach ( $to_display as $page_id => $level ) {
+		foreach ($to_display as $page_id => $level) {
 			echo "\t";
-			$this->single_row( $page_id, $level );
+			$this->single_row($page_id, $level);
 		}
 	}
 
@@ -740,51 +740,51 @@ 
 	 * @param int $per_page
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
+	private function _page_rows(&$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display) {
+		if ( ! isset($children_pages[$parent]))
 			return;
 
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 
-		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
+		foreach ($children_pages[$parent] as $page) {
+			if ($count >= $end)
 				break;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $page->post_parent > 0 ) {
+			if ($count == $start && $page->post_parent > 0) {
 				$my_parents = array();
 				$my_parent = $page->post_parent;
-				while ( $my_parent ) {
+				while ($my_parent) {
 					// Get the ID from the list or the attribute if my_parent is an object
 					$parent_id = $my_parent;
-					if ( is_object( $my_parent ) ) {
+					if (is_object($my_parent)) {
 						$parent_id = $my_parent->ID;
 					}
 
-					$my_parent = get_post( $parent_id );
+					$my_parent = get_post($parent_id);
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
+					if ( ! $my_parent->post_parent)
 						break;
 					$my_parent = $my_parent->post_parent;
 				}
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					$to_display[$my_parent->ID] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
-		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+		unset($children_pages[$parent]); //required in order to keep track of orphans
 	}
 
 	/**
@@ -795,10 +795,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)): ?>
 			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php
-				printf( __( 'Select %s' ), _draft_or_post_title() );
+				printf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator"></div>
@@ -814,10 +814,10 @@ 
 	 * @param string  $data
 	 * @param string  $primary
 	 */
-	protected function _column_title( $post, $classes, $data, $primary ) {
-		echo '<td class="' . $classes . ' page-title" ', $data, '>';
-		echo $this->column_title( $post );
-		echo $this->handle_row_actions( $post, 'title', $primary );
+	protected function _column_title($post, $classes, $data, $primary) {
+		echo '<td class="'.$classes.' page-title" ', $data, '>';
+		echo $this->column_title($post);
+		echo $this->handle_row_actions($post, 'title', $primary);
 		echo '</td>';
 	}
 
@@ -831,90 +831,90 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
+	public function column_title($post) {
 		global $mode;
 
-		if ( $this->hierarchical_display ) {
-			if ( 0 === $this->current_level && (int) $post->post_parent > 0 ) {
+		if ($this->hierarchical_display) {
+			if (0 === $this->current_level && (int) $post->post_parent > 0) {
 				// Sent level 0 by accident, by default, or because we don't know the actual level.
 				$find_main_page = (int) $post->post_parent;
-				while ( $find_main_page > 0 ) {
-					$parent = get_post( $find_main_page );
+				while ($find_main_page > 0) {
+					$parent = get_post($find_main_page);
 
-					if ( is_null( $parent ) ) {
+					if (is_null($parent)) {
 						break;
 					}
 
 					$this->current_level++;
 					$find_main_page = (int) $parent->post_parent;
 
-					if ( ! isset( $parent_name ) ) {
+					if ( ! isset($parent_name)) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
+						$parent_name = apply_filters('the_title', $parent->post_title, $parent->ID);
 					}
 				}
 			}
 		}
 
-		$pad = str_repeat( '&#8212; ', $this->current_level );
+		$pad = str_repeat('&#8212; ', $this->current_level);
 		echo "<strong>";
 
-		$format = get_post_format( $post->ID );
-		if ( $format ) {
-			$label = get_post_format_string( $format );
+		$format = get_post_format($post->ID);
+		if ($format) {
+			$label = get_post_format_string($format);
 
-			$format_class = 'post-state-format post-format-icon post-format-' . $format;
+			$format_class = 'post-state-format post-format-icon post-format-'.$format;
 
 			$format_args = array(
 				'post_format' => $format,
 				'post_type' => $post->post_type
 			);
 
-			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
+			echo $this->get_edit_link($format_args, $label.':', $format_class);
 		}
 
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
+		if ($can_edit_post && $post->post_status != 'trash') {
 			printf(
 				'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title)),
 				$pad,
 				$title
 			);
 		} else {
-			echo $pad . $title;
+			echo $pad.$title;
 		}
-		_post_states( $post );
+		_post_states($post);
 
-		if ( isset( $parent_name ) ) {
-			$post_type_object = get_post_type_object( $post->post_type );
-			echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+		if (isset($parent_name)) {
+			$post_type_object = get_post_type_object($post->post_type);
+			echo ' | '.$post_type_object->labels->parent_item_colon.' '.esc_html($parent_name);
 		}
 		echo "</strong>\n";
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
-			$lock_holder = wp_check_post_lock( $post->ID );
+		if ($can_edit_post && $post->post_status != 'trash') {
+			$lock_holder = wp_check_post_lock($post->ID);
 
-			if ( $lock_holder ) {
-				$lock_holder = get_userdata( $lock_holder );
-				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+			if ($lock_holder) {
+				$lock_holder = get_userdata($lock_holder);
+				$locked_avatar = get_avatar($lock_holder->ID, 18);
+				$locked_text = esc_html(sprintf(__('%s is currently editing'), $lock_holder->display_name));
 			} else {
 				$locked_avatar = $locked_text = '';
 			}
 
-			echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
+			echo '<div class="locked-info"><span class="locked-avatar">'.$locked_avatar.'</span> <span class="locked-text">'.$locked_text."</span></div>\n";
 		}
 
-		if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
+		if ( ! is_post_type_hierarchical($this->screen->post_type) && 'excerpt' === $mode && current_user_can('read_post', $post->ID)) {
 			the_excerpt();
 		}
 
-		get_inline_data( $post );
+		get_inline_data($post);
 	}
 
 	/**
@@ -927,39 +927,39 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
+	public function column_date($post) {
 		global $mode;
 
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time = $h_time = __( 'Unpublished' );
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$t_time = $h_time = __('Unpublished');
 			$time_diff = 0;
 		} else {
-			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$t_time = get_the_time(__('Y/m/d g:i:s a'));
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post );
+			$time = get_post_time('G', true, $post);
 
 			$time_diff = time() - $time;
 
-			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			if ($time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
-		if ( 'publish' === $post->post_status ) {
-			_e( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+		if ('publish' === $post->post_status) {
+			_e('Published');
+		} elseif ('future' === $post->post_status) {
+			if ($time_diff > 0) {
+				echo '<strong class="error-message">'.__('Missed schedule').'</strong>';
 			} else {
-				_e( 'Scheduled' );
+				_e('Scheduled');
 			}
 		} else {
-			_e( 'Last Modified' );
+			_e('Last Modified');
 		}
 		echo '<br />';
-		if ( 'excerpt' === $mode ) {
+		if ('excerpt' === $mode) {
 			/**
 			 * Filter the published time of the post.
 			 *
@@ -974,11 +974,11 @@ 
 			 * @param string  $column_name The column name.
 			 * @param string  $mode        The list display mode ('excerpt' or 'list').
 			 */
-			echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
+			echo apply_filters('post_date_column_time', $t_time, $post, 'date', $mode);
 		} else {
 
 			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
+			echo '<abbr title="'.$t_time.'">'.apply_filters('post_date_column_time', $h_time, $post, 'date', $mode).'</abbr>';
 		}
 	}
 
@@ -990,13 +990,13 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		?>
 		<div class="post-com-count-wrapper">
 		<?php
-			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+			$pending_comments = isset($this->comment_pending_count[$post->ID]) ? $this->comment_pending_count[$post->ID] : 0;
 
-			$this->comments_bubble( $post->ID, $pending_comments );
+			$this->comments_bubble($post->ID, $pending_comments);
 		?>
 		</div>
 		<?php
@@ -1010,12 +1010,12 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
+	public function column_author($post) {
 		$args = array(
 			'post_type' => $post->post_type,
-			'author' => get_the_author_meta( 'ID' )
+			'author' => get_the_author_meta('ID')
 		);
-		echo $this->get_edit_link( $args, get_the_author() );
+		echo $this->get_edit_link($args, get_the_author());
 	}
 
 	/**
@@ -1027,45 +1027,45 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' === $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
-		if ( $taxonomy ) {
-			$taxonomy_object = get_taxonomy( $taxonomy );
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$taxonomy_object = get_taxonomy($taxonomy);
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
-					if ( 'post' != $post->post_type ) {
+					if ('post' != $post->post_type) {
 						$posts_in_term_qv['post_type'] = $post->post_type;
 					}
-					if ( $taxonomy_object->query_var ) {
-						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+					if ($taxonomy_object->query_var) {
+						$posts_in_term_qv[$taxonomy_object->query_var] = $t->slug;
 					} else {
 						$posts_in_term_qv['taxonomy'] = $taxonomy;
 						$posts_in_term_qv['term'] = $t->slug;
 					}
 
-					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
-					$out[] = $this->get_edit_link( $posts_in_term_qv, $label );
+					$label = esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'));
+					$out[] = $this->get_edit_link($posts_in_term_qv, $label);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.$taxonomy_object->labels->no_terms.'</span>';
 			}
 			return;
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Fires in each custom column on the Posts list table.
@@ -1078,7 +1078,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_pages_custom_column', $column_name, $post->ID );
+			do_action('manage_pages_custom_column', $column_name, $post->ID);
 		} else {
 
 			/**
@@ -1092,7 +1092,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_posts_custom_column', $column_name, $post->ID );
+			do_action('manage_posts_custom_column', $column_name, $post->ID);
 		}
 
 		/**
@@ -1105,7 +1105,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $post_id     The current post ID.
 		 */
-		do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
+		do_action("manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID);
 	}
 
 	/**
@@ -1114,31 +1114,31 @@ 
 	 * @param int|WP_Post $post
 	 * @param int         $level
 	 */
-	public function single_row( $post, $level = 0 ) {
+	public function single_row($post, $level = 0) {
 		$global_post = get_post();
 
-		$post = get_post( $post );
+		$post = get_post($post);
 		$this->current_level = $level;
 
 		$GLOBALS['post'] = $post;
-		setup_postdata( $post );
+		setup_postdata($post);
 
-		$classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+		$classes = 'iedit author-'.(get_current_user_id() == $post->post_author ? 'self' : 'other');
 
-		$lock_holder = wp_check_post_lock( $post->ID );
-		if ( $lock_holder ) {
+		$lock_holder = wp_check_post_lock($post->ID);
+		if ($lock_holder) {
 			$classes .= ' wp-locked';
 		}
 
-		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+		if ($post->post_parent) {
+		    $count = count(get_post_ancestors($post->ID));
+		    $classes .= ' level-'.$count;
 		} else {
 		    $classes .= ' level-0';
 		}
 	?>
-		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
-			<?php $this->single_row_columns( $post ); ?>
+		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode(' ', get_post_class($classes, $post->ID)); ?>">
+			<?php $this->single_row_columns($post); ?>
 		</tr>
 	<?php
 		$GLOBALS['post'] = $global_post;
@@ -1167,85 +1167,85 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$post_type_object = get_post_type_object($post->post_type);
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$actions = array();
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && 'trash' != $post->post_status ) {
+		if ($can_edit_post && 'trash' != $post->post_status) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline" aria-label="%s">%s</a>',
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $title ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $title)),
+				__('Quick&nbsp;Edit')
 			);
 		}
 
-		if ( current_user_can( 'delete_post', $post->ID ) ) {
-			if ( 'trash' === $post->post_status ) {
+		if (current_user_can('delete_post', $post->ID)) {
+			if ('trash' === $post->post_status) {
 				$actions['untrash'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+					wp_nonce_url(admin_url(sprintf($post_type_object->_edit_link.'&amp;action=untrash', $post->ID)), 'untrash-post_'.$post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $title ) ),
-					__( 'Restore' )
+					esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $title)),
+					__('Restore')
 				);
-			} elseif ( EMPTY_TRASH_DAYS ) {
+			} elseif (EMPTY_TRASH_DAYS) {
 				$actions['trash'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID ),
+					get_delete_post_link($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $title ) ),
-					_x( 'Trash', 'verb' )
+					esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $title)),
+					_x('Trash', 'verb')
 				);
 			}
-			if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+			if ('trash' === $post->post_status || ! EMPTY_TRASH_DAYS) {
 				$actions['delete'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID, '', true ),
+					get_delete_post_link($post->ID, '', true),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $title ) ),
-					__( 'Delete Permanently' )
+					esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $title)),
+					__('Delete Permanently')
 				);
 			}
 		}
 
-		if ( is_post_type_viewable( $post_type_object ) ) {
-			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-				if ( $can_edit_post ) {
-					$preview_link = get_preview_post_link( $post );
+		if (is_post_type_viewable($post_type_object)) {
+			if (in_array($post->post_status, array('pending', 'draft', 'future'))) {
+				if ($can_edit_post) {
+					$preview_link = get_preview_post_link($post);
 					$actions['view'] = sprintf(
 						'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-						esc_url( $preview_link ),
+						esc_url($preview_link),
 						/* translators: %s: post title */
-						esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ),
-						__( 'Preview' )
+						esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)),
+						__('Preview')
 					);
 				}
-			} elseif ( 'trash' != $post->post_status ) {
+			} elseif ('trash' != $post->post_status) {
 				$actions['view'] = sprintf(
 					'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)),
+					__('View')
 				);
 			}
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Filter the array of row action links on the Pages list table.
@@ -1259,7 +1259,7 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'page_row_actions', $actions, $post );
+			$actions = apply_filters('page_row_actions', $actions, $post);
 		} else {
 
 			/**
@@ -1274,10 +1274,10 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'post_row_actions', $actions, $post );
+			$actions = apply_filters('post_row_actions', $actions, $post);
 		}
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
@@ -1292,15 +1292,15 @@ 
 
 		$screen = $this->screen;
 
-		$post = get_default_post_to_edit( $screen->post_type );
-		$post_type_object = get_post_type_object( $screen->post_type );
+		$post = get_default_post_to_edit($screen->post_type);
+		$post_type_object = get_post_type_object($screen->post_type);
 
-		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$taxonomy_names = get_object_taxonomies($screen->post_type);
 		$hierarchical_taxonomies = array();
 		$flat_taxonomies = array();
-		foreach ( $taxonomy_names as $taxonomy_name ) {
+		foreach ($taxonomy_names as $taxonomy_name) {
 
-			$taxonomy = get_taxonomy( $taxonomy_name );
+			$taxonomy = get_taxonomy($taxonomy_name);
 
 			$show_in_quick_edit = $taxonomy->show_in_quick_edit;
 
@@ -1313,39 +1313,39 @@ 
 			 * @param string $taxonomy_name      Taxonomy name.
 			 * @param string $post_type          Post type of current Quick Edit post.
 			 */
-			if ( ! apply_filters( 'quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type ) ) {
+			if ( ! apply_filters('quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type)) {
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
+			if ($taxonomy->hierarchical)
 				$hierarchical_taxonomies[] = $taxonomy;
 			else
 				$flat_taxonomies[] = $taxonomy;
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
-		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
-		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+		$m = (isset($mode) && 'excerpt' === $mode) ? 'excerpt' : 'list';
+		$can_publish = current_user_can($post_type_object->cap->publish_posts);
+		$core_columns = array('cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true);
 
 	?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
-		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$hclass = count($hierarchical_taxonomies) ? 'post' : 'page';
 		$bulk = 0;
-		while ( $bulk < 2 ) { ?>
+		while ($bulk < 2) { ?>
 
-		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-".$screen->post_type;
 			echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 		<fieldset class="inline-edit-col-left">
-			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+			<legend class="inline-edit-legend"><?php echo $bulk ? __('Bulk Edit') : __('Quick Edit'); ?></legend>
 			<div class="inline-edit-col">
 	<?php
 
-	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) : ?>
+	if (post_type_supports($screen->post_type, 'title')) :
+		if ($bulk) : ?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
@@ -1353,30 +1353,30 @@ 
 	<?php else : // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e('Title'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
 			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
+				<span class="title"><?php _e('Slug'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
 	<?php endif; // $bulk
 	endif; // post_type_supports title ?>
 
-	<?php if ( !$bulk ) : ?>
+	<?php if ( ! $bulk) : ?>
 			<fieldset class="inline-edit-date">
-			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
-				<?php touch_time( 1, 1, 0, 1 ); ?>
+			<legend><span class="title"><?php _e('Date'); ?></span></legend>
+				<?php touch_time(1, 1, 0, 1); ?>
 			</fieldset>
 			<br class="clear" />
 	<?php endif; // $bulk
 
-		if ( post_type_supports( $screen->post_type, 'author' ) ) :
+		if (post_type_supports($screen->post_type, 'author')) :
 			$authors_dropdown = '';
 
-			if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+			if (is_super_admin() || current_user_can($post_type_object->cap->edit_others_posts)) :
 				$users_opt = array(
 					'hide_if_only_one_author' => false,
 					'who' => 'authors',
@@ -1386,39 +1386,39 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ($bulk)
+					$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
 
-				if ( $authors = wp_dropdown_users( $users_opt ) ) :
+				if ($authors = wp_dropdown_users($users_opt)) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
-					$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+					$authors_dropdown .= '<span class="title">'.__('Author').'</span>';
 					$authors_dropdown .= $authors;
 					$authors_dropdown .= '</label>';
 				endif;
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( ! $bulk) echo $authors_dropdown;
 	endif; // post_type_supports author
 
-	if ( !$bulk && $can_publish ) :
+	if ( ! $bulk && $can_publish) :
 	?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="alignleft">
-					<span class="title"><?php _e( 'Password' ); ?></span>
+					<span class="title"><?php _e('Password'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
 				<em class="alignleft inline-edit-or">
 					<?php
 					/* translators: Between password field and private checkbox on post quick edit interface */
-					_e( '&ndash;OR&ndash;' );
+					_e('&ndash;OR&ndash;');
 					?>
 				</em>
 				<label class="alignleft inline-edit-private">
 					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
+					<span class="checkbox-title"><?php _e('Private'); ?></span>
 				</label>
 			</div>
 
@@ -1426,16 +1426,16 @@ 
 
 		</div></fieldset>
 
-	<?php if ( count( $hierarchical_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($hierarchical_taxonomies) && ! $bulk) : ?>
 
 		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
 
-	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+	<?php foreach ($hierarchical_taxonomies as $taxonomy) : ?>
 
-			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
-			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
-				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
+			<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name) ?></span>
+			<input type="hidden" name="<?php echo ($taxonomy->name === 'category') ? 'post_category[]' : 'tax_input['.esc_attr($taxonomy->name).'][]'; ?>" value="0" />
+			<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
+				<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)) ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1447,27 +1447,27 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
+		if (post_type_supports($screen->post_type, 'author') && $bulk)
 			echo $authors_dropdown;
 
-		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+		if (post_type_supports($screen->post_type, 'page-attributes')) :
 
-			if ( $post_type_object->hierarchical ) :
+			if ($post_type_object->hierarchical) :
 		?>
 			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
+				<span class="title"><?php _e('Parent'); ?></span>
 	<?php
 		$dropdown_args = array(
 			'post_type'         => $post_type_object->name,
 			'selected'          => $post->post_parent,
 			'name'              => 'post_parent',
-			'show_option_none'  => __( 'Main Page (no parent)' ),
+			'show_option_none'  => __('Main Page (no parent)'),
 			'option_none_value' => 0,
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ($bulk)
+			$dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1478,38 +1478,38 @@ 
 		 *
 		 * @param array $dropdown_args An array of arguments.
 		 */
-		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+		$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
 
-		wp_dropdown_pages( $dropdown_args );
+		wp_dropdown_pages($dropdown_args);
 	?>
 			</label>
 
 	<?php
 			endif; // hierarchical
 
-			if ( !$bulk ) : ?>
+			if ( ! $bulk) : ?>
 
 			<label>
-				<span class="title"><?php _e( 'Order' ); ?></span>
+				<span class="title"><?php _e('Order'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
 			</label>
 
 	<?php	endif; // !$bulk
 
-			if ( 'page' === $screen->post_type ) :
+			if ('page' === $screen->post_type) :
 	?>
 
 			<label>
-				<span class="title"><?php _e( 'Template' ); ?></span>
+				<span class="title"><?php _e('Template'); ?></span>
 				<select name="page_template">
-	<?php	if ( $bulk ) : ?>
-					<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php	if ($bulk) : ?>
+					<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php	endif; // $bulk ?>
     				<?php
 					/** This filter is documented in wp-admin/includes/meta-boxes.php */
-					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
+					$default_title = apply_filters('default_page_template_title', __('Default Template'), 'quick-edit');
     				?>
-					<option value="default"><?php echo esc_html( $default_title ); ?></option>
+					<option value="default"><?php echo esc_html($default_title); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>
 			</label>
@@ -1519,13 +1519,13 @@ 
 		endif; // page-attributes
 	?>
 
-	<?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($flat_taxonomies) && ! $bulk) : ?>
 
-	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-		<?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) : ?>
+	<?php foreach ($flat_taxonomies as $taxonomy) : ?>
+		<?php if (current_user_can($taxonomy->cap->assign_terms)) : ?>
 			<label class="inline-edit-tags">
-				<span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-				<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr( $taxonomy->name )?>]" class="tax_input_<?php echo esc_attr( $taxonomy->name )?>"></textarea>
+				<span class="title"><?php echo esc_html($taxonomy->labels->name) ?></span>
+				<textarea cols="22" rows="1" name="tax_input[<?php echo esc_attr($taxonomy->name)?>]" class="tax_input_<?php echo esc_attr($taxonomy->name)?>"></textarea>
 			</label>
 		<?php endif; ?>
 
@@ -1533,26 +1533,26 @@ 
 
 	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
 
-	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-		if ( $bulk ) : ?>
+	<?php if (post_type_supports($screen->post_type, 'comments') || post_type_supports($screen->post_type, 'trackbacks')) :
+		if ($bulk) : ?>
 
 			<div class="inline-edit-group wp-clearfix">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+		<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Comments' ); ?></span>
+				<span class="title"><?php _e('Comments'); ?></span>
 				<select name="comment_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
-		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+		<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 			<label class="alignright">
-				<span class="title"><?php _e( 'Pings' ); ?></span>
+				<span class="title"><?php _e('Pings'); ?></span>
 				<select name="ping_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
 		<?php endif; ?>
@@ -1561,15 +1561,15 @@ 
 	<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
-			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+			<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Comments'); ?></span>
 				</label>
-			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+			<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="ping_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Pings'); ?></span>
 				</label>
 			<?php endif; ?>
 			</div>
@@ -1579,33 +1579,33 @@ 
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
-					<span class="title"><?php _e( 'Status' ); ?></span>
+					<span class="title"><?php _e('Status'); ?></span>
 					<select name="_status">
-	<?php if ( $bulk ) : ?>
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php endif; // $bulk ?>
-					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-						<option value="publish"><?php _e( 'Published' ); ?></option>
-						<option value="future"><?php _e( 'Scheduled' ); ?></option>
-	<?php if ( $bulk ) : ?>
-						<option value="private"><?php _e( 'Private' ) ?></option>
+					<?php if ($can_publish) : // Contributors only get "Unpublished" and "Pending Review" ?>
+						<option value="publish"><?php _e('Published'); ?></option>
+						<option value="future"><?php _e('Scheduled'); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="private"><?php _e('Private') ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
-						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-						<option value="draft"><?php _e( 'Draft' ); ?></option>
+						<option value="pending"><?php _e('Pending Review'); ?></option>
+						<option value="draft"><?php _e('Draft'); ?></option>
 					</select>
 				</label>
 
-	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+	<?php if ('post' === $screen->post_type && $can_publish && current_user_can($post_type_object->cap->edit_others_posts)) : ?>
 
-	<?php	if ( $bulk ) : ?>
+	<?php	if ($bulk) : ?>
 
 				<label class="alignright">
-					<span class="title"><?php _e( 'Sticky' ); ?></span>
+					<span class="title"><?php _e('Sticky'); ?></span>
 					<select name="sticky">
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-						<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-						<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+						<option value="sticky"><?php _e('Sticky'); ?></option>
+						<option value="unsticky"><?php _e('Not Sticky'); ?></option>
 					</select>
 				</label>
 
@@ -1613,7 +1613,7 @@ 
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e('Make this post sticky'); ?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1624,20 +1624,20 @@ 
 
 	<?php
 
-	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$post_formats = get_theme_support( 'post-formats' );
+	if ($bulk && current_theme_supports('post-formats') && post_type_supports($screen->post_type, 'post-formats')) {
+		$post_formats = get_theme_support('post-formats');
 
 		?>
 		<label class="alignleft">
-		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
+		<span class="title"><?php _ex('Format', 'post format'); ?></span>
 		<select name="post_format">
-			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+			<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+			<option value="0"><?php echo get_post_format_string('standard'); ?></option>
 			<?php
-			if ( is_array( $post_formats[0] ) ) {
-				foreach ( $post_formats[0] as $format ) {
+			if (is_array($post_formats[0])) {
+				foreach ($post_formats[0] as $format) {
 					?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+					<option value="<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></option>
 					<?php
 				}
 			}
@@ -1652,13 +1652,13 @@ 
 		</div></fieldset>
 
 	<?php
-		list( $columns ) = $this->get_column_info();
+		list($columns) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
+		foreach ($columns as $column_name => $column_display_name) {
+			if (isset($core_columns[$column_name]))
 				continue;
 
-			if ( $bulk ) {
+			if ($bulk) {
 
 				/**
 				 * Fires once for each column in Bulk Edit mode.
@@ -1668,7 +1668,7 @@ 
 				 * @param string  $column_name Name of the column to edit.
 				 * @param WP_Post $post_type   The post type slug.
 				 */
-				do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+				do_action('bulk_edit_custom_box', $column_name, $screen->post_type);
 			} else {
 
 				/**
@@ -1679,25 +1679,25 @@ 
 				 * @param string $column_name Name of the column to edit.
 				 * @param string $post_type   The post type slug.
 				 */
-				do_action( 'quick_edit_custom_box', $column_name, $screen->post_type );
+				do_action('quick_edit_custom_box', $column_name, $screen->post_type);
 			}
 
 		}
 	?>
 		<p class="submit inline-edit-save">
-			<button type="button" class="button-secondary cancel alignleft"><?php _e( 'Cancel' ); ?></button>
-			<?php if ( ! $bulk ) {
-				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
+			<button type="button" class="button-secondary cancel alignleft"><?php _e('Cancel'); ?></button>
+			<?php if ( ! $bulk) {
+				wp_nonce_field('inlineeditnonce', '_inline_edit', false);
 				?>
-				<button type="button" class="button-primary save alignright"><?php _e( 'Update' ); ?></button>
+				<button type="button" class="button-primary save alignright"><?php _e('Update'); ?></button>
 				<span class="spinner"></span>
 			<?php } else {
-				submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false );
+				submit_button(__('Update'), 'button-primary alignright', 'bulk_edit', false);
 			} ?>
-			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
-			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
-			<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
-				<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
+			<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+			<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
+			<?php if ( ! $bulk && ! post_type_supports($screen->post_type, 'author')) { ?>
+				<input type="hidden" name="post_author" value="<?php echo esc_attr($post->post_author); ?>" />
 			<?php } ?>
 			<span class="error" style="display:none"></span>
 			<br class="clear" />

Braces +91 added lines, -59 removed lines

@@ -199,10 +199,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -266,8 +267,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -476,8 +478,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -526,19 +529,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' === $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' === $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -599,8 +604,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -619,13 +625,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -643,8 +651,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -668,10 +677,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -683,8 +693,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -692,16 +703,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -741,15 +754,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -764,8 +779,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1317,10 +1333,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
@@ -1350,10 +1367,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1386,8 +1406,9 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1398,7 +1419,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1447,8 +1470,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1466,8 +1490,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1558,13 +1583,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1609,11 +1637,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1655,8 +1686,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

src/wp-admin/includes/plugin.php

Doc Comments +4 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
  * @param bool   $markup      Optional. If the returned data should have HTML markup applied.
  *                            Default true.
  * @param bool   $translate   Optional. If the returned data should be translated. Default true.
- * @return array {
+ * @return string {
  *     Plugin data. Values will be empty if not supplied by the plugin.
  *
  *     @type string $Name        Name of the plugin. Should be unique.
@@ -180,7 +180,7 @@ 
  * @since 2.8.0
  *
  * @param string $plugin Plugin ID
- * @return array List of files relative to the plugin root.
+ * @return string[] List of files relative to the plugin root.
  */
 function get_plugin_files($plugin) {
 	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
@@ -978,7 +978,7 @@ 
  * @since 2.7.0
  *
  * @param string $plugin Relative plugin path from Plugin Directory.
- * @return true True if a plugin's uninstall.php file has been found and included.
+ * @return boolean|null True if a plugin's uninstall.php file has been found and included.
  */
 function uninstall_plugin($plugin) {
 	$file = plugin_basename($plugin);
@@ -1498,6 +1498,7 @@ 
  * @global array $_wp_real_parent_file
  * @global array $_wp_menu_nopriv
  * @global array $_wp_submenu_nopriv
+ * @return string
  */
 function get_admin_page_parent( $parent = '' ) {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,

Indentation +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Plugin Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Plugin Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Parses the plugin contents to retrieve plugin's metadata.
@@ -1280,21 +1280,21 @@ 
 	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
 }
 /**
- * Add submenu page to the Dashboard main menu.
- *
- * This function takes a capability which will be used to determine whether
- * or not a page is included in the menu.
- *
- * The function which is hooked in to handle the output of the page must check
- * that the user has the required capability as well.
- *
- * @param string   $page_title The text to be displayed in the title tags of the page when the menu is selected.
- * @param string   $menu_title The text to be used for the menu.
- * @param string   $capability The capability required for this menu to be displayed to the user.
- * @param string   $menu_slug  The slug name to refer to this menu by (should be unique for this menu).
- * @param callable $function   The function to be called to output the content for this page.
- * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
- */
+	 * Add submenu page to the Dashboard main menu.
+	 *
+	 * This function takes a capability which will be used to determine whether
+	 * or not a page is included in the menu.
+	 *
+	 * The function which is hooked in to handle the output of the page must check
+	 * that the user has the required capability as well.
+	 *
+	 * @param string   $page_title The text to be displayed in the title tags of the page when the menu is selected.
+	 * @param string   $menu_title The text to be used for the menu.
+	 * @param string   $capability The capability required for this menu to be displayed to the user.
+	 * @param string   $menu_slug  The slug name to refer to this menu by (should be unique for this menu).
+	 * @param callable $function   The function to be called to output the content for this page.
+	 * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
+	 */
 function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
 	return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function );
 }

Spacing +431 added lines, -431 removed lines

@@ -65,7 +65,7 @@ 
  *     @type bool   $Network     Whether the plugin can only be activated network-wide.
  * }
  */
-function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
+function get_plugin_data($plugin_file, $markup = true, $translate = true) {
 
 	$default_headers = array(
 		'Name' => 'Plugin Name',
@@ -81,19 +81,19 @@ 
 		'_sitewide' => 'Site Wide Only',
 	);
 
-	$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
+	$plugin_data = get_file_data($plugin_file, $default_headers, 'plugin');
 
 	// Site Wide Only is the old header for Network
-	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide'] ) {
+	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide']) {
 		/* translators: 1: Site Wide Only: true, 2: Network: true */
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The %1$s plugin header is deprecated. Use %2$s instead.' ), '<code>Site Wide Only: true</code>', '<code>Network: true</code>' ) );
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The %1$s plugin header is deprecated. Use %2$s instead.'), '<code>Site Wide Only: true</code>', '<code>Network: true</code>'));
 		$plugin_data['Network'] = $plugin_data['_sitewide'];
 	}
-	$plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) );
-	unset( $plugin_data['_sitewide'] );
+	$plugin_data['Network'] = ('true' == strtolower($plugin_data['Network']));
+	unset($plugin_data['_sitewide']);
 
-	if ( $markup || $translate ) {
-		$plugin_data = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup, $translate );
+	if ($markup || $translate) {
+		$plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup, $translate);
 	} else {
 		$plugin_data['Title']      = $plugin_data['Name'];
 		$plugin_data['AuthorName'] = $plugin_data['Author'];
@@ -109,66 +109,66 @@ 
  * @access private
  * @see get_plugin_data()
  */
-function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup = true, $translate = true ) {
+function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = true, $translate = true) {
 
 	// Sanitize the plugin filename to a WP_PLUGIN_DIR relative path
-	$plugin_file = plugin_basename( $plugin_file );
+	$plugin_file = plugin_basename($plugin_file);
 
 	// Translate fields
-	if ( $translate ) {
-		if ( $textdomain = $plugin_data['TextDomain'] ) {
-			if ( ! is_textdomain_loaded( $textdomain ) ) {
-				if ( $plugin_data['DomainPath'] ) {
-					load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
+	if ($translate) {
+		if ($textdomain = $plugin_data['TextDomain']) {
+			if ( ! is_textdomain_loaded($textdomain)) {
+				if ($plugin_data['DomainPath']) {
+					load_plugin_textdomain($textdomain, false, dirname($plugin_file).$plugin_data['DomainPath']);
 				} else {
-					load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
+					load_plugin_textdomain($textdomain, false, dirname($plugin_file));
 				}
 			}
-		} elseif ( 'hello.php' == basename( $plugin_file ) ) {
+		} elseif ('hello.php' == basename($plugin_file)) {
 			$textdomain = 'default';
 		}
-		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
-				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+		if ($textdomain) {
+			foreach (array('Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version') as $field)
+				$plugin_data[$field] = translate($plugin_data[$field], $textdomain);
 		}
 	}
 
 	// Sanitize fields
 	$allowed_tags = $allowed_tags_in_links = array(
-		'abbr'    => array( 'title' => true ),
-		'acronym' => array( 'title' => true ),
+		'abbr'    => array('title' => true),
+		'acronym' => array('title' => true),
 		'code'    => true,
 		'em'      => true,
 		'strong'  => true,
 	);
-	$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+	$allowed_tags['a'] = array('href' => true, 'title' => true);
 
 	// Name is marked up inside <a> tags. Don't allow these.
 	// Author is too, but some plugins have used <a> here (omitting Author URI).
-	$plugin_data['Name']        = wp_kses( $plugin_data['Name'],        $allowed_tags_in_links );
-	$plugin_data['Author']      = wp_kses( $plugin_data['Author'],      $allowed_tags );
+	$plugin_data['Name']        = wp_kses($plugin_data['Name'], $allowed_tags_in_links);
+	$plugin_data['Author']      = wp_kses($plugin_data['Author'], $allowed_tags);
 
-	$plugin_data['Description'] = wp_kses( $plugin_data['Description'], $allowed_tags );
-	$plugin_data['Version']     = wp_kses( $plugin_data['Version'],     $allowed_tags );
+	$plugin_data['Description'] = wp_kses($plugin_data['Description'], $allowed_tags);
+	$plugin_data['Version']     = wp_kses($plugin_data['Version'], $allowed_tags);
 
-	$plugin_data['PluginURI']   = esc_url( $plugin_data['PluginURI'] );
-	$plugin_data['AuthorURI']   = esc_url( $plugin_data['AuthorURI'] );
+	$plugin_data['PluginURI']   = esc_url($plugin_data['PluginURI']);
+	$plugin_data['AuthorURI']   = esc_url($plugin_data['AuthorURI']);
 
 	$plugin_data['Title']      = $plugin_data['Name'];
 	$plugin_data['AuthorName'] = $plugin_data['Author'];
 
 	// Apply markup
-	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
-			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+	if ($markup) {
+		if ($plugin_data['PluginURI'] && $plugin_data['Name'])
+			$plugin_data['Title'] = '<a href="'.$plugin_data['PluginURI'].'">'.$plugin_data['Name'].'</a>';
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
-			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		if ($plugin_data['AuthorURI'] && $plugin_data['Author'])
+			$plugin_data['Author'] = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
 
-		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
+		$plugin_data['Description'] = wptexturize($plugin_data['Description']);
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ($plugin_data['Author'])
+			$plugin_data['Description'] .= ' <cite>'.sprintf(__('By %s.'), $plugin_data['Author']).'</cite>';
 	}
 
 	return $plugin_data;
@@ -183,31 +183,31 @@ 
  * @return array List of files relative to the plugin root.
  */
 function get_plugin_files($plugin) {
-	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
+	$plugin_file = WP_PLUGIN_DIR.'/'.$plugin;
 	$dir = dirname($plugin_file);
 	$plugin_files = array($plugin);
-	if ( is_dir($dir) && $dir != WP_PLUGIN_DIR ) {
-		$plugins_dir = @ opendir( $dir );
-		if ( $plugins_dir ) {
-			while (($file = readdir( $plugins_dir ) ) !== false ) {
-				if ( substr($file, 0, 1) == '.' )
+	if (is_dir($dir) && $dir != WP_PLUGIN_DIR) {
+		$plugins_dir = @ opendir($dir);
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if (substr($file, 0, 1) == '.')
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$plugins_subdir = @ opendir( $dir . '/' . $file );
-					if ( $plugins_subdir ) {
-						while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-							if ( substr($subfile, 0, 1) == '.' )
+				if (is_dir($dir.'/'.$file)) {
+					$plugins_subdir = @ opendir($dir.'/'.$file);
+					if ($plugins_subdir) {
+						while (($subfile = readdir($plugins_subdir)) !== false) {
+							if (substr($subfile, 0, 1) == '.')
 								continue;
 							$plugin_files[] = plugin_basename("$dir/$file/$subfile");
 						}
-						@closedir( $plugins_subdir );
+						@closedir($plugins_subdir);
 					}
 				} else {
-					if ( plugin_basename("$dir/$file") != $plugin )
+					if (plugin_basename("$dir/$file") != $plugin)
 						$plugin_files[] = plugin_basename("$dir/$file");
 				}
 			}
-			@closedir( $plugins_dir );
+			@closedir($plugins_dir);
 		}
 	}
 
@@ -236,61 +236,61 @@ 
  */
 function get_plugins($plugin_folder = '') {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
+	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins'))
 		$cache_plugins = array();
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
-		return $cache_plugins[ $plugin_folder ];
+	if (isset($cache_plugins[$plugin_folder]))
+		return $cache_plugins[$plugin_folder];
 
-	$wp_plugins = array ();
+	$wp_plugins = array();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
+	if ( ! empty($plugin_folder))
 		$plugin_root .= $plugin_folder;
 
 	// Files in wp-content/plugins directory
-	$plugins_dir = @ opendir( $plugin_root);
+	$plugins_dir = @ opendir($plugin_root);
 	$plugin_files = array();
-	if ( $plugins_dir ) {
-		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
+	if ($plugins_dir) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, 0, 1) == '.')
 				continue;
-			if ( is_dir( $plugin_root.'/'.$file ) ) {
-				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
-				if ( $plugins_subdir ) {
-					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
+			if (is_dir($plugin_root.'/'.$file)) {
+				$plugins_subdir = @ opendir($plugin_root.'/'.$file);
+				if ($plugins_subdir) {
+					while (($subfile = readdir($plugins_subdir)) !== false) {
+						if (substr($subfile, 0, 1) == '.')
 							continue;
-						if ( substr($subfile, -4) == '.php' )
+						if (substr($subfile, -4) == '.php')
 							$plugin_files[] = "$file/$subfile";
 					}
-					closedir( $plugins_subdir );
+					closedir($plugins_subdir);
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
+				if (substr($file, -4) == '.php')
 					$plugin_files[] = $file;
 			}
 		}
-		closedir( $plugins_dir );
+		closedir($plugins_dir);
 	}
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable("$plugin_root/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data("$plugin_root/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			continue;
 
-		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
+		$wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
 	}
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
-	$cache_plugins[ $plugin_folder ] = $wp_plugins;
+	$cache_plugins[$plugin_folder] = $wp_plugins;
 	wp_cache_set('plugins', $cache_plugins, 'plugins');
 
 	return $wp_plugins;
@@ -309,38 +309,38 @@ 
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $wp_plugins;
-	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
+	if ($plugins_dir = @ opendir(WPMU_PLUGIN_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, -4) == '.php')
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $wp_plugins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WPMU_PLUGIN_DIR."/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data(WPMU_PLUGIN_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
 
-		$wp_plugins[ $plugin_file ] = $plugin_data;
+		$wp_plugins[$plugin_file] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
-		unset( $wp_plugins['index.php'] );
+	if (isset($wp_plugins['index.php']) && filesize(WPMU_PLUGIN_DIR.'/index.php') <= 30) // silence is golden
+		unset($wp_plugins['index.php']);
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
 	return $wp_plugins;
 }
@@ -351,8 +351,8 @@ 
  * @since 3.1.0
  * @access private
  */
-function _sort_uname_callback( $a, $b ) {
-	return strnatcasecmp( $a['Name'], $b['Name'] );
+function _sort_uname_callback($a, $b) {
+	return strnatcasecmp($a['Name'], $b['Name']);
 }
 
 /**
@@ -368,30 +368,30 @@ 
 	$_dropins = _get_dropins();
 
 	// These exist in the wp-content directory
-	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
+	if ($plugins_dir = @ opendir(WP_CONTENT_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (isset($_dropins[$file]))
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $dropins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $dropins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WP_CONTENT_DIR."/$plugin_file"))
 			continue;
-		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
+		$plugin_data = get_plugin_data(WP_CONTENT_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
+		if (empty($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
-		$dropins[ $plugin_file ] = $plugin_data;
+		$dropins[$plugin_file] = $plugin_data;
 	}
 
-	uksort( $dropins, 'strnatcasecmp' );
+	uksort($dropins, 'strnatcasecmp');
 
 	return $dropins;
 }
@@ -408,19 +408,19 @@ 
  */
 function _get_dropins() {
 	$dropins = array(
-		'advanced-cache.php' => array( __( 'Advanced caching plugin.'       ), 'WP_CACHE' ), // WP_CACHE
-		'db.php'             => array( __( 'Custom database class.'         ), true ), // auto on load
-		'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
-		'install.php'        => array( __( 'Custom install script.'         ), true ), // auto on install
-		'maintenance.php'    => array( __( 'Custom maintenance message.'    ), true ), // auto on maintenance
-		'object-cache.php'   => array( __( 'External object cache.'         ), true ), // auto on load
+		'advanced-cache.php' => array(__('Advanced caching plugin.'), 'WP_CACHE'), // WP_CACHE
+		'db.php'             => array(__('Custom database class.'), true), // auto on load
+		'db-error.php'       => array(__('Custom database error message.'), true), // auto on error
+		'install.php'        => array(__('Custom install script.'), true), // auto on install
+		'maintenance.php'    => array(__('Custom maintenance message.'), true), // auto on maintenance
+		'object-cache.php'   => array(__('External object cache.'), true), // auto on load
 	);
 
-	if ( is_multisite() ) {
-		$dropins['sunrise.php'       ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
-		$dropins['blog-deleted.php'  ] = array( __( 'Custom site deleted message.'   ), true ); // auto on deleted blog
-		$dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.'  ), true ); // auto on inactive blog
-		$dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
+	if (is_multisite()) {
+		$dropins['sunrise.php'] = array(__('Executed before Multisite is loaded.'), 'SUNRISE'); // SUNRISE
+		$dropins['blog-deleted.php'] = array(__('Custom site deleted message.'), true); // auto on deleted blog
+		$dropins['blog-inactive.php'] = array(__('Custom site inactive message.'), true); // auto on inactive blog
+		$dropins['blog-suspended.php'] = array(__('Custom site suspended message.'), true); // auto on archived or spammed blog
 	}
 
 	return $dropins;
@@ -439,8 +439,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if in the active plugins list. False, not in the list.
  */
-function is_plugin_active( $plugin ) {
-	return in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) || is_plugin_active_for_network( $plugin );
+function is_plugin_active($plugin) {
+	return in_array($plugin, (array) get_option('active_plugins', array())) || is_plugin_active_for_network($plugin);
 }
 
 /**
@@ -454,8 +454,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True if inactive. False if active.
  */
-function is_plugin_inactive( $plugin ) {
-	return ! is_plugin_active( $plugin );
+function is_plugin_inactive($plugin) {
+	return ! is_plugin_active($plugin);
 }
 
 /**
@@ -471,12 +471,12 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if active for the network, otherwise false.
  */
-function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
+function is_plugin_active_for_network($plugin) {
+	if ( ! is_multisite())
 		return false;
 
-	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
+	$plugins = get_site_option('active_sitewide_plugins');
+	if (isset($plugins[$plugin]))
 		return true;
 
 	return false;
@@ -494,9 +494,9 @@ 
  * @param string $plugin Plugin to check
  * @return bool True if plugin is network only, false otherwise.
  */
-function is_network_only_plugin( $plugin ) {
-	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
+function is_network_only_plugin($plugin) {
+	$plugin_data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
+	if ($plugin_data)
 		return $plugin_data['Network'];
 	return false;
 }
@@ -528,31 +528,31 @@ 
  * @param bool   $silent       Optional. Whether to prevent calling activation hooks. Default false.
  * @return WP_Error|null WP_Error on invalid file or null on success.
  */
-function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
-	$plugin = plugin_basename( trim( $plugin ) );
+function activate_plugin($plugin, $redirect = '', $network_wide = false, $silent = false) {
+	$plugin = plugin_basename(trim($plugin));
 
-	if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
+	if (is_multisite() && ($network_wide || is_network_only_plugin($plugin))) {
 		$network_wide = true;
-		$current = get_site_option( 'active_sitewide_plugins', array() );
+		$current = get_site_option('active_sitewide_plugins', array());
 		$_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
 	} else {
-		$current = get_option( 'active_plugins', array() );
+		$current = get_option('active_plugins', array());
 	}
 
 	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
+	if (is_wp_error($valid))
 		return $valid;
 
-	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+	if (($network_wide && ! isset($current[$plugin])) || ( ! $network_wide && ! in_array($plugin, $current))) {
+		if ( ! empty($redirect))
+			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_'.$plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
 		ob_start();
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
 		$_wp_plugin_file = $plugin;
-		include_once( WP_PLUGIN_DIR . '/' . $plugin );
+		include_once(WP_PLUGIN_DIR.'/'.$plugin);
 		$plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is activated.
 			 *
@@ -565,7 +565,7 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_plugin', $plugin, $network_wide );
+			do_action('activate_plugin', $plugin, $network_wide);
 
 			/**
 			 * Fires as a specific plugin is being activated.
@@ -582,21 +582,21 @@ 
 			 * @param bool $network_wide Whether to enable the plugin for all sites in the network
 			 *                           or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_' . $plugin, $network_wide );
+			do_action('activate_'.$plugin, $network_wide);
 		}
 
-		if ( $network_wide ) {
-			$current = get_site_option( 'active_sitewide_plugins', array() );
+		if ($network_wide) {
+			$current = get_site_option('active_sitewide_plugins', array());
 			$current[$plugin] = time();
-			update_site_option( 'active_sitewide_plugins', $current );
+			update_site_option('active_sitewide_plugins', $current);
 		} else {
-			$current = get_option( 'active_plugins', array() );
+			$current = get_option('active_plugins', array());
 			$current[] = $plugin;
 			sort($current);
 			update_option('active_plugins', $current);
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires after a plugin has been activated.
 			 *
@@ -609,10 +609,10 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activated_plugin', $plugin, $network_wide );
+			do_action('activated_plugin', $plugin, $network_wide);
 		}
 
-		if ( ob_get_length() > 0 ) {
+		if (ob_get_length() > 0) {
 			$output = ob_get_clean();
 			return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
 		}
@@ -635,20 +635,20 @@ 
  * @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
  * 	A value of null (the default) will deactivate plugins for both the site and the network.
  */
-function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
-		$network_current = get_site_option( 'active_sitewide_plugins', array() );
-	$current = get_option( 'active_plugins', array() );
+function deactivate_plugins($plugins, $silent = false, $network_wide = null) {
+	if (is_multisite())
+		$network_current = get_site_option('active_sitewide_plugins', array());
+	$current = get_option('active_plugins', array());
 	$do_blog = $do_network = false;
 
-	foreach ( (array) $plugins as $plugin ) {
-		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
+	foreach ((array) $plugins as $plugin) {
+		$plugin = plugin_basename(trim($plugin));
+		if ( ! is_plugin_active($plugin))
 			continue;
 
-		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
+		$network_deactivating = false !== $network_wide && is_plugin_active_for_network($plugin);
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is deactivated.
 			 *
@@ -661,27 +661,27 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_plugin', $plugin, $network_deactivating );
+			do_action('deactivate_plugin', $plugin, $network_deactivating);
 		}
 
-		if ( false !== $network_wide ) {
-			if ( is_plugin_active_for_network( $plugin ) ) {
+		if (false !== $network_wide) {
+			if (is_plugin_active_for_network($plugin)) {
 				$do_network = true;
-				unset( $network_current[ $plugin ] );
-			} elseif ( $network_wide ) {
+				unset($network_current[$plugin]);
+			} elseif ($network_wide) {
 				continue;
 			}
 		}
 
-		if ( true !== $network_wide ) {
-			$key = array_search( $plugin, $current );
-			if ( false !== $key ) {
+		if (true !== $network_wide) {
+			$key = array_search($plugin, $current);
+			if (false !== $key) {
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset($current[$key]);
 			}
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires as a specific plugin is being deactivated.
 			 *
@@ -697,7 +697,7 @@ 
 			 * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                   or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_' . $plugin, $network_deactivating );
+			do_action('deactivate_'.$plugin, $network_deactivating);
 
 			/**
 			 * Fires after a plugin is deactivated.
@@ -711,14 +711,14 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default false.
 			 */
-			do_action( 'deactivated_plugin', $plugin, $network_deactivating );
+			do_action('deactivated_plugin', $plugin, $network_deactivating);
 		}
 	}
 
-	if ( $do_blog )
+	if ($do_blog)
 		update_option('active_plugins', $current);
-	if ( $do_network )
-		update_site_option( 'active_sitewide_plugins', $network_current );
+	if ($do_network)
+		update_site_option('active_sitewide_plugins', $network_current);
 }
 
 /**
@@ -737,20 +737,20 @@ 
  * @param bool $silent Prevent calling activation hooks. Default is false.
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
-function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
+function activate_plugins($plugins, $redirect = '', $network_wide = false, $silent = false) {
+	if ( ! is_array($plugins))
 		$plugins = array($plugins);
 
 	$errors = array();
-	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
+	foreach ($plugins as $plugin) {
+		if ( ! empty($redirect))
 			$redirect = add_query_arg('plugin', $plugin, $redirect);
 		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
+		if (is_wp_error($result))
 			$errors[$plugin] = $result;
 	}
 
-	if ( !empty($errors) )
+	if ( ! empty($errors))
 		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
 
 	return true;
@@ -768,64 +768,64 @@ 
  * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure.
  *                            Null if filesystem credentials are required to proceed.
  */
-function delete_plugins( $plugins, $deprecated = '' ) {
+function delete_plugins($plugins, $deprecated = '') {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
+	if (empty($plugins))
 		return false;
 
 	$checked = array();
-	foreach ( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
+	foreach ($plugins as $plugin)
+		$checked[] = 'checked[]='.$plugin;
 
 	ob_start();
-	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
-	if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&'.implode('&', $checked), 'bulk-plugins');
+	if (false === ($credentials = request_filesystem_credentials($url))) {
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem($credentials) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty( $plugins_dir ) ) {
-		return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress Plugin directory.' ) );
+	if (empty($plugins_dir)) {
+		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
 	}
 
-	$plugins_dir = trailingslashit( $plugins_dir );
+	$plugins_dir = trailingslashit($plugins_dir);
 
-	$plugin_translations = wp_get_installed_translations( 'plugins' );
+	$plugin_translations = wp_get_installed_translations('plugins');
 
 	$errors = array();
 
-	foreach ( $plugins as $plugin_file ) {
+	foreach ($plugins as $plugin_file) {
 		// Run Uninstall hook.
-		if ( is_uninstallable_plugin( $plugin_file ) ) {
+		if (is_uninstallable_plugin($plugin_file)) {
 			uninstall_plugin($plugin_file);
 		}
 
@@ -836,15 +836,15 @@ 
 		 *
 		 * @param string $plugin_file Plugin file name.
 		 */
-		do_action( 'delete_plugin', $plugin_file );
+		do_action('delete_plugin', $plugin_file);
 
-		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir.$plugin_file));
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
-			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
+		if (strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
+			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file );
+			$deleted = $wp_filesystem->delete($plugins_dir.$plugin_file);
 		}
 
 		/**
@@ -855,39 +855,39 @@ 
 		 * @param string $plugin_file Plugin file name.
 		 * @param bool   $deleted     Whether the plugin deletion was successful.
 		 */
-		do_action( 'deleted_plugin', $plugin_file, $deleted );
+		do_action('deleted_plugin', $plugin_file, $deleted);
 
-		if ( ! $deleted ) {
+		if ( ! $deleted) {
 			$errors[] = $plugin_file;
 			continue;
 		}
 
 		// Remove language files, silently.
-		$plugin_slug = dirname( $plugin_file );
-		if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
-			$translations = $plugin_translations[ $plugin_slug ];
+		$plugin_slug = dirname($plugin_file);
+		if ('.' !== $plugin_slug && ! empty($plugin_translations[$plugin_slug])) {
+			$translations = $plugin_translations[$plugin_slug];
 
-			foreach ( $translations as $translation => $data ) {
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.po' );
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.mo' );
+			foreach ($translations as $translation => $data) {
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.po');
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.mo');
 			}
 		}
 	}
 
 	// Remove deleted plugins from the plugin updates list.
-	if ( $current = get_site_transient('update_plugins') ) {
+	if ($current = get_site_transient('update_plugins')) {
 		// Don't remove the plugins that weren't deleted.
-		$deleted = array_diff( $plugins, $errors );
+		$deleted = array_diff($plugins, $errors);
 
-		foreach ( $deleted as $plugin_file ) {
-			unset( $current->response[ $plugin_file ] );
+		foreach ($deleted as $plugin_file) {
+			unset($current->response[$plugin_file]);
 		}
 
-		set_site_transient( 'update_plugins', $current );
+		set_site_transient('update_plugins', $current);
 	}
 
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	if ( ! empty($errors))
+		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)));
 
 	return true;
 }
@@ -902,29 +902,29 @@ 
  * @return array invalid plugins, plugin as key, error as value
  */
 function validate_active_plugins() {
-	$plugins = get_option( 'active_plugins', array() );
+	$plugins = get_option('active_plugins', array());
 	// Validate vartype: array.
-	if ( ! is_array( $plugins ) ) {
-		update_option( 'active_plugins', array() );
+	if ( ! is_array($plugins)) {
+		update_option('active_plugins', array());
 		$plugins = array();
 	}
 
-	if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-		$network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
+	if (is_multisite() && current_user_can('manage_network_plugins')) {
+		$network_plugins = (array) get_site_option('active_sitewide_plugins', array());
+		$plugins = array_merge($plugins, array_keys($network_plugins));
 	}
 
-	if ( empty( $plugins ) )
+	if (empty($plugins))
 		return array();
 
 	$invalid = array();
 
 	// Invalid plugins get deactivated.
-	foreach ( $plugins as $plugin ) {
-		$result = validate_plugin( $plugin );
-		if ( is_wp_error( $result ) ) {
+	foreach ($plugins as $plugin) {
+		$result = validate_plugin($plugin);
+		if (is_wp_error($result)) {
 			$invalid[$plugin] = $result;
-			deactivate_plugins( $plugin, true );
+			deactivate_plugins($plugin, true);
 		}
 	}
 	return $invalid;
@@ -941,13 +941,13 @@ 
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
 function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
+	if (validate_file($plugin))
 		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
+	if ( ! file_exists(WP_PLUGIN_DIR.'/'.$plugin))
 		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
+	if ( ! isset($installed_plugins[$plugin]))
 		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
 	return 0;
 }
@@ -964,7 +964,7 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
+	if (isset($uninstallable_plugins[$file]) || file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php'))
 		return true;
 
 	return false;
@@ -993,32 +993,32 @@ 
 	 * @param string $plugin                Relative plugin path from plugin directory.
 	 * @param array  $uninstallable_plugins Uninstallable plugins.
 	 */
-	do_action( 'pre_uninstall_plugin', $plugin, $uninstallable_plugins );
+	do_action('pre_uninstall_plugin', $plugin, $uninstallable_plugins);
 
-	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
-		if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php')) {
+		if (isset($uninstallable_plugins[$file])) {
 			unset($uninstallable_plugins[$file]);
 			update_option('uninstall_plugins', $uninstallable_plugins);
 		}
 		unset($uninstallable_plugins);
 
 		define('WP_UNINSTALL_PLUGIN', $file);
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) );
-		include( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.dirname($file));
+		include(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php');
 
 		return true;
 	}
 
-	if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (isset($uninstallable_plugins[$file])) {
 		$callable = $uninstallable_plugins[$file];
 		unset($uninstallable_plugins[$file]);
 		update_option('uninstall_plugins', $uninstallable_plugins);
 		unset($uninstallable_plugins);
 
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-		include( WP_PLUGIN_DIR . '/' . $file );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$file);
+		include(WP_PLUGIN_DIR.'/'.$file);
 
-		add_action( 'uninstall_' . $file, $callable );
+		add_action('uninstall_'.$file, $callable);
 
 		/**
 		 * Fires in uninstall_plugin() once the plugin has been uninstalled.
@@ -1028,7 +1028,7 @@ 
 		 *
 		 * @since 2.7.0
 		 */
-		do_action( 'uninstall_' . $file );
+		do_action('uninstall_'.$file);
 	}
 }
 
@@ -1064,35 +1064,35 @@ 
  * @param int      $position   The position in the menu order this one should appear.
  * @return string The resulting page's hook_suffix.
  */
-function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
+function add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null) {
 	global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
+	$menu_slug = plugin_basename($menu_slug);
 
-	$admin_page_hooks[$menu_slug] = sanitize_title( $menu_title );
+	$admin_page_hooks[$menu_slug] = sanitize_title($menu_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, '' );
+	$hookname = get_plugin_page_hookname($menu_slug, '');
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
-		add_action( $hookname, $function );
+	if ( ! empty($function) && ! empty($hookname) && current_user_can($capability))
+		add_action($hookname, $function);
 
-	if ( empty($icon_url) ) {
+	if (empty($icon_url)) {
 		$icon_url = 'dashicons-admin-generic';
 		$icon_class = 'menu-icon-generic ';
 	} else {
-		$icon_url = set_url_scheme( $icon_url );
+		$icon_url = set_url_scheme($icon_url);
 		$icon_class = '';
 	}
 
-	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
+	$new_menu = array($menu_title, $capability, $menu_slug, $page_title, 'menu-top '.$icon_class.$hookname, $hookname, $icon_url);
 
-	if ( null === $position ) {
+	if (null === $position) {
 		$menu[] = $new_menu;
-	} elseif ( isset( $menu[ "$position" ] ) ) {
-	 	$position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ) , -5 ) * 0.00001;
-		$menu[ "$position" ] = $new_menu;
+	} elseif (isset($menu["$position"])) {
+	 	$position = $position + substr(base_convert(md5($menu_slug.$menu_title), 16, 10), -5) * 0.00001;
+		$menu["$position"] = $new_menu;
 	} else {
-		$menu[ $position ] = $new_menu;
+		$menu[$position] = $new_menu;
 	}
 
 	$_registered_pages[$hookname] = true;
@@ -1127,17 +1127,17 @@ 
  * @param callable $function    The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
+function add_submenu_page($parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '') {
 	global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
 		$_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
-	$parent_slug = plugin_basename( $parent_slug);
+	$menu_slug = plugin_basename($menu_slug);
+	$parent_slug = plugin_basename($parent_slug);
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
+	if (isset($_wp_real_parent_file[$parent_slug]))
 		$parent_slug = $_wp_real_parent_file[$parent_slug];
 
-	if ( !current_user_can( $capability ) ) {
+	if ( ! current_user_can($capability)) {
 		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
 		return false;
 	}
@@ -1148,18 +1148,18 @@ 
 	 * parent file someone is trying to link back to the parent manually. In
 	 * this case, don't automatically add a link back to avoid duplication.
 	 */
-	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+	if ( ! isset($submenu[$parent_slug]) && $menu_slug != $parent_slug) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $parent_slug && current_user_can($parent_menu[1]))
+				$submenu[$parent_slug][] = array_slice($parent_menu, 0, 4);
 		}
 	}
 
-	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
+	$submenu[$parent_slug][] = array($menu_title, $capability, $menu_slug, $page_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
+	$hookname = get_plugin_page_hookname($menu_slug, $parent_slug);
+	if ( ! empty ($function) && ! empty ($hookname))
+		add_action($hookname, $function);
 
 	$_registered_pages[$hookname] = true;
 
@@ -1167,8 +1167,8 @@ 
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ('tools.php' == $parent_slug)
+		$_registered_pages[get_plugin_page_hookname($menu_slug, 'edit.php')] = true;
 
 	// No parent as top level.
 	$_parent_pages[$menu_slug] = $parent_slug;
@@ -1192,8 +1192,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_management_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('tools.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1212,8 +1212,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_options_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1232,8 +1232,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_theme_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('themes.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1252,8 +1252,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_plugins_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1272,12 +1272,12 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
+function add_users_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	if (current_user_can('edit_users'))
 		$parent = 'users.php';
 	else
 		$parent = 'profile.php';
-	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
+	return add_submenu_page($parent, $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 /**
  * Add submenu page to the Dashboard main menu.
@@ -1295,8 +1295,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_dashboard_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('index.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1315,8 +1315,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_posts_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1335,8 +1335,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_media_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('upload.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1355,8 +1355,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_links_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1375,8 +1375,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_pages_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1395,8 +1395,8 @@ 
  * @param callable $function   The function to be called to output the content for this page.
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_comments_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1409,12 +1409,12 @@ 
  * @param string $menu_slug The slug of the menu.
  * @return array|bool The removed menu on success, false if not found.
  */
-function remove_menu_page( $menu_slug ) {
+function remove_menu_page($menu_slug) {
 	global $menu;
 
-	foreach ( $menu as $i => $item ) {
-		if ( $menu_slug == $item[2] ) {
-			unset( $menu[$i] );
+	foreach ($menu as $i => $item) {
+		if ($menu_slug == $item[2]) {
+			unset($menu[$i]);
 			return $item;
 		}
 	}
@@ -1433,15 +1433,15 @@ 
  * @param string $submenu_slug The slug of the submenu.
  * @return array|bool The removed submenu on success, false if not found.
  */
-function remove_submenu_page( $menu_slug, $submenu_slug ) {
+function remove_submenu_page($menu_slug, $submenu_slug) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
+	if ( ! isset($submenu[$menu_slug]))
 		return false;
 
-	foreach ( $submenu[$menu_slug] as $i => $item ) {
-		if ( $submenu_slug == $item[2] ) {
-			unset( $submenu[$menu_slug][$i] );
+	foreach ($submenu[$menu_slug] as $i => $item) {
+		if ($submenu_slug == $item[2]) {
+			unset($submenu[$menu_slug][$i]);
 			return $item;
 		}
 	}
@@ -1465,12 +1465,12 @@ 
 function menu_page_url($menu_slug, $echo = true) {
 	global $_parent_pages;
 
-	if ( isset( $_parent_pages[$menu_slug] ) ) {
+	if (isset($_parent_pages[$menu_slug])) {
 		$parent_slug = $_parent_pages[$menu_slug];
-		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
-			$url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
+		if ($parent_slug && ! isset($_parent_pages[$parent_slug])) {
+			$url = admin_url(add_query_arg('page', $menu_slug, $parent_slug));
 		} else {
-			$url = admin_url( 'admin.php?page=' . $menu_slug );
+			$url = admin_url('admin.php?page='.$menu_slug);
 		}
 	} else {
 		$url = '';
@@ -1478,7 +1478,7 @@ 
 
 	$url = esc_url($url);
 
-	if ( $echo )
+	if ($echo)
 		echo $url;
 
 	return $url;
@@ -1499,58 +1499,58 @@ 
  * @global array $_wp_menu_nopriv
  * @global array $_wp_submenu_nopriv
  */
-function get_admin_page_parent( $parent = '' ) {
+function get_admin_page_parent($parent = '') {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
-	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
+	if ( ! empty ($parent) && 'admin.php' != $parent) {
+		if (isset($_wp_real_parent_file[$parent]))
 			$parent = $_wp_real_parent_file[$parent];
 		return $parent;
 	}
 
-	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $plugin_page ) {
+	if ($pagenow == 'admin.php' && isset($plugin_page)) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $plugin_page) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
+				if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 				return $parent_file;
 			}
 		}
-		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+		if (isset($_wp_menu_nopriv[$plugin_page])) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
+			if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 			return $parent_file;
 		}
 	}
 
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+	if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page])) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
+		if (isset($_wp_real_parent_file[$parent_file]))
 			$parent_file = $_wp_real_parent_file[$parent_file];
 		return $parent_file;
 	}
 
-	foreach (array_keys( (array)$submenu ) as $parent) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
+	foreach (array_keys((array) $submenu) as $parent) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($_wp_real_parent_file[$parent]))
 				$parent = $_wp_real_parent_file[$parent];
-			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+			if ( ! empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow")) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+			} elseif ($submenu_array[2] == $pagenow && empty($typenow) && (empty($parent_file) || false === strpos($parent_file, '?'))) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+			} elseif (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
 				$parent_file = $parent;
 				return $parent;
 			}
 		}
 	}
 
-	if ( empty($parent_file) )
+	if (empty($parent_file))
 		$parent_file = '';
 	return '';
 }
@@ -1567,20 +1567,20 @@ 
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
+	if ( ! empty ($title))
 		return $title;
 
-	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
+	$hook = get_plugin_page_hook($plugin_page, $pagenow);
 
 	$parent = $parent1 = get_admin_page_parent();
 
-	if ( empty ( $parent) ) {
-		foreach ( (array)$menu as $menu_array ) {
-			if ( isset( $menu_array[3] ) ) {
-				if ( $menu_array[2] == $pagenow ) {
+	if (empty ($parent)) {
+		foreach ((array) $menu as $menu_array) {
+			if (isset($menu_array[3])) {
+				if ($menu_array[2] == $pagenow) {
 					$title = $menu_array[3];
 					return $menu_array[3];
-				} elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+				} elseif (isset($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) {
 					$title = $menu_array[3];
 					return $menu_array[3];
 				}
@@ -1590,26 +1590,26 @@ 
 			}
 		}
 	} else {
-		foreach ( array_keys( $submenu ) as $parent ) {
-			foreach ( $submenu[$parent] as $submenu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $submenu_array[2] ) &&
+		foreach (array_keys($submenu) as $parent) {
+			foreach ($submenu[$parent] as $submenu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $submenu_array[2]) &&
 					(
-						( $parent == $pagenow ) ||
-						( $parent == $plugin_page ) ||
-						( $plugin_page == $hook ) ||
-						( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
-						( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
+						($parent == $pagenow) ||
+						($parent == $plugin_page) ||
+						($plugin_page == $hook) ||
+						($pagenow == 'admin.php' && $parent1 != $submenu_array[2]) ||
+						( ! empty($typenow) && $parent == $pagenow.'?post_type='.$typenow)
 					)
 					) {
 						$title = $submenu_array[3];
 						return $submenu_array[3];
 					}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ($submenu_array[2] != $pagenow || isset($_GET['page'])) // not the current page
 					continue;
 
-				if ( isset( $submenu_array[3] ) ) {
+				if (isset($submenu_array[3])) {
 					$title = $submenu_array[3];
 					return $submenu_array[3];
 				} else {
@@ -1618,12 +1618,12 @@ 
 				}
 			}
 		}
-		if ( empty ( $title ) ) {
-			foreach ( $menu as $menu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $menu_array[2] ) &&
-					( $pagenow == 'admin.php' ) &&
-					( $parent1 == $menu_array[2] ) )
+		if (empty ($title)) {
+			foreach ($menu as $menu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $menu_array[2]) &&
+					($pagenow == 'admin.php') &&
+					($parent1 == $menu_array[2]))
 					{
 						$title = $menu_array[3];
 						return $menu_array[3];
@@ -1642,9 +1642,9 @@ 
  * @param string $parent_page
  * @return string|null
  */
-function get_plugin_page_hook( $plugin_page, $parent_page ) {
-	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
+function get_plugin_page_hook($plugin_page, $parent_page) {
+	$hook = get_plugin_page_hookname($plugin_page, $parent_page);
+	if (has_action($hook))
 		return $hook;
 	else
 		return null;
@@ -1656,25 +1656,25 @@ 
  * @param string $plugin_page
  * @param string $parent_page
  */
-function get_plugin_page_hookname( $plugin_page, $parent_page ) {
+function get_plugin_page_hookname($plugin_page, $parent_page) {
 	global $admin_page_hooks;
 
-	$parent = get_admin_page_parent( $parent_page );
+	$parent = get_admin_page_parent($parent_page);
 
 	$page_type = 'admin';
-	if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
-		if ( isset( $admin_page_hooks[$plugin_page] ) ) {
+	if (empty ($parent_page) || 'admin.php' == $parent_page || isset($admin_page_hooks[$plugin_page])) {
+		if (isset($admin_page_hooks[$plugin_page])) {
 			$page_type = 'toplevel';
-		} elseif ( isset( $admin_page_hooks[$parent] )) {
+		} elseif (isset($admin_page_hooks[$parent])) {
 			$page_type = $admin_page_hooks[$parent];
 		}
-	} elseif ( isset( $admin_page_hooks[$parent] ) ) {
+	} elseif (isset($admin_page_hooks[$parent])) {
 		$page_type = $admin_page_hooks[$parent];
 	}
 
-	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
+	$plugin_name = preg_replace('!\.php!', '', $plugin_page);
 
-	return $page_type . '_page_' . $plugin_name;
+	return $page_type.'_page_'.$plugin_name;
 }
 
 /**
@@ -1693,49 +1693,49 @@ 
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
+	if ( ! isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$pagenow]))
 		return false;
 
-	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
+	if (isset($plugin_page)) {
+		if (isset($_wp_submenu_nopriv[$parent][$plugin_page]))
 			return false;
 
 		$hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-		if ( !isset($_registered_pages[$hookname]) )
+		if ( ! isset($_registered_pages[$hookname]))
 			return false;
 	}
 
-	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
+	if (empty($parent)) {
+		if (isset($_wp_menu_nopriv[$pagenow]))
 			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
+		if (isset($_wp_submenu_nopriv[$pagenow][$pagenow]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_menu_nopriv[$plugin_page]))
 			return false;
-		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
+		foreach (array_keys($_wp_submenu_nopriv) as $key) {
+			if (isset($_wp_submenu_nopriv[$key][$pagenow]))
 				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
+			if (isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]))
 			return false;
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+	if (isset($plugin_page) && ($plugin_page == $parent) && isset($_wp_menu_nopriv[$plugin_page]))
 		return false;
 
-	if ( isset( $submenu[$parent] ) ) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
+	if (isset($submenu[$parent])) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($plugin_page) && ($submenu_array[2] == $plugin_page)) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
-			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
+			} elseif ($submenu_array[2] == $pagenow) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
@@ -1743,9 +1743,9 @@ 
 		}
 	}
 
-	foreach ( $menu as $menu_array ) {
-		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
+	foreach ($menu as $menu_array) {
+		if ($menu_array[2] == $parent) {
+			if (current_user_can($menu_array[1]))
 				return true;
 			else
 				return false;
@@ -1769,22 +1769,22 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function register_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function register_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( $sanitize_callback != '' )
-		add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$new_whitelist_options[$option_group][] = $option_name;
+	if ($sanitize_callback != '')
+		add_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1798,24 +1798,24 @@ 
  * @param string   $option_name
  * @param callable $sanitize_callback
  */
-function unregister_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function unregister_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false )
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
-	if ( $sanitize_callback != '' )
-		remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$pos = array_search($option_name, (array) $new_whitelist_options[$option_group]);
+	if ($pos !== false)
+		unset($new_whitelist_options[$option_group][$pos]);
+	if ($sanitize_callback != '')
+		remove_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1828,11 +1828,11 @@ 
  * @param array $options
  * @return array
  */
-function option_update_filter( $options ) {
+function option_update_filter($options) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
-		$options = add_option_whitelist( $new_whitelist_options, $options );
+	if (is_array($new_whitelist_options))
+		$options = add_option_whitelist($new_whitelist_options, $options);
 
 	return $options;
 }
@@ -1848,21 +1848,21 @@ 
  * @param string|array $options
  * @return array
  */
-function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
+function add_option_whitelist($new_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $new_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
-				$whitelist_options[ $page ] = array();
-				$whitelist_options[ $page ][] = $key;
+	foreach ($new_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if ( ! isset($whitelist_options[$page]) || ! is_array($whitelist_options[$page])) {
+				$whitelist_options[$page] = array();
+				$whitelist_options[$page][] = $key;
 			} else {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
-					$whitelist_options[ $page ][] = $key;
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos === false)
+					$whitelist_options[$page][] = $key;
 			}
 		}
 	}
@@ -1881,18 +1881,18 @@ 
  * @param string|array $options
  * @return array
  */
-function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
+function remove_option_whitelist($del_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $del_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
-					unset( $whitelist_options[ $page ][ $pos ] );
+	foreach ($del_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if (isset($whitelist_options[$page]) && is_array($whitelist_options[$page])) {
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos !== false)
+					unset($whitelist_options[$page][$pos]);
 			}
 		}
 	}
@@ -1908,7 +1908,7 @@ 
  * @param string $option_group A settings group name. This should match the group name used in register_setting().
  */
 function settings_fields($option_group) {
-	echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
+	echo "<input type='hidden' name='option_page' value='".esc_attr($option_group)."' />";
 	echo '<input type="hidden" name="action" value="update" />';
 	wp_nonce_field("$option_group-options");
 }
@@ -1920,16 +1920,16 @@ 
  *
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
-function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_plugins' );
-	wp_cache_delete( 'plugins', 'plugins' );
+function wp_clean_plugins_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_plugins');
+	wp_cache_delete('plugins', 'plugins');
 }
 
 /**
  * @param string $plugin
  */
-function plugin_sandbox_scrape( $plugin ) {
-	wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-	include( WP_PLUGIN_DIR . '/' . $plugin );
+function plugin_sandbox_scrape($plugin) {
+	wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
+	include(WP_PLUGIN_DIR.'/'.$plugin);
 }

Braces +286 added lines, -194 removed lines

@@ -128,8 +128,9 @@ 
 			$textdomain = 'default';
 		}
 		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
-				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
+							$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+			}
 		}
 	}
 
@@ -159,16 +160,19 @@ 
 
 	// Apply markup
 	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
-			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] ) {
+					$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+		}
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
-			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] ) {
+					$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		}
 
 		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ( $plugin_data['Author'] ) {
+					$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		}
 	}
 
 	return $plugin_data;
@@ -190,21 +194,24 @@ 
 		$plugins_dir = @ opendir( $dir );
 		if ( $plugins_dir ) {
 			while (($file = readdir( $plugins_dir ) ) !== false ) {
-				if ( substr($file, 0, 1) == '.' )
-					continue;
+				if ( substr($file, 0, 1) == '.' ) {
+									continue;
+				}
 				if ( is_dir( $dir . '/' . $file ) ) {
 					$plugins_subdir = @ opendir( $dir . '/' . $file );
 					if ( $plugins_subdir ) {
 						while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-							if ( substr($subfile, 0, 1) == '.' )
-								continue;
+							if ( substr($subfile, 0, 1) == '.' ) {
+															continue;
+							}
 							$plugin_files[] = plugin_basename("$dir/$file/$subfile");
 						}
 						@closedir( $plugins_subdir );
 					}
 				} else {
-					if ( plugin_basename("$dir/$file") != $plugin )
-						$plugin_files[] = plugin_basename("$dir/$file");
+					if ( plugin_basename("$dir/$file") != $plugin ) {
+											$plugin_files[] = plugin_basename("$dir/$file");
+					}
 				}
 			}
 			@closedir( $plugins_dir );
@@ -236,54 +243,64 @@ 
  */
 function get_plugins($plugin_folder = '') {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
-		$cache_plugins = array();
+	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') ) {
+			$cache_plugins = array();
+	}
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
-		return $cache_plugins[ $plugin_folder ];
+	if ( isset($cache_plugins[ $plugin_folder ]) ) {
+			return $cache_plugins[ $plugin_folder ];
+	}
 
 	$wp_plugins = array ();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
-		$plugin_root .= $plugin_folder;
+	if ( !empty($plugin_folder) ) {
+			$plugin_root .= $plugin_folder;
+	}
 
 	// Files in wp-content/plugins directory
 	$plugins_dir = @ opendir( $plugin_root);
 	$plugin_files = array();
 	if ( $plugins_dir ) {
 		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
-				continue;
+			if ( substr($file, 0, 1) == '.' ) {
+							continue;
+			}
 			if ( is_dir( $plugin_root.'/'.$file ) ) {
 				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
 				if ( $plugins_subdir ) {
 					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
-							continue;
-						if ( substr($subfile, -4) == '.php' )
-							$plugin_files[] = "$file/$subfile";
+						if ( substr($subfile, 0, 1) == '.' ) {
+													continue;
+						}
+						if ( substr($subfile, -4) == '.php' ) {
+													$plugin_files[] = "$file/$subfile";
+						}
 					}
 					closedir( $plugins_subdir );
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
-					$plugin_files[] = $file;
+				if ( substr($file, -4) == '.php' ) {
+									$plugin_files[] = $file;
+				}
 			}
 		}
 		closedir( $plugins_dir );
 	}
 
-	if ( empty($plugin_files) )
-		return $wp_plugins;
+	if ( empty($plugin_files) ) {
+			return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
-			continue;
+		if ( !is_readable( "$plugin_root/$plugin_file" ) ) {
+					continue;
+		}
 
 		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
-			continue;
+		if ( empty ( $plugin_data['Name'] ) ) {
+					continue;
+		}
 
 		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
 	}
@@ -309,12 +326,14 @@ 
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
-		return $wp_plugins;
+	if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
+			return $wp_plugins;
+	}
 	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
-				$plugin_files[] = $file;
+			if ( substr( $file, -4 ) == '.php' ) {
+							$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $wp_plugins;
@@ -322,23 +341,28 @@ 
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
-		return $wp_plugins;
+	if ( empty($plugin_files) ) {
+			return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
-			continue;
+		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) ) {
+					continue;
+		}
 
 		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
-			$plugin_data['Name'] = $plugin_file;
+		if ( empty ( $plugin_data['Name'] ) ) {
+					$plugin_data['Name'] = $plugin_file;
+		}
 
 		$wp_plugins[ $plugin_file ] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
+	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) {
+		// silence is golden
 		unset( $wp_plugins['index.php'] );
+	}
 
 	uasort( $wp_plugins, '_sort_uname_callback' );
 
@@ -370,8 +394,9 @@ 
 	// These exist in the wp-content directory
 	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
-				$plugin_files[] = $file;
+			if ( isset( $_dropins[ $file ] ) ) {
+							$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $dropins;
@@ -379,15 +404,18 @@ 
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
-		return $dropins;
+	if ( empty($plugin_files) ) {
+			return $dropins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
-			continue;
+		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) ) {
+					continue;
+		}
 		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
-			$plugin_data['Name'] = $plugin_file;
+		if ( empty( $plugin_data['Name'] ) ) {
+					$plugin_data['Name'] = $plugin_file;
+		}
 		$dropins[ $plugin_file ] = $plugin_data;
 	}
 
@@ -472,12 +500,14 @@ 
  * @return bool True, if active for the network, otherwise false.
  */
 function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
-		return false;
+	if ( !is_multisite() ) {
+			return false;
+	}
 
 	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
-		return true;
+	if ( isset($plugins[$plugin]) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -496,8 +526,9 @@ 
  */
 function is_network_only_plugin( $plugin ) {
 	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
-		return $plugin_data['Network'];
+	if ( $plugin_data ) {
+			return $plugin_data['Network'];
+	}
 	return false;
 }
 
@@ -540,12 +571,15 @@ 
 	}
 
 	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
-		return $valid;
+	if ( is_wp_error($valid) ) {
+			return $valid;
+	}
 
 	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+		if ( !empty($redirect) ) {
+					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+		}
+		// we'll override this later if the plugin can be included without fatal error
 		ob_start();
 		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
 		$_wp_plugin_file = $plugin;
@@ -636,15 +670,17 @@ 
  * 	A value of null (the default) will deactivate plugins for both the site and the network.
  */
 function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
-		$network_current = get_site_option( 'active_sitewide_plugins', array() );
+	if ( is_multisite() ) {
+			$network_current = get_site_option( 'active_sitewide_plugins', array() );
+	}
 	$current = get_option( 'active_plugins', array() );
 	$do_blog = $do_network = false;
 
 	foreach ( (array) $plugins as $plugin ) {
 		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
-			continue;
+		if ( ! is_plugin_active($plugin) ) {
+					continue;
+		}
 
 		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
 
@@ -715,11 +751,13 @@ 
 		}
 	}
 
-	if ( $do_blog )
-		update_option('active_plugins', $current);
-	if ( $do_network )
-		update_site_option( 'active_sitewide_plugins', $network_current );
-}
+	if ( $do_blog ) {
+			update_option('active_plugins', $current);
+	}
+	if ( $do_network ) {
+			update_site_option( 'active_sitewide_plugins', $network_current );
+	}
+	}
 
 /**
  * Activate multiple plugins.
@@ -738,20 +776,24 @@ 
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
 function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
-		$plugins = array($plugins);
+	if ( !is_array($plugins) ) {
+			$plugins = array($plugins);
+	}
 
 	$errors = array();
 	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
-			$redirect = add_query_arg('plugin', $plugin, $redirect);
+		if ( !empty($redirect) ) {
+					$redirect = add_query_arg('plugin', $plugin, $redirect);
+		}
 		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
-			$errors[$plugin] = $result;
+		if ( is_wp_error($result) ) {
+					$errors[$plugin] = $result;
+		}
 	}
 
-	if ( !empty($errors) )
-		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+	if ( !empty($errors) ) {
+			return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+	}
 
 	return true;
 }
@@ -771,12 +813,14 @@ 
 function delete_plugins( $plugins, $deprecated = '' ) {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
-		return false;
+	if ( empty($plugins) ) {
+			return false;
+	}
 
 	$checked = array();
-	foreach ( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
+	foreach ( $plugins as $plugin ) {
+			$checked[] = 'checked[]=' . $plugin;
+	}
 
 	ob_start();
 	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
@@ -805,11 +849,13 @@ 
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	}
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
@@ -886,8 +932,9 @@ 
 		set_site_transient( 'update_plugins', $current );
 	}
 
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	if ( ! empty($errors) ) {
+			return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	}
 
 	return true;
 }
@@ -914,8 +961,9 @@ 
 		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
 	}
 
-	if ( empty( $plugins ) )
-		return array();
+	if ( empty( $plugins ) ) {
+			return array();
+	}
 
 	$invalid = array();
 
@@ -941,14 +989,17 @@ 
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
 function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
-		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
-		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+	if ( validate_file($plugin) ) {
+			return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
+	}
+	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) ) {
+			return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+	}
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
-		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+	if ( ! isset($installed_plugins[$plugin]) ) {
+			return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+	}
 	return 0;
 }
 
@@ -964,8 +1015,9 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
-		return true;
+	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -1073,8 +1125,9 @@ 
 
 	$hookname = get_plugin_page_hookname( $menu_slug, '' );
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
-		add_action( $hookname, $function );
+	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) ) {
+			add_action( $hookname, $function );
+	}
 
 	if ( empty($icon_url) ) {
 		$icon_url = 'dashicons-admin-generic';
@@ -1134,8 +1187,9 @@ 
 	$menu_slug = plugin_basename( $menu_slug );
 	$parent_slug = plugin_basename( $parent_slug);
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
-		$parent_slug = $_wp_real_parent_file[$parent_slug];
+	if ( isset( $_wp_real_parent_file[$parent_slug] ) ) {
+			$parent_slug = $_wp_real_parent_file[$parent_slug];
+	}
 
 	if ( !current_user_can( $capability ) ) {
 		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
@@ -1150,16 +1204,18 @@ 
 	 */
 	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
 		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) {
+							$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+			}
 		}
 	}
 
 	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
 
 	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
+	if (!empty ( $function ) && !empty ( $hookname )) {
+			add_action( $hookname, $function );
+	}
 
 	$_registered_pages[$hookname] = true;
 
@@ -1167,8 +1223,9 @@ 
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ( 'tools.php' == $parent_slug ) {
+			$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	}
 
 	// No parent as top level.
 	$_parent_pages[$menu_slug] = $parent_slug;
@@ -1273,10 +1330,11 @@ 
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
 function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
-		$parent = 'users.php';
-	else
-		$parent = 'profile.php';
+	if ( current_user_can('edit_users') ) {
+			$parent = 'users.php';
+	} else {
+			$parent = 'profile.php';
+	}
 	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
 }
 /**
@@ -1436,8 +1494,9 @@ 
 function remove_submenu_page( $menu_slug, $submenu_slug ) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
-		return false;
+	if ( !isset( $submenu[$menu_slug] ) ) {
+			return false;
+	}
 
 	foreach ( $submenu[$menu_slug] as $i => $item ) {
 		if ( $submenu_slug == $item[2] ) {
@@ -1478,8 +1537,9 @@ 
 
 	$url = esc_url($url);
 
-	if ( $echo )
-		echo $url;
+	if ( $echo ) {
+			echo $url;
+	}
 
 	return $url;
 }
@@ -1504,8 +1564,9 @@ 
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
 	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
-			$parent = $_wp_real_parent_file[$parent];
+		if ( isset( $_wp_real_parent_file[$parent] ) ) {
+					$parent = $_wp_real_parent_file[$parent];
+		}
 		return $parent;
 	}
 
@@ -1513,30 +1574,34 @@ 
 		foreach ( (array)$menu as $parent_menu ) {
 			if ( $parent_menu[2] == $plugin_page ) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+				if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+									$parent_file = $_wp_real_parent_file[$parent_file];
+				}
 				return $parent_file;
 			}
 		}
 		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+			if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+								$parent_file = $_wp_real_parent_file[$parent_file];
+			}
 			return $parent_file;
 		}
 	}
 
 	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
+		if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+					$parent_file = $_wp_real_parent_file[$parent_file];
+		}
 		return $parent_file;
 	}
 
 	foreach (array_keys( (array)$submenu ) as $parent) {
 		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
-				$parent = $_wp_real_parent_file[$parent];
+			if ( isset( $_wp_real_parent_file[$parent] ) ) {
+							$parent = $_wp_real_parent_file[$parent];
+			}
 			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
 				$parent_file = $parent;
 				return $parent;
@@ -1550,8 +1615,9 @@ 
 		}
 	}
 
-	if ( empty($parent_file) )
-		$parent_file = '';
+	if ( empty($parent_file) ) {
+			$parent_file = '';
+	}
 	return '';
 }
 
@@ -1567,8 +1633,9 @@ 
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
-		return $title;
+	if ( ! empty ( $title ) ) {
+			return $title;
+	}
 
 	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
 
@@ -1606,8 +1673,10 @@ 
 						return $submenu_array[3];
 					}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) {
+					// not the current page
 					continue;
+				}
 
 				if ( isset( $submenu_array[3] ) ) {
 					$title = $submenu_array[3];
@@ -1644,11 +1713,12 @@ 
  */
 function get_plugin_page_hook( $plugin_page, $parent_page ) {
 	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
-		return $hook;
-	else
-		return null;
-}
+	if ( has_action($hook) ) {
+			return $hook;
+	} else {
+			return null;
+	}
+	}
 
 /**
  *
@@ -1693,62 +1763,75 @@ 
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
-		return false;
+	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) ) {
+			return false;
+	}
 
 	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
-			return false;
+		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) ) {
+					return false;
+		}
 
 		$hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-		if ( !isset($_registered_pages[$hookname]) )
-			return false;
+		if ( !isset($_registered_pages[$hookname]) ) {
+					return false;
+		}
 	}
 
 	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
-			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
-			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
-			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
-			return false;
+		if ( isset( $_wp_menu_nopriv[$pagenow] ) ) {
+					return false;
+		}
+		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) ) {
+					return false;
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+					return false;
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+					return false;
+		}
 		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
-				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
-			return false;
+			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) ) {
+							return false;
+			}
+			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) ) {
+						return false;
+			}
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
-		return false;
+	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+			return false;
+	}
 
 	if ( isset( $submenu[$parent] ) ) {
 		foreach ( $submenu[$parent] as $submenu_array ) {
 			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
+				if ( current_user_can( $submenu_array[1] )) {
+									return true;
+				} else {
+									return false;
+				}
 			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
+				if ( current_user_can( $submenu_array[1] )) {
+									return true;
+				} else {
+									return false;
+				}
 			}
 		}
 	}
 
 	foreach ( $menu as $menu_array ) {
 		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
-				return true;
-			else
-				return false;
+			if ( current_user_can( $menu_array[1] )) {
+							return true;
+			} else {
+							return false;
+			}
 		}
 	}
 
@@ -1783,9 +1866,10 @@ 
 	}
 
 	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( $sanitize_callback != '' )
-		add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
-}
+	if ( $sanitize_callback != '' ) {
+			add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	}
+	}
 
 /**
  * Unregister a setting
@@ -1812,11 +1896,13 @@ 
 	}
 
 	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false )
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
-	if ( $sanitize_callback != '' )
-		remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
-}
+	if ( $pos !== false ) {
+			unset( $new_whitelist_options[ $option_group ][ $pos ] );
+	}
+	if ( $sanitize_callback != '' ) {
+			remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	}
+	}
 
 /**
  * Refreshes the value of the options whitelist available via the 'whitelist_options' filter.
@@ -1831,8 +1917,9 @@ 
 function option_update_filter( $options ) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
-		$options = add_option_whitelist( $new_whitelist_options, $options );
+	if ( is_array( $new_whitelist_options ) ) {
+			$options = add_option_whitelist( $new_whitelist_options, $options );
+	}
 
 	return $options;
 }
@@ -1849,10 +1936,11 @@ 
  * @return array
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
-		global $whitelist_options;
-	else
-		$whitelist_options = $options;
+	if ( $options == '' ) {
+			global $whitelist_options;
+	} else {
+			$whitelist_options = $options;
+	}
 
 	foreach ( $new_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
@@ -1861,8 +1949,9 @@ 
 				$whitelist_options[ $page ][] = $key;
 			} else {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
-					$whitelist_options[ $page ][] = $key;
+				if ( $pos === false ) {
+									$whitelist_options[ $page ][] = $key;
+				}
 			}
 		}
 	}
@@ -1882,17 +1971,19 @@ 
  * @return array
  */
 function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
-		global $whitelist_options;
-	else
-		$whitelist_options = $options;
+	if ( $options == '' ) {
+			global $whitelist_options;
+	} else {
+			$whitelist_options = $options;
+	}
 
 	foreach ( $del_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
 			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
-					unset( $whitelist_options[ $page ][ $pos ] );
+				if ( $pos !== false ) {
+									unset( $whitelist_options[ $page ][ $pos ] );
+				}
 			}
 		}
 	}
@@ -1921,8 +2012,9 @@ 
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
 function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_plugins' );
+	if ( $clear_update_cache ) {
+			delete_site_transient( 'update_plugins' );
+	}
 	wp_cache_delete( 'plugins', 'plugins' );
 }
 

src/wp-includes/capabilities.php

Doc Comments -9 removed lines

@@ -20,10 +20,6 @@ 
  *
  * @param string $cap       Capability name.
  * @param int    $user_id   User ID.
- * @param int    $object_id Optional. ID of the specific object to check against if `$cap` is a "meta" cap.
- *                          "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                          by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
 function map_meta_cap( $cap, $user_id ) {
@@ -416,11 +412,6 @@ 
  * @see map_meta_cap()
  *
  * @param string $capability Capability name.
- * @param int    $object_id  Optional. ID of the specific object to check against if `$capability` is a "meta" cap.
- *                           "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                           by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                           'edit_others_posts', etc. Accessed via func_get_args() and passed to WP_User::has_cap(),
- *                           then map_meta_cap().
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Core User Role & Capabilities API
- *
- * @package WordPress
- * @subpackage Users
- */
+	 * Core User Role & Capabilities API
+	 *
+	 * @package WordPress
+	 * @subpackage Users
+	 */
 
 /**
  * Map meta capabilities to primitive capabilities.

Switch Indentation +287 added lines, -287 removed lines

@@ -31,224 +31,224 @@ 
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		$caps[] = 'remove_users';
-		break;
-	case 'promote_user':
-	case 'add_users':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			$caps[] = 'remove_users';
 			break;
-
-		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		}
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+		case 'promote_user':
+		case 'add_users':
+			$caps[] = 'promote_users';
 			break;
-		}
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+				break;
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
+			if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			}
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					} else {
+						$caps[] = $post_type->cap->delete_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		}
-		break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// edit_post breaks down to edit_posts, edit_published_posts, or
+			// edit_others_posts
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					} else {
+						$caps[] = $post_type->cap->edit_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
+				break;
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
+
+			$caps[] = $post_type->cap->publish_posts;
 			break;
-		}
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
 
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+			$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
 
-		if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
-			/**
+			if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+				/**
 			 * Filter whether the user is allowed to add post meta to a post.
 			 *
 			 * The dynamic portion of the hook name, `$meta_key`, refers to the
@@ -263,130 +263,130 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
+				$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
+				if ( ! $allowed )
+					$caps[] = $cap;
+			} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
-			$caps[] = $cap;
-		}
-		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
-			$caps[] = 'do_not_allow';
+			}
 			break;
-		}
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( ! $comment ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post = get_post( $comment->comment_post_ID );
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
+			/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'activate_plugins':
-		$caps[] = $cap;
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
+			break;
+		case 'unfiltered_upload':
+			if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'unfiltered_html' :
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+				$caps[] = 'do_not_allow';
+			elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'activate_plugins':
 			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		$caps[] = 'manage_options';
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) )
+					$caps[] = 'manage_network_plugins';
+			}
+			break;
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
+			break;
+		case 'create_users':
+			if ( !is_multisite() )
+				$caps[] = $cap;
+			elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'manage_links' :
+			if ( get_option( 'link_manager_enabled' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'customize' :
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			$caps[] = 'manage_options';
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			global $post_type_meta_caps;
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**

Spacing +138 added lines, -138 removed lines

@@ -26,11 +26,11 @@ 
  *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-	$args = array_slice( func_get_args(), 2 );
+function map_meta_cap($cap, $user_id) {
+	$args = array_slice(func_get_args(), 2);
 	$caps = array();
 
-	switch ( $cap ) {
+	switch ($cap) {
 	case 'remove_user':
 		$caps[] = 'remove_users';
 		break;
@@ -41,11 +41,11 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		if ('edit_user' == $cap && isset($args[0]) && $user_id == $args[0])
 			break;
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+		if (is_multisite() && (( ! is_super_admin($user_id) && 'edit_user' === $cap && is_super_admin($args[0])) || ! user_can($user_id, 'manage_network_users'))) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'edit_users'; // edit_user maps to edit_users.
@@ -53,44 +53,44 @@ 
 		break;
 	case 'delete_post':
 	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
+			if ('delete_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->delete_published_posts;
 				} else {
 					$caps[] = $post_type->cap->delete_posts;
@@ -103,9 +103,9 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->delete_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_private_posts;
 			}
 		}
@@ -114,44 +114,44 @@ 
 		// edit_others_posts
 	case 'edit_post':
 	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
+			if ('edit_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->edit_published_posts;
 				} else {
 					$caps[] = $post_type->cap->edit_posts;
@@ -164,70 +164,70 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->edit_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_private_posts;
 			}
 		}
 		break;
 	case 'read_post':
 	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
+			if ('read_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
+		$status_obj = get_post_status_object($post->post_status);
+		if ($status_obj->public) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
+		} elseif ($status_obj->private) {
 			$caps[] = $post_type->cap->read_private_posts;
 		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		}
 		break;
 	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
@@ -237,17 +237,17 @@ 
 	case 'edit_post_meta':
 	case 'delete_post_meta':
 	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+		$meta_key = isset($args[1]) ? $args[1] : false;
 
-		if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+		if ($meta_key && has_filter("auth_post_meta_{$meta_key}")) {
 			/**
 			 * Filter whether the user is allowed to add post meta to a post.
 			 *
@@ -263,43 +263,43 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
+			$allowed = apply_filters("auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps);
+			if ( ! $allowed)
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
+		} elseif ($meta_key && is_protected_meta($meta_key, 'post')) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
+		$comment = get_comment($args[0]);
+		if ( ! $comment) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post = get_post( $comment->comment_post_ID );
+		$post = get_post($comment->comment_post_ID);
 
 		/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		if ($post) {
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
+			$caps = map_meta_cap('edit_posts', $user_id);
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+		if (defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin($user_id)))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+		if (defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -308,11 +308,11 @@ 
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+		if (defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT)
 			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		elseif (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -328,13 +328,13 @@ 
 	case 'update_core':
 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
 		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+		if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+		} elseif (is_multisite() && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
+		} elseif ('upload_themes' === $cap) {
 			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
+		} elseif ('upload_plugins' === $cap) {
 			$caps[] = 'install_plugins';
 		} else {
 			$caps[] = $cap;
@@ -342,31 +342,31 @@ 
 		break;
 	case 'activate_plugins':
 		$caps[] = $cap;
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
+			$menu_perms = get_site_option('menu_items', array());
+			if (empty($menu_perms['plugins']))
 				$caps[] = 'manage_network_plugins';
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'delete_users'; // delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
+		if ( ! is_multisite())
 			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+		elseif (is_super_admin($user_id) || get_site_option('add_new_users'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+		if (get_option('link_manager_enabled'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -380,9 +380,9 @@ 
 	default:
 		// Handle meta capabilities for custom post types.
 		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
+		if (isset($post_type_meta_caps[$cap])) {
+			$args = array_merge(array($post_type_meta_caps[$cap], $user_id), $args);
+			return call_user_func_array('map_meta_cap', $args);
 		}
 
 		// If no meta caps match, return the original cap.
@@ -399,7 +399,7 @@ 
 	 * @param int    $user_id The user ID.
 	 * @param array  $args    Adds the context to the cap. Typically the object ID.
 	 */
-	return apply_filters( 'map_meta_cap', $caps, $cap, $user_id, $args );
+	return apply_filters('map_meta_cap', $caps, $cap, $user_id, $args);
 }
 
 /**
@@ -424,16 +424,16 @@ 
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */
-function current_user_can( $capability ) {
+function current_user_can($capability) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if (empty($current_user))
 		return false;
 
-	$args = array_slice( func_get_args(), 1 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	return call_user_func_array(array($current_user, 'has_cap'), $args);
 }
 
 /**
@@ -445,24 +445,24 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
-	$switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
+function current_user_can_for_blog($blog_id, $capability) {
+	$switched = is_multisite() ? switch_to_blog($blog_id) : false;
 
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) ) {
-		if ( $switched ) {
+	if (empty($current_user)) {
+		if ($switched) {
 			restore_current_blog();
 		}
 		return false;
 	}
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	$can = call_user_func_array(array($current_user, 'has_cap'), $args);
 
-	if ( $switched ) {
+	if ($switched) {
 		restore_current_blog();
 	}
 
@@ -478,19 +478,19 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+function author_can($post, $capability) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( ! $author )
+	if ( ! $author)
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $author, 'has_cap' ), $args );
+	return call_user_func_array(array($author, 'has_cap'), $args);
 }
 
 /**
@@ -502,17 +502,17 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+function user_can($user, $capability) {
+	if ( ! is_object($user))
+		$user = get_userdata($user);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $user, 'has_cap' ), $args );
+	return call_user_func_array(array($user, 'has_cap'), $args);
 }
 
 /**
@@ -527,7 +527,7 @@ 
 function wp_roles() {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) ) {
+	if ( ! isset($wp_roles)) {
 		$wp_roles = new WP_Roles();
 	}
 	return $wp_roles;
@@ -541,8 +541,8 @@ 
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
-function get_role( $role ) {
-	return wp_roles()->get_role( $role );
+function get_role($role) {
+	return wp_roles()->get_role($role);
 }
 
 /**
@@ -555,11 +555,11 @@ 
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
-function add_role( $role, $display_name, $capabilities = array() ) {
-	if ( empty( $role ) ) {
+function add_role($role, $display_name, $capabilities = array()) {
+	if (empty($role)) {
 		return;
 	}
-	return wp_roles()->add_role( $role, $display_name, $capabilities );
+	return wp_roles()->add_role($role, $display_name, $capabilities);
 }
 
 /**
@@ -569,8 +569,8 @@ 
  *
  * @param string $role Role name.
  */
-function remove_role( $role ) {
-	wp_roles()->remove_role( $role );
+function remove_role($role) {
+	wp_roles()->remove_role($role);
 }
 
 /**
@@ -585,10 +585,10 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if (isset($super_admins))
 		return $super_admins;
 	else
-		return get_site_option( 'site_admins', array('admin') );
+		return get_site_option('site_admins', array('admin'));
 }
 
 /**
@@ -599,21 +599,21 @@ 
  * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
  * @return bool True if the user is a site admin.
  */
-function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+function is_super_admin($user_id = false) {
+	if ( ! $user_id || $user_id == get_current_user_id())
 		$user = wp_get_current_user();
 	else
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if (is_array($super_admins) && in_array($user->user_login, $super_admins))
 			return true;
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ($user->has_cap('delete_users'))
 			return true;
 	}
 

Braces +92 added lines, -69 removed lines

@@ -41,8 +41,9 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
-			break;
+		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
+					break;
+		}
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
 		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
@@ -78,8 +79,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'delete_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -139,8 +141,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'edit_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -198,8 +201,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'read_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -264,8 +268,9 @@ 
 			 * @param array  $caps     User capabilities.
 			 */
 			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
-			if ( ! $allowed )
-				$caps[] = $cap;
+			if ( ! $allowed ) {
+							$caps[] = $cap;
+			}
 		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
 			$caps[] = $cap;
 		}
@@ -290,32 +295,35 @@ 
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'edit_files':
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'update_plugins':
 	case 'delete_plugins':
@@ -345,31 +353,36 @@ 
 		if ( is_multisite() ) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
 			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
+			if ( empty( $menu_perms['plugins'] ) ) {
+							$caps[] = 'manage_network_plugins';
+			}
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
+		if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'delete_users';
+		}
+		// delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( !is_multisite() ) {
+					$caps[] = $cap;
+		} elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( get_option( 'link_manager_enabled' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'customize' :
 		$caps[] = 'edit_theme_options';
@@ -427,8 +440,9 @@ 
 function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
-		return false;
+	if ( empty( $current_user ) ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	$args = array_merge( array( $capability ), $args );
@@ -479,13 +493,15 @@ 
  * @return bool
  */
 function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
-		return false;
+	if ( !$post = get_post($post) ) {
+			return false;
+	}
 
 	$author = get_userdata( $post->post_author );
 
-	if ( ! $author )
-		return false;
+	if ( ! $author ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -503,11 +519,13 @@ 
  * @return bool
  */
 function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+	if ( ! is_object( $user ) ) {
+			$user = get_userdata( $user );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -585,11 +603,12 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
-		return $super_admins;
-	else
-		return get_site_option( 'site_admins', array('admin') );
-}
+	if ( isset($super_admins) ) {
+			return $super_admins;
+	} else {
+			return get_site_option( 'site_admins', array('admin') );
+	}
+	}
 
 /**
  * Determine if user is a site admin.
@@ -600,21 +619,25 @@ 
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
-		$user = wp_get_current_user();
-	else
-		$user = get_userdata( $user_id );
+	if ( ! $user_id || $user_id == get_current_user_id() ) {
+			$user = wp_get_current_user();
+	} else {
+			$user = get_userdata( $user_id );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	if ( is_multisite() ) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
-			return true;
+		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
+					return true;
+		}
 	} else {
-		if ( $user->has_cap('delete_users') )
-			return true;
+		if ( $user->has_cap('delete_users') ) {
+					return true;
+		}
 	}
 
 	return false;

src/wp-includes/class-feed.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	 * @since 4.1.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function active_callback() {
 		return true;

Spacing +25 added lines, -25 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! class_exists( 'SimplePie', false ) )
-	require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+if ( ! class_exists('SimplePie', false))
+	require_once(ABSPATH.WPINC.'/class-simplepie.php');
 
 class WP_Feed_Cache extends SimplePie_Cache {
 	/**
@@ -33,8 +33,8 @@ 
 	 * @param string $extension 'spi' or 'spc'.
 	 */
 	public function __construct($location, $filename, $extension) {
-		$this->name = 'feed_' . $filename;
-		$this->mod_name = 'feed_mod_' . $filename;
+		$this->name = 'feed_'.$filename;
+		$this->mod_name = 'feed_mod_'.$filename;
 
 		$lifetime = $this->lifetime;
 		/**
@@ -45,7 +45,7 @@ 
 		 * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
 		 * @param string $filename Unique identifier for the cache object.
 		 */
-		$this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
+		$this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $lifetime, $filename);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @return true Always true.
 	 */
 	public function save($data) {
-		if ( $data instanceof SimplePie ) {
+		if ($data instanceof SimplePie) {
 			$data = $data->data;
 		}
 
@@ -106,27 +106,27 @@ 
 
 		$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
-		if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+		if (preg_match('/^http(s)?:\/\//i', $url)) {
 			$args = array(
 				'timeout' => $this->timeout,
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
+			if ( ! empty($this->headers))
 				$args['headers'] = $this->headers;
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if (SIMPLEPIE_USERAGENT != $this->useragent) //Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
 
 			$res = wp_safe_remote_request($url, $args);
 
-			if ( is_wp_error($res) ) {
-				$this->error = 'WP HTTP Error: ' . $res->get_error_message();
+			if (is_wp_error($res)) {
+				$this->error = 'WP HTTP Error: '.$res->get_error_message();
 				$this->success = false;
 			} else {
-				$this->headers = wp_remote_retrieve_headers( $res );
-				$this->body = wp_remote_retrieve_body( $res );
-				$this->status_code = wp_remote_retrieve_response_code( $res );
+				$this->headers = wp_remote_retrieve_headers($res);
+				$this->body = wp_remote_retrieve_body($res);
+				$this->status_code = wp_remote_retrieve_response_code($res);
 			}
 		} else {
 			$this->error = '';
@@ -145,27 +145,27 @@ 
  * @since 3.5.0
  */
 class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
-	public function sanitize( $data, $type, $base = '' ) {
-		$data = trim( $data );
-		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
-			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
+	public function sanitize($data, $type, $base = '') {
+		$data = trim($data);
+		if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML) {
+			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data)) {
 				$type |= SIMPLEPIE_CONSTRUCT_HTML;
 			}
 			else {
 				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 			}
 		}
-		if ( $type & SIMPLEPIE_CONSTRUCT_BASE64 ) {
-			$data = base64_decode( $data );
+		if ($type & SIMPLEPIE_CONSTRUCT_BASE64) {
+			$data = base64_decode($data);
 		}
-		if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
-			$data = wp_kses_post( $data );
-			if ( $this->output_encoding !== 'UTF-8' ) {
-				$data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
+		if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML)) {
+			$data = wp_kses_post($data);
+			if ($this->output_encoding !== 'UTF-8') {
+				$data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding));
 			}
 			return $data;
 		} else {
-			return parent::sanitize( $data, $type, $base );
+			return parent::sanitize($data, $type, $base);
 		}
 	}
 }

Braces +9 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if ( ! class_exists( 'SimplePie', false ) )
+if ( ! class_exists( 'SimplePie', false ) ) {
 	require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+}
 
 class WP_Feed_Cache extends SimplePie_Cache {
 	/**
@@ -112,11 +113,14 @@ 
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
-				$args['headers'] = $this->headers;
+			if ( !empty($this->headers) ) {
+							$args['headers'] = $this->headers;
+			}
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if ( SIMPLEPIE_USERAGENT != $this->useragent ) {
+				//Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
+			}
 
 			$res = wp_safe_remote_request($url, $args);
 
@@ -150,8 +154,7 @@ 
 		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
 			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
 				$type |= SIMPLEPIE_CONSTRUCT_HTML;
-			}
-			else {
+			} else {
 				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 			}
 		}

src/wp-includes/class-http.php

Doc Comments +2 added lines, -2 removed lines

@@ -522,7 +522,7 @@ 
 	 * @since 2.7.0
 	 *
 	 * @param string $strResponse The full response string
-	 * @return array Array with 'headers' and 'body' keys.
+	 * @return string Array with 'headers' and 'body' keys.
 	 */
 	public static function processResponse($strResponse) {
 		$res = explode("\r\n\r\n", $strResponse, 2);
@@ -542,7 +542,7 @@ 
 	 *
 	 * @param string|array $headers
 	 * @param string $url The URL that was requested
-	 * @return array Processed string headers. If duplicate headers are encountered,
+	 * @return string Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
 	public static function processHeaders( $headers, $url = '' ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * HTTP API: WP_Http class
- *
- * @package WordPress
- * @subpackage HTTP
- * @since 2.7.0
- */
+		 * HTTP API: WP_Http class
+		 *
+		 * @package WordPress
+		 * @subpackage HTTP
+		 * @since 2.7.0
+		 */
 
 /**
  * Core class used for managing HTTP transports and making HTTP requests.

Spacing +167 added lines, -167 removed lines

@@ -140,7 +140,7 @@ 
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'.
 	 *                        A WP_Error instance upon error.
 	 */
-	public function request( $url, $args = array() ) {
+	public function request($url, $args = array()) {
 		global $wp_version;
 
 		$defaults = array(
@@ -153,7 +153,7 @@ 
 			 * @param int $timeout_value Time in seconds until a request times out.
 			 *                           Default 5.
 			 */
-			'timeout' => apply_filters( 'http_request_timeout', 5 ),
+			'timeout' => apply_filters('http_request_timeout', 5),
 			/**
 			 * Filter the number of redirects allowed during an HTTP request.
 			 *
@@ -161,7 +161,7 @@ 
 			 *
 			 * @param int $redirect_count Number of redirects allowed. Default 5.
 			 */
-			'redirection' => apply_filters( 'http_request_redirection_count', 5 ),
+			'redirection' => apply_filters('http_request_redirection_count', 5),
 			/**
 			 * Filter the version of the HTTP protocol used in a request.
 			 *
@@ -170,7 +170,7 @@ 
 			 * @param string $version Version of HTTP used. Accepts '1.0' and '1.1'.
 			 *                        Default '1.0'.
 			 */
-			'httpversion' => apply_filters( 'http_request_version', '1.0' ),
+			'httpversion' => apply_filters('http_request_version', '1.0'),
 			/**
 			 * Filter the user agent value sent with an HTTP request.
 			 *
@@ -178,7 +178,7 @@ 
 			 *
 			 * @param string $user_agent WordPress user agent string.
 			 */
-			'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ),
+			'user-agent' => apply_filters('http_headers_useragent', 'WordPress/'.$wp_version.'; '.get_bloginfo('url')),
 			/**
 			 * Filter whether to pass URLs through wp_http_validate_url() in an HTTP request.
 			 *
@@ -187,7 +187,7 @@ 
 			 * @param bool $pass_url Whether to pass URLs through wp_http_validate_url().
 			 *                       Default false.
 			 */
-			'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ),
+			'reject_unsafe_urls' => apply_filters('http_request_reject_unsafe_urls', false),
 			'blocking' => true,
 			'headers' => array(),
 			'cookies' => array(),
@@ -195,20 +195,20 @@ 
 			'compress' => false,
 			'decompress' => true,
 			'sslverify' => true,
-			'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
+			'sslcertificates' => ABSPATH.WPINC.'/certificates/ca-bundle.crt',
 			'stream' => false,
 			'filename' => null,
 			'limit_response_size' => null,
 		);
 
 		// Pre-parse for the HEAD checks.
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
+		if (isset($args['method']) && 'HEAD' == $args['method'])
 			$defaults['redirection'] = 0;
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		/**
 		 * Filter the arguments used in an HTTP request.
 		 *
@@ -217,10 +217,10 @@ 
 		 * @param array  $r   An array of HTTP request arguments.
 		 * @param string $url The request URL.
 		 */
-		$r = apply_filters( 'http_request_args', $r, $url );
+		$r = apply_filters('http_request_args', $r, $url);
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
+		if ( ! isset($r['_redirection']))
 			$r['_redirection'] = $r['redirection'];
 
 		/**
@@ -241,26 +241,26 @@ 
 		 * @param array               $r        HTTP request arguments.
 		 * @param string              $url      The request URL.
 		 */
-		$pre = apply_filters( 'pre_http_request', false, $r, $url );
+		$pre = apply_filters('pre_http_request', false, $r, $url);
 
-		if ( false !== $pre )
+		if (false !== $pre)
 			return $pre;
 
-		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] )
-				$url = wp_http_validate_url( $url );
-			if ( $url ) {
-				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+		if (function_exists('wp_kses_bad_protocol')) {
+			if ($r['reject_unsafe_urls'])
+				$url = wp_http_validate_url($url);
+			if ($url) {
+				$url = wp_kses_bad_protocol($url, array('http', 'https', 'ssl'));
 			}
 		}
 
-		$arrURL = @parse_url( $url );
+		$arrURL = @parse_url($url);
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) )
+		if (empty($url) || empty($arrURL['scheme']))
 			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
 
-		if ( $this->block_request( $url ) )
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ($this->block_request($url))
+			return new WP_Error('http_request_failed', __('User has blocked requests through HTTP.'));
 
 		/*
 		 * Determine if this is a https call and pass that on to the transport functions
@@ -269,88 +269,88 @@ 
 		$r['ssl'] = $arrURL['scheme'] == 'https' || $arrURL['scheme'] == 'ssl';
 
 		// Determine if this request is to OUR install of WordPress.
-		$homeURL = parse_url( get_bloginfo( 'url' ) );
-		$r['local'] = 'localhost' == $arrURL['host'] || ( isset( $homeURL['host'] ) && $homeURL['host'] == $arrURL['host'] );
-		unset( $homeURL );
+		$homeURL = parse_url(get_bloginfo('url'));
+		$r['local'] = 'localhost' == $arrURL['host'] || (isset($homeURL['host']) && $homeURL['host'] == $arrURL['host']);
+		unset($homeURL);
 
 		/*
 		 * If we are streaming to a file but no filename was given drop it in the WP temp dir
 		 * and pick its name using the basename of the $url.
 		 */
-		if ( $r['stream']  && empty( $r['filename'] ) ) {
-			$r['filename'] = get_temp_dir() . wp_unique_filename( get_temp_dir(), basename( $url ) );
+		if ($r['stream'] && empty($r['filename'])) {
+			$r['filename'] = get_temp_dir().wp_unique_filename(get_temp_dir(), basename($url));
 		}
 
 		/*
 		 * Force some settings if we are streaming to a file and check for existence and perms
 		 * of destination directory.
 		 */
-		if ( $r['stream'] ) {
+		if ($r['stream']) {
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) )
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable(dirname($r['filename'])))
+				return new WP_Error('http_request_failed', __('Destination directory for file streaming does not exist or is not writable.'));
 		}
 
-		if ( is_null( $r['headers'] ) )
+		if (is_null($r['headers']))
 			$r['headers'] = array();
 
-		if ( ! is_array( $r['headers'] ) ) {
-			$processedHeaders = self::processHeaders( $r['headers'], $url );
+		if ( ! is_array($r['headers'])) {
+			$processedHeaders = self::processHeaders($r['headers'], $url);
 			$r['headers'] = $processedHeaders['headers'];
 		}
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
+			unset($r['headers']['User-Agent']);
 		}
 
-		if ( isset( $r['headers']['user-agent'] ) ) {
+		if (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
-		if ( '1.1' == $r['httpversion'] && !isset( $r['headers']['connection'] ) ) {
+		if ('1.1' == $r['httpversion'] && ! isset($r['headers']['connection'])) {
 			$r['headers']['connection'] = 'close';
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		self::buildCookieHeader( $r );
+		self::buildCookieHeader($r);
 
 		// Avoid issues where mbstring.func_overload is enabled.
 		mbstring_binary_safe_encoding();
 
-		if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
-			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
+		if ( ! isset($r['headers']['Accept-Encoding'])) {
+			if ($encoding = WP_Http_Encoding::accept_encoding($url, $r))
 				$r['headers']['Accept-Encoding'] = $encoding;
 		}
 
-		if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
-			if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
-				$r['body'] = http_build_query( $r['body'], null, '&' );
+		if (( ! is_null($r['body']) && '' != $r['body']) || 'POST' == $r['method'] || 'PUT' == $r['method']) {
+			if (is_array($r['body']) || is_object($r['body'])) {
+				$r['body'] = http_build_query($r['body'], null, '&');
 
-				if ( ! isset( $r['headers']['Content-Type'] ) )
-					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				if ( ! isset($r['headers']['Content-Type']))
+					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset='.get_option('blog_charset');
 			}
 
-			if ( '' === $r['body'] )
+			if ('' === $r['body'])
 				$r['body'] = null;
 
-			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
-				$r['headers']['Content-Length'] = strlen( $r['body'] );
+			if ( ! isset($r['headers']['Content-Length']) && ! isset($r['headers']['content-length']))
+				$r['headers']['Content-Length'] = strlen($r['body']);
 		}
 
-		$response = $this->_dispatch_request( $url, $r );
+		$response = $this->_dispatch_request($url, $r);
 
 		reset_mbstring_encoding();
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		// Append cookies that were used in this request to the response
-		if ( ! empty( $r['cookies'] ) ) {
-			$cookies_set = wp_list_pluck( $response['cookies'], 'name' );
-			foreach ( $r['cookies'] as $cookie ) {
-				if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+		if ( ! empty($r['cookies'])) {
+			$cookies_set = wp_list_pluck($response['cookies'], 'name');
+			foreach ($r['cookies'] as $cookie) {
+				if ( ! in_array($cookie->name, $cookies_set) && $cookie->test($url)) {
 					$response['cookies'][] = $cookie;
 				}
 			}
@@ -370,8 +370,8 @@ 
 	 *
 	 * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
 	 */
-	public function _get_first_available_transport( $args, $url = null ) {
-		$transports = array( 'curl', 'streams' );
+	public function _get_first_available_transport($args, $url = null) {
+		$transports = array('curl', 'streams');
 
 		/**
 		 * Filter which HTTP transports are available and in what order.
@@ -383,17 +383,17 @@ 
 		 * @param array  $args       HTTP request arguments.
 		 * @param string $url        The URL to request.
 		 */
-		$request_order = apply_filters( 'http_api_transports', $transports, $args, $url );
+		$request_order = apply_filters('http_api_transports', $transports, $args, $url);
 
 		// Loop over each transport on each HTTP request looking for one which will serve this request's needs.
-		foreach ( $request_order as $transport ) {
-			if ( in_array( $transport, $transports ) ) {
-				$transport = ucfirst( $transport );
+		foreach ($request_order as $transport) {
+			if (in_array($transport, $transports)) {
+				$transport = ucfirst($transport);
 			}
-			$class = 'WP_Http_' . $transport;
+			$class = 'WP_Http_'.$transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+			if ( ! call_user_func(array($class, 'test'), $args, $url))
 				continue;
 
 			return $class;
@@ -419,18 +419,18 @@ 
 	 * @param array $args Request arguments
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	private function _dispatch_request( $url, $args ) {
+	private function _dispatch_request($url, $args) {
 		static $transports = array();
 
-		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		$class = $this->_get_first_available_transport($args, $url);
+		if ( ! $class)
+			return new WP_Error('http_failure', __('There are no HTTP transports available which can complete the requested request.'));
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
+		if (empty($transports[$class]))
 			$transports[$class] = new $class;
 
-		$response = $transports[$class]->request( $url, $args );
+		$response = $transports[$class]->request($url, $args);
 
 		/**
 		 * Fires after an HTTP API response is received and before the response is returned.
@@ -443,9 +443,9 @@ 
 		 * @param array          $args     HTTP request arguments.
 		 * @param string         $url      The request URL.
 		 */
-		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+		do_action('http_api_debug', $response, 'response', $class, $args, $url);
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		/**
@@ -457,7 +457,7 @@ 
 		 * @param array  $args     HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $args, $url );
+		return apply_filters('http_response', $response, $args, $url);
 	}
 
 	/**
@@ -474,7 +474,7 @@ 
 	 */
 	public function post($url, $args = array()) {
 		$defaults = array('method' => 'POST');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -492,7 +492,7 @@ 
 	 */
 	public function get($url, $args = array()) {
 		$defaults = array('method' => 'GET');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -510,7 +510,7 @@ 
 	 */
 	public function head($url, $args = array()) {
 		$defaults = array('method' => 'HEAD');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -545,9 +545,9 @@ 
 	 * @return array Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
-	public static function processHeaders( $headers, $url = '' ) {
+	public static function processHeaders($headers, $url = '') {
 		// Split headers, one per array element.
-		if ( is_string($headers) ) {
+		if (is_string($headers)) {
 			// Tolerate line terminator: CRLF = LF (RFC 2616 19.3).
 			$headers = str_replace("\r\n", "\n", $headers);
 			/*
@@ -565,8 +565,8 @@ 
 		 * If a redirection has taken place, The headers for each page request may have been passed.
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
-		for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-			if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
+		for ($i = count($headers) - 1; $i >= 0; $i--) {
+			if ( ! empty($headers[$i]) && false === strpos($headers[$i], ':')) {
 				$headers = array_splice($headers, $i);
 				break;
 			}
@@ -574,35 +574,35 @@ 
 
 		$cookies = array();
 		$newheaders = array();
-		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
+		foreach ((array) $headers as $tempheader) {
+			if (empty($tempheader))
 				continue;
 
-			if ( false === strpos($tempheader, ':') ) {
+			if (false === strpos($tempheader, ':')) {
 				$stack = explode(' ', $tempheader, 3);
 				$stack[] = '';
-				list( , $response['code'], $response['message']) = $stack;
+				list(, $response['code'], $response['message']) = $stack;
 				continue;
 			}
 
 			list($key, $value) = explode(':', $tempheader, 2);
 
-			$key = strtolower( $key );
-			$value = trim( $value );
+			$key = strtolower($key);
+			$value = trim($value);
 
-			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
-				$newheaders[ $key ][] = $value;
+			if (isset($newheaders[$key])) {
+				if ( ! is_array($newheaders[$key]))
+					$newheaders[$key] = array($newheaders[$key]);
+				$newheaders[$key][] = $value;
 			} else {
-				$newheaders[ $key ] = $value;
+				$newheaders[$key] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ('set-cookie' == $key)
+				$cookies[] = new WP_Http_Cookie($value, $url);
 		}
 
 		// Cast the Response Code to an int
-		$response['code'] = intval( $response['code'] );
+		$response['code'] = intval($response['code']);
 
 		return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
 	}
@@ -620,20 +620,20 @@ 
 	 *
 	 * @param array $r Full array of args passed into ::request()
 	 */
-	public static function buildCookieHeader( &$r ) {
-		if ( ! empty($r['cookies']) ) {
+	public static function buildCookieHeader(&$r) {
+		if ( ! empty($r['cookies'])) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
-			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+			foreach ($r['cookies'] as $name => $value) {
+				if ( ! is_object($value))
+					$r['cookies'][$name] = new WP_Http_Cookie(array('name' => $name, 'value' => $value));
 			}
 
 			$cookies_header = '';
-			foreach ( (array) $r['cookies'] as $cookie ) {
-				$cookies_header .= $cookie->getHeaderValue() . '; ';
+			foreach ((array) $r['cookies'] as $cookie) {
+				$cookies_header .= $cookie->getHeaderValue().'; ';
 			}
 
-			$cookies_header = substr( $cookies_header, 0, -2 );
+			$cookies_header = substr($cookies_header, 0, -2);
 			$r['headers']['cookie'] = $cookies_header;
 		}
 	}
@@ -652,9 +652,9 @@ 
 	 * @param string $body Body content
 	 * @return string Chunked decoded body on success or raw body on failure.
 	 */
-	public static function chunkTransferDecode( $body ) {
+	public static function chunkTransferDecode($body) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($body)))
 			return $body;
 
 		$parsed_body = '';
@@ -662,22 +662,22 @@ 
 		// We'll be altering $body, so need a backup in case of error.
 		$body_original = $body;
 
-		while ( true ) {
-			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
+		while (true) {
+			$has_chunk = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match);
+			if ( ! $has_chunk || empty($match[1]))
 				return $body_original;
 
-			$length = hexdec( $match[1] );
-			$chunk_length = strlen( $match[0] );
+			$length = hexdec($match[1]);
+			$chunk_length = strlen($match[0]);
 
 			// Parse out the chunk of data.
-			$parsed_body .= substr( $body, $chunk_length, $length );
+			$parsed_body .= substr($body, $chunk_length, $length);
 
 			// Remove the chunk from the raw data.
-			$body = substr( $body, $length + $chunk_length );
+			$body = substr($body, $length + $chunk_length);
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
+			if ('0' === trim($body))
 				return $parsed_body;
 		}
 	}
@@ -706,17 +706,17 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
+		if ( ! defined('WP_HTTP_BLOCK_EXTERNAL') || ! WP_HTTP_BLOCK_EXTERNAL)
 			return false;
 
 		$check = parse_url($uri);
-		if ( ! $check )
+		if ( ! $check)
 			return true;
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url(get_option('siteurl'));
 
 		// Don't block requests back to ourselves by default.
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+		if ('localhost' == $check['host'] || (isset($home['host']) && $home['host'] == $check['host'])) {
 			/**
 			 * Filter whether to block local requests through the proxy.
 			 *
@@ -725,29 +725,29 @@ 
 			 * @param bool $block Whether to block local requests through proxy.
 			 *                    Default false.
 			 */
-			return apply_filters( 'block_local_requests', false );
+			return apply_filters('block_local_requests', false);
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
+		if ( ! defined('WP_ACCESSIBLE_HOSTS'))
 			return true;
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
-		if ( null === $accessible_hosts ) {
+		if (null === $accessible_hosts) {
 			$accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
 
-			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
+			if (false !== strpos(WP_ACCESSIBLE_HOSTS, '*')) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				foreach ($accessible_hosts as $host)
+					$wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+				$wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
+		if ( ! empty($wildcard_regex))
+			return ! preg_match($wildcard_regex, $check['host']);
 		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+			return ! in_array($check['host'], $accessible_hosts); //Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -762,9 +762,9 @@ 
 	 * @return bool|array False on failure; Array of URL components on success;
 	 *                    See parse_url()'s return values.
 	 */
-	protected static function parse_url( $url ) {
-		_deprecated_function( __METHOD__, '4.4.0', 'wp_parse_url()' );
-		return wp_parse_url( $url );
+	protected static function parse_url($url) {
+		_deprecated_function(__METHOD__, '4.4.0', 'wp_parse_url()');
+		return wp_parse_url($url);
 	}
 
 	/**
@@ -781,65 +781,65 @@ 
 	 * @param string $url                 The URL which $maybe_relative_path is relative to
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
-	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
+	public static function make_absolute_url($maybe_relative_path, $url) {
+		if (empty($url))
 			return $maybe_relative_path;
 
-		if ( ! $url_parts = wp_parse_url( $url ) ) {
+		if ( ! $url_parts = wp_parse_url($url)) {
 			return $maybe_relative_path;
 		}
 
-		if ( ! $relative_url_parts = wp_parse_url( $maybe_relative_path ) ) {
+		if ( ! $relative_url_parts = wp_parse_url($maybe_relative_path)) {
 			return $maybe_relative_path;
 		}
 
 		// Check for a scheme on the 'relative' url
-		if ( ! empty( $relative_url_parts['scheme'] ) ) {
+		if ( ! empty($relative_url_parts['scheme'])) {
 			return $maybe_relative_path;
 		}
 
-		$absolute_path = $url_parts['scheme'] . '://';
+		$absolute_path = $url_parts['scheme'].'://';
 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
-		if ( isset( $relative_url_parts['host'] ) ) {
+		if (isset($relative_url_parts['host'])) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if (isset($relative_url_parts['port']))
+				$absolute_path .= ':'.$relative_url_parts['port'];
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if (isset($url_parts['port']))
+				$absolute_path .= ':'.$url_parts['port'];
 		}
 
 		// Start off with the Absolute URL path.
-		$path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
+		$path = ! empty($url_parts['path']) ? $url_parts['path'] : '/';
 
 		// If it's a root-relative path, then great.
-		if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
+		if ( ! empty($relative_url_parts['path']) && '/' == $relative_url_parts['path'][0]) {
 			$path = $relative_url_parts['path'];
 
 		// Else it's a relative path.
-		} elseif ( ! empty( $relative_url_parts['path'] ) ) {
+		} elseif ( ! empty($relative_url_parts['path'])) {
 			// Strip off any file components from the absolute path.
-			$path = substr( $path, 0, strrpos( $path, '/' ) + 1 );
+			$path = substr($path, 0, strrpos($path, '/') + 1);
 
 			// Build the new path.
 			$path .= $relative_url_parts['path'];
 
 			// Strip all /path/../ out of the path.
-			while ( strpos( $path, '../' ) > 1 ) {
-				$path = preg_replace( '![^/]+/\.\./!', '', $path );
+			while (strpos($path, '../') > 1) {
+				$path = preg_replace('![^/]+/\.\./!', '', $path);
 			}
 
 			// Strip any final leading ../ from the path.
-			$path = preg_replace( '!^/(\.\./)+!', '', $path );
+			$path = preg_replace('!^/(\.\./)+!', '', $path);
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty($relative_url_parts['query']))
+			$path .= '?'.$relative_url_parts['query'];
 
-		return $absolute_path . '/' . ltrim( $path, '/' );
+		return $absolute_path.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -854,42 +854,42 @@ 
 	 * @param array $response The Response of the HTTP request.
 	 * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
 	 */
-	public static function handle_redirects( $url, $args, $response ) {
+	public static function handle_redirects($url, $args, $response) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+		if ( ! isset($response['headers']['location']) || 0 === $args['_redirection'])
 			return false;
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+		if ($response['response']['code'] > 399 || $response['response']['code'] < 300)
 			return false;
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ($args['redirection']-- <= 0)
+			return new WP_Error('http_request_failed', __('Too many redirects.'));
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if (is_array($redirect_location))
+			$redirect_location = array_pop($redirect_location);
 
-		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
+		$redirect_location = WP_Http::make_absolute_url($redirect_location, $url);
 
 		// POST requests should not POST to a redirected location.
-		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+		if ('POST' == $args['method']) {
+			if (in_array($response['response']['code'], array(302, 303)))
 				$args['method'] = 'GET';
 		}
 
 		// Include valid cookies in the redirect process.
-		if ( ! empty( $response['cookies'] ) ) {
-			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
+		if ( ! empty($response['cookies'])) {
+			foreach ($response['cookies'] as $cookie) {
+				if ($cookie->test($redirect_location))
 					$args['cookies'][] = $cookie;
 			}
 		}
 
-		return wp_remote_request( $redirect_location, $args );
+		return wp_remote_request($redirect_location, $args);
 	}
 
 	/**
@@ -908,11 +908,11 @@ 
 	 * @param string $maybe_ip A suspected IP address
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
-	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+	public static function is_ip_address($maybe_ip) {
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip))
 			return 4;
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+		if (false !== strpos($maybe_ip, ':') && preg_match('/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim($maybe_ip, ' []')))
 			return 6;
 
 		return false;

Braces +126 added lines, -84 removed lines

@@ -205,8 +205,9 @@ 
 		$args = wp_parse_args( $args );
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
-			$defaults['redirection'] = 0;
+		if ( isset($args['method']) && 'HEAD' == $args['method'] ) {
+					$defaults['redirection'] = 0;
+		}
 
 		$r = wp_parse_args( $args, $defaults );
 		/**
@@ -220,8 +221,9 @@ 
 		$r = apply_filters( 'http_request_args', $r, $url );
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
-			$r['_redirection'] = $r['redirection'];
+		if ( ! isset( $r['_redirection'] ) ) {
+					$r['_redirection'] = $r['redirection'];
+		}
 
 		/**
 		 * Filter whether to preempt an HTTP request's return value.
@@ -243,12 +245,14 @@ 
 		 */
 		$pre = apply_filters( 'pre_http_request', false, $r, $url );
 
-		if ( false !== $pre )
-			return $pre;
+		if ( false !== $pre ) {
+					return $pre;
+		}
 
 		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] )
-				$url = wp_http_validate_url( $url );
+			if ( $r['reject_unsafe_urls'] ) {
+							$url = wp_http_validate_url( $url );
+			}
 			if ( $url ) {
 				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
 			}
@@ -256,11 +260,13 @@ 
 
 		$arrURL = @parse_url( $url );
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) )
-			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+					return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+		}
 
-		if ( $this->block_request( $url ) )
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ( $this->block_request( $url ) ) {
+					return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		}
 
 		/*
 		 * Determine if this is a https call and pass that on to the transport functions
@@ -287,12 +293,14 @@ 
 		 */
 		if ( $r['stream'] ) {
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) )
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
+							return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			}
 		}
 
-		if ( is_null( $r['headers'] ) )
-			$r['headers'] = array();
+		if ( is_null( $r['headers'] ) ) {
+					$r['headers'] = array();
+		}
 
 		if ( ! is_array( $r['headers'] ) ) {
 			$processedHeaders = self::processHeaders( $r['headers'], $url );
@@ -320,31 +328,36 @@ 
 		mbstring_binary_safe_encoding();
 
 		if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
-			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
-				$r['headers']['Accept-Encoding'] = $encoding;
+			if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) ) {
+							$r['headers']['Accept-Encoding'] = $encoding;
+			}
 		}
 
 		if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
 			if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
 				$r['body'] = http_build_query( $r['body'], null, '&' );
 
-				if ( ! isset( $r['headers']['Content-Type'] ) )
-					$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				if ( ! isset( $r['headers']['Content-Type'] ) ) {
+									$r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
+				}
 			}
 
-			if ( '' === $r['body'] )
-				$r['body'] = null;
+			if ( '' === $r['body'] ) {
+							$r['body'] = null;
+			}
 
-			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
-				$r['headers']['Content-Length'] = strlen( $r['body'] );
+			if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) ) {
+							$r['headers']['Content-Length'] = strlen( $r['body'] );
+			}
 		}
 
 		$response = $this->_dispatch_request( $url, $r );
 
 		reset_mbstring_encoding();
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		// Append cookies that were used in this request to the response
 		if ( ! empty( $r['cookies'] ) ) {
@@ -393,8 +406,9 @@ 
 			$class = 'WP_Http_' . $transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
-				continue;
+			if ( !call_user_func( array( $class, 'test' ), $args, $url ) ) {
+							continue;
+			}
 
 			return $class;
 		}
@@ -423,12 +437,14 @@ 
 		static $transports = array();
 
 		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		if ( !$class ) {
+					return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		}
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
-			$transports[$class] = new $class;
+		if ( empty( $transports[$class] ) ) {
+					$transports[$class] = new $class;
+		}
 
 		$response = $transports[$class]->request( $url, $args );
 
@@ -445,8 +461,9 @@ 
 		 */
 		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		/**
 		 * Filter the HTTP API response immediately before the response is returned.
@@ -575,8 +592,9 @@ 
 		$cookies = array();
 		$newheaders = array();
 		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
-				continue;
+			if ( empty($tempheader) ) {
+							continue;
+			}
 
 			if ( false === strpos($tempheader, ':') ) {
 				$stack = explode(' ', $tempheader, 3);
@@ -591,14 +609,16 @@ 
 			$value = trim( $value );
 
 			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
+				if ( ! is_array( $newheaders[ $key ] ) ) {
+									$newheaders[$key] = array( $newheaders[ $key ] );
+				}
 				$newheaders[ $key ][] = $value;
 			} else {
 				$newheaders[ $key ] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ( 'set-cookie' == $key ) {
+							$cookies[] = new WP_Http_Cookie( $value, $url );
+			}
 		}
 
 		// Cast the Response Code to an int
@@ -624,8 +644,9 @@ 
 		if ( ! empty($r['cookies']) ) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
 			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				if ( ! is_object( $value ) ) {
+									$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				}
 			}
 
 			$cookies_header = '';
@@ -654,8 +675,9 @@ 
 	 */
 	public static function chunkTransferDecode( $body ) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
-			return $body;
+		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) ) {
+					return $body;
+		}
 
 		$parsed_body = '';
 
@@ -664,8 +686,9 @@ 
 
 		while ( true ) {
 			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
-				return $body_original;
+			if ( ! $has_chunk || empty( $match[1] ) ) {
+							return $body_original;
+			}
 
 			$length = hexdec( $match[1] );
 			$chunk_length = strlen( $match[0] );
@@ -677,8 +700,9 @@ 
 			$body = substr( $body, $length + $chunk_length );
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
-				return $parsed_body;
+			if ( '0' === trim( $body ) ) {
+							return $parsed_body;
+			}
 		}
 	}
 
@@ -706,12 +730,14 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
-			return false;
+		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) {
+					return false;
+		}
 
 		$check = parse_url($uri);
-		if ( ! $check )
-			return true;
+		if ( ! $check ) {
+					return true;
+		}
 
 		$home = parse_url( get_option('siteurl') );
 
@@ -728,8 +754,9 @@ 
 			return apply_filters( 'block_local_requests', false );
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
-			return true;
+		if ( !defined('WP_ACCESSIBLE_HOSTS') ) {
+					return true;
+		}
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
@@ -738,16 +765,19 @@ 
 
 			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				foreach ( $accessible_hosts as $host ) {
+									$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				}
 				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		if ( !empty($wildcard_regex) ) {
+					return !preg_match($wildcard_regex, $check['host']);
+		} else {
+					return !in_array( $check['host'], $accessible_hosts );
+		}
+		//Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -782,8 +812,9 @@ 
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
 	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
-			return $maybe_relative_path;
+		if ( empty( $url ) ) {
+					return $maybe_relative_path;
+		}
 
 		if ( ! $url_parts = wp_parse_url( $url ) ) {
 			return $maybe_relative_path;
@@ -803,12 +834,14 @@ 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
 		if ( isset( $relative_url_parts['host'] ) ) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if ( isset( $relative_url_parts['port'] ) ) {
+							$absolute_path .= ':' . $relative_url_parts['port'];
+			}
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if ( isset( $url_parts['port'] ) ) {
+							$absolute_path .= ':' . $url_parts['port'];
+			}
 		}
 
 		// Start off with the Absolute URL path.
@@ -836,8 +869,9 @@ 
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty( $relative_url_parts['query'] ) ) {
+					$path .= '?' . $relative_url_parts['query'];
+		}
 
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
@@ -856,36 +890,42 @@ 
 	 */
 	public static function handle_redirects( $url, $args, $response ) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
-			return false;
+		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) {
+					return false;
+		}
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
-			return false;
+		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) {
+					return false;
+		}
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ( $args['redirection']-- <= 0 ) {
+					return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		}
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if ( is_array( $redirect_location ) ) {
+					$redirect_location = array_pop( $redirect_location );
+		}
 
 		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
 		// POST requests should not POST to a redirected location.
 		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
-				$args['method'] = 'GET';
+			if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
+							$args['method'] = 'GET';
+			}
 		}
 
 		// Include valid cookies in the redirect process.
 		if ( ! empty( $response['cookies'] ) ) {
 			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
-					$args['cookies'][] = $cookie;
+				if ( $cookie->test( $redirect_location ) ) {
+									$args['cookies'][] = $cookie;
+				}
 			}
 		}
 
@@ -909,11 +949,13 @@ 
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
 	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
-			return 4;
+		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
+					return 4;
+		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
-			return 6;
+		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+					return 6;
+		}
 
 		return false;
 	}

src/wp-includes/class-wp-comment-query.php

Doc Comments +1 added lines, -1 removed lines

@@ -1004,7 +1004,7 @@
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $string
-	 * @param array $cols
+	 * @param string[] $cols
 	 * @return string
 	 */
 	protected function get_search_sql( $string, $cols ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Comment API: WP_Comment_Query class
- *
- * @package WordPress
- * @subpackage Comments
- * @since 4.4.0
- */
+	 * Comment API: WP_Comment_Query class
+	 *
+	 * @package WordPress
+	 * @subpackage Comments
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used for querying comments.

Spacing +232 added lines, -233 removed lines

@@ -134,9 +134,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -256,7 +256,7 @@ 
 	 *                                                   Default false.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'author_email' => '',
 			'author_url' => '',
@@ -303,8 +303,8 @@ 
 			'update_comment_post_cache' => false,
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -317,13 +317,13 @@ 
 	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
-		do_action_ref_array( 'parse_comment_query', array( &$this ) );
+		$this->query_vars = wp_parse_args($query, $this->query_var_defaults);
+		do_action_ref_array('parse_comment_query', array(&$this));
 	}
 
 	/**
@@ -340,8 +340,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of comments, or number of comments when 'count' is passed as a query var.
 	 */
-	public function query( $query ) {
-		$this->query_vars = wp_parse_args( $query );
+	public function query($query) {
+		$this->query_vars = wp_parse_args($query);
 		return $this->get_comments();
 	}
 
@@ -362,7 +362,7 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $this->query_vars );
+		$this->meta_query->parse_query_vars($this->query_vars);
 
 		/**
 		 * Fires before comments are retrieved.
@@ -371,40 +371,40 @@ 
 		 *
 		 * @param WP_Comment_Query &$this Current instance of WP_Comment_Query, passed by reference.
 		 */
-		do_action_ref_array( 'pre_get_comments', array( &$this ) );
+		do_action_ref_array('pre_get_comments', array(&$this));
 
 		// Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
-		$this->meta_query->parse_query_vars( $this->query_vars );
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+		$this->meta_query->parse_query_vars($this->query_vars);
+		if ( ! empty($this->meta_query->queries)) {
+			$this->meta_query_clauses = $this->meta_query->get_sql('comment', $wpdb->comments, 'comment_ID', $this);
 		}
 
 		// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get( 'last_changed', 'comment' );
-		if ( ! $last_changed ) {
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get('last_changed', 'comment');
+		if ( ! $last_changed) {
 			$last_changed = microtime();
-			wp_cache_set( 'last_changed', $last_changed, 'comment' );
+			wp_cache_set('last_changed', $last_changed, 'comment');
 		}
 		$cache_key = "get_comment_ids:$key:$last_changed";
 
-		$comment_ids = wp_cache_get( $cache_key, 'comment' );
-		if ( false === $comment_ids ) {
+		$comment_ids = wp_cache_get($cache_key, 'comment');
+		if (false === $comment_ids) {
 			$comment_ids = $this->get_comment_ids();
-			wp_cache_add( $cache_key, $comment_ids, 'comment' );
+			wp_cache_add($cache_key, $comment_ids, 'comment');
 		}
 
 		// If querying for a count only, there's nothing more to do.
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			// $comment_ids is actually a count in this case.
-			return intval( $comment_ids );
+			return intval($comment_ids);
 		}
 
-		$comment_ids = array_map( 'intval', $comment_ids );
+		$comment_ids = array_map('intval', $comment_ids);
 
-		$this->comment_count = count( $this->comments );
+		$this->comment_count = count($this->comments);
 
-		if ( $comment_ids && $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+		if ($comment_ids && $this->query_vars['number'] && ! $this->query_vars['no_found_rows']) {
 			/**
 			 * Filter the query used to retrieve found comment count.
 			 *
@@ -413,35 +413,35 @@ 
 			 * @param string           $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
 			 * @param WP_Comment_Query $comment_query        The `WP_Comment_Query` instance.
 			 */
-			$found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
-			$this->found_comments = (int) $wpdb->get_var( $found_comments_query );
+			$found_comments_query = apply_filters('found_comments_query', 'SELECT FOUND_ROWS()', $this);
+			$this->found_comments = (int) $wpdb->get_var($found_comments_query);
 
-			$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
+			$this->max_num_pages = ceil($this->found_comments / $this->query_vars['number']);
 		}
 
-		if ( 'ids' == $this->query_vars['fields'] ) {
+		if ('ids' == $this->query_vars['fields']) {
 			$this->comments = $comment_ids;
 			return $this->comments;
 		}
 
-		_prime_comment_caches( $comment_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($comment_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Fetch full comment objects from the primed cache.
 		$_comments = array();
-		foreach ( $comment_ids as $comment_id ) {
-			if ( $_comment = get_comment( $comment_id ) ) {
+		foreach ($comment_ids as $comment_id) {
+			if ($_comment = get_comment($comment_id)) {
 				$_comments[] = $_comment;
 			}
 		}
 
 		// Prime comment post caches.
-		if ( $this->query_vars['update_comment_post_cache'] ) {
+		if ($this->query_vars['update_comment_post_cache']) {
 			$comment_post_ids = array();
-			foreach ( $_comments as $_comment ) {
+			foreach ($_comments as $_comment) {
 				$comment_post_ids[] = $_comment->comment_post_ID;
 			}
 
-			_prime_post_caches( $comment_post_ids, false, false );
+			_prime_post_caches($comment_post_ids, false, false);
 		}
 
 		/**
@@ -452,13 +452,13 @@ 
 		 * @param array            $results  An array of comments.
 		 * @param WP_Comment_Query &$this    Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$_comments = apply_filters_ref_array( 'the_comments', array( $_comments, &$this ) );
+		$_comments = apply_filters_ref_array('the_comments', array($_comments, &$this));
 
 		// Convert to WP_Comment instances
-		$comments = array_map( 'get_comment', $_comments );
+		$comments = array_map('get_comment', $_comments);
 
-		if ( $this->query_vars['hierarchical'] ) {
-			$comments = $this->fill_descendants( $comments );
+		if ($this->query_vars['hierarchical']) {
+			$comments = $this->fill_descendants($comments);
 		}
 
 		$this->comments = $comments;
@@ -482,14 +482,14 @@ 
 		// 'status' accepts an array or a comma-separated string.
 		$status_clauses = array();
 		$statuses = $this->query_vars['status'];
-		if ( ! is_array( $statuses ) ) {
-			$statuses = preg_split( '/[\s,]+/', $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = preg_split('/[\s,]+/', $statuses);
 		}
 
 		// 'any' overrides other statuses.
-		if ( ! in_array( 'any', $statuses ) ) {
-			foreach ( $statuses as $status ) {
-				switch ( $status ) {
+		if ( ! in_array('any', $statuses)) {
+			foreach ($statuses as $status) {
+				switch ($status) {
 					case 'hold' :
 						$status_clauses[] = "comment_approved = '0'";
 						break;
@@ -504,65 +504,64 @@ 
 						break;
 
 					default :
-						$status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+						$status_clauses[] = $wpdb->prepare("comment_approved = %s", $status);
 						break;
 				}
 			}
 
-			if ( ! empty( $status_clauses ) ) {
-				$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+			if ( ! empty($status_clauses)) {
+				$approved_clauses[] = '( '.implode(' OR ', $status_clauses).' )';
 			}
 		}
 
 		// User IDs or emails whose unapproved comments are included, regardless of $status.
-		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
+		if ( ! empty($this->query_vars['include_unapproved'])) {
 			$include_unapproved = $this->query_vars['include_unapproved'];
 
 			// Accepts arrays or comma-separated strings.
-			if ( ! is_array( $include_unapproved ) ) {
-				$include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+			if ( ! is_array($include_unapproved)) {
+				$include_unapproved = preg_split('/[\s,]+/', $include_unapproved);
 			}
 
 			$unapproved_ids = $unapproved_emails = array();
-			foreach ( $include_unapproved as $unapproved_identifier ) {
+			foreach ($include_unapproved as $unapproved_identifier) {
 				// Numeric values are assumed to be user ids.
-				if ( is_numeric( $unapproved_identifier ) ) {
-					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+				if (is_numeric($unapproved_identifier)) {
+					$approved_clauses[] = $wpdb->prepare("( user_id = %d AND comment_approved = '0' )", $unapproved_identifier);
 
 				// Otherwise we match against email addresses.
 				} else {
-					$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+					$approved_clauses[] = $wpdb->prepare("( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier);
 				}
 			}
 		}
 
 		// Collapse comment_approved clauses into a single OR-separated clause.
-		if ( ! empty( $approved_clauses ) ) {
-			if ( 1 === count( $approved_clauses ) ) {
+		if ( ! empty($approved_clauses)) {
+			if (1 === count($approved_clauses)) {
 				$this->sql_clauses['where']['approved'] = $approved_clauses[0];
 			} else {
-				$this->sql_clauses['where']['approved'] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+				$this->sql_clauses['where']['approved'] = '( '.implode(' OR ', $approved_clauses).' )';
 			}
 		}
 
-		$order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
+		$order = ('ASC' == strtoupper($this->query_vars['order'])) ? 'ASC' : 'DESC';
 
 		// Disable ORDER BY with 'none', an empty array, or boolean false.
-		if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+		if (in_array($this->query_vars['orderby'], array('none', array(), false), true)) {
 			$orderby = '';
-		} elseif ( ! empty( $this->query_vars['orderby'] ) ) {
-			$ordersby = is_array( $this->query_vars['orderby'] ) ?
-				$this->query_vars['orderby'] :
-				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+		} elseif ( ! empty($this->query_vars['orderby'])) {
+			$ordersby = is_array($this->query_vars['orderby']) ?
+				$this->query_vars['orderby'] : preg_split('/[,\s]/', $this->query_vars['orderby']);
 
 			$orderby_array = array();
 			$found_orderby_comment_ID = false;
-			foreach ( $ordersby as $_key => $_value ) {
-				if ( ! $_value ) {
+			foreach ($ordersby as $_key => $_value) {
+				if ( ! $_value) {
 					continue;
 				}
 
-				if ( is_int( $_key ) ) {
+				if (is_int($_key)) {
 					$_orderby = $_value;
 					$_order = $order;
 				} else {
@@ -570,45 +569,45 @@ 
 					$_order = $_value;
 				}
 
-				if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
+				if ( ! $found_orderby_comment_ID && in_array($_orderby, array('comment_ID', 'comment__in'))) {
 					$found_orderby_comment_ID = true;
 				}
 
-				$parsed = $this->parse_orderby( $_orderby );
+				$parsed = $this->parse_orderby($_orderby);
 
-				if ( ! $parsed ) {
+				if ( ! $parsed) {
 					continue;
 				}
 
-				if ( 'comment__in' === $_orderby ) {
+				if ('comment__in' === $_orderby) {
 					$orderby_array[] = $parsed;
 					continue;
 				}
 
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 
 			// If no valid clauses were found, order by comment_date_gmt.
-			if ( empty( $orderby_array ) ) {
+			if (empty($orderby_array)) {
 				$orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
 			}
 
 			// To ensure determinate sorting, always include a comment_ID clause.
-			if ( ! $found_orderby_comment_ID ) {
+			if ( ! $found_orderby_comment_ID) {
 				$comment_ID_order = '';
 
 				// Inherit order from comment_date or comment_date_gmt, if available.
-				foreach ( $orderby_array as $orderby_clause ) {
-					if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
+				foreach ($orderby_array as $orderby_clause) {
+					if (preg_match('/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match)) {
 						$comment_ID_order = $match[1];
 						break;
 					}
 				}
 
 				// If no date-related order is available, use the date from the first available clause.
-				if ( ! $comment_ID_order ) {
-					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+				if ( ! $comment_ID_order) {
+					foreach ($orderby_array as $orderby_clause) {
+						if (false !== strpos('ASC', $orderby_clause)) {
 							$comment_ID_order = 'ASC';
 						} else {
 							$comment_ID_order = 'DESC';
@@ -619,94 +618,94 @@ 
 				}
 
 				// Default to DESC.
-				if ( ! $comment_ID_order ) {
+				if ( ! $comment_ID_order) {
 					$comment_ID_order = 'DESC';
 				}
 
 				$orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
 			}
 
-			$orderby = implode( ', ', $orderby_array );
+			$orderby = implode(', ', $orderby_array);
 		} else {
 			$orderby = "$wpdb->comments.comment_date_gmt $order";
 		}
 
-		$number = absint( $this->query_vars['number'] );
-		$offset = absint( $this->query_vars['offset'] );
+		$number = absint($this->query_vars['number']);
+		$offset = absint($this->query_vars['offset']);
 
-		if ( ! empty( $number ) ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ( ! empty($number)) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		}
 
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			$fields = 'COUNT(*)';
 		} else {
 			$fields = "$wpdb->comments.comment_ID";
 		}
 
-		$post_id = absint( $this->query_vars['post_id'] );
-		if ( ! empty( $post_id ) ) {
-			$this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
+		$post_id = absint($this->query_vars['post_id']);
+		if ( ! empty($post_id)) {
+			$this->sql_clauses['where']['post_id'] = $wpdb->prepare('comment_post_ID = %d', $post_id);
 		}
 
 		// Parse comment IDs for an IN clause.
-		if ( ! empty( $this->query_vars['comment__in'] ) ) {
-			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__in'])) {
+			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__in'])).' )';
 		}
 
 		// Parse comment IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__not_in'])) {
+			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__not_in'])).' )';
 		}
 
 		// Parse comment parent IDs for an IN clause.
-		if ( ! empty( $this->query_vars['parent__in'] ) ) {
-			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__in'])) {
+			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__in'])).' )';
 		}
 
 		// Parse comment parent IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['parent__not_in'] ) ) {
-			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__not_in'])) {
+			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__not_in'])).' )';
 		}
 
 		// Parse comment post IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post__in'] ) ) {
-			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__in'])) {
+			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__in'])).' )';
 		}
 
 		// Parse comment post IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post__not_in'] ) ) {
-			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__not_in'])) {
+			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__not_in'])).' )';
 		}
 
-		if ( '' !== $this->query_vars['author_email'] ) {
-			$this->sql_clauses['where']['author_email'] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
+		if ('' !== $this->query_vars['author_email']) {
+			$this->sql_clauses['where']['author_email'] = $wpdb->prepare('comment_author_email = %s', $this->query_vars['author_email']);
 		}
 
-		if ( '' !== $this->query_vars['author_url'] ) {
-			$this->sql_clauses['where']['author_url'] = $wpdb->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
+		if ('' !== $this->query_vars['author_url']) {
+			$this->sql_clauses['where']['author_url'] = $wpdb->prepare('comment_author_url = %s', $this->query_vars['author_url']);
 		}
 
-		if ( '' !== $this->query_vars['karma'] ) {
-			$this->sql_clauses['where']['karma'] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
+		if ('' !== $this->query_vars['karma']) {
+			$this->sql_clauses['where']['karma'] = $wpdb->prepare('comment_karma = %d', $this->query_vars['karma']);
 		}
 
 		// Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
 		$raw_types = array(
-			'IN' => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
+			'IN' => array_merge((array) $this->query_vars['type'], (array) $this->query_vars['type__in']),
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
 		$comment_types = array();
-		foreach ( $raw_types as $operator => $_raw_types ) {
-			$_raw_types = array_unique( $_raw_types );
+		foreach ($raw_types as $operator => $_raw_types) {
+			$_raw_types = array_unique($_raw_types);
 
-			foreach ( $_raw_types as $type ) {
-				switch ( $type ) {
+			foreach ($_raw_types as $type) {
+				switch ($type) {
 					// An empty translates to 'all', for backward compatibility
 					case '':
 					case 'all' :
@@ -714,134 +713,134 @@ 
 
 					case 'comment':
 					case 'comments':
-						$comment_types[ $operator ][] = "''";
+						$comment_types[$operator][] = "''";
 						break;
 
 					case 'pings':
-						$comment_types[ $operator ][] = "'pingback'";
-						$comment_types[ $operator ][] = "'trackback'";
+						$comment_types[$operator][] = "'pingback'";
+						$comment_types[$operator][] = "'trackback'";
 						break;
 
 					default:
-						$comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+						$comment_types[$operator][] = $wpdb->prepare('%s', $type);
 						break;
 				}
 			}
 
-			if ( ! empty( $comment_types[ $operator ] ) ) {
-				$types_sql = implode( ', ', $comment_types[ $operator ] );
-				$this->sql_clauses['where']['comment_type__' . strtolower( str_replace( ' ', '_', $operator ) ) ] = "comment_type $operator ($types_sql)";
+			if ( ! empty($comment_types[$operator])) {
+				$types_sql = implode(', ', $comment_types[$operator]);
+				$this->sql_clauses['where']['comment_type__'.strtolower(str_replace(' ', '_', $operator))] = "comment_type $operator ($types_sql)";
 			}
 		}
 
-		if ( $this->query_vars['hierarchical'] && ! $this->query_vars['parent'] ) {
+		if ($this->query_vars['hierarchical'] && ! $this->query_vars['parent']) {
 			$this->query_vars['parent'] = 0;
 		}
 
-		if ( '' !== $this->query_vars['parent'] ) {
-			$this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $this->query_vars['parent'] );
+		if ('' !== $this->query_vars['parent']) {
+			$this->sql_clauses['where']['parent'] = $wpdb->prepare('comment_parent = %d', $this->query_vars['parent']);
 		}
 
-		if ( is_array( $this->query_vars['user_id'] ) ) {
-			$this->sql_clauses['where']['user_id'] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
-		} elseif ( '' !== $this->query_vars['user_id'] ) {
-			$this->sql_clauses['where']['user_id'] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
+		if (is_array($this->query_vars['user_id'])) {
+			$this->sql_clauses['where']['user_id'] = 'user_id IN ('.implode(',', array_map('absint', $this->query_vars['user_id'])).')';
+		} elseif ('' !== $this->query_vars['user_id']) {
+			$this->sql_clauses['where']['user_id'] = $wpdb->prepare('user_id = %d', $this->query_vars['user_id']);
 		}
 
 		// Falsy search strings are ignored.
-		if ( strlen( $this->query_vars['search'] ) ) {
+		if (strlen($this->query_vars['search'])) {
 			$search_sql = $this->get_search_sql(
 				$this->query_vars['search'],
-				array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
+				array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content')
 			);
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['search'] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
+			$this->sql_clauses['where']['search'] = preg_replace('/^\s*AND\s*/', '', $search_sql);
 		}
 
 		// If any post-related query vars are passed, join the posts table.
 		$join_posts_table = false;
-		$plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
-		$post_fields = array_filter( $plucked );
+		$plucked = wp_array_slice_assoc($this->query_vars, array('post_author', 'post_name', 'post_parent'));
+		$post_fields = array_filter($plucked);
 
-		if ( ! empty( $post_fields ) ) {
+		if ( ! empty($post_fields)) {
 			$join_posts_table = true;
-			foreach ( $post_fields as $field_name => $field_value ) {
+			foreach ($post_fields as $field_name => $field_value) {
 				// $field_value may be an array.
-				$esses = array_fill( 0, count( (array) $field_value ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+				$esses = array_fill(0, count((array) $field_value), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).')', $field_value);
 			}
 		}
 
 		// 'post_status' and 'post_type' are handled separately, due to the specialized behavior of 'any'.
-		foreach ( array( 'post_status', 'post_type' ) as $field_name ) {
+		foreach (array('post_status', 'post_type') as $field_name) {
 			$q_values = array();
-			if ( ! empty( $this->query_vars[ $field_name ] ) ) {
-				$q_values = $this->query_vars[ $field_name ];
-				if ( ! is_array( $q_values ) ) {
-					$q_values = explode( ',', $q_values );
+			if ( ! empty($this->query_vars[$field_name])) {
+				$q_values = $this->query_vars[$field_name];
+				if ( ! is_array($q_values)) {
+					$q_values = explode(',', $q_values);
 				}
 
 				// 'any' will cause the query var to be ignored.
-				if ( in_array( 'any', $q_values, true ) || empty( $q_values ) ) {
+				if (in_array('any', $q_values, true) || empty($q_values)) {
 					continue;
 				}
 
 				$join_posts_table = true;
 
-				$esses = array_fill( 0, count( $q_values ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
+				$esses = array_fill(0, count($q_values), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).")", $q_values);
 			}
 		}
 
 		// Comment author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['author__in'] ) ) {
-			$this->sql_clauses['where']['author__in'] = 'user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__in'])) {
+			$this->sql_clauses['where']['author__in'] = 'user_id IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__in'])).' )';
 		}
 
 		// Comment author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['author__not_in'] ) ) {
-			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__not_in'])) {
+			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__not_in'])).' )';
 		}
 
 		// Post author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post_author__in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__in'])).' )';
 		}
 
 		// Post author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__not_in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__not_in'])).' )';
 		}
 
 		$join = '';
 
-		if ( $join_posts_table ) {
+		if ($join_posts_table) {
 			$join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
 		}
 
-		if ( ! empty( $this->meta_query_clauses ) ) {
+		if ( ! empty($this->meta_query_clauses)) {
 			$join .= $this->meta_query_clauses['join'];
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $this->meta_query_clauses['where'] );
+			$this->sql_clauses['where']['meta_query'] = preg_replace('/^\s*AND\s*/', '', $this->meta_query_clauses['where']);
 
-			if ( ! $this->query_vars['count'] ) {
+			if ( ! $this->query_vars['count']) {
 				$groupby = "{$wpdb->comments}.comment_ID";
 			}
 		}
 
 		$date_query = $this->query_vars['date_query'];
-		if ( ! empty( $date_query ) && is_array( $date_query ) ) {
-			$date_query_object = new WP_Date_Query( $date_query, 'comment_date' );
-			$this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $date_query_object->get_sql() );
+		if ( ! empty($date_query) && is_array($date_query)) {
+			$date_query_object = new WP_Date_Query($date_query, 'comment_date');
+			$this->sql_clauses['where']['date_query'] = preg_replace('/^\s*AND\s*/', '', $date_query_object->get_sql());
 		}
 
-		$where = implode( ' AND ', $this->sql_clauses['where'] );
+		$where = implode(' AND ', $this->sql_clauses['where']);
 
-		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array('fields', 'join', 'where', 'orderby', 'limits', 'groupby');
 		/**
 		 * Filter the comment query clauses.
 		 *
@@ -850,31 +849,31 @@ 
 		 * @param array            $pieces A compacted array of comment query clauses.
 		 * @param WP_Comment_Query &$this  Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array('comments_clauses', array(compact($pieces), &$this));
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
-		$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
+		$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
 
 		$this->filtered_where_clause = $where;
 
-		if ( $where ) {
-			$where = 'WHERE ' . $where;
+		if ($where) {
+			$where = 'WHERE '.$where;
 		}
 
-		if ( $groupby ) {
-			$groupby = 'GROUP BY ' . $groupby;
+		if ($groupby) {
+			$groupby = 'GROUP BY '.$groupby;
 		}
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
 		$found_rows = '';
-		if ( ! $this->query_vars['no_found_rows'] ) {
+		if ( ! $this->query_vars['no_found_rows']) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
@@ -886,11 +885,11 @@ 
 
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
-		if ( $this->query_vars['count'] ) {
-			return intval( $wpdb->get_var( $this->request ) );
+		if ($this->query_vars['count']) {
+			return intval($wpdb->get_var($this->request));
 		} else {
-			$comment_ids = $wpdb->get_col( $this->request );
-			return array_map( 'intval', $comment_ids );
+			$comment_ids = $wpdb->get_col($this->request);
+			return array_map('intval', $comment_ids);
 		}
 	}
 
@@ -905,11 +904,11 @@ 
 	 * @param array $comments Array of top-level comments whose descendants should be filled in.
 	 * @return array
 	 */
-	protected function fill_descendants( $comments ) {
+	protected function fill_descendants($comments) {
 		global $wpdb;
 
 		$levels = array(
-			0 => wp_list_pluck( $comments, 'comment_ID' ),
+			0 => wp_list_pluck($comments, 'comment_ID'),
 		);
 
 		/*
@@ -917,74 +916,74 @@ 
 		 * query, minus the `parent`, `parent__in`, and `parent__not_in` sub-clauses.
 		 */
 		$_where = $this->filtered_where_clause;
-		$exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
-		foreach ( $exclude_keys as $exclude_key ) {
-			if ( isset( $this->sql_clauses['where'][ $exclude_key ] ) ) {
-				$clause = $this->sql_clauses['where'][ $exclude_key ];
+		$exclude_keys = array('parent', 'parent__in', 'parent__not_in');
+		foreach ($exclude_keys as $exclude_key) {
+			if (isset($this->sql_clauses['where'][$exclude_key])) {
+				$clause = $this->sql_clauses['where'][$exclude_key];
 
 				// Strip the clause as well as any adjacent ANDs.
-				$pattern = '|(?:AND)?\s*' . $clause . '\s*(?:AND)?|';
-				$_where_parts = preg_split( $pattern, $_where );
+				$pattern = '|(?:AND)?\s*'.$clause.'\s*(?:AND)?|';
+				$_where_parts = preg_split($pattern, $_where);
 
 				// Remove empties.
-				$_where_parts = array_filter( array_map( 'trim', $_where_parts ) );
+				$_where_parts = array_filter(array_map('trim', $_where_parts));
 
 				// Reassemble with an AND.
-				$_where = implode( ' AND ', $_where_parts );
+				$_where = implode(' AND ', $_where_parts);
 			}
 		}
 
 		// Fetch an entire level of the descendant tree at a time.
 		$level = 0;
 		do {
-			$parent_ids = $levels[ $level ];
-			if ( ! $parent_ids ) {
+			$parent_ids = $levels[$level];
+			if ( ! $parent_ids) {
 				break;
 			}
 
-			$where = 'WHERE ' . $_where . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $parent_ids ) ) . ')';
-			$comment_ids = $wpdb->get_col( "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );
+			$where = 'WHERE '.$_where.' AND comment_parent IN ('.implode(',', array_map('intval', $parent_ids)).')';
+			$comment_ids = $wpdb->get_col("{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC");
 
 			$level++;
-			$levels[ $level ] = $comment_ids;
-		} while ( $comment_ids );
+			$levels[$level] = $comment_ids;
+		} while ($comment_ids);
 
 		// Prime comment caches for non-top-level comments.
 		$descendant_ids = array();
-		for ( $i = 1; $i < count( $levels ); $i++ ) {
-			$descendant_ids = array_merge( $descendant_ids, $levels[ $i ] );
+		for ($i = 1; $i < count($levels); $i++) {
+			$descendant_ids = array_merge($descendant_ids, $levels[$i]);
 		}
 
-		_prime_comment_caches( $descendant_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($descendant_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Assemble a flat array of all comments + descendants.
 		$all_comments = $comments;
-		foreach ( $descendant_ids as $descendant_id ) {
-			$all_comments[] = get_comment( $descendant_id );
+		foreach ($descendant_ids as $descendant_id) {
+			$all_comments[] = get_comment($descendant_id);
 		}
 
 		// If a threaded representation was requested, build the tree.
-		if ( 'threaded' === $this->query_vars['hierarchical'] ) {
+		if ('threaded' === $this->query_vars['hierarchical']) {
 			$threaded_comments = $ref = array();
-			foreach ( $all_comments as $k => $c ) {
-				$_c = get_comment( $c->comment_ID );
+			foreach ($all_comments as $k => $c) {
+				$_c = get_comment($c->comment_ID);
 
 				// If the comment isn't in the reference array, it goes in the top level of the thread.
-				if ( ! isset( $ref[ $c->comment_parent ] ) ) {
-					$threaded_comments[ $_c->comment_ID ] = $_c;
-					$ref[ $_c->comment_ID ] = $threaded_comments[ $_c->comment_ID ];
+				if ( ! isset($ref[$c->comment_parent])) {
+					$threaded_comments[$_c->comment_ID] = $_c;
+					$ref[$_c->comment_ID] = $threaded_comments[$_c->comment_ID];
 
 				// Otherwise, set it as a child of its parent.
 				} else {
 
-					$ref[ $_c->comment_parent ]->add_child( $_c );
-					$ref[ $_c->comment_ID ] = $ref[ $_c->comment_parent ]->get_child( $_c->comment_ID );
+					$ref[$_c->comment_parent]->add_child($_c);
+					$ref[$_c->comment_ID] = $ref[$_c->comment_parent]->get_child($_c->comment_ID);
 				}
 			}
 
 			// Set the 'populated_children' flag, to ensure additional database queries aren't run.
-			foreach ( $ref as $_ref ) {
-				$_ref->populated_children( true );
+			foreach ($ref as $_ref) {
+				$_ref->populated_children(true);
 			}
 
 			$comments = $threaded_comments;
@@ -1007,17 +1006,17 @@ 
 	 * @param array $cols
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols ) {
+	protected function get_search_sql($string, $cols) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
 		$searches = array();
-		foreach ( $cols as $col ) {
-			$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+		foreach ($cols as $col) {
+			$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -1031,7 +1030,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$allowed_keys = array(
@@ -1052,30 +1051,30 @@ 
 			'user_id',
 		);
 
-		if ( ! empty( $this->query_vars['meta_key'] ) ) {
+		if ( ! empty($this->query_vars['meta_key'])) {
 			$allowed_keys[] = $this->query_vars['meta_key'];
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
 		}
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
-		if ( $meta_query_clauses ) {
-			$allowed_keys = array_merge( $allowed_keys, array_keys( $meta_query_clauses ) );
+		if ($meta_query_clauses) {
+			$allowed_keys = array_merge($allowed_keys, array_keys($meta_query_clauses));
 		}
 
 		$parsed = false;
-		if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
+		if ($orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value') {
 			$parsed = "$wpdb->commentmeta.meta_value";
-		} elseif ( $orderby == 'meta_value_num' ) {
+		} elseif ($orderby == 'meta_value_num') {
 			$parsed = "$wpdb->commentmeta.meta_value+0";
-		} elseif ( $orderby == 'comment__in' ) {
-			$comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
+		} elseif ($orderby == 'comment__in') {
+			$comment__in = implode(',', array_map('absint', $this->query_vars['comment__in']));
 			$parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
-		} elseif ( in_array( $orderby, $allowed_keys ) ) {
+		} elseif (in_array($orderby, $allowed_keys)) {
 
-			if ( isset( $meta_query_clauses[ $orderby ] ) ) {
-				$meta_clause = $meta_query_clauses[ $orderby ];
-				$parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+			if (isset($meta_query_clauses[$orderby])) {
+				$meta_clause = $meta_query_clauses[$orderby];
+				$parsed = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 			} else {
 				$parsed = "$wpdb->comments.$orderby";
 			}
@@ -1093,12 +1092,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

src/wp-includes/class-wp-comment.php

Doc Comments +1 added lines, -1 removed lines

@@ -366,7 +366,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property name.
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->post_fields ) && 0 !== (int) $this->comment_post_ID ) {

Spacing +34 added lines, -34 removed lines

@@ -174,7 +174,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $post_fields = array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_content_filtered', 'post_parent', 'guid', 'menu_order', 'post_type', 'post_mime_type', 'comment_count' );
+	protected $post_fields = array('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_content_filtered', 'post_parent', 'guid', 'menu_order', 'post_type', 'post_mime_type', 'comment_count');
 
 	/**
 	 * Retrieves a WP_Comment instance.
@@ -188,27 +188,27 @@ 
 	 * @param int $id Comment ID.
 	 * @return WP_Comment|false Comment object, otherwise false.
 	 */
-	public static function get_instance( $id ) {
+	public static function get_instance($id) {
 		global $wpdb;
 
 		$comment_id = (int) $id;
-		if ( ! $comment_id ) {
+		if ( ! $comment_id) {
 			return false;
 		}
 
-		$_comment = wp_cache_get( $comment_id, 'comment' );
+		$_comment = wp_cache_get($comment_id, 'comment');
 
-		if ( ! $_comment ) {
-			$_comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id ) );
+		if ( ! $_comment) {
+			$_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id));
 
-			if ( ! $_comment ) {
+			if ( ! $_comment) {
 				return false;
 			}
 
-			wp_cache_add( $_comment->comment_ID, $_comment, 'comment' );
+			wp_cache_add($_comment->comment_ID, $_comment, 'comment');
 		}
 
-		return new WP_Comment( $_comment );
+		return new WP_Comment($_comment);
 	}
 
 	/**
@@ -221,8 +221,8 @@ 
 	 *
 	 * @param WP_Comment $comment Comment object.
 	 */
-	public function __construct( $comment ) {
-		foreach ( get_object_vars( $comment ) as $key => $value ) {
+	public function __construct($comment) {
+		foreach (get_object_vars($comment) as $key => $value) {
 			$this->$key = $value;
 		}
 	}
@@ -236,7 +236,7 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		return get_object_vars( $this );
+		return get_object_vars($this);
 	}
 
 	/**
@@ -276,7 +276,7 @@ 
 	 * }
 	 * @return array Array of `WP_Comment` objects.
 	 */
-	public function get_children( $args = array() ) {
+	public function get_children($args = array()) {
 		$defaults = array(
 			'format' => 'tree',
 			'status' => 'all',
@@ -284,26 +284,26 @@ 
 			'orderby' => '',
 		);
 
-		$_args = wp_parse_args( $args, $defaults );
+		$_args = wp_parse_args($args, $defaults);
 		$_args['parent'] = $this->comment_ID;
 
-		if ( is_null( $this->children ) ) {
-			if ( $this->populated_children ) {
+		if (is_null($this->children)) {
+			if ($this->populated_children) {
 				$this->children = array();
 			} else {
-				$this->children = get_comments( $_args );
+				$this->children = get_comments($_args);
 			}
 		}
 
-		if ( 'flat' === $_args['format'] ) {
+		if ('flat' === $_args['format']) {
 			$children = array();
-			foreach ( $this->children as $child ) {
+			foreach ($this->children as $child) {
 				$child_args = $_args;
 				$child_args['format'] = 'flat';
 				// get_children() resets this value automatically.
-				unset( $child_args['parent'] );
+				unset($child_args['parent']);
 
-				$children = array_merge( $children, array( $child ), $child->get_children( $child_args ) );
+				$children = array_merge($children, array($child), $child->get_children($child_args));
 			}
 		} else {
 			$children = $this->children;
@@ -322,8 +322,8 @@ 
 	 *
 	 * @param WP_Comment $child Child comment.
 	 */
-	public function add_child( WP_Comment $child ) {
-		$this->children[ $child->comment_ID ] = $child;
+	public function add_child(WP_Comment $child) {
+		$this->children[$child->comment_ID] = $child;
 	}
 
 	/**
@@ -335,9 +335,9 @@ 
 	 * @param int $child_id ID of the child.
 	 * @return WP_Comment|bool Returns the comment object if found, otherwise false.
 	 */
-	public function get_child( $child_id ) {
-		if ( isset( $this->children[ $child_id ] ) ) {
-			return $this->children[ $child_id ];
+	public function get_child($child_id) {
+		if (isset($this->children[$child_id])) {
+			return $this->children[$child_id];
 		}
 
 		return false;
@@ -353,7 +353,7 @@ 
 	 *
 	 * @param bool $set Whether the comment's children have already been populated.
 	 */
-	public function populated_children( $set ) {
+	public function populated_children($set) {
 		$this->populated_children = (bool) $set;
 	}
 
@@ -368,10 +368,10 @@ 
 	 * @param string $name Property name.
 	 * @return bool
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->post_fields ) && 0 !== (int) $this->comment_post_ID ) {
-			$post = get_post( $this->comment_post_ID );
-			return property_exists( $post, $name );
+	public function __isset($name) {
+		if (in_array($name, $this->post_fields) && 0 !== (int) $this->comment_post_ID) {
+			$post = get_post($this->comment_post_ID);
+			return property_exists($post, $name);
 		}
 	}
 
@@ -386,9 +386,9 @@ 
 	 * @param string $name
 	 * @return mixed
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->post_fields ) ) {
-			$post = get_post( $this->comment_post_ID );
+	public function __get($name) {
+		if (in_array($name, $this->post_fields)) {
+			$post = get_post($this->comment_post_ID);
 			return $post->$name;
 		}
 	}

src/wp-includes/class-wp-customize-setting.php

Doc Comments +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $default A default value which is used as a fallback. Default is null.
+	 * @param stdClass $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized value.
 	 */
 	final public function post_value( $default = null ) {

Spacing +146 added lines, -146 removed lines

@@ -121,11 +121,11 @@ 
 	 *                                      theme mod or option name.
 	 * @param array                $args    Setting arguments.
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
@@ -133,29 +133,29 @@ 
 		$this->id = $id;
 
 		// Parse the ID for array keys.
-		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
-		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
+		$this->id_data['keys'] = preg_split('/\[/', str_replace(']', '', $this->id));
+		$this->id_data['base'] = array_shift($this->id_data['keys']);
 
 		// Rebuild the ID.
-		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) ) {
-			$this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
+		$this->id = $this->id_data['base'];
+		if ( ! empty($this->id_data['keys'])) {
+			$this->id .= '['.implode('][', $this->id_data['keys']).']';
 		}
 
-		if ( $this->sanitize_callback ) {
-			add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+		if ($this->sanitize_callback) {
+			add_filter("customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2);
 		}
-		if ( $this->sanitize_js_callback ) {
-			add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
+		if ($this->sanitize_js_callback) {
+			add_filter("customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2);
 		}
 
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
 			// Other setting types can opt-in to aggregate multidimensional explicitly.
 			$this->aggregate_multidimensional();
 
 			// Allow option settings to indicate whether they should be autoloaded.
-			if ( 'option' === $this->type && isset( $args['autoload'] ) ) {
-				self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] = $args['autoload'];
+			if ('option' === $this->type && isset($args['autoload'])) {
+				self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'] = $args['autoload'];
 			}
 		}
 	}
@@ -188,20 +188,20 @@ 
 	 */
 	protected function aggregate_multidimensional() {
 		$id_base = $this->id_data['base'];
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ] = array();
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type])) {
+			self::$aggregated_multidimensionals[$this->type] = array();
 		}
-		if ( ! isset( self::$aggregated_multidimensionals[ $this->type ][ $id_base ] ) ) {
-			self::$aggregated_multidimensionals[ $this->type ][ $id_base ] = array(
+		if ( ! isset(self::$aggregated_multidimensionals[$this->type][$id_base])) {
+			self::$aggregated_multidimensionals[$this->type][$id_base] = array(
 				'previewed_instances'       => array(), // Calling preview() will add the $setting to the array.
 				'preview_applied_instances' => array(), // Flags for which settings have had their values applied.
-				'root_value'                => $this->get_root_value( array() ), // Root value for initial state, manipulated by preview and update calls.
+				'root_value'                => $this->get_root_value(array()), // Root value for initial state, manipulated by preview and update calls.
 			);
 		}
 
-		if ( ! empty( $this->id_data['keys'] ) ) {
+		if ( ! empty($this->id_data['keys'])) {
 			// Note the preview-applied flag is cleared at priority 9 to ensure it is cleared before a deferred-preview runs.
-			add_action( "customize_post_value_set_{$this->id}", array( $this, '_clear_aggregated_multidimensional_preview_applied_flag' ), 9 );
+			add_action("customize_post_value_set_{$this->id}", array($this, '_clear_aggregated_multidimensional_preview_applied_flag'), 9);
 			$this->is_multidimensional_aggregated = true;
 		}
 	}
@@ -224,10 +224,10 @@ 
 	 * @return bool If preview() has been called.
 	 */
 	public function is_current_blog_previewed() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			return false;
 		}
-		return ( get_current_blog_id() === $this->_previewed_blog_id );
+		return (get_current_blog_id() === $this->_previewed_blog_id);
 	}
 
 	/**
@@ -253,18 +253,18 @@ 
 	 * @return bool False when preview short-circuits due no change needing to be previewed.
 	 */
 	public function preview() {
-		if ( ! isset( $this->_previewed_blog_id ) ) {
+		if ( ! isset($this->_previewed_blog_id)) {
 			$this->_previewed_blog_id = get_current_blog_id();
 		}
 
 		// Prevent re-previewing an already-previewed setting.
-		if ( $this->is_previewed ) {
+		if ($this->is_previewed) {
 			return true;
 		}
 
 		$id_base = $this->id_data['base'];
-		$is_multidimensional = ! empty( $this->id_data['keys'] );
-		$multidimensional_filter = array( $this, '_multidimensional_preview_filter' );
+		$is_multidimensional = ! empty($this->id_data['keys']);
+		$multidimensional_filter = array($this, '_multidimensional_preview_filter');
 
 		/*
 		 * Check if the setting has a pre-existing value (an isset check),
@@ -273,53 +273,53 @@ 
 		 * to be previewed.
 		 */
 		$undefined = new stdClass();
-		$needs_preview = ( $undefined !== $this->post_value( $undefined ) );
+		$needs_preview = ($undefined !== $this->post_value($undefined));
 		$value = null;
 
 		// Since no post value was defined, check if we have an initial value set.
-		if ( ! $needs_preview ) {
-			if ( $this->is_multidimensional_aggregated ) {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$value = $this->multidimensional_get( $root, $this->id_data['keys'], $undefined );
+		if ( ! $needs_preview) {
+			if ($this->is_multidimensional_aggregated) {
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$value = $this->multidimensional_get($root, $this->id_data['keys'], $undefined);
 			} else {
 				$default = $this->default;
 				$this->default = $undefined; // Temporarily set default to undefined so we can detect if existing value is set.
 				$value = $this->value();
 				$this->default = $default;
 			}
-			$needs_preview = ( $undefined === $value ); // Because the default needs to be supplied.
+			$needs_preview = ($undefined === $value); // Because the default needs to be supplied.
 		}
 
 		// If the setting does not need previewing now, defer to when it has a value to preview.
-		if ( ! $needs_preview ) {
-			if ( ! has_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) ) ) {
-				add_action( "customize_post_value_set_{$this->id}", array( $this, 'preview' ) );
+		if ( ! $needs_preview) {
+			if ( ! has_action("customize_post_value_set_{$this->id}", array($this, 'preview'))) {
+				add_action("customize_post_value_set_{$this->id}", array($this, 'preview'));
 			}
 			return false;
 		}
 
-		switch ( $this->type ) {
+		switch ($this->type) {
 			case 'theme_mod' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "theme_mod_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("theme_mod_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add this filter once for this ID base.
-						add_filter( "theme_mod_{$id_base}", $multidimensional_filter );
+						add_filter("theme_mod_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			case 'option' :
-				if ( ! $is_multidimensional ) {
-					add_filter( "pre_option_{$id_base}", array( $this, '_preview_filter' ) );
+				if ( ! $is_multidimensional) {
+					add_filter("pre_option_{$id_base}", array($this, '_preview_filter'));
 				} else {
-					if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+					if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 						// Only add these filters once for this ID base.
-						add_filter( "option_{$id_base}", $multidimensional_filter );
-						add_filter( "default_option_{$id_base}", $multidimensional_filter );
+						add_filter("option_{$id_base}", $multidimensional_filter);
+						add_filter("default_option_{$id_base}", $multidimensional_filter);
 					}
-					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
+					self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'][$this->id] = $this;
 				}
 				break;
 			default :
@@ -334,7 +334,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 				 */
-				do_action( "customize_preview_{$this->id}", $this );
+				do_action("customize_preview_{$this->id}", $this);
 
 				/**
 				 * Fires when the {@see WP_Customize_Setting::preview()} method is called for settings
@@ -346,7 +346,7 @@ 
 				 *
 				 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 				 */
-				do_action( "customize_preview_{$this->type}", $this );
+				do_action("customize_preview_{$this->type}", $this);
 		}
 
 		$this->is_previewed = true;
@@ -367,7 +367,7 @@ 
 	 * @see WP_Customize_Setting::_multidimensional_preview_filter()
 	 */
 	final public function _clear_aggregated_multidimensional_preview_applied_flag() {
-		unset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['preview_applied_instances'][ $this->id ] );
+		unset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['preview_applied_instances'][$this->id]);
 	}
 
 	/**
@@ -382,14 +382,14 @@ 
 	 * @param mixed $original Old value.
 	 * @return mixed New or old value.
 	 */
-	public function _preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	public function _preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$undefined = new stdClass(); // Symbol hack.
-		$post_value = $this->post_value( $undefined );
-		if ( $undefined !== $post_value ) {
+		$post_value = $this->post_value($undefined);
+		if ($undefined !== $post_value) {
 			$value = $post_value;
 		} else {
 			/*
@@ -415,35 +415,35 @@ 
 	 * @param mixed $original Original root value.
 	 * @return mixed New or old value.
 	 */
-	final public function _multidimensional_preview_filter( $original ) {
-		if ( ! $this->is_current_blog_previewed() ) {
+	final public function _multidimensional_preview_filter($original) {
+		if ( ! $this->is_current_blog_previewed()) {
 			return $original;
 		}
 
 		$id_base = $this->id_data['base'];
 
 		// If no settings have been previewed yet (which should not be the case, since $this is), just pass through the original value.
-		if ( empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] ) ) {
+		if (empty(self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'])) {
 			return $original;
 		}
 
-		foreach ( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'] as $previewed_setting ) {
+		foreach (self::$aggregated_multidimensionals[$this->type][$id_base]['previewed_instances'] as $previewed_setting) {
 			// Skip applying previewed value for any settings that have already been applied.
-			if ( ! empty( self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] ) ) {
+			if ( ! empty(self::$aggregated_multidimensionals[$this->type][$id_base]['preview_applied_instances'][$previewed_setting->id])) {
 				continue;
 			}
 
 			// Do the replacements of the posted/default sub value into the root value.
-			$value = $previewed_setting->post_value( $previewed_setting->default );
-			$root = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
-			$root = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'] = $root;
+			$value = $previewed_setting->post_value($previewed_setting->default);
+			$root = self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'];
+			$root = $previewed_setting->multidimensional_replace($root, $previewed_setting->id_data['keys'], $value);
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['root_value'] = $root;
 
 			// Mark this setting having been applied so that it will be skipped when the filter is called again.
-			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['preview_applied_instances'][ $previewed_setting->id ] = true;
+			self::$aggregated_multidimensionals[$previewed_setting->type][$id_base]['preview_applied_instances'][$previewed_setting->id] = true;
 		}
 
-		return self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
+		return self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
 	}
 
 	/**
@@ -457,7 +457,7 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) )
+		if ( ! $this->check_capabilities() || ! isset($value))
 			return false;
 
 		/**
@@ -470,9 +470,9 @@ 
 		 *
 		 * @param WP_Customize_Setting $this {@see WP_Customize_Setting} instance.
 		 */
-		do_action( 'customize_save_' . $this->id_data[ 'base' ], $this );
+		do_action('customize_save_'.$this->id_data['base'], $this);
 
-		$this->update( $value );
+		$this->update($value);
 	}
 
 	/**
@@ -483,8 +483,8 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The default value on failure, otherwise the sanitized value.
 	 */
-	final public function post_value( $default = null ) {
-		return $this->manager->post_value( $this, $default );
+	final public function post_value($default = null) {
+		return $this->manager->post_value($this, $default);
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 * @param string|array $value The value to sanitize.
 	 * @return string|array|null Null if an input isn't valid, otherwise the sanitized value.
 	 */
-	public function sanitize( $value ) {
+	public function sanitize($value) {
 
 		/**
 		 * Filter a Customize setting value in un-slashed form.
@@ -505,7 +505,7 @@ 
 		 * @param mixed                $value Value of the setting.
 		 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 		 */
-		return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+		return apply_filters("customize_sanitize_{$this->id}", $value, $this);
 	}
 
 	/**
@@ -517,12 +517,12 @@ 
 	 * @param mixed $default Value to return if root does not exist.
 	 * @return mixed
 	 */
-	protected function get_root_value( $default = null ) {
+	protected function get_root_value($default = null) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
-			return get_option( $id_base, $default );
-		} else if ( 'theme_mod' ) {
-			return get_theme_mod( $id_base, $default );
+		if ('option' === $this->type) {
+			return get_option($id_base, $default);
+		} else if ('theme_mod') {
+			return get_theme_mod($id_base, $default);
 		} else {
 			/*
 			 * Any WP_Customize_Setting subclass implementing aggregate multidimensional
@@ -542,16 +542,16 @@ 
 	 * @param mixed $value Value to set as root of multidimensional setting.
 	 * @return bool Whether the multidimensional root was updated successfully.
 	 */
-	protected function set_root_value( $value ) {
+	protected function set_root_value($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type ) {
+		if ('option' === $this->type) {
 			$autoload = true;
-			if ( isset( self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] ) ) {
-				$autoload = self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'];
+			if (isset(self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'])) {
+				$autoload = self::$aggregated_multidimensionals[$this->type][$this->id_data['base']]['autoload'];
 			}
-			return update_option( $id_base, $value, $autoload );
-		} else if ( 'theme_mod' ) {
-			set_theme_mod( $id_base, $value );
+			return update_option($id_base, $value, $autoload);
+		} else if ('theme_mod') {
+			set_theme_mod($id_base, $value);
 			return true;
 		} else {
 			/*
@@ -571,16 +571,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return bool The result of saving the value.
 	 */
-	protected function update( $value ) {
+	protected function update($value) {
 		$id_base = $this->id_data['base'];
-		if ( 'option' === $this->type || 'theme_mod' === $this->type ) {
-			if ( ! $this->is_multidimensional_aggregated ) {
-				return $this->set_root_value( $value );
+		if ('option' === $this->type || 'theme_mod' === $this->type) {
+			if ( ! $this->is_multidimensional_aggregated) {
+				return $this->set_root_value($value);
 			} else {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-				$root = $this->multidimensional_replace( $root, $this->id_data['keys'], $value );
-				self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'] = $root;
-				return $this->set_root_value( $root );
+				$root = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+				$root = $this->multidimensional_replace($root, $this->id_data['keys'], $value);
+				self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'] = $root;
+				return $this->set_root_value($root);
 			}
 		} else {
 			/**
@@ -594,9 +594,9 @@ 
 			 * @param mixed                $value Value of the setting.
 			 * @param WP_Customize_Setting $this  WP_Customize_Setting instance.
 			 */
-			do_action( "customize_update_{$this->type}", $value, $this );
+			do_action("customize_update_{$this->type}", $value, $this);
 
-			return has_action( "customize_update_{$this->type}" );
+			return has_action("customize_update_{$this->type}");
 		}
 	}
 
@@ -607,7 +607,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_theme_mod() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -617,7 +617,7 @@ 
 	 * @deprecated 4.4.0 Deprecated in favor of update() method.
 	 */
 	protected function _update_option() {
-		_deprecated_function( __METHOD__, '4.4.0', __CLASS__ . '::update()' );
+		_deprecated_function(__METHOD__, '4.4.0', __CLASS__.'::update()');
 	}
 
 	/**
@@ -629,10 +629,10 @@ 
 	 */
 	public function value() {
 		$id_base = $this->id_data['base'];
-		$is_core_type = ( 'option' === $this->type || 'theme_mod' === $this->type );
+		$is_core_type = ('option' === $this->type || 'theme_mod' === $this->type);
 
-		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated ) {
-			$value = $this->get_root_value( $this->default );
+		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated) {
+			$value = $this->get_root_value($this->default);
 
 			/**
 			 * Filter a Customize setting value not handled as a theme_mod or option.
@@ -647,12 +647,12 @@ 
 			 *
 			 * @param mixed $default The setting default value. Default empty.
 			 */
-			$value = apply_filters( "customize_value_{$id_base}", $value );
-		} else if ( $this->is_multidimensional_aggregated ) {
-			$root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-			$value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+			$value = apply_filters("customize_value_{$id_base}", $value);
+		} else if ($this->is_multidimensional_aggregated) {
+			$root_value = self::$aggregated_multidimensionals[$this->type][$id_base]['root_value'];
+			$value = $this->multidimensional_get($root_value, $this->id_data['keys'], $this->default);
 		} else {
-			$value = $this->get_root_value( $this->default );
+			$value = $this->get_root_value($this->default);
 		}
 		return $value;
 	}
@@ -676,10 +676,10 @@ 
 		 * @param mixed                $value The setting value.
 		 * @param WP_Customize_Setting $this  {@see WP_Customize_Setting} instance.
 		 */
-		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
+		$value = apply_filters("customize_sanitize_js_{$this->id}", $this->value(), $this);
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if (is_string($value))
+			return html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 
 		return $value;
 	}
@@ -692,10 +692,10 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+		if ($this->capability && ! call_user_func_array('current_user_can', (array) $this->capability))
 			return false;
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+		if ($this->theme_supports && ! call_user_func_array('current_theme_supports', (array) $this->theme_supports))
 			return false;
 
 		return true;
@@ -711,37 +711,37 @@ 
 	 * @param bool $create Default is false.
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
-	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
+	final protected function multidimensional(&$root, $keys, $create = false) {
+		if ($create && empty($root))
 			$root = array();
 
-		if ( ! isset( $root ) || empty( $keys ) )
+		if ( ! isset($root) || empty($keys))
 			return;
 
-		$last = array_pop( $keys );
+		$last = array_pop($keys);
 		$node = &$root;
 
-		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+		foreach ($keys as $key) {
+			if ($create && ! isset($node[$key]))
+				$node[$key] = array();
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+			if ( ! is_array($node) || ! isset($node[$key]))
 				return;
 
-			$node = &$node[ $key ];
+			$node = &$node[$key];
 		}
 
-		if ( $create ) {
-			if ( ! is_array( $node ) ) {
+		if ($create) {
+			if ( ! is_array($node)) {
 				// account for an array overriding a string or object value
 				$node = array();
 			}
-			if ( ! isset( $node[ $last ] ) ) {
-				$node[ $last ] = array();
+			if ( ! isset($node[$last])) {
+				$node[$last] = array();
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
+		if ( ! isset($node[$last]))
 			return;
 
 		return array(
@@ -761,16 +761,16 @@ 
 	 * @param mixed $value The value to update.
 	 * @return mixed
 	 */
-	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
+	final protected function multidimensional_replace($root, $keys, $value) {
+		if ( ! isset($value))
 			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		elseif (empty($keys)) // If there are no keys, we're replacing the root.
 			return $value;
 
-		$result = $this->multidimensional( $root, $keys, true );
+		$result = $this->multidimensional($root, $keys, true);
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if (isset($result))
+			$result['node'][$result['key']] = $value;
 
 		return $root;
 	}
@@ -785,12 +785,12 @@ 
 	 * @param mixed $default A default value which is used as a fallback. Default is null.
 	 * @return mixed The requested value or the default value.
 	 */
-	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
-			return isset( $root ) ? $root : $default;
+	final protected function multidimensional_get($root, $keys, $default = null) {
+		if (empty($keys)) // If there are no keys, test the root.
+			return isset($root) ? $root : $default;
 
-		$result = $this->multidimensional( $root, $keys );
-		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
+		$result = $this->multidimensional($root, $keys);
+		return isset($result) ? $result['node'][$result['key']] : $default;
 	}
 
 	/**
@@ -802,23 +802,23 @@ 
 	 * @param $keys
 	 * @return bool True if value is set, false if not.
 	 */
-	final protected function multidimensional_isset( $root, $keys ) {
-		$result = $this->multidimensional_get( $root, $keys );
-		return isset( $result );
+	final protected function multidimensional_isset($root, $keys) {
+		$result = $this->multidimensional_get($root, $keys);
+		return isset($result);
 	}
 }
 
 /** WP_Customize_Filter_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
 
 /** WP_Customize_Header_Image_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
 
 /** WP_Customize_Background_Image_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
 
 /** WP_Customize_Nav_Menu_Item_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
 
 /** WP_Customize_Nav_Menu_Setting class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');

Braces +38 added lines, -24 removed lines

@@ -457,8 +457,9 @@ 
 	final public function save() {
 		$value = $this->post_value();
 
-		if ( ! $this->check_capabilities() || ! isset( $value ) )
-			return false;
+		if ( ! $this->check_capabilities() || ! isset( $value ) ) {
+					return false;
+		}
 
 		/**
 		 * Fires when the WP_Customize_Setting::save() method is called.
@@ -678,8 +679,9 @@ 
 		 */
 		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if ( is_string( $value ) ) {
+					return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		}
 
 		return $value;
 	}
@@ -692,11 +694,13 @@ 
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
-			return false;
+		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
+					return false;
+		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
-			return false;
+		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
+					return false;
+		}
 
 		return true;
 	}
@@ -712,21 +716,25 @@ 
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
 	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
-			$root = array();
+		if ( $create && empty( $root ) ) {
+					$root = array();
+		}
 
-		if ( ! isset( $root ) || empty( $keys ) )
-			return;
+		if ( ! isset( $root ) || empty( $keys ) ) {
+					return;
+		}
 
 		$last = array_pop( $keys );
 		$node = &$root;
 
 		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
-				$node[ $key ] = array();
+			if ( $create && ! isset( $node[ $key ] ) ) {
+							$node[ $key ] = array();
+			}
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
-				return;
+			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
+							return;
+			}
 
 			$node = &$node[ $key ];
 		}
@@ -741,8 +749,9 @@ 
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
-			return;
+		if ( ! isset( $node[ $last ] ) ) {
+					return;
+		}
 
 		return array(
 			'root' => &$root,
@@ -762,15 +771,18 @@ 
 	 * @return mixed
 	 */
 	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
-			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		if ( ! isset( $value ) ) {
+					return $root;
+		} elseif ( empty( $keys ) ) {
+			// If there are no keys, we're replacing the root.
 			return $value;
+		}
 
 		$result = $this->multidimensional( $root, $keys, true );
 
-		if ( isset( $result ) )
-			$result['node'][ $result['key'] ] = $value;
+		if ( isset( $result ) ) {
+					$result['node'][ $result['key'] ] = $value;
+		}
 
 		return $root;
 	}
@@ -786,8 +798,10 @@ 
 	 * @return mixed The requested value or the default value.
 	 */
 	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
+		if ( empty( $keys ) ) {
+			// If there are no keys, test the root.
 			return isset( $root ) ? $root : $default;
+		}
 
 		$result = $this->multidimensional( $root, $keys );
 		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;