ntwb / wordpress

src/wp-admin/includes/noop.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function is_admin() {return true; }
 
 /**
  * @ignore
@@ -85,22 +85,22 @@ 
  */
 function wp_guess_url() {}
 
-if ( ! function_exists( 'json_encode' ) ) :
+if ( ! function_exists('json_encode')) :
 /**
  * @ignore
  */
 function json_encode() {}
 endif;
 
-function get_file( $path ) {
+function get_file($path) {
 
-	if ( function_exists('realpath') ) {
-		$path = realpath( $path );
+	if (function_exists('realpath')) {
+		$path = realpath($path);
 	}
 
-	if ( ! $path || ! @is_file( $path ) ) {
+	if ( ! $path || ! @is_file($path)) {
 		return '';
 	}
 
-	return @file_get_contents( $path );
+	return @file_get_contents($path);
 }
\ No newline at end of file

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Media_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Media_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying media items in a list table.

Spacing +199 added lines, -199 removed lines

@@ -39,18 +39,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		$this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+	public function __construct($args = array()) {
+		$this->detached = (isset($_REQUEST['attachment-filter']) && 'detached' === $_REQUEST['attachment-filter']);
 
 		$this->modes = array(
-			'list' => __( 'List View' ),
-			'grid' => __( 'Grid View' )
+			'list' => __('List View'),
+			'grid' => __('Grid View')
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'media',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -71,17 +71,17 @@ 
 	public function prepare_items() {
 		global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
 
-		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
+		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query($_REQUEST);
 
- 		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
+ 		$this->is_trash = isset($_REQUEST['attachment-filter']) && 'trash' === $_REQUEST['attachment-filter'];
 
- 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+ 		$mode = empty($_REQUEST['mode']) ? 'list' : $_REQUEST['mode'];
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_query->found_posts,
 			'total_pages' => $wp_query->max_num_pages,
 			'per_page' => $wp_query->query_vars['posts_per_page'],
-		) );
+		));
 	}
 
 	/**
@@ -94,40 +94,40 @@ 
 
 		$type_links = array();
 
-		$filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter'];
+		$filter = empty($_GET['attachment-filter']) ? '' : $_GET['attachment-filter'];
 
 		$type_links['all'] = sprintf(
 			'<option value=""%s>%s</option>',
-			selected( $filter, true, false ),
-			__( 'All media items' )
+			selected($filter, true, false),
+			__('All media items')
 		);
 
-		foreach ( $post_mime_types as $mime_type => $label ) {
-			if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
+		foreach ($post_mime_types as $mime_type => $label) {
+			if ( ! wp_match_mime_types($mime_type, $avail_post_mime_types)) {
 				continue;
 			}
 
 			$selected = selected(
-				$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
-					wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
+				$filter && 0 === strpos($filter, 'post_mime_type:') &&
+					wp_match_mime_types($mime_type, str_replace('post_mime_type:', '', $filter)),
 				true,
 				false
 			);
 
 			$type_links[$mime_type] = sprintf(
 				'<option value="post_mime_type:%s"%s>%s</option>',
-				esc_attr( $mime_type ),
+				esc_attr($mime_type),
 				$selected,
 				$label[0]
 			);
 		}
-		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
+		$type_links['detached'] = '<option value="detached"'.($this->detached ? ' selected="selected"' : '').'>'.__('Unattached').'</option>';
 
-		if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+		if ($this->is_trash || (defined('MEDIA_TRASH') && MEDIA_TRASH)) {
 			$type_links['trash'] = sprintf(
 				'<option value="trash"%s>%s</option>',
-				selected( 'trash' === $filter, true, false ),
-				_x( 'Trash', 'attachment filter' )
+				selected('trash' === $filter, true, false),
+				_x('Trash', 'attachment filter')
 			);
 		}
 		return $type_links;
@@ -139,19 +139,19 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( MEDIA_TRASH ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (MEDIA_TRASH) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = _x( 'Trash', 'verb' );
+				$actions['trash'] = _x('Trash', 'verb');
 			}
 		} else {
-			$actions['delete'] = __( 'Delete Permanently' );
+			$actions['delete'] = __('Delete Permanently');
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach' );
+		if ($this->detached)
+			$actions['attach'] = __('Attach');
 
 		return $actions;
 	}
@@ -159,26 +159,26 @@ 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'bar' !== $which ) {
+	protected function extra_tablenav($which) {
+		if ('bar' !== $which) {
 			return;
 		}
 ?>
 		<div class="actions">
 <?php
-		if ( ! is_singular() ) {
-			if ( ! $this->is_trash ) {
-				$this->months_dropdown( 'attachment' );
+		if ( ! is_singular()) {
+			if ( ! $this->is_trash) {
+				$this->months_dropdown('attachment');
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			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( 'edit_others_posts' ) ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can('edit_others_posts')) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		} ?>
 		</div>
 <?php
@@ -189,13 +189,13 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['found_post_id']) && isset($_REQUEST['media']))
 			return 'attach';
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['parent_post_id']) && isset($_REQUEST['media']))
 			return 'detach';
 
-		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();
@@ -213,7 +213,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No media files found.' );
+		_e('No media files found.');
 	}
 
 	/**
@@ -226,17 +226,17 @@ 
 
 		$views = $this->get_views();
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 ?>
 <div class="wp-filter">
 	<div class="filter-items">
-		<?php $this->view_switcher( $mode ); ?>
+		<?php $this->view_switcher($mode); ?>
 
-		<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+		<label for="attachment-filter" class="screen-reader-text"><?php _e('Filter by type'); ?></label>
 		<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
 			<?php
-			if ( ! empty( $views ) ) {
-				foreach ( $views as $class => $view ) {
+			if ( ! empty($views)) {
+				foreach ($views as $class => $view) {
 					echo "\t$view\n";
 				}
 			}
@@ -244,15 +244,15 @@ 
 		</select>
 
 <?php
-		$this->extra_tablenav( 'bar' );
+		$this->extra_tablenav('bar');
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", array() );
+		$views = apply_filters("views_{$this->screen->id}", array());
 
 		// Back compat for pre-4.0 view links.
-		if ( ! empty( $views ) ) {
+		if ( ! empty($views)) {
 			echo '<ul class="filter-links">';
-			foreach ( $views as $class => $view ) {
+			foreach ($views as $class => $view) {
 				echo "<li class='$class'>$view</li>";
 			}
 			echo '</ul>';
@@ -261,8 +261,8 @@ 
 	</div>
 
 	<div class="search-form">
-		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
-		<input type="search" placeholder="<?php esc_attr_e( 'Search' ) ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
+		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e('Search Media'); ?></label>
+		<input type="search" placeholder="<?php esc_attr_e('Search') ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
 	</div>
 	<?php
 	}
@@ -275,11 +275,11 @@ 
 		$posts_columns = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
 		/* translators: column name */
-		$posts_columns['title'] = _x( 'File', 'column name' );
-		$posts_columns['author'] = __( 'Author' );
+		$posts_columns['title'] = _x('File', 'column name');
+		$posts_columns['author'] = __('Author');
 
-		$taxonomies = get_taxonomies_for_attachments( 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_taxonomies_for_attachments('objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filter the taxonomy columns for attachments in the Media list table.
@@ -289,28 +289,28 @@ 
 		 * @param array  $taxonomies An array of registered taxonomies to show for attachments.
 		 * @param string $post_type  The post type. Default 'attachment'.
 		 */
-		$taxonomies = apply_filters( 'manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment' );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters('manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment');
+		$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;
 		}
 
 		/* translators: column name */
-		if ( !$this->detached ) {
-			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( ! $this->detached) {
+			$posts_columns['parent'] = _x('Uploaded to', 'column name');
+			if (post_type_supports('attachment', 'comments'))
+				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 		}
 		/* translators: column name */
-		$posts_columns['date'] = _x( 'Date', 'column name' );
+		$posts_columns['date'] = _x('Date', 'column name');
 		/**
 		 * Filter the Media list table columns.
 		 *
@@ -320,7 +320,7 @@ 
 		 * @param bool  $detached      Whether the list table contains media not attached
 		 *                             to any posts. Default true.
 		 */
-		return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
+		return apply_filters('manage_media_columns', $posts_columns, $this->detached);
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 			'author'   => 'author',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
+			'date'     => array('date', true),
 		);
 	}
 
@@ -345,10 +345,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 echo $post->ID; ?>"><?php
-				echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
+				echo sprintf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
 		<?php }
@@ -362,19 +362,19 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
-		list( $mime ) = explode( '/', $post->post_mime_type );
+	public function column_title($post) {
+		list($mime) = explode('/', $post->post_mime_type);
 
 		$title = _draft_or_post_title();
-		$thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$thumb = wp_get_attachment_image($post->ID, array(60, 60), true, array('alt' => ''));
 		$link_start = $link_end = '';
 
-		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
+		if (current_user_can('edit_post', $post->ID) && ! $this->is_trash) {
 			$link_start = sprintf(
 				'<a href="%s" aria-label="%s">',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: attachment title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) )
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title))
 			);
 			$link_end = '</a>';
 		}
@@ -384,18 +384,18 @@ 
 		<strong<?php echo $class; ?>>
 			<?php
 			echo $link_start;
-			if ( $thumb ) : ?>
-				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+			if ($thumb) : ?>
+				<span class="media-icon <?php echo sanitize_html_class($mime.'-icon'); ?>"><?php echo $thumb; ?></span>
 			<?php endif;
-			echo $title . $link_end;
-			_media_states( $post );
+			echo $title.$link_end;
+			_media_states($post);
 			?>
 		</strong>
 		<p class="filename">
-			<span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+			<span class="screen-reader-text"><?php _e('File name:'); ?> </span>
 			<?php
-			$file = get_attached_file( $post->ID );
-			echo wp_basename( $file );
+			$file = get_attached_file($post->ID);
+			echo wp_basename($file);
 			?>
 		</p>
 		<?php
@@ -409,9 +409,9 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
-		printf( '<a href="%s">%s</a>',
-			esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+	public function column_author($post) {
+		printf('<a href="%s">%s</a>',
+			esc_url(add_query_arg(array('author' => get_the_author_meta('ID')), 'upload.php')),
 			get_the_author()
 		);
 	}
@@ -424,7 +424,7 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_desc( $post ) {
+	public function column_desc($post) {
 		echo has_excerpt() ? $post->post_excerpt : '';
 	}
 
@@ -436,20 +436,20 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$h_time = __( 'Unpublished' );
+	public function column_date($post) {
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$h_time = __('Unpublished');
 		} else {
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post, false );
-			if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
-				if ( $t_diff < 0 ) {
-					$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
+			$time = get_post_time('G', true, $post, false);
+			if ((abs($t_diff = time() - $time)) < DAY_IN_SECONDS) {
+				if ($t_diff < 0) {
+					$h_time = sprintf(__('%s from now'), human_time_diff($time));
 				} else {
-					$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+					$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);
 			}
 		}
 
@@ -464,52 +464,52 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_parent( $post ) {
-		$user_can_edit = current_user_can( 'edit_post', $post->ID );
+	public function column_parent($post) {
+		$user_can_edit = current_user_can('edit_post', $post->ID);
 
-		if ( $post->post_parent > 0 ) {
-			$parent = get_post( $post->post_parent );
+		if ($post->post_parent > 0) {
+			$parent = get_post($post->post_parent);
 		} else {
 			$parent = false;
 		}
 
-		if ( $parent ) {
-			$title = _draft_or_post_title( $post->post_parent );
-			$parent_type = get_post_type_object( $parent->post_type );
+		if ($parent) {
+			$title = _draft_or_post_title($post->post_parent);
+			$parent_type = get_post_type_object($parent->post_type);
 ?>
 			<strong>
-			<?php if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
-				<a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
+			<?php if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $post->post_parent)) { ?>
+				<a href="<?php echo get_edit_post_link($post->post_parent); ?>">
 					<?php echo $title ?></a><?php
 			} else {
 				echo $title;
 			} ?></strong>
 			<br />
 			<?php
-			if ( $user_can_edit ):
-				$detach_url = add_query_arg( array(
+			if ($user_can_edit):
+				$detach_url = add_query_arg(array(
 					'parent_post_id' => $post->post_parent,
 					'media[]' => $post->ID,
-					'_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
-				), 'upload.php' );
+					'_wpnonce' => wp_create_nonce('bulk-'.$this->_args['plural'])
+				), 'upload.php');
 				printf(
 					'<a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
 					$detach_url,
 					/* translators: %s: title of the post the attachment is attached to */
-					esc_attr( sprintf( __( 'Detach from &#8220;%s&#8221;' ), $title ) ),
-					__( 'Detach' )
+					esc_attr(sprintf(__('Detach from &#8220;%s&#8221;'), $title)),
+					__('Detach')
 				);
 			endif;
 		} else {
-			_e( '(Unattached)' ); ?><br />
-			<?php if ( $user_can_edit ) {
-				$title = _draft_or_post_title( $post->post_parent );
+			_e('(Unattached)'); ?><br />
+			<?php if ($user_can_edit) {
+				$title = _draft_or_post_title($post->post_parent);
 				printf(
 					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $title)),
+					__('Attach')
 				);
 			}
 		}
@@ -523,16 +523,16 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		echo '<div class="post-com-count-wrapper">';
 
-		if ( isset( $this->comment_pending_count[ $post->ID ] ) ) {
-			$pending_comments = $this->comment_pending_count[ $post->ID ];
+		if (isset($this->comment_pending_count[$post->ID])) {
+			$pending_comments = $this->comment_pending_count[$post->ID];
 		} else {
-			$pending_comments = get_pending_comments_num( $post->ID );
+			$pending_comments = get_pending_comments_num($post->ID);
 		}
 
-		$this->comments_bubble( $post->ID, $pending_comments );
+		$this->comments_bubble($post->ID, $pending_comments);
 
 		echo '</div>';
 	}
@@ -546,35 +546,35 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name 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 ) {
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($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();
 					$posts_in_term_qv['taxonomy'] = $taxonomy;
 					$posts_in_term_qv['term'] = $t->slug;
 
-					$out[] = sprintf( '<a href="%s">%s</a>',
-						esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
-						esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
+					$out[] = sprintf('<a href="%s">%s</a>',
+						esc_url(add_query_arg($posts_in_term_qv, 'upload.php')),
+						esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'))
 					);
 				}
 				/* 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">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.get_taxonomy($taxonomy)->labels->no_terms.'</span>';
 			}
 
 			return;
@@ -590,7 +590,7 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $post_id     Attachment ID.
 		 */
-		do_action( 'manage_media_custom_column', $column_name, $post->ID );
+		do_action('manage_media_custom_column', $column_name, $post->ID);
 	}
 
 	/**
@@ -600,24 +600,24 @@ 
 	public function display_rows() {
 		global $post, $wp_query;
 
-		$post_ids = wp_list_pluck( $wp_query->posts, 'ID' );
-		reset( $wp_query->posts );
+		$post_ids = wp_list_pluck($wp_query->posts, 'ID');
+		reset($wp_query->posts);
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		add_filter( 'the_title','esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		while ( have_posts() ) : the_post();
+		while (have_posts()) : the_post();
 			if (
-				( $this->is_trash && $post->post_status != 'trash' )
-				|| ( ! $this->is_trash && $post->post_status === 'trash' )
+				($this->is_trash && $post->post_status != 'trash')
+				|| ( ! $this->is_trash && $post->post_status === 'trash')
 			) {
 				continue;
 			}
-			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+			$post_owner = (get_current_user_id() == $post->post_author) ? 'self' : 'other';
 		?>
-			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
-				<?php $this->single_row_columns( $post ); ?>
+			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim(' author-'.$post_owner.' status-'.$post->post_status); ?>">
+				<?php $this->single_row_columns($post); ?>
 			</tr>
 		<?php
 		endwhile;
@@ -641,105 +641,105 @@ 
 	 *
 	 * @return array
 	 */
-	private function _get_row_actions( $post, $att_title ) {
+	private function _get_row_actions($post, $att_title) {
 		$actions = array();
 
-		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+		if ($this->detached) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$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: attachment title */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				} else {
 					$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID),
 						$delete_ays,
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s" rel="permalink">%s</a>',
-				get_permalink( $post->ID ),
+				get_permalink($post->ID),
 				/* translators: %s: attachment title */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+				__('View')
 			);
 
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
+			if (current_user_can('edit_post', $post->ID)) {
 				$actions['attach'] = sprintf(
 					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js" aria-label="%s">%s</a>',
 					$post->ID,
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $att_title ) ),
-					__( 'Attach' )
+					esc_attr(sprintf(__('Attach &#8220;%s&#8221; to existing content'), $att_title)),
+					__('Attach')
 				);
 			}
 		}
 		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+			if (current_user_can('edit_post', $post->ID) && ! $this->is_trash) {
 				$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: attachment title */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)),
+					__('Edit')
 				);
 			}
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash ) {
+			if (current_user_can('delete_post', $post->ID)) {
+				if ($this->is_trash) {
 					$actions['untrash'] = sprintf(
 						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $att_title ) ),
-						__( 'Restore' )
+						esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $att_title)),
+						__('Restore')
 					);
-				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+				} elseif (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
 					$actions['trash'] = sprintf(
 						'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID),
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
+						esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $att_title)),
+						_x('Trash', 'verb')
 					);
 				}
-				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
-					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+				if ($this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH) {
+					$delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+						wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID),
 						$delete_ays,
 						/* translators: %s: attachment title */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
+						esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $att_title)),
+						__('Delete Permanently')
 					);
 				}
 			}
-			if ( ! $this->is_trash ) {
+			if ( ! $this->is_trash) {
 				$actions['view'] = sprintf(
 					'<a href="%s" aria-label="%s" rel="permalink">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: attachment title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)),
+					__('View')
 				);
 			}
 		}
@@ -755,7 +755,7 @@ 
 		 * @param bool    $detached Whether the list table contains media not attached
 		 *                          to any posts. Default true.
 		 */
-		return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+		return apply_filters('media_row_actions', $actions, $post, $this->detached);
 	}
 
 	/**
@@ -769,12 +769,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for media attachments.
 	 */
-	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 '';
 		}
 
 		$att_title = _draft_or_post_title();
-		return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
+		return $this->row_actions($this->_get_row_actions($post, $att_title));
 	}
 }

Braces +16 added lines, -12 removed lines

@@ -150,8 +150,9 @@ 
 			$actions['delete'] = __( 'Delete Permanently' );
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach' );
+		if ( $this->detached ) {
+					$actions['attach'] = __( 'Attach' );
+		}
 
 		return $actions;
 	}
@@ -189,14 +190,17 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'attach';
+		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'attach';
+		}
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'detach';
+		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'detach';
+		}
 
-		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();
 	}
@@ -306,8 +310,9 @@ 
 		/* translators: column name */
 		if ( !$this->detached ) {
 			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$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( 'attachment', 'comments' ) ) {
+							$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			}
 		}
 		/* translators: column name */
 		$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -692,8 +697,7 @@ 
 					__( 'Attach' )
 				);
 			}
-		}
-		else {
+		} else {
 			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',

src/wp-admin/includes/class-wp-theme-install-list-table.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Theme_Install_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Theme_Install_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying themes to install in a list table.

Spacing +100 added lines, -100 removed lines

@@ -24,7 +24,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'install_themes' );
+		return current_user_can('install_themes');
 	}
 
 	/**
@@ -36,19 +36,19 @@ 
 	 * @global array  $theme_field_defaults
 	 */
 	public function prepare_items() {
-		include( ABSPATH . 'wp-admin/includes/theme-install.php' );
+		include(ABSPATH.'wp-admin/includes/theme-install.php');
 
 		global $tabs, $tab, $paged, $type, $theme_field_defaults;
-		wp_reset_vars( array( 'tab' ) );
+		wp_reset_vars(array('tab'));
 
 		$search_terms = array();
 		$search_string = '';
-		if ( ! empty( $_REQUEST['s'] ) ){
-			$search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-			$search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+		if ( ! empty($_REQUEST['s'])) {
+			$search_string = strtolower(wp_unslash($_REQUEST['s']));
+			$search_terms = array_unique(array_filter(array_map('trim', explode(',', $search_string))));
 		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty($_REQUEST['features']))
 			$this->features = $_REQUEST['features'];
 
 		$paged = $this->get_pagenum();
@@ -57,19 +57,19 @@ 
 
 		// These are the tabs which are shown on the page,
 		$tabs = array();
-		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab )
-			$tabs['search']	= __( 'Search Results' );
-		$tabs['upload'] = __( 'Upload' );
-		$tabs['featured'] = _x( 'Featured', 'themes' );
+		$tabs['dashboard'] = __('Search');
+		if ('search' === $tab)
+			$tabs['search'] = __('Search Results');
+		$tabs['upload'] = __('Upload');
+		$tabs['featured'] = _x('Featured', 'themes');
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
-		$tabs['new']      = _x( 'Latest', 'themes' );
-		$tabs['updated']  = _x( 'Recently Updated', 'themes' );
+		$tabs['new']      = _x('Latest', 'themes');
+		$tabs['updated']  = _x('Recently Updated', 'themes');
 
-		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+		$nonmenu_tabs = array('theme-information'); // Valid actions to perform which do not have a Menu item.
 
 		/** This filter is documented in wp-admin/theme-install.php */
-		$tabs = apply_filters( 'install_themes_tabs', $tabs );
+		$tabs = apply_filters('install_themes_tabs', $tabs);
 
 		/**
 		 * Filter tabs not associated with a menu item on the Install Themes screen.
@@ -79,20 +79,20 @@ 
 		 * @param array $nonmenu_tabs The tabs that don't have a menu item on
 		 *                            the Install Themes screen.
 		 */
-		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
+		$nonmenu_tabs = apply_filters('install_themes_nonmenu_tabs', $nonmenu_tabs);
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if (empty($tab) || ( ! isset($tabs[$tab]) && ! in_array($tab, (array) $nonmenu_tabs)))
+			$tab = key($tabs);
 
-		$args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
+		$args = array('page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults);
 
-		switch ( $tab ) {
+		switch ($tab) {
 			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				switch ( $type ) {
+				$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+				switch ($type) {
 					case 'tag':
-						$args['tag'] = array_map( 'sanitize_key', $search_terms );
+						$args['tag'] = array_map('sanitize_key', $search_terms);
 						break;
 					case 'term':
 						$args['search'] = $search_string;
@@ -102,13 +102,13 @@ 
 						break;
 				}
 
-				if ( ! empty( $this->features ) ) {
+				if ( ! empty($this->features)) {
 					$args['tag'] = $this->features;
-					$_REQUEST['s'] = implode( ',', $this->features );
+					$_REQUEST['s'] = implode(',', $this->features);
 					$_REQUEST['type'] = 'tag';
 				}
 
-				add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
+				add_action('install_themes_table_header', 'install_theme_search_form', 10, 0);
 				break;
 
 			case 'featured':
@@ -134,30 +134,30 @@ 
 		 *
 		 * @param array $args An array of themes API arguments.
 		 */
-		$args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
+		$args = apply_filters('install_themes_table_api_args_'.$tab, $args);
 
-		if ( ! $args )
+		if ( ! $args)
 			return;
 
-		$api = themes_api( 'query_themes', $args );
+		$api = themes_api('query_themes', $args);
 
-		if ( is_wp_error( $api ) )
-			wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		if (is_wp_error($api))
+			wp_die($api->get_error_message().'</p> <p><a href="#" onclick="document.location.reload(); return false;">'.__('Try again').'</a>');
 
 		$this->items = $api->themes;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $api->info['results'],
 			'per_page' => $args['per_page'],
 			'infinite_scroll' => true,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No themes match your request.' );
+		_e('No themes match your request.');
 	}
 
 	/**
@@ -170,9 +170,9 @@ 
 		global $tabs, $tab;
 
 		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action === $tab ) ? ' class="current"' : '';
-			$href = self_admin_url('theme-install.php?tab=' . $action);
+		foreach ((array) $tabs as $action => $text) {
+			$class = ($action === $tab) ? ' class="current"' : '';
+			$href = self_admin_url('theme-install.php?tab='.$action);
 			$display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
 		}
 
@@ -183,7 +183,7 @@ 
 	 * @access public
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 ?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
@@ -193,10 +193,10 @@ 
 				 *
 				 * @since 2.8.0
 				 */
-				do_action( 'install_themes_table_header' );
+				do_action('install_themes_table_header');
 				?>
 			</div>
-			<?php $this->pagination( 'top' ); ?>
+			<?php $this->pagination('top'); ?>
 			<br class="clear" />
 		</div>
 
@@ -205,7 +205,7 @@ 
 		</div>
 
 		<?php
-		$this->tablenav( 'bottom' );
+		$this->tablenav('bottom');
 	}
 
 	/**
@@ -213,10 +213,10 @@ 
 	 */
 	public function display_rows() {
 		$themes = $this->items;
-		foreach ( $themes as $theme ) {
+		foreach ($themes as $theme) {
 				?>
 				<div class="available-theme installable-theme"><?php
-					$this->single_row( $theme );
+					$this->single_row($theme);
 				?></div>
 		<?php } // end foreach $theme_names
 
@@ -244,50 +244,50 @@ 
 	 *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a back-end interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
 	 *     public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
 	 */
-	public function single_row( $theme ) {
+	public function single_row($theme) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
+		if (empty($theme))
 			return;
 
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
+		$name   = wp_kses($theme->name, $themes_allowedtags);
+		$author = wp_kses($theme->author, $themes_allowedtags);
 
-		$preview_title = sprintf( __('Preview &#8220;%s&#8221;'), $name );
-		$preview_url   = add_query_arg( array(
+		$preview_title = sprintf(__('Preview &#8220;%s&#8221;'), $name);
+		$preview_url   = add_query_arg(array(
 			'tab'   => 'theme-information',
 			'theme' => $theme->slug,
-		), self_admin_url( 'theme-install.php' ) );
+		), self_admin_url('theme-install.php'));
 
 		$actions = array();
 
-		$install_url = add_query_arg( array(
+		$install_url = add_query_arg(array(
 			'action' => 'install-theme',
 			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		), self_admin_url('update.php'));
 
-		$update_url = add_query_arg( array(
+		$update_url = add_query_arg(array(
 			'action' => 'upgrade-theme',
 			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		), self_admin_url('update.php'));
 
-		$status = $this->_get_theme_status( $theme );
+		$status = $this->_get_theme_status($theme);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'update_available':
-				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+				$actions[] = '<a class="install-now" href="'.esc_url(wp_nonce_url($update_url, 'upgrade-theme_'.$theme->slug)).'" title="'.esc_attr(sprintf(__('Update to version %s'), $theme->version)).'">'.__('Update').'</a>';
 				break;
 			case 'newer_installed':
 			case 'latest_installed':
-				$actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+				$actions[] = '<span class="install-now" title="'.esc_attr__('This theme is already installed and is up to date').'">'._x('Installed', 'theme').'</span>';
 				break;
 			case 'install':
 			default:
-				$actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+				$actions[] = '<a class="install-now" href="'.esc_url(wp_nonce_url($install_url, 'install-theme_'.$theme->slug)).'" title="'.esc_attr(sprintf(__('Install %s'), $name)).'">'.__('Install Now').'</a>';
 				break;
 		}
 
-		$actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
+		$actions[] = '<a class="install-theme-preview" href="'.esc_url($preview_url).'" title="'.esc_attr(sprintf(__('Preview %s'), $name)).'">'.__('Preview').'</a>';
 
 		/**
 		 * Filter the install action links for a theme in the Install Themes list table.
@@ -298,19 +298,19 @@ 
 		 *                          links to Install Now, Preview, and Details.
 		 * @param WP_Theme $theme   Theme object.
 		 */
-		$actions = apply_filters( 'theme_install_actions', $actions, $theme );
+		$actions = apply_filters('theme_install_actions', $actions, $theme);
 
 		?>
-		<a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
-			<img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
+		<a class="screenshot install-theme-preview" href="<?php echo esc_url($preview_url); ?>" title="<?php echo esc_attr($preview_title); ?>">
+			<img src="<?php echo esc_url($theme->screenshot_url); ?>" width="150" alt="" />
 		</a>
 
 		<h3><?php echo $name; ?></h3>
-		<div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+		<div class="theme-author"><?php printf(__('By %s'), $author); ?></div>
 
 		<div class="action-links">
 			<ul>
-				<?php foreach ( $actions as $action ): ?>
+				<?php foreach ($actions as $action): ?>
 					<li><?php echo $action; ?></li>
 				<?php endforeach; ?>
 				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
@@ -318,7 +318,7 @@ 
 		</div>
 
 		<?php
-		$this->install_theme_info( $theme );
+		$this->install_theme_info($theme);
 	}
 
 	/**
@@ -329,16 +329,16 @@ 
 		<div id="theme-installer" class="wp-full-overlay expanded">
 			<div class="wp-full-overlay-sidebar">
 				<div class="wp-full-overlay-header">
-					<a href="#" class="close-full-overlay button-secondary"><?php _e( 'Close' ); ?></a>
+					<a href="#" class="close-full-overlay button-secondary"><?php _e('Close'); ?></a>
 					<span class="theme-install"></span>
 				</div>
 				<div class="wp-full-overlay-sidebar-content">
 					<div class="install-theme-info"></div>
 				</div>
 				<div class="wp-full-overlay-footer">
-					<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+					<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 						<span class="collapse-sidebar-arrow"></span>
-						<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+						<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 					</button>
 				</div>
 			</div>
@@ -353,14 +353,14 @@ 
 	 *
 	 * @param object $theme - A WordPress.org Theme API object.
 	 */
-	public function theme_installer_single( $theme ) {
+	public function theme_installer_single($theme) {
 		?>
 		<div id="theme-installer" class="wp-full-overlay single-theme">
 			<div class="wp-full-overlay-sidebar">
-				<?php $this->install_theme_info( $theme ); ?>
+				<?php $this->install_theme_info($theme); ?>
 			</div>
 			<div class="wp-full-overlay-main">
-				<iframe src="<?php echo esc_url( $theme->preview_url ); ?>"></iframe>
+				<iframe src="<?php echo esc_url($theme->preview_url); ?>"></iframe>
 			</div>
 		</div>
 		<?php
@@ -373,58 +373,58 @@ 
 	 *
 	 * @param object $theme - A WordPress.org Theme API object.
 	 */
-	public function install_theme_info( $theme ) {
+	public function install_theme_info($theme) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
+		if (empty($theme))
 			return;
 
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
-		$author = wp_kses( $theme->author, $themes_allowedtags );
+		$name   = wp_kses($theme->name, $themes_allowedtags);
+		$author = wp_kses($theme->author, $themes_allowedtags);
 
-		$install_url = add_query_arg( array(
+		$install_url = add_query_arg(array(
 			'action' => 'install-theme',
 			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		), self_admin_url('update.php'));
 
-		$update_url = add_query_arg( array(
+		$update_url = add_query_arg(array(
 			'action' => 'upgrade-theme',
 			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		), self_admin_url('update.php'));
 
-		$status = $this->_get_theme_status( $theme );
+		$status = $this->_get_theme_status($theme);
 
 		?>
 		<div class="install-theme-info"><?php
-			switch ( $status ) {
+			switch ($status) {
 				case 'update_available':
-					echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+					echo '<a class="theme-install button-primary" href="'.esc_url(wp_nonce_url($update_url, 'upgrade-theme_'.$theme->slug)).'" title="'.esc_attr(sprintf(__('Update to version %s'), $theme->version)).'">'.__('Update').'</a>';
 					break;
 				case 'newer_installed':
 				case 'latest_installed':
-					echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+					echo '<span class="theme-install" title="'.esc_attr__('This theme is already installed and is up to date').'">'._x('Installed', 'theme').'</span>';
 					break;
 				case 'install':
 				default:
-					echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+					echo '<a class="theme-install button-primary" href="'.esc_url(wp_nonce_url($install_url, 'install-theme_'.$theme->slug)).'">'.__('Install').'</a>';
 					break;
 			} ?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
-			<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
-			<?php if ( isset( $theme->screenshot_url ) ): ?>
-				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
+			<span class="theme-by"><?php printf(__('By %s'), $author); ?></span>
+			<?php if (isset($theme->screenshot_url)): ?>
+				<img class="theme-screenshot" src="<?php echo esc_url($theme->screenshot_url); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
-				<?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
+				<?php wp_star_rating(array('rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings)); ?>
 				<div class="theme-version">
 					<strong><?php _e('Version:') ?> </strong>
-					<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
+					<?php echo wp_kses($theme->version, $themes_allowedtags); ?>
 				</div>
 				<div class="theme-description">
-					<?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
+					<?php echo wp_kses($theme->description, $themes_allowedtags); ?>
 				</div>
 			</div>
-			<input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
+			<input class="theme-preview-url" type="hidden" value="<?php echo esc_url($theme->preview_url); ?>" />
 		</div>
 		<?php
 	}
@@ -440,9 +440,9 @@ 
 	 *
 	 * @param array $extra_args Unused.
 	 */
-	public function _js_vars( $extra_args = array() ) {
+	public function _js_vars($extra_args = array()) {
 		global $tab, $type;
-		parent::_js_vars( compact( 'tab', 'type' ) );
+		parent::_js_vars(compact('tab', 'type'));
 	}
 
 	/**
@@ -454,14 +454,14 @@ 
 	 * @param object $theme - A WordPress.org Theme API object.
 	 * @return string Theme status.
 	 */
-	private function _get_theme_status( $theme ) {
+	private function _get_theme_status($theme) {
 		$status = 'install';
 
-		$installed_theme = wp_get_theme( $theme->slug );
-		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
+		$installed_theme = wp_get_theme($theme->slug);
+		if ($installed_theme->exists()) {
+			if (version_compare($installed_theme->get('Version'), $theme->version, '='))
 				$status = 'latest_installed';
-			elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
+			elseif (version_compare($installed_theme->get('Version'), $theme->version, '>'))
 				$status = 'newer_installed';
 			else
 				$status = 'update_available';

Braces +28 added lines, -20 removed lines

@@ -48,8 +48,9 @@ 
 			$search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
 		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
-			$this->features = $_REQUEST['features'];
+		if ( ! empty( $_REQUEST['features'] ) ) {
+					$this->features = $_REQUEST['features'];
+		}
 
 		$paged = $this->get_pagenum();
 
@@ -58,8 +59,9 @@ 
 		// These are the tabs which are shown on the page,
 		$tabs = array();
 		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab )
-			$tabs['search']	= __( 'Search Results' );
+		if ( 'search' === $tab ) {
+					$tabs['search']	= __( 'Search Results' );
+		}
 		$tabs['upload'] = __( 'Upload' );
 		$tabs['featured'] = _x( 'Featured', 'themes' );
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
@@ -82,8 +84,9 @@ 
 		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
+					$tab = key( $tabs );
+		}
 
 		$args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
 
@@ -136,13 +139,15 @@ 
 		 */
 		$args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
 
-		if ( ! $args )
-			return;
+		if ( ! $args ) {
+					return;
+		}
 
 		$api = themes_api( 'query_themes', $args );
 
-		if ( is_wp_error( $api ) )
-			wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		if ( is_wp_error( $api ) ) {
+					wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		}
 
 		$this->items = $api->themes;
 
@@ -247,8 +252,9 @@ 
 	public function single_row( $theme ) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
-			return;
+		if ( empty( $theme ) ) {
+					return;
+		}
 
 		$name   = wp_kses( $theme->name,   $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
@@ -376,8 +382,9 @@ 
 	public function install_theme_info( $theme ) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
-			return;
+		if ( empty( $theme ) ) {
+					return;
+		}
 
 		$name   = wp_kses( $theme->name,   $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
@@ -459,12 +466,13 @@ 
 
 		$installed_theme = wp_get_theme( $theme->slug );
 		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
-				$status = 'latest_installed';
-			elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
-				$status = 'newer_installed';
-			else
-				$status = 'update_available';
+			if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) ) {
+							$status = 'latest_installed';
+			} elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) ) {
+							$status = 'newer_installed';
+			} else {
+							$status = 'update_available';
+			}
 		}
 
 		return $status;

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

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * List Table API: WP_Users_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Users_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying users in a list table.
@@ -61,7 +61,7 @@ 
 	/**
 	 * Check the current user's permissions.
 	 *
- 	 * @since 3.1.0
+	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @return bool

Spacing +109 added lines, -109 removed lines

@@ -45,17 +45,17 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'singular' => 'user',
 			'plural'   => 'users',
-			'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen'   => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ($this->is_site_users)
+			$this->site_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 	}
 
 	/**
@@ -67,10 +67,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_users)
+			return current_user_can('manage_sites');
 		else
-			return current_user_can( 'list_users' );
+			return current_user_can('list_users');
 	}
 
 	/**
@@ -85,19 +85,19 @@ 
 	public function prepare_items() {
 		global $role, $usersearch;
 
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$usersearch = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+		$role = isset($_REQUEST['role']) ? $_REQUEST['role'] : '';
 
-		$per_page = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
-		$users_per_page = $this->get_items_per_page( $per_page );
+		$per_page = ($this->is_site_users) ? 'site_users_network_per_page' : 'users_per_page';
+		$users_per_page = $this->get_items_per_page($per_page);
 
 		$paged = $this->get_pagenum();
 
-		if ( 'none' === $role ) {
+		if ('none' === $role) {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'include' => wp_get_users_with_no_role(),
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
@@ -105,23 +105,23 @@ 
 		} else {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'role' => $role,
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ('' !== $args['search'])
+			$args['search'] = '*'.$args['search'].'*';
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$args['blog_id'] = $this->site_id;
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if (isset($_REQUEST['orderby']))
 			$args['orderby'] = $_REQUEST['orderby'];
 
-		if ( isset( $_REQUEST['order'] ) )
+		if (isset($_REQUEST['order']))
 			$args['order'] = $_REQUEST['order'];
 
 		/**
@@ -132,17 +132,17 @@ 
 		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
 		 *                    users list table.
 		 */
-		$args = apply_filters( 'users_list_table_query_args', $args );
+		$args = apply_filters('users_list_table_query_args', $args);
 
 		// Query the user IDs for this page
-		$wp_user_search = new WP_User_Query( $args );
+		$wp_user_search = new WP_User_Query($args);
 
 		$this->items = $wp_user_search->get_results();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_user_search->get_total(),
 			'per_page' => $users_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 
 		$wp_roles = wp_roles();
 
-		if ( $this->is_site_users ) {
-			$url = 'site-users.php?id=' . $this->site_id;
-			switch_to_blog( $this->site_id );
+		if ($this->is_site_users) {
+			$url = 'site-users.php?id='.$this->site_id;
+			switch_to_blog($this->site_id);
 			$users_of_blog = count_users();
 			restore_current_blog();
 		} else {
@@ -185,40 +185,40 @@ 
 		}
 
 		$total_users = $users_of_blog['total_users'];
-		$avail_roles =& $users_of_blog['avail_roles'];
+		$avail_roles = & $users_of_blog['avail_roles'];
 		unset($users_of_blog);
 
 		$class = empty($role) ? ' class="current"' : '';
 		$role_links = array();
-		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
-		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
+		$role_links['all'] = "<a href='$url'$class>".sprintf(_nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users'), number_format_i18n($total_users)).'</a>';
+		foreach ($wp_roles->get_names() as $this_role => $name) {
+			if ( ! isset($avail_roles[$this_role]))
 				continue;
 
 			$class = '';
 
-			if ( $this_role === $role ) {
+			if ($this_role === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = translate_user_role( $name );
+			$name = translate_user_role($name);
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
-			$role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles[$this_role]));
+			$role_links[$this_role] = "<a href='".esc_url(add_query_arg('role', $this_role, $url))."'$class>$name</a>";
 		}
 
-		if ( ! empty( $avail_roles['none' ] ) ) {
+		if ( ! empty($avail_roles['none'])) {
 
 			$class = '';
 
-			if ( 'none' === $role ) {
+			if ('none' === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = __( 'No role' );
+			$name = __('No role');
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
-			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles['none']));
+			$role_links['none'] = "<a href='".esc_url(add_query_arg('role', 'none', $url))."'$class>$name</a>";
 
 		}
 
@@ -236,12 +236,12 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+		if (is_multisite()) {
+			if (current_user_can('remove_users'))
+				$actions['remove'] = __('Remove');
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if (current_user_can('delete_users'))
+				$actions['delete'] = __('Delete');
 		}
 
 		return $actions;
@@ -256,18 +256,18 @@ 
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		$id = 'bottom' === $which ? 'new_role2' : 'new_role';
 	?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
-		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to&hellip;' ) ?></label>
+		<?php if (current_user_can('promote_users') && $this->has_items()) : ?>
+		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e('Change role to&hellip;') ?></label>
 		<select name="<?php echo $id ?>" id="<?php echo $id ?>">
-			<option value=""><?php _e( 'Change role to&hellip;' ) ?></option>
+			<option value=""><?php _e('Change role to&hellip;') ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
 	<?php
-			submit_button( __( 'Change' ), 'button', 'changeit', false );
+			submit_button(__('Change'), 'button', 'changeit', false);
 		endif;
 
 		/**
@@ -276,7 +276,7 @@ 
 		 *
 		 * @since 3.5.0
 		 */
-		do_action( 'restrict_manage_users' );
+		do_action('restrict_manage_users');
 		echo '</div>';
 	}
 
@@ -292,8 +292,8 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['changeit'] ) &&
-			( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+		if (isset($_REQUEST['changeit']) &&
+			( ! empty($_REQUEST['new_role']) || ! empty($_REQUEST['new_role2']))) {
 			return 'promote';
 		}
 
@@ -312,15 +312,15 @@ 
 	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'Email' ),
-			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' )
+			'username' => __('Username'),
+			'name'     => __('Name'),
+			'email'    => __('Email'),
+			'role'     => __('Role'),
+			'posts'    => __('Posts')
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ($this->is_site_users)
+			unset($c['posts']);
 
 		return $c;
 	}
@@ -351,14 +351,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users)
+			$post_counts = count_many_users_posts(array_keys($this->items));
 
-		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
+		foreach ($this->items as $userid => $user_object) {
+			if (is_multisite() && empty($user_object->allcaps))
 				continue;
 
-			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+			echo "\n\t".$this->single_row($user_object, '', '', isset($post_counts) ? $post_counts[$userid] : 0);
 		}
 	}
 
@@ -377,39 +377,39 @@ 
 	 *                            to zero, as in, a new user has made zero posts.
 	 * @return string Output for a single row.
 	 */
-	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
+	public function single_row($user_object, $style = '', $role = '', $numposts = 0) {
+		if ( ! ($user_object instanceof WP_User)) {
+			$user_object = get_userdata((int) $user_object);
 		}
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$url = "site-users.php?id={$this->site_id}&amp;";
 		else
 			$url = 'users.php?';
 
-		$user_roles = $this->get_role_list( $user_object );
+		$user_roles = $this->get_role_list($user_object);
 
 		// Set up the hover actions for this user
 		$actions = array();
 		$checkbox = '';
 		// Check if the user for this row is editable
-		if ( current_user_can( 'list_users' ) ) {
+		if (current_user_can('list_users')) {
 			// Set up the user editing link
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
+			$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_object->ID)));
 
-			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
+			if (current_user_can('edit_user', $user_object->ID)) {
 				$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
 			} else {
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( ! is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID))
+				$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users')."'>".__('Delete')."</a>";
+			if (is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID))
+				$actions['remove'] = "<a class='submitdelete' href='".wp_nonce_url($url."action=remove&amp;user=$user_object->ID", 'bulk-users')."'>".__('Remove')."</a>";
 
 			/**
 			 * Filter the action links displayed under each user in the Users list table.
@@ -421,49 +421,49 @@ 
 			 *                             'Edit', 'Remove' for Multisite.
 			 * @param WP_User $user_object WP_User object for the currently-listed user.
 			 */
-			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
+			$actions = apply_filters('user_row_actions', $actions, $user_object);
 
 			// Role classes.
-			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+			$role_classes = esc_attr(implode(' ', array_keys($user_roles)));
 
 			// Set up the checkbox ( because the user is editable, otherwise it's empty )
-			$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
+			$checkbox = '<label class="screen-reader-text" for="user_'.$user_object->ID.'">'.sprintf(__('Select %s'), $user_object->user_login).'</label>'
 						. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
 
 		} else {
-			$edit = '<strong>' . $user_object->user_login . '</strong>';
+			$edit = '<strong>'.$user_object->user_login.'</strong>';
 		}
-		$avatar = get_avatar( $user_object->ID, 32 );
+		$avatar = get_avatar($user_object->ID, 32);
 
 		// Comma-separated list of user roles.
-		$roles_list = implode( ', ', $user_roles );
+		$roles_list = implode(', ', $user_roles);
 
 		$r = "<tr id='user-$user_object->ID'>";
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
-			if ( 'posts' === $column_name ) {
+			if ('posts' === $column_name) {
 				$classes .= ' num'; // Special case for that column
 			}
 
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
-			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = 'data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
 			} else {
 				$r .= "<td $attributes>";
-				switch ( $column_name ) {
+				switch ($column_name) {
 					case 'username':
 						$r .= "$avatar $edit";
 						break;
@@ -471,16 +471,16 @@ 
 						$r .= "$user_object->first_name $user_object->last_name";
 						break;
 					case 'email':
-						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+						$r .= "<a href='".esc_url("mailto:$email")."'>$email</a>";
 						break;
 					case 'role':
-						$r .= esc_html( $roles_list );
+						$r .= esc_html($roles_list);
 						break;
 					case 'posts':
-						if ( $numposts > 0 ) {
+						if ($numposts > 0) {
 							$r .= "<a href='edit.php?author=$user_object->ID' class='edit'>";
-							$r .= '<span aria-hidden="true">' . $numposts . '</span>';
-							$r .= '<span class="screen-reader-text">' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . '</span>';
+							$r .= '<span aria-hidden="true">'.$numposts.'</span>';
+							$r .= '<span class="screen-reader-text">'.sprintf(_n('%s post by this author', '%s posts by this author', $numposts), number_format_i18n($numposts)).'</span>';
 							$r .= '</a>';
 						} else {
 							$r .= 0;
@@ -496,11 +496,11 @@ 
 						 * @param string $column_name Column name.
 						 * @param int    $user_id     ID of the currently-listed user.
 						 */
-						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+						$r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
 				}
 
-				if ( $primary === $column_name ) {
-					$r .= $this->row_actions( $actions );
+				if ($primary === $column_name) {
+					$r .= $this->row_actions($actions);
 				}
 				$r .= "</td>";
 			}
@@ -531,19 +531,19 @@ 
 	 * @param WP_User $user_object The WP_User object.
 	 * @return array An array of user roles.
 	 */
-	protected function get_role_list( $user_object ) {
+	protected function get_role_list($user_object) {
 		$wp_roles = wp_roles();
 
 		$role_list = array();
 
-		foreach ( $user_object->roles as $role ) {
-			if ( isset( $wp_roles->role_names[ $role ] ) ) {
-				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+		foreach ($user_object->roles as $role) {
+			if (isset($wp_roles->role_names[$role])) {
+				$role_list[$role] = translate_user_role($wp_roles->role_names[$role]);
 			}
 		}
 
-		if ( empty( $role_list ) ) {
-			$role_list['none'] = _x( 'None', 'no user roles' );
+		if (empty($role_list)) {
+			$role_list['none'] = _x('None', 'no user roles');
 		}
 
 		/**
@@ -554,7 +554,7 @@ 
 		 * @param array   $role_list   An array of user roles.
 		 * @param WP_User $user_object A WP_User object.
 		 */
-		return apply_filters( 'get_role_list', $role_list, $user_object );
+		return apply_filters('get_role_list', $role_list, $user_object);
 	}
 
 }

Braces +49 added lines, -34 removed lines

@@ -54,8 +54,9 @@ 
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ( $this->is_site_users ) {
+					$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
@@ -67,10 +68,11 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
-		else
-			return current_user_can( 'list_users' );
+		if ( $this->is_site_users ) {
+					return current_user_can( 'manage_sites' );
+		} else {
+					return current_user_can( 'list_users' );
+		}
 	}
 
 	/**
@@ -112,17 +114,21 @@ 
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ( '' !== $args['search'] ) {
+					$args['search'] = '*' . $args['search'] . '*';
+		}
 
-		if ( $this->is_site_users )
-			$args['blog_id'] = $this->site_id;
+		if ( $this->is_site_users ) {
+					$args['blog_id'] = $this->site_id;
+		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
-			$args['orderby'] = $_REQUEST['orderby'];
+		if ( isset( $_REQUEST['orderby'] ) ) {
+					$args['orderby'] = $_REQUEST['orderby'];
+		}
 
-		if ( isset( $_REQUEST['order'] ) )
-			$args['order'] = $_REQUEST['order'];
+		if ( isset( $_REQUEST['order'] ) ) {
+					$args['order'] = $_REQUEST['order'];
+		}
 
 		/**
 		 * Filter the query arguments used to retrieve users for the current users list table.
@@ -192,8 +198,9 @@ 
 		$role_links = array();
 		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
-				continue;
+			if ( !isset($avail_roles[$this_role]) ) {
+							continue;
+			}
 
 			$class = '';
 
@@ -237,11 +244,13 @@ 
 		$actions = array();
 
 		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+			if ( current_user_can( 'remove_users' ) ) {
+							$actions['remove'] = __( 'Remove' );
+			}
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if ( current_user_can( 'delete_users' ) ) {
+							$actions['delete'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -319,8 +328,9 @@ 
 			'posts'    => __( 'Posts' )
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ( $this->is_site_users ) {
+					unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -351,12 +361,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users ) {
+					$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		}
 
 		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
-				continue;
+			if ( is_multisite() && empty( $user_object->allcaps ) ) {
+							continue;
+			}
 
 			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
 		}
@@ -384,10 +396,11 @@ 
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
-			$url = "site-users.php?id={$this->site_id}&amp;";
-		else
-			$url = 'users.php?';
+		if ( $this->is_site_users ) {
+					$url = "site-users.php?id={$this->site_id}&amp;";
+		} else {
+					$url = 'users.php?';
+		}
 
 		$user_roles = $this->get_role_list( $user_object );
 
@@ -406,10 +419,12 @@ 
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) {
+							$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
+			}
+			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) ) {
+							$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			}
 
 			/**
 			 * Filter the action links displayed under each user in the Users list table.

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

Indentation +6 added lines, -6 removed lines

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

Spacing +210 added lines, -210 removed lines

@@ -37,26 +37,26 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_id;
 
-		$post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
+		$post_id = isset($_REQUEST['p']) ? absint($_REQUEST['p']) : 0;
 
-		if ( get_option( 'show_avatars' ) ) {
-			add_filter( 'comment_author', array( $this, 'floated_admin_avatar' ), 10, 2 );
+		if (get_option('show_avatars')) {
+			add_filter('comment_author', array($this, 'floated_admin_avatar'), 10, 2);
 		}
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'comments',
 			'singular' => 'comment',
 			'ajax' => true,
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
-	public function floated_admin_avatar( $name, $comment_ID ) {
-		$comment = get_comment( $comment_ID );
-		$avatar = get_avatar( $comment, 32, 'mystery' );
+	public function floated_admin_avatar($name, $comment_ID) {
+		$comment = get_comment($comment_ID);
+		$avatar = get_avatar($comment, 32, 'mystery');
 		return "$avatar $name";
 	}
 
@@ -77,41 +77,41 @@ 
 	public function prepare_items() {
 		global $post_id, $comment_status, $search, $comment_type;
 
-		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
-		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
+		$comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
+		if ( ! in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'trash')))
 			$comment_status = 'all';
 
-		$comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
+		$comment_type = ! empty($_REQUEST['comment_type']) ? $_REQUEST['comment_type'] : '';
 
-		$search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
+		$search = (isset($_REQUEST['s'])) ? $_REQUEST['s'] : '';
 
-		$post_type = ( isset( $_REQUEST['post_type'] ) ) ? sanitize_key( $_REQUEST['post_type'] ) : '';
+		$post_type = (isset($_REQUEST['post_type'])) ? sanitize_key($_REQUEST['post_type']) : '';
 
-		$user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
+		$user_id = (isset($_REQUEST['user_id'])) ? $_REQUEST['user_id'] : '';
 
-		$orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
-		$order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : '';
+		$orderby = (isset($_REQUEST['orderby'])) ? $_REQUEST['orderby'] : '';
+		$order = (isset($_REQUEST['order'])) ? $_REQUEST['order'] : '';
 
-		$comments_per_page = $this->get_per_page( $comment_status );
+		$comments_per_page = $this->get_per_page($comment_status);
 
-		$doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+		$doing_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-		if ( isset( $_REQUEST['number'] ) ) {
+		if (isset($_REQUEST['number'])) {
 			$number = (int) $_REQUEST['number'];
 		}
 		else {
-			$number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra
+			$number = $comments_per_page + min(8, $comments_per_page); // Grab a few extra
 		}
 
 		$page = $this->get_pagenum();
 
-		if ( isset( $_REQUEST['start'] ) ) {
+		if (isset($_REQUEST['start'])) {
 			$start = $_REQUEST['start'];
 		} else {
-			$start = ( $page - 1 ) * $comments_per_page;
+			$start = ($page - 1) * $comments_per_page;
 		}
 
-		if ( $doing_ajax && isset( $_REQUEST['offset'] ) ) {
+		if ($doing_ajax && isset($_REQUEST['offset'])) {
 			$start += $_REQUEST['offset'];
 		}
 
@@ -122,7 +122,7 @@ 
 		);
 
 		$args = array(
-			'status' => isset( $status_map[$comment_status] ) ? $status_map[$comment_status] : $comment_status,
+			'status' => isset($status_map[$comment_status]) ? $status_map[$comment_status] : $comment_status,
 			'search' => $search,
 			'user_id' => $user_id,
 			'offset' => $start,
@@ -134,28 +134,28 @@ 
 			'post_type' => $post_type,
 		);
 
-		$_comments = get_comments( $args );
-		if ( is_array( $_comments ) ) {
-			update_comment_cache( $_comments );
+		$_comments = get_comments($args);
+		if (is_array($_comments)) {
+			update_comment_cache($_comments);
 
-			$this->items = array_slice( $_comments, 0, $comments_per_page );
-			$this->extra_items = array_slice( $_comments, $comments_per_page );
+			$this->items = array_slice($_comments, 0, $comments_per_page);
+			$this->extra_items = array_slice($_comments, $comments_per_page);
 
-			$_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) );
+			$_comment_post_ids = array_unique(wp_list_pluck($_comments, 'comment_post_ID'));
 
-			$this->pending_count = get_pending_comments_num( $_comment_post_ids );
+			$this->pending_count = get_pending_comments_num($_comment_post_ids);
 		}
 
-		$total_comments = get_comments( array_merge( $args, array(
+		$total_comments = get_comments(array_merge($args, array(
 			'count' => true,
 			'offset' => 0,
 			'number' => 0
-		) ) );
+		)));
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_comments,
 			'per_page' => $comments_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -163,8 +163,8 @@ 
 	 * @param string $comment_status
 	 * @return int
 	 */
-	public function get_per_page( $comment_status = 'all' ) {
-		$comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
+	public function get_per_page($comment_status = 'all') {
+		$comments_per_page = $this->get_items_per_page('edit_comments_per_page');
 		/**
 		 * Filter the number of comments listed per page in the comments list table.
 		 *
@@ -173,7 +173,7 @@ 
 		 * @param int    $comments_per_page The number of comments to list per page.
 		 * @param string $comment_status    The comment status name. Default 'All'.
 		 */
-		return apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
+		return apply_filters('comments_per_page', $comments_per_page, $comment_status);
 	}
 
 	/**
@@ -183,10 +183,10 @@ 
 	public function no_items() {
 		global $comment_status;
 
-		if ( 'moderated' === $comment_status ) {
-			_e( 'No comments awaiting moderation.' );
+		if ('moderated' === $comment_status) {
+			_e('No comments awaiting moderation.');
 		} else {
-			_e( 'No comments found.' );
+			_e('No comments found.');
 		}
 	}
 
@@ -200,7 +200,7 @@ 
 		global $post_id, $comment_status, $comment_type;
 
 		$status_links = array();
-		$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
+		$num_comments = ($post_id) ? wp_count_comments($post_id) : wp_count_comments();
 		//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
 		//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
 		$stati = array(
@@ -240,33 +240,33 @@ 
 			)
 		);
 
-		if ( !EMPTY_TRASH_DAYS )
+		if ( ! EMPTY_TRASH_DAYS)
 			unset($stati['trash']);
 
-		$link = admin_url( 'edit-comments.php' );
-		if ( !empty($comment_type) && 'all' != $comment_type )
-			$link = add_query_arg( 'comment_type', $comment_type, $link );
+		$link = admin_url('edit-comments.php');
+		if ( ! empty($comment_type) && 'all' != $comment_type)
+			$link = add_query_arg('comment_type', $comment_type, $link);
 
-		foreach ( $stati as $status => $label ) {
-			$class = ( $status === $comment_status ) ? ' class="current"' : '';
+		foreach ($stati as $status => $label) {
+			$class = ($status === $comment_status) ? ' class="current"' : '';
 
-			if ( !isset( $num_comments->$status ) )
+			if ( ! isset($num_comments->$status))
 				$num_comments->$status = 10;
-			$link = add_query_arg( 'comment_status', $status, $link );
-			if ( $post_id )
-				$link = add_query_arg( 'p', absint( $post_id ), $link );
+			$link = add_query_arg('comment_status', $status, $link);
+			if ($post_id)
+				$link = add_query_arg('p', absint($post_id), $link);
 			/*
 			// I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
 			if ( !empty( $_REQUEST['s'] ) )
 				$link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
 			*/
-			$status_links[ $status ] = "<a href='$link'$class>" . sprintf(
-				translate_nooped_plural( $label, $num_comments->$status ),
-				sprintf( '<span class="%s-count">%s</span>',
-					( 'moderated' === $status ) ? 'pending' : $status,
-					number_format_i18n( $num_comments->$status )
+			$status_links[$status] = "<a href='$link'$class>".sprintf(
+				translate_nooped_plural($label, $num_comments->$status),
+				sprintf('<span class="%s-count">%s</span>',
+					('moderated' === $status) ? 'pending' : $status,
+					number_format_i18n($num_comments->$status)
 				)
-			) . '</a>';
+			).'</a>';
 		}
 
 		/**
@@ -277,7 +277,7 @@ 
 		 * @param array $status_links An array of fully-formed status links. Default 'All'.
 		 *                            Accepts 'All', 'Pending', 'Approved', 'Spam', and 'Trash'.
 		 */
-		return apply_filters( 'comment_status_links', $status_links );
+		return apply_filters('comment_status_links', $status_links);
 	}
 
 	/**
@@ -290,23 +290,23 @@ 
 		global $comment_status;
 
 		$actions = array();
-		if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
-			$actions['unapprove'] = __( 'Unapprove' );
-		if ( in_array( $comment_status, array( 'all', 'moderated' ) ) )
-			$actions['approve'] = __( 'Approve' );
-		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
-			$actions['spam'] = _x( 'Mark as Spam', 'comment' );
+		if (in_array($comment_status, array('all', 'approved')))
+			$actions['unapprove'] = __('Unapprove');
+		if (in_array($comment_status, array('all', 'moderated')))
+			$actions['approve'] = __('Approve');
+		if (in_array($comment_status, array('all', 'moderated', 'approved', 'trash')))
+			$actions['spam'] = _x('Mark as Spam', 'comment');
 
-		if ( 'trash' === $comment_status ) {
-			$actions['untrash'] = __( 'Restore' );
-		} elseif ( 'spam' === $comment_status ) {
-			$actions['unspam'] = _x( 'Not Spam', 'comment' );
+		if ('trash' === $comment_status) {
+			$actions['untrash'] = __('Restore');
+		} elseif ('spam' === $comment_status) {
+			$actions['unspam'] = _x('Not Spam', 'comment');
 		}
 
-		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
-			$actions['delete'] = __( 'Delete Permanently' );
+		if (in_array($comment_status, array('trash', 'spam')) || ! EMPTY_TRASH_DAYS)
+			$actions['delete'] = __('Delete Permanently');
 		else
-			$actions['trash'] = __( 'Move to Trash' );
+			$actions['trash'] = __('Move to Trash');
 
 		return $actions;
 	}
@@ -318,16 +318,16 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $comment_status, $comment_type;
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which ) {
+		if ('top' === $which) {
 ?>
-			<label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
+			<label class="screen-reader-text" for="filter-by-comment-type"><?php _e('Filter by comment type'); ?></label>
 			<select id="filter-by-comment-type" name="comment_type">
-				<option value=""><?php _e( 'All comment types' ); ?></option>
+				<option value=""><?php _e('All comment types'); ?></option>
 <?php
 				/**
 				 * Filter the comment types dropdown menu.
@@ -336,13 +336,13 @@ 
 				 *
 				 * @param array $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
 				 */
-				$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
-					'comment' => __( 'Comments' ),
-					'pings' => __( 'Pings' ),
-				) );
+				$comment_types = apply_filters('admin_comment_types_dropdown', array(
+					'comment' => __('Comments'),
+					'pings' => __('Pings'),
+				));
 
-				foreach ( $comment_types as $type => $label )
-					echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+				foreach ($comment_types as $type => $label)
+					echo "\t".'<option value="'.esc_attr($type).'"'.selected($comment_type, $type, false).">$label</option>\n";
 			?>
 			</select>
 <?php
@@ -351,14 +351,14 @@ 
 			 *
 			 * @since 3.5.0
 			 */
-			do_action( 'restrict_manage_comments' );
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			do_action('restrict_manage_comments');
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 		}
 
-		if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) {
-			wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
-			$title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
-			submit_button( $title, 'apply', 'delete_all', false );
+		if (('spam' === $comment_status || 'trash' === $comment_status) && current_user_can('moderate_comments')) {
+			wp_nonce_field('bulk-destroy', '_destroy_nonce');
+			$title = ('spam' === $comment_status) ? esc_attr__('Empty Spam') : esc_attr__('Empty Trash');
+			submit_button($title, 'apply', 'delete_all', false);
 		}
 		/**
 		 * Fires after the Filter submit button for comment types.
@@ -367,7 +367,7 @@ 
 		 *
 		 * @param string $comment_status The comment status name. Default 'All'.
 		 */
-		do_action( 'manage_comments_nav', $comment_status );
+		do_action('manage_comments_nav', $comment_status);
 		echo '</div>';
 	}
 
@@ -375,7 +375,7 @@ 
 	 * @return string|false
 	 */
 	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();
@@ -392,18 +392,18 @@ 
 
 		$columns = array();
 
-		if ( $this->checkbox )
+		if ($this->checkbox)
 			$columns['cb'] = '<input type="checkbox" />';
 
-		$columns['author'] = __( 'Author' );
-		$columns['comment'] = _x( 'Comment', 'column name' );
+		$columns['author'] = __('Author');
+		$columns['comment'] = _x('Comment', 'column name');
 
-		if ( ! $post_id ) {
+		if ( ! $post_id) {
 			/* translators: column name or table row header */
-			$columns['response'] = __( 'In Response To' );
+			$columns['response'] = __('In Response To');
 		}
 
-		$columns['date'] = _x( 'Submitted On', 'column name' );
+		$columns['date'] = _x('Submitted On', 'column name');
 
 		return $columns;
 	}
@@ -436,14 +436,14 @@ 
 	 * @access public
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
-		$this->screen->render_screen_reader_content( 'heading_list' );
+		$this->screen->render_screen_reader_content('heading_list');
 
 ?>
-<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<table class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -463,14 +463,14 @@ 
 
 	<tfoot>
 	<tr>
-		<?php $this->print_column_headers( false ); ?>
+		<?php $this->print_column_headers(false); ?>
 	</tr>
 	</tfoot>
 
 </table>
 <?php
 
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -479,27 +479,27 @@ 
 	 *
 	 * @param WP_Comment $item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		global $post, $comment;
 
 		$comment = $item;
 
-		$the_comment_class = wp_get_comment_status( $comment );
-		if ( ! $the_comment_class ) {
+		$the_comment_class = wp_get_comment_status($comment);
+		if ( ! $the_comment_class) {
 			$the_comment_class = '';
 		}
-		$the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
+		$the_comment_class = join(' ', get_comment_class($the_comment_class, $comment, $comment->comment_post_ID));
 
-		if ( $comment->comment_post_ID > 0 ) {
-			$post = get_post( $comment->comment_post_ID );
+		if ($comment->comment_post_ID > 0) {
+			$post = get_post($comment->comment_post_ID);
 		}
-		$this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
+		$this->user_can = current_user_can('edit_comment', $comment->comment_ID);
 
 		echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
-		$this->single_row_columns( $comment );
+		$this->single_row_columns($comment);
 		echo "</tr>\n";
 
-		unset( $GLOBALS['post'], $GLOBALS['comment'] );
+		unset($GLOBALS['post'], $GLOBALS['comment']);
 	}
 
  	/**
@@ -515,33 +515,33 @@ 
  	 * @param string     $primary     Primary column name.
  	 * @return string|void Comment row actions output.
  	 */
- 	protected function handle_row_actions( $comment, $column_name, $primary ) {
+ 	protected function handle_row_actions($comment, $column_name, $primary) {
  		global $comment_status;
 
-		if ( $primary !== $column_name ) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
- 		if ( ! $this->user_can ) {
+ 		if ( ! $this->user_can) {
  			return;
 		}
 
-		$the_comment_status = wp_get_comment_status( $comment );
+		$the_comment_status = wp_get_comment_status($comment);
 
 		$out = '';
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+		$del_nonce = esc_html('_wpnonce='.wp_create_nonce("delete-comment_$comment->comment_ID"));
+		$approve_nonce = esc_html('_wpnonce='.wp_create_nonce("approve-comment_$comment->comment_ID"));
 
 		$url = "comment.php?c=$comment->comment_ID";
 
-		$approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" );
-		$unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" );
-		$spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" );
-		$unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" );
-		$trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" );
-		$untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" );
-		$delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
+		$approve_url = esc_url($url."&action=approvecomment&$approve_nonce");
+		$unapprove_url = esc_url($url."&action=unapprovecomment&$approve_nonce");
+		$spam_url = esc_url($url."&action=spamcomment&$del_nonce");
+		$unspam_url = esc_url($url."&action=unspamcomment&$del_nonce");
+		$trash_url = esc_url($url."&action=trashcomment&$del_nonce");
+		$untrash_url = esc_url($url."&action=untrashcomment&$del_nonce");
+		$delete_url = esc_url($url."&action=deletecomment&$del_nonce");
 
 		// Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
 		$actions = array(
@@ -554,57 +554,57 @@ 
 		);
 
 		// Not looking at all comments.
-		if ( $comment_status && 'all' != $comment_status ) {
-			if ( 'approved' === $the_comment_status ) {
-				$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved' class='vim-u vim-destructive' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-			} elseif ( 'unapproved' === $the_comment_status ) {
-				$actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved' class='vim-a vim-destructive' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+		if ($comment_status && 'all' != $comment_status) {
+			if ('approved' === $the_comment_status) {
+				$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved' class='vim-u vim-destructive' aria-label='".esc_attr__('Unapprove this comment')."'>".__('Unapprove').'</a>';
+			} elseif ('unapproved' === $the_comment_status) {
+				$actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved' class='vim-a vim-destructive' aria-label='".esc_attr__('Approve this comment')."'>".__('Approve').'</a>';
 			}
 		} else {
-			$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-			$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+			$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='".esc_attr__('Approve this comment')."'>".__('Approve').'</a>';
+			$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='".esc_attr__('Unapprove this comment')."'>".__('Unapprove').'</a>';
 		}
 
-		if ( 'spam' !== $the_comment_status ) {
-			$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-		} elseif ( 'spam' === $the_comment_status ) {
-			$actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive' aria-label='" . esc_attr__( 'Restore this comment from the spam' ) . "'>" . _x( 'Not Spam', 'comment' ) . '</a>';
+		if ('spam' !== $the_comment_status) {
+			$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='".esc_attr__('Mark this comment as spam')."'>"./* translators: mark as spam link */ _x('Spam', 'verb').'</a>';
+		} elseif ('spam' === $the_comment_status) {
+			$actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive' aria-label='".esc_attr__('Restore this comment from the spam')."'>"._x('Not Spam', 'comment').'</a>';
 		}
 
-		if ( 'trash' === $the_comment_status ) {
-			$actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive' aria-label='" . esc_attr__( 'Restore this comment from the Trash' ) . "'>" . __( 'Restore' ) . '</a>';
+		if ('trash' === $the_comment_status) {
+			$actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive' aria-label='".esc_attr__('Restore this comment from the Trash')."'>".__('Restore').'</a>';
 		}
 
-		if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
-			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+		if ('spam' === $the_comment_status || 'trash' === $the_comment_status || ! EMPTY_TRASH_DAYS) {
+			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Delete this comment permanently')."'>".__('Delete Permanently').'</a>';
 		} else {
-			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Move this comment to the Trash')."'>"._x('Trash', 'verb').'</a>';
 		}
 
-		if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
-			$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
+		if ('spam' !== $the_comment_status && 'trash' !== $the_comment_status) {
+			$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='".esc_attr__('Edit this comment')."'>".__('Edit').'</a>';
 
 			$format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
 
-			$actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick&nbsp;Edit' ) );
+			$actions['quickedit'] = sprintf($format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__('Quick edit this comment inline'), __('Quick&nbsp;Edit'));
 
-			$actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+			$actions['reply'] = sprintf($format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__('Reply to this comment'), __('Reply'));
 		}
 
 		/** This filter is documented in wp-admin/includes/dashboard.php */
-		$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
+		$actions = apply_filters('comment_row_actions', array_filter($actions), $comment);
 
 		$i = 0;
 		$out .= '<div class="row-actions">';
-		foreach ( $actions as $action => $link ) {
+		foreach ($actions as $action => $link) {
 			++$i;
-			( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+			((('approve' === $action || 'unapprove' === $action) && 2 === $i) || 1 === $i) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span when not added with ajax
-			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') )
+			if (('reply' === $action || 'quickedit' === $action) && ! defined('DOING_AJAX'))
 				$action .= ' hide-if-no-js';
-			elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
-				if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
+			elseif (($action === 'untrash' && $the_comment_status === 'trash') || ($action === 'unspam' && $the_comment_status === 'spam')) {
+				if ('1' == get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true))
 					$action .= ' approve';
 				else
 					$action .= ' unapprove';
@@ -614,7 +614,7 @@ 
 		}
 		$out .= '</div>';
 
-		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>';
 
 		return $out;
 	}
@@ -623,9 +623,9 @@ 
 	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
-	public function column_cb( $comment ) {
-		if ( $this->user_can ) { ?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
+	public function column_cb($comment) {
+		if ($this->user_can) { ?>
+		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e('Select comment'); ?></label>
 		<input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
 		<?php
 		}
@@ -634,34 +634,34 @@ 
 	/**
 	 * @param WP_Comment $comment The comment object.
 	 */
-	public function column_comment( $comment ) {
+	public function column_comment($comment) {
 		echo '<div class="comment-author">';
-			$this->column_author( $comment );
+			$this->column_author($comment);
 		echo '</div>';
 
-		if ( $comment->comment_parent ) {
-			$parent = get_comment( $comment->comment_parent );
-			if ( $parent ) {
-				$parent_link = esc_url( get_comment_link( $parent ) );
-				$name = get_comment_author( $parent );
+		if ($comment->comment_parent) {
+			$parent = get_comment($comment->comment_parent);
+			if ($parent) {
+				$parent_link = esc_url(get_comment_link($parent));
+				$name = get_comment_author($parent);
 				printf(
 					/* translators: %s: comment link */
-					__( 'In reply to %s.' ),
-					'<a href="' . $parent_link . '">' . $name . '</a>'
+					__('In reply to %s.'),
+					'<a href="'.$parent_link.'">'.$name.'</a>'
 				);
 			}
 		}
 
-		comment_text( $comment );
-		if ( $this->user_can ) { ?>
+		comment_text($comment);
+		if ($this->user_can) { ?>
 		<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
 		<textarea class="comment" rows="1" cols="1"><?php
 			/** This filter is documented in wp-admin/includes/comment.php */
-			echo esc_textarea( apply_filters( 'comment_edit_pre', $comment->comment_content ) );
+			echo esc_textarea(apply_filters('comment_edit_pre', $comment->comment_content));
 		?></textarea>
-		<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
-		<div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
-		<div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
+		<div class="author-email"><?php echo esc_attr($comment->comment_author_email); ?></div>
+		<div class="author"><?php echo esc_attr($comment->comment_author); ?></div>
+		<div class="author-url"><?php echo esc_attr($comment->comment_author_url); ?></div>
 		<div class="comment_status"><?php echo $comment->comment_approved; ?></div>
 		</div>
 		<?php
@@ -674,38 +674,38 @@ 
 	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
-	public function column_author( $comment ) {
+	public function column_author($comment) {
 		global $comment_status;
 
-		$author_url = get_comment_author_url( $comment );
+		$author_url = get_comment_author_url($comment);
 
-		$author_url_display = untrailingslashit( preg_replace( '|^http(s)?://(www\.)?|i', '', $author_url ) );
-		if ( strlen( $author_url_display ) > 50 ) {
-			$author_url_display = wp_html_excerpt( $author_url_display, 49, '&hellip;' );
+		$author_url_display = untrailingslashit(preg_replace('|^http(s)?://(www\.)?|i', '', $author_url));
+		if (strlen($author_url_display) > 50) {
+			$author_url_display = wp_html_excerpt($author_url_display, 49, '&hellip;');
 		}
 
-		echo "<strong>"; comment_author( $comment ); echo '</strong><br />';
-		if ( ! empty( $author_url_display ) ) {
-			printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
+		echo "<strong>"; comment_author($comment); echo '</strong><br />';
+		if ( ! empty($author_url_display)) {
+			printf('<a href="%s">%s</a><br />', esc_url($author_url), esc_html($author_url_display));
 		}
 
-		if ( $this->user_can ) {
-			if ( ! empty( $comment->comment_author_email ) ) {
+		if ($this->user_can) {
+			if ( ! empty($comment->comment_author_email)) {
 				/* This filter is documented in wp-includes/comment-template.php */
-				$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
+				$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
 
-				if ( ! empty( $email ) && '@' !== $email ) {
-					printf( '<a href="%1$s">%2$s</a><br />', esc_url( 'mailto:' . $email ), esc_html( $email ) );
+				if ( ! empty($email) && '@' !== $email) {
+					printf('<a href="%1$s">%2$s</a><br />', esc_url('mailto:'.$email), esc_html($email));
 				}
 			}
 
-			$author_ip = get_comment_author_IP( $comment );
-			if ( $author_ip ) {
-				$author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) );
-				if ( 'spam' === $comment_status ) {
-					$author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
+			$author_ip = get_comment_author_IP($comment);
+			if ($author_ip) {
+				$author_ip_url = add_query_arg(array('s' => $author_ip, 'mode' => 'detail'), admin_url('edit-comments.php'));
+				if ('spam' === $comment_status) {
+					$author_ip_url = add_query_arg('comment_status', 'spam', $author_ip_url);
 				}
-				printf( '<a href="%1$s">%2$s</a>', esc_url( $author_ip_url ), esc_html( $author_ip ) );
+				printf('<a href="%1$s">%2$s</a>', esc_url($author_ip_url), esc_html($author_ip));
 			}
 		}
 	}
@@ -715,19 +715,19 @@ 
 	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
-	public function column_date( $comment ) {
+	public function column_date($comment) {
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(__('%1$s at %2$s'),
 			/* translators: comment date format. See http://php.net/date */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			get_comment_date( __( 'g:i a' ), $comment )
+			get_comment_date(__('Y/m/d'), $comment),
+			get_comment_date(__('g:i a'), $comment)
 		);
 
 		echo '<div class="submitted-on">';
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+		if ('approved' === wp_get_comment_status($comment) && ! empty ($comment->comment_post_ID)) {
 			printf(
 				'<a href="%s">%s</a>',
-				esc_url( get_comment_link( $comment ) ),
+				esc_url(get_comment_link($comment)),
 				$submitted
 			);
 		} else {
@@ -741,36 +741,36 @@ 
 	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
-	public function column_response( $comment ) {
+	public function column_response($comment) {
 		$post = get_post();
 
-		if ( ! $post ) {
+		if ( ! $post) {
 			return;
 		}
 
-		if ( isset( $this->pending_count[$post->ID] ) ) {
+		if (isset($this->pending_count[$post->ID])) {
 			$pending_comments = $this->pending_count[$post->ID];
 		} else {
-			$_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
+			$_pending_count_temp = get_pending_comments_num(array($post->ID));
 			$pending_comments = $this->pending_count[$post->ID] = $_pending_count_temp[$post->ID];
 		}
 
-		if ( current_user_can( 'edit_post', $post->ID ) ) {
-			$post_link = "<a href='" . get_edit_post_link( $post->ID ) . "' class='comments-edit-item-link'>";
-			$post_link .= esc_html( get_the_title( $post->ID ) ) . '</a>';
+		if (current_user_can('edit_post', $post->ID)) {
+			$post_link = "<a href='".get_edit_post_link($post->ID)."' class='comments-edit-item-link'>";
+			$post_link .= esc_html(get_the_title($post->ID)).'</a>';
 		} else {
-			$post_link = esc_html( get_the_title( $post->ID ) );
+			$post_link = esc_html(get_the_title($post->ID));
 		}
 
 		echo '<div class="response-links">';
-		if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
+		if ('attachment' === $post->post_type && ($thumb = wp_get_attachment_image($post->ID, array(80, 60), true))) {
 			echo $thumb;
 		}
 		echo $post_link;
-		$post_type_object = get_post_type_object( $post->post_type );
-		echo "<a href='" . get_permalink( $post->ID ) . "' class='comments-view-item-link'>" . $post_type_object->labels->view_item . '</a>';
+		$post_type_object = get_post_type_object($post->post_type);
+		echo "<a href='".get_permalink($post->ID)."' class='comments-view-item-link'>".$post_type_object->labels->view_item.'</a>';
 		echo '<span class="post-com-count-wrapper post-com-count-', $post->ID, '">';
-		$this->comments_bubble( $post->ID, $pending_comments );
+		$this->comments_bubble($post->ID, $pending_comments);
 		echo '</span> ';
 		echo '</div>';
 	}
@@ -780,7 +780,7 @@ 
 	 * @param WP_Comment $comment     The comment object.
 	 * @param string     $column_name The custom column's name.
 	 */
-	public function column_default( $comment, $column_name ) {
+	public function column_default($comment, $column_name) {
 		/**
 		 * Fires when the default column output is displayed for a single row.
 		 *
@@ -789,6 +789,6 @@ 
 		 * @param string $column_name         The custom column's name.
 		 * @param int    $comment->comment_ID The custom column's unique ID number.
 		 */
-		do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
+		do_action('manage_comments_custom_column', $column_name, $comment->comment_ID);
 	}
 }

Braces +47 added lines, -35 removed lines

@@ -78,8 +78,9 @@ 
 		global $post_id, $comment_status, $search, $comment_type;
 
 		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
-		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
-			$comment_status = 'all';
+		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) ) {
+					$comment_status = 'all';
+		}
 
 		$comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
 
@@ -98,8 +99,7 @@ 
 
 		if ( isset( $_REQUEST['number'] ) ) {
 			$number = (int) $_REQUEST['number'];
-		}
-		else {
+		} else {
 			$number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra
 		}
 
@@ -240,21 +240,25 @@ 
 			)
 		);
 
-		if ( !EMPTY_TRASH_DAYS )
-			unset($stati['trash']);
+		if ( !EMPTY_TRASH_DAYS ) {
+					unset($stati['trash']);
+		}
 
 		$link = admin_url( 'edit-comments.php' );
-		if ( !empty($comment_type) && 'all' != $comment_type )
-			$link = add_query_arg( 'comment_type', $comment_type, $link );
+		if ( !empty($comment_type) && 'all' != $comment_type ) {
+					$link = add_query_arg( 'comment_type', $comment_type, $link );
+		}
 
 		foreach ( $stati as $status => $label ) {
 			$class = ( $status === $comment_status ) ? ' class="current"' : '';
 
-			if ( !isset( $num_comments->$status ) )
-				$num_comments->$status = 10;
+			if ( !isset( $num_comments->$status ) ) {
+							$num_comments->$status = 10;
+			}
 			$link = add_query_arg( 'comment_status', $status, $link );
-			if ( $post_id )
-				$link = add_query_arg( 'p', absint( $post_id ), $link );
+			if ( $post_id ) {
+							$link = add_query_arg( 'p', absint( $post_id ), $link );
+			}
 			/*
 			// I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
 			if ( !empty( $_REQUEST['s'] ) )
@@ -290,12 +294,15 @@ 
 		global $comment_status;
 
 		$actions = array();
-		if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
-			$actions['unapprove'] = __( 'Unapprove' );
-		if ( in_array( $comment_status, array( 'all', 'moderated' ) ) )
-			$actions['approve'] = __( 'Approve' );
-		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
-			$actions['spam'] = _x( 'Mark as Spam', 'comment' );
+		if ( in_array( $comment_status, array( 'all', 'approved' ) ) ) {
+					$actions['unapprove'] = __( 'Unapprove' );
+		}
+		if ( in_array( $comment_status, array( 'all', 'moderated' ) ) ) {
+					$actions['approve'] = __( 'Approve' );
+		}
+		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) ) {
+					$actions['spam'] = _x( 'Mark as Spam', 'comment' );
+		}
 
 		if ( 'trash' === $comment_status ) {
 			$actions['untrash'] = __( 'Restore' );
@@ -303,10 +310,11 @@ 
 			$actions['unspam'] = _x( 'Not Spam', 'comment' );
 		}
 
-		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
-			$actions['delete'] = __( 'Delete Permanently' );
-		else
-			$actions['trash'] = __( 'Move to Trash' );
+		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS ) {
+					$actions['delete'] = __( 'Delete Permanently' );
+		} else {
+					$actions['trash'] = __( 'Move to Trash' );
+		}
 
 		return $actions;
 	}
@@ -341,8 +349,9 @@ 
 					'pings' => __( 'Pings' ),
 				) );
 
-				foreach ( $comment_types as $type => $label )
-					echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+				foreach ( $comment_types as $type => $label ) {
+									echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
+				}
 			?>
 			</select>
 <?php
@@ -375,8 +384,9 @@ 
 	 * @return string|false
 	 */
 	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();
 	}
@@ -392,8 +402,9 @@ 
 
 		$columns = array();
 
-		if ( $this->checkbox )
-			$columns['cb'] = '<input type="checkbox" />';
+		if ( $this->checkbox ) {
+					$columns['cb'] = '<input type="checkbox" />';
+		}
 
 		$columns['author'] = __( 'Author' );
 		$columns['comment'] = _x( 'Comment', 'column name' );
@@ -601,13 +612,14 @@ 
 			( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span when not added with ajax
-			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') )
-				$action .= ' hide-if-no-js';
-			elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
-				if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
-					$action .= ' approve';
-				else
-					$action .= ' unapprove';
+			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') ) {
+							$action .= ' hide-if-no-js';
+			} elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
+				if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
+									$action .= ' approve';
+				} else {
+									$action .= ' unapprove';
+				}
 			}
 
 			$out .= "<span class='$action'>$sep$link</span>";

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Plugins_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+							 * List Table API: WP_Plugins_List_Table class
+							 *
+							 * @package WordPress
+							 * @subpackage Administration
+							 * @since 3.1.0
+							 */
 
 /**
  * Core class used to implement displaying installed plugins in a list table.

Spacing +220 added lines, -220 removed lines

@@ -30,20 +30,20 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'plugins',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
+		if (isset($_REQUEST['plugin_status']) && in_array($_REQUEST['plugin_status'], array('active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search')))
 			$status = $_REQUEST['plugin_status'];
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if (isset($_REQUEST['s']))
+			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']));
 
 		$page = $this->get_pagenum();
 	}
@@ -52,7 +52,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	public function prepare_items() {
 		global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order' ) );
+		wp_reset_vars(array('orderby', 'order'));
 
 		/**
 		 * Filters the full array of plugins to list in the Plugins list table.
@@ -86,7 +86,7 @@ 
 		 *
 		 * @param array $all_plugins An array of plugins to display in the list table.
 		 */
-		$all_plugins = apply_filters( 'all_plugins', get_plugins() );
+		$all_plugins = apply_filters('all_plugins', get_plugins());
 
 		$plugins = array(
 			'all'                => $all_plugins,
@@ -101,7 +101,7 @@ 
 
 		$screen = $this->screen;
 
-		if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
+		if ( ! is_multisite() || ($screen->in_admin('network') && current_user_can('manage_network_plugins'))) {
 
 			/**
 			 * Filter whether to display the advanced plugins list table.
@@ -118,27 +118,27 @@ 
 			 *                     plugin type. Default true.
 			 * @param string $type The plugin type. Accepts 'mustuse', 'dropins'.
 			 */
-			if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) ) {
+			if (apply_filters('show_advanced_plugins', true, 'mustuse')) {
 				$plugins['mustuse'] = get_mu_plugins();
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+			if (apply_filters('show_advanced_plugins', true, 'dropins'))
 				$plugins['dropins'] = get_dropins();
 
-			if ( current_user_can( 'update_plugins' ) ) {
-				$current = get_site_transient( 'update_plugins' );
-				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-					if ( isset( $current->response[ $plugin_file ] ) ) {
-						$plugins['all'][ $plugin_file ]['update'] = true;
-						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+			if (current_user_can('update_plugins')) {
+				$current = get_site_transient('update_plugins');
+				foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
+					if (isset($current->response[$plugin_file])) {
+						$plugins['all'][$plugin_file]['update'] = true;
+						$plugins['upgrade'][$plugin_file] = $plugins['all'][$plugin_file];
 					}
 				}
 			}
 		}
 
-		if ( ! $screen->in_admin( 'network' ) ) {
-			$show = current_user_can( 'manage_network_plugins' );
+		if ( ! $screen->in_admin('network')) {
+			$show = current_user_can('manage_network_plugins');
 			/**
 			 * Filter whether to display network-active plugins alongside plugins active for the current site.
 			 *
@@ -152,121 +152,121 @@ 
 			 * @param bool $show Whether to show network-active plugins. Default is whether the current
 			 *                   user can manage network plugins (ie. a Super Admin).
 			 */
-			$show_network_active = apply_filters( 'show_network_active_plugins', $show );
+			$show_network_active = apply_filters('show_network_active_plugins', $show);
 		}
 
-		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
+		set_transient('plugin_slugs', array_keys($plugins['all']), DAY_IN_SECONDS);
 
-		if ( $screen->in_admin( 'network' ) ) {
-			$recently_activated = get_site_option( 'recently_activated', array() );
+		if ($screen->in_admin('network')) {
+			$recently_activated = get_site_option('recently_activated', array());
 		} else {
-			$recently_activated = get_option( 'recently_activated', array() );
+			$recently_activated = get_option('recently_activated', array());
 		}
 
-		foreach ( $recently_activated as $key => $time ) {
-			if ( $time + WEEK_IN_SECONDS < time() ) {
-				unset( $recently_activated[$key] );
+		foreach ($recently_activated as $key => $time) {
+			if ($time + WEEK_IN_SECONDS < time()) {
+				unset($recently_activated[$key]);
 			}
 		}
 
-		if ( $screen->in_admin( 'network' ) ) {
-			update_site_option( 'recently_activated', $recently_activated );
+		if ($screen->in_admin('network')) {
+			update_site_option('recently_activated', $recently_activated);
 		} else {
-			update_option( 'recently_activated', $recently_activated );
+			update_option('recently_activated', $recently_activated);
 		}
 
-		$plugin_info = get_site_transient( 'update_plugins' );
+		$plugin_info = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+		foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
 			// Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
-			if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+			if (isset($plugin_info->response[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				}
 
-			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+			} elseif (isset($plugin_info->no_update[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				}
 			}
 
 			// Filter into individual sections
-			if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			if (is_multisite() && ! $screen->in_admin('network') && is_network_only_plugin($plugin_file) && ! is_plugin_active($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show inactive network-only plugins if allowed
-					$plugins['inactive'][ $plugin_file ] = $plugin_data;
+					$plugins['inactive'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-only plugins as long as they're not individually active
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			} elseif ( ! $screen->in_admin('network') && is_plugin_active_for_network($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show network-active plugins if allowed
-					$plugins['active'][ $plugin_file ] = $plugin_data;
+					$plugins['active'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-active plugins
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
-				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
+			} elseif (( ! $screen->in_admin('network') && is_plugin_active($plugin_file))
+				|| ($screen->in_admin('network') && is_plugin_active_for_network($plugin_file))) {
 				// On the non-network screen, populate the active list with plugins that are individually activated
 				// On the network-admin screen, populate the active list with plugins that are network activated
-				$plugins['active'][ $plugin_file ] = $plugin_data;
+				$plugins['active'][$plugin_file] = $plugin_data;
 			} else {
-				if ( isset( $recently_activated[ $plugin_file ] ) ) {
+				if (isset($recently_activated[$plugin_file])) {
 					// Populate the recently activated list with plugins that have been recently activated
-					$plugins['recently_activated'][ $plugin_file ] = $plugin_data;
+					$plugins['recently_activated'][$plugin_file] = $plugin_data;
 				}
 				// Populate the inactive list with plugins that aren't activated
-				$plugins['inactive'][ $plugin_file ] = $plugin_data;
+				$plugins['inactive'][$plugin_file] = $plugin_data;
 			}
 		}
 
-		if ( strlen( $s ) ) {
+		if (strlen($s)) {
 			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
+			$plugins['search'] = array_filter($plugins['all'], array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($plugins as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($plugins[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
 		$this->items = array();
-		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
+		foreach ($plugins[$status] as $plugin_file => $plugin_data) {
 			// Translate, Don't Apply Markup, Sanitize HTML
-			$this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			$this->items[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true);
 		}
 
-		$total_this_page = $totals[ $status ];
+		$total_this_page = $totals[$status];
 
-		if ( ! $orderby ) {
+		if ( ! $orderby) {
 			$orderby = 'Name';
 		} else {
-			$orderby = ucfirst( $orderby );
+			$orderby = ucfirst($orderby);
 		}
 
-		$order = strtoupper( $order );
+		$order = strtoupper($order);
 
-		uasort( $this->items, array( $this, '_order_callback' ) );
+		uasort($this->items, array($this, '_order_callback'));
 
-		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
+		$plugins_per_page = $this->get_items_per_page(str_replace('-', '_', $screen->id.'_per_page'), 999);
 
-		$start = ( $page - 1 ) * $plugins_per_page;
+		$start = ($page - 1) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ($total_this_page > $plugins_per_page)
+			$this->items = array_slice($this->items, $start, $plugins_per_page);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $plugins_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -275,11 +275,11 @@ 
 	 * @param array $plugin
 	 * @return bool
 	 */
-	public function _search_callback( $plugin ) {
+	public function _search_callback($plugin) {
 		global $s;
 
-		foreach ( $plugin as $value ) {
-			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
+		foreach ($plugin as $value) {
+			if (is_string($value) && false !== stripos(strip_tags($value), urldecode($s))) {
 				return true;
 			}
 		}
@@ -294,19 +294,19 @@ 
 	 * @param array $plugin_b
 	 * @return int
 	 */
-	public function _order_callback( $plugin_a, $plugin_b ) {
+	public function _order_callback($plugin_a, $plugin_b) {
 		global $orderby, $order;
 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' === $order ) {
-			return strcasecmp( $b, $a );
+		if ('DESC' === $order) {
+			return strcasecmp($b, $a);
 		} else {
-			return strcasecmp( $a, $b );
+			return strcasecmp($a, $b);
 		}
 	}
 
@@ -317,19 +317,19 @@ 
 	public function no_items() {
 		global $plugins;
 
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
+		if ( ! empty($_REQUEST['s'])) {
+			$s = esc_html(wp_unslash($_REQUEST['s']));
 
-			printf( __( 'No plugins found for &#8220;%s&#8221;.' ), $s );
+			printf(__('No plugins found for &#8220;%s&#8221;.'), $s);
 
 			// We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link.
-			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
-				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
+			if ( ! is_multisite() && current_user_can('install_plugins')) {
+				echo ' <a href="'.esc_url(admin_url('plugin-install.php?tab=search&s='.urlencode($s))).'">'.__('Search for plugins in the WordPress Plugin Directory.').'</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
+		} elseif ( ! empty($plugins['all']))
+			_e('No plugins found.');
 		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+			_e('You do not appear to have any plugins available at this time.');
 	}
 
 	/**
@@ -341,9 +341,9 @@ 
 		global $status;
 
 		return array(
-			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
-			'name'        => __( 'Plugin' ),
-			'description' => __( 'Description' ),
+			'cb'          => ! in_array($status, array('mustuse', 'dropins')) ? '<input type="checkbox" />' : '',
+			'name'        => __('Plugin'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -364,39 +364,39 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins');
 					break;
 				case 'active':
-					$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
+					$text = _n('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'recently_activated':
-					$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
+					$text = _n('Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'inactive':
-					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
+					$text = _n('Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count);
 					break;
 				case 'mustuse':
-					$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
+					$text = _n('Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count);
 					break;
 				case 'dropins':
-					$text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
+					$text = _n('Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( 'search' !== $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+			if ('search' !== $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
 					add_query_arg('plugin_status', $type, 'plugins.php'),
-					( $type === $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+					($type === $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 					);
 			}
 		}
@@ -414,17 +414,17 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ('active' != $status)
+			$actions['activate-selected'] = $this->screen->in_admin('network') ? __('Network Activate') : __('Activate');
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ('inactive' != $status && 'recent' != $status)
+			$actions['deactivate-selected'] = $this->screen->in_admin('network') ? __('Network Deactivate') : __('Deactivate');
 
-		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ( ! is_multisite() || $this->screen->in_admin('network')) {
+			if (current_user_can('update_plugins'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_plugins') && ('active' != $status))
+				$actions['delete-selected'] = __('Delete');
 		}
 
 		return $actions;
@@ -434,39 +434,39 @@ 
 	 * @global string $status
 	 * @param string $which
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		parent::bulk_actions( $which );
+		parent::bulk_actions($which);
 	}
 
 	/**
 	 * @global string $status
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins')))
 			return;
 
 		echo '<div class="alignleft actions">';
 
-		if ( 'recently_activated' == $status ) {
-			submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-		} elseif ( 'top' === $which && 'mustuse' === $status ) {
+		if ('recently_activated' == $status) {
+			submit_button(__('Clear List'), 'button', 'clear-recent-list', false);
+		} elseif ('top' === $which && 'mustuse' === $status) {
 			/* translators: %s: mu-plugins directory name */
-			echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
-				'<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
-			) . '</p>';
-		} elseif ( 'top' === $which && 'dropins' === $status ) {
+			echo '<p>'.sprintf(__('Files in the %s directory are executed automatically.'),
+				'<code>'.str_replace(ABSPATH, '/', WPMU_PLUGIN_DIR).'</code>'
+			).'</p>';
+		} elseif ('top' === $which && 'dropins' === $status) {
 			/* translators: %s: wp-content directory name */
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
-				'<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
-			) . '</p>';
+			echo '<p>'.sprintf(__('Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.'),
+				'<code>'.str_replace(ABSPATH, '', WP_CONTENT_DIR).'</code>'
+			).'</p>';
 		}
 		echo '</div>';
 	}
@@ -475,7 +475,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
+		if (isset($_POST['clear-recent-list']))
 			return 'clear-recent-list';
 
 		return parent::current_action();
@@ -488,11 +488,11 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (is_multisite() && ! $this->screen->in_admin('network') && in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ($this->items as $plugin_file => $plugin_data)
+			$this->single_row(array($plugin_file, $plugin_data));
 	}
 
 	/**
@@ -503,10 +503,10 @@ 
 	 *
 	 * @param array $item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		global $status, $page, $s, $totals;
 
-		list( $plugin_file, $plugin_data ) = $item;
+		list($plugin_file, $plugin_data) = $item;
 		$context = $status;
 		$screen = $this->screen;
 
@@ -523,88 +523,88 @@ 
 		$restrict_network_active = false;
 		$restrict_network_only = false;
 
-		if ( 'mustuse' === $context ) {
+		if ('mustuse' === $context) {
 			$is_active = true;
-		} elseif ( 'dropins' === $context ) {
+		} elseif ('dropins' === $context) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
-			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+			if ($plugin_file != $plugin_data['Name'])
+				$plugin_name .= '<br/>'.$plugin_data['Name'];
+			if (true === ($dropins[$plugin_file][1])) { // Doesn't require a constant
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
+			} elseif (defined($dropins[$plugin_file][1]) && constant($dropins[$plugin_file][1])) { // Constant is true
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
 			} else {
 				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
+				$description = '<p><strong>'.$dropins[$plugin_file][0].' <span class="error-message">'.__('Inactive:').'</span></strong> '.
 					/* translators: 1: drop-in constant name, 2: wp-config.php */
-					sprintf( __( 'Requires %1$s in %2$s file.' ),
-						"<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
+					sprintf(__('Requires %1$s in %2$s file.'),
+						"<code>define('".$dropins[$plugin_file][1]."', true);</code>",
 						'<code>wp-config.php</code>'
-					) . '</p>';
+					).'</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ($plugin_data['Description'])
+				$description .= '<p>'.$plugin_data['Description'].'</p>';
 		} else {
-			if ( $screen->in_admin( 'network' ) ) {
-				$is_active = is_plugin_active_for_network( $plugin_file );
+			if ($screen->in_admin('network')) {
+				$is_active = is_plugin_active_for_network($plugin_file);
 			} else {
-				$is_active = is_plugin_active( $plugin_file );
-				$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
-				$restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+				$is_active = is_plugin_active($plugin_file);
+				$restrict_network_active = (is_multisite() && is_plugin_active_for_network($plugin_file));
+				$restrict_network_only = (is_multisite() && is_network_only_plugin($plugin_file) && ! $is_active);
 			}
 
-			if ( $screen->in_admin( 'network' ) ) {
-				if ( $is_active ) {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+			if ($screen->in_admin('network')) {
+				if ($is_active) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+						$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Network deactivate %s'), $plugin_data['Name'])).'">'.__('Network Deactivate').'</a>';
 						}
 				} else {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Network Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+						$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Network Activate %s'), $plugin_data['Name'])).'">'.__('Network Activate').'</a>';
 					}
-					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+					if (current_user_can('delete_plugins') && ! is_plugin_active($plugin_file)) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				}
 			} else {
-				if ( $restrict_network_active ) {
+				if ($restrict_network_active) {
 					$actions = array(
-						'network_active' => __( 'Network Active' ),
+						'network_active' => __('Network Active'),
 					);
-				} elseif ( $restrict_network_only ) {
+				} elseif ($restrict_network_only) {
 					$actions = array(
-						'network_only' => __( 'Network Only' ),
+						'network_only' => __('Network Only'),
 					);
-				} elseif ( $is_active ) {
+				} elseif ($is_active) {
 					/* translators: %s: plugin name */
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+					$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Deactivate %s'), $plugin_data['Name'])).'">'.__('Deactivate').'</a>';
 				} else {
 					/* translators: %s: plugin name */
-					$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
+					$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Activate %s'), $plugin_data['Name'])).'">'.__('Activate').'</a>';
 
-					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+					if ( ! is_multisite() && current_user_can('delete_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				} // end if $is_active
 
 			 } // end if $screen->in_admin( 'network' )
 
-			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+			if (( ! is_multisite() || $screen->in_admin('network')) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR.'/'.$plugin_file)) {
 				/* translators: %s: plugin name */
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="plugin-editor.php?file='.$plugin_file.'" class="edit" aria-label="'.esc_attr(sprintf(__('Edit %s'), $plugin_data['Name'])).'">'.__('Edit').'</a>';
 			}
 		} // end if $context
 
-		$actions = array_filter( $actions );
+		$actions = array_filter($actions);
 
-		if ( $screen->in_admin( 'network' ) ) {
+		if ($screen->in_admin('network')) {
 
 			/**
 			 * Filter the action links displayed for each plugin in the Network Admin Plugins list table.
@@ -622,7 +622,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filter the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
@@ -640,7 +640,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		} else {
 
@@ -661,7 +661,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filter the list of action links displayed for a specific plugin in the Plugins list table.
@@ -679,48 +679,48 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		}
 
 		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+		$checkbox_id = "checkbox_".md5($plugin_data['Name']);
+		if ($restrict_network_active || $restrict_network_only || in_array($status, array('mustuse', 'dropins'))) {
 			$checkbox = '';
 		} else {
-			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-				. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+			$checkbox = "<label class='screen-reader-text' for='".$checkbox_id."' >".sprintf(__('Select %s'), $plugin_data['Name'])."</label>"
+				. "<input type='checkbox' name='checked[]' value='".esc_attr($plugin_file)."' id='".$checkbox_id."' />";
 		}
-		if ( 'dropins' != $context ) {
-			$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
+		if ('dropins' != $context) {
+			$description = '<p>'.($plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;').'</p>';
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+		if ( ! empty($totals['upgrade']) && ! empty($plugin_data['update']))
 			$class .= ' update';
 
-		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
-		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
-			esc_attr( $class ),
-			esc_attr( $plugin_slug ),
-			esc_attr( $plugin_file )
+		$plugin_slug = isset($plugin_data['slug']) ? $plugin_data['slug'] : sanitize_title($plugin_name);
+		printf('<tr class="%s" data-slug="%s" data-plugin="%s">',
+			esc_attr($class),
+			esc_attr($plugin_slug),
+			esc_attr($plugin_file)
 		);
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes = ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
 					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
-					echo $this->row_actions( $actions, true );
+					echo $this->row_actions($actions, true);
 					echo "</td>";
 					break;
 				case 'description':
@@ -731,28 +731,28 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-					if ( !empty( $plugin_data['Author'] ) ) {
+					if ( ! empty($plugin_data['Version']))
+						$plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']);
+					if ( ! empty($plugin_data['Author'])) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
-						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
+						if ( ! empty($plugin_data['AuthorURI']))
+							$author = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
+						$plugin_meta[] = sprintf(__('By %s'), $author);
 					}
 
 					// Details link using API info, if available
-					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) ),
-							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
-							esc_attr( $plugin_name ),
-							__( 'View details' )
+					if (isset($plugin_data['slug']) && current_user_can('install_plugins')) {
+						$plugin_meta[] = sprintf('<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+							esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_data['slug'].
+								'&TB_iframe=true&width=600&height=550')),
+							esc_attr(sprintf(__('More information about %s'), $plugin_name)),
+							esc_attr($plugin_name),
+							__('View details')
 						);
-					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
-							esc_url( $plugin_data['PluginURI'] ),
-							__( 'Visit plugin site' )
+					} elseif ( ! empty($plugin_data['PluginURI'])) {
+						$plugin_meta[] = sprintf('<a href="%s">%s</a>',
+							esc_url($plugin_data['PluginURI']),
+							__('Visit plugin site')
 						);
 					}
 
@@ -770,8 +770,8 @@ 
 					 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 					 *                            'Drop-ins', 'Search'.
 					 */
-					$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
-					echo implode( ' | ', $plugin_meta );
+					$plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status);
+					echo implode(' | ', $plugin_meta);
 
 					echo "</div></td>";
 					break;
@@ -789,7 +789,7 @@ 
 					 * @param string $plugin_file Path to the plugin file.
 					 * @param array  $plugin_data An array of plugin data.
 					 */
-					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+					do_action('manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data);
 
 					echo "</td>";
 			}
@@ -808,7 +808,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+		do_action('after_plugin_row', $plugin_file, $plugin_data, $status);
 
 		/**
 		 * Fires after each specific row in the Plugins list table.
@@ -824,7 +824,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
+		do_action("after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status);
 	}
 
 	/**

Braces +71 added lines, -48 removed lines

@@ -39,11 +39,13 @@ 
 		) );
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-			$status = $_REQUEST['plugin_status'];
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
+					$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset($_REQUEST['s']) ) {
+					$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -123,8 +125,9 @@ 
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-				$plugins['dropins'] = get_dropins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
+							$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
@@ -232,11 +235,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $plugins as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
@@ -260,8 +265,9 @@ 
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ( $total_this_page > $plugins_per_page ) {
+					$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -300,8 +306,9 @@ 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
 		if ( 'DESC' === $order ) {
 			return strcasecmp( $b, $a );
@@ -326,10 +333,11 @@ 
 			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
-		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+		} elseif ( ! empty( $plugins['all'] ) ) {
+					_e( 'No plugins found.' );
+		} else {
+					_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -365,8 +373,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -414,17 +423,21 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ( 'active' != $status ) {
+					$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ( 'inactive' != $status && 'recent' != $status ) {
+					$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
 		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_plugins' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -437,8 +450,9 @@ 
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -450,8 +464,9 @@ 
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-			return;
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) {
+					return;
+		}
 
 		echo '<div class="alignleft actions">';
 
@@ -475,8 +490,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
-			return 'clear-recent-list';
+		if ( isset($_POST['clear-recent-list']) ) {
+					return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
@@ -488,11 +504,13 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+					$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -528,8 +546,9 @@ 
 		} elseif ( 'dropins' === $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			if ( $plugin_file != $plugin_data['Name'] ) {
+							$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
 				$is_active = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
@@ -545,8 +564,9 @@ 
 						'<code>wp-config.php</code>'
 					) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ( $plugin_data['Description'] ) {
+							$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
 			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
@@ -696,8 +716,9 @@ 
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+					$class .= ' update';
+		}
 
 		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
 		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
@@ -731,12 +752,14 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					if ( !empty( $plugin_data['Version'] ) ) {
+											$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					}
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						if ( !empty( $plugin_data['AuthorURI'] ) ) {
+													$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 

src/wp-admin/includes/class-wp-screen.php

Indentation +14 added lines, -14 removed lines

@@ -143,12 +143,12 @@ 
 	private $_help_sidebar = '';
 
  	/**
-	 * The accessible hidden headings and text associated with the screen, if any.
-	 *
-	 * @since 4.4.0
-	 * @access private
-	 * @var array
-	 */
+ 	 * The accessible hidden headings and text associated with the screen, if any.
+ 	 *
+ 	 * @since 4.4.0
+ 	 * @access private
+ 	 * @var array
+ 	 */
 	private $_screen_reader_content = array();
 
 	/**
@@ -656,14 +656,14 @@ 
 	}
 
  	/**
-	 * Get the accessible hidden headings and text used in the screen.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @see set_screen_reader_content() For more information on the array format.
-	 *
-	 * @return array An associative array of screen reader text strings.
-	 */
+ 	 * Get the accessible hidden headings and text used in the screen.
+ 	 *
+ 	 * @since 4.4.0
+ 	 *
+ 	 * @see set_screen_reader_content() For more information on the array format.
+ 	 *
+ 	 * @return array An associative array of screen reader text strings.
+ 	 */
 	public function get_screen_reader_content() {
 		return $this->_screen_reader_content;
 	}

Spacing +223 added lines, -223 removed lines

@@ -214,8 +214,8 @@ 
 	 * 	                                  Defaults to the current $hook_suffix global.
 	 * @return WP_Screen Screen object.
 	 */
-	public static function get( $hook_name = '' ) {
-		if ( $hook_name instanceof WP_Screen ) {
+	public static function get($hook_name = '') {
+		if ($hook_name instanceof WP_Screen) {
 			return $hook_name;
 		}
 
@@ -223,146 +223,146 @@ 
 		$in_admin = false;
 		$action = '';
 
-		if ( $hook_name )
+		if ($hook_name)
 			$id = $hook_name;
 		else
 			$id = $GLOBALS['hook_suffix'];
 
 		// For those pesky meta boxes.
-		if ( $hook_name && post_type_exists( $hook_name ) ) {
+		if ($hook_name && post_type_exists($hook_name)) {
 			$post_type = $id;
 			$id = 'post'; // changes later. ends up being $base.
 		} else {
-			if ( '.php' == substr( $id, -4 ) )
-				$id = substr( $id, 0, -4 );
+			if ('.php' == substr($id, -4))
+				$id = substr($id, 0, -4);
 
-			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
-				$id = substr( $id, 0, -4 );
+			if ('post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id) {
+				$id = substr($id, 0, -4);
 				$action = 'add';
 			}
 		}
 
-		if ( ! $post_type && $hook_name ) {
-			if ( '-network' == substr( $id, -8 ) ) {
-				$id = substr( $id, 0, -8 );
+		if ( ! $post_type && $hook_name) {
+			if ('-network' == substr($id, -8)) {
+				$id = substr($id, 0, -8);
 				$in_admin = 'network';
-			} elseif ( '-user' == substr( $id, -5 ) ) {
-				$id = substr( $id, 0, -5 );
+			} elseif ('-user' == substr($id, -5)) {
+				$id = substr($id, 0, -5);
 				$in_admin = 'user';
 			}
 
-			$id = sanitize_key( $id );
-			if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
-				$maybe = substr( $id, 5 );
-				if ( taxonomy_exists( $maybe ) ) {
+			$id = sanitize_key($id);
+			if ('edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr($id, 0, 5)) {
+				$maybe = substr($id, 5);
+				if (taxonomy_exists($maybe)) {
 					$id = 'edit-tags';
 					$taxonomy = $maybe;
-				} elseif ( post_type_exists( $maybe ) ) {
+				} elseif (post_type_exists($maybe)) {
 					$id = 'edit';
 					$post_type = $maybe;
 				}
 			}
 
-			if ( ! $in_admin )
+			if ( ! $in_admin)
 				$in_admin = 'site';
 		} else {
-			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
+			if (defined('WP_NETWORK_ADMIN') && WP_NETWORK_ADMIN)
 				$in_admin = 'network';
-			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
+			elseif (defined('WP_USER_ADMIN') && WP_USER_ADMIN)
 				$in_admin = 'user';
 			else
 				$in_admin = 'site';
 		}
 
-		if ( 'index' == $id )
+		if ('index' == $id)
 			$id = 'dashboard';
-		elseif ( 'front' == $id )
+		elseif ('front' == $id)
 			$in_admin = false;
 
 		$base = $id;
 
 		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
-		if ( ! $hook_name ) {
-			if ( isset( $_REQUEST['post_type'] ) )
-				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
-			if ( isset( $_REQUEST['taxonomy'] ) )
-				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+		if ( ! $hook_name) {
+			if (isset($_REQUEST['post_type']))
+				$post_type = post_type_exists($_REQUEST['post_type']) ? $_REQUEST['post_type'] : false;
+			if (isset($_REQUEST['taxonomy']))
+				$taxonomy = taxonomy_exists($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : false;
 
-			switch ( $base ) {
+			switch ($base) {
 				case 'post' :
-					if ( isset( $_GET['post'] ) )
+					if (isset($_GET['post']))
 						$post_id = (int) $_GET['post'];
-					elseif ( isset( $_POST['post_ID'] ) )
+					elseif (isset($_POST['post_ID']))
 						$post_id = (int) $_POST['post_ID'];
 					else
 						$post_id = 0;
 
-					if ( $post_id ) {
-						$post = get_post( $post_id );
-						if ( $post )
+					if ($post_id) {
+						$post = get_post($post_id);
+						if ($post)
 							$post_type = $post->post_type;
 					}
 					break;
 				case 'edit-tags' :
 				case 'term' :
-					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
+					if (null === $post_type && is_object_in_taxonomy('post', $taxonomy ? $taxonomy : 'post_tag'))
 						$post_type = 'post';
 					break;
 			}
 		}
 
-		switch ( $base ) {
+		switch ($base) {
 			case 'post' :
-				if ( null === $post_type )
+				if (null === $post_type)
 					$post_type = 'post';
 				$id = $post_type;
 				break;
 			case 'edit' :
-				if ( null === $post_type )
+				if (null === $post_type)
 					$post_type = 'post';
-				$id .= '-' . $post_type;
+				$id .= '-'.$post_type;
 				break;
 			case 'edit-tags' :
 			case 'term' :
-				if ( null === $taxonomy )
+				if (null === $taxonomy)
 					$taxonomy = 'post_tag';
 				// The edit-tags ID does not contain the post type. Look for it in the request.
-				if ( null === $post_type ) {
+				if (null === $post_type) {
 					$post_type = 'post';
-					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+					if (isset($_REQUEST['post_type']) && post_type_exists($_REQUEST['post_type']))
 						$post_type = $_REQUEST['post_type'];
 				}
 
-				$id = 'edit-' . $taxonomy;
+				$id = 'edit-'.$taxonomy;
 				break;
 		}
 
-		if ( 'network' == $in_admin ) {
+		if ('network' == $in_admin) {
 			$id   .= '-network';
 			$base .= '-network';
-		} elseif ( 'user' == $in_admin ) {
+		} elseif ('user' == $in_admin) {
 			$id   .= '-user';
 			$base .= '-user';
 		}
 
-		if ( isset( self::$_registry[ $id ] ) ) {
-			$screen = self::$_registry[ $id ];
-			if ( $screen === get_current_screen() )
+		if (isset(self::$_registry[$id])) {
+			$screen = self::$_registry[$id];
+			if ($screen === get_current_screen())
 				return $screen;
 		} else {
 			$screen = new WP_Screen();
-			$screen->id     = $id;
+			$screen->id = $id;
 		}
 
 		$screen->base       = $base;
 		$screen->action     = $action;
 		$screen->post_type  = (string) $post_type;
 		$screen->taxonomy   = (string) $taxonomy;
-		$screen->is_user    = ( 'user' == $in_admin );
-		$screen->is_network = ( 'network' == $in_admin );
+		$screen->is_user    = ('user' == $in_admin);
+		$screen->is_network = ('network' == $in_admin);
 		$screen->in_admin   = $in_admin;
 
-		self::$_registry[ $id ] = $screen;
+		self::$_registry[$id] = $screen;
 
 		return $screen;
 	}
@@ -390,7 +390,7 @@ 
 		 *
 		 * @param WP_Screen $current_screen Current WP_Screen object.
 		 */
-		do_action( 'current_screen', $current_screen );
+		do_action('current_screen', $current_screen);
 	}
 
 	/**
@@ -410,11 +410,11 @@ 
 	 *                      If empty any of the three admins will result in true.
 	 * @return bool True if the screen is in the indicated admin, false otherwise.
 	 */
-	public function in_admin( $admin = null ) {
-		if ( empty( $admin ) )
+	public function in_admin($admin = null) {
+		if (empty($admin))
 			return (bool) $this->in_admin;
 
-		return ( $admin == $this->in_admin );
+		return ($admin == $this->in_admin);
 	}
 
 	/**
@@ -429,8 +429,8 @@ 
 	 * @param WP_Screen $screen A screen object.
 	 * @param string $help Help text.
 	 */
-	public static function add_old_compat_help( $screen, $help ) {
-		self::$_old_compat_help[ $screen->id ] = $help;
+	public static function add_old_compat_help($screen, $help) {
+		self::$_old_compat_help[$screen->id] = $help;
 	}
 
 	/**
@@ -441,10 +441,10 @@ 
 	 *
 	 * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
 	 */
-	public function set_parentage( $parent_file ) {
+	public function set_parentage($parent_file) {
 		$this->parent_file = $parent_file;
-		list( $this->parent_base ) = explode( '?', $parent_file );
-		$this->parent_base = str_replace( '.php', '', $this->parent_base );
+		list($this->parent_base) = explode('?', $parent_file);
+		$this->parent_base = str_replace('.php', '', $this->parent_base);
 	}
 
 	/**
@@ -456,8 +456,8 @@ 
 	 * @param string $option Option ID
 	 * @param mixed $args Option-dependent arguments.
 	 */
-	public function add_option( $option, $args = array() ) {
-		$this->_options[ $option ] = $args;
+	public function add_option($option, $args = array()) {
+		$this->_options[$option] = $args;
 	}
 
 	/**
@@ -467,8 +467,8 @@ 
 	 *
 	 * @param string $option Option ID.
 	 */
-	public function remove_option( $option ) {
-		unset( $this->_options[ $option ] );
+	public function remove_option($option) {
+		unset($this->_options[$option]);
 	}
 
 	/**
@@ -501,15 +501,15 @@ 
 	 *                       Default false.
 	 * @return string The option value if set, null otherwise.
 	 */
-	public function get_option( $option, $key = false ) {
-		if ( ! isset( $this->_options[ $option ] ) )
+	public function get_option($option, $key = false) {
+		if ( ! isset($this->_options[$option]))
 			return null;
-		if ( $key ) {
-			if ( isset( $this->_options[ $option ][ $key ] ) )
-				return $this->_options[ $option ][ $key ];
+		if ($key) {
+			if (isset($this->_options[$option][$key]))
+				return $this->_options[$option][$key];
 			return null;
 		}
-		return $this->_options[ $option ];
+		return $this->_options[$option];
 	}
 
 	/**
@@ -524,20 +524,20 @@ 
 		$help_tabs = $this->_help_tabs;
 
 		$priorities = array();
-		foreach ( $help_tabs as $help_tab ) {
-			if ( isset( $priorities[ $help_tab['priority'] ] ) ) {
-				$priorities[ $help_tab['priority'] ][] = $help_tab;
+		foreach ($help_tabs as $help_tab) {
+			if (isset($priorities[$help_tab['priority']])) {
+				$priorities[$help_tab['priority']][] = $help_tab;
 			} else {
-				$priorities[ $help_tab['priority'] ] = array( $help_tab );
+				$priorities[$help_tab['priority']] = array($help_tab);
 			}
 		}
 
-		ksort( $priorities );
+		ksort($priorities);
 
 		$sorted = array();
-		foreach ( $priorities as $list ) {
-			foreach ( $list as $tab ) {
-				$sorted[ $tab['id'] ] = $tab;
+		foreach ($priorities as $list) {
+			foreach ($list as $tab) {
+				$sorted[$tab['id']] = $tab;
 			}
 		}
 
@@ -552,10 +552,10 @@ 
 	 * @param string $id Help Tab ID.
 	 * @return array Help tab arguments.
 	 */
-	public function get_help_tab( $id ) {
-		if ( ! isset( $this->_help_tabs[ $id ] ) )
+	public function get_help_tab($id) {
+		if ( ! isset($this->_help_tabs[$id]))
 			return null;
-		return $this->_help_tabs[ $id ];
+		return $this->_help_tabs[$id];
 	}
 
 	/**
@@ -575,7 +575,7 @@ 
 	 *     @type int    $priority Optional. The priority of the tab, used for ordering. Default 10.
 	 * }
 	 */
-	public function add_help_tab( $args ) {
+	public function add_help_tab($args) {
 		$defaults = array(
 			'title'    => false,
 			'id'       => false,
@@ -583,16 +583,16 @@ 
 			'callback' => false,
 			'priority' => 10,
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$args['id'] = sanitize_html_class( $args['id'] );
+		$args['id'] = sanitize_html_class($args['id']);
 
 		// Ensure we have an ID and title.
-		if ( ! $args['id'] || ! $args['title'] )
+		if ( ! $args['id'] || ! $args['title'])
 			return;
 
 		// Allows for overriding an existing tab with that ID.
-		$this->_help_tabs[ $args['id'] ] = $args;
+		$this->_help_tabs[$args['id']] = $args;
 	}
 
 	/**
@@ -602,8 +602,8 @@ 
 	 *
 	 * @param string $id The help tab ID.
 	 */
-	public function remove_help_tab( $id ) {
-		unset( $this->_help_tabs[ $id ] );
+	public function remove_help_tab($id) {
+		unset($this->_help_tabs[$id]);
 	}
 
 	/**
@@ -634,7 +634,7 @@ 
 	 *
 	 * @param string $content Sidebar content in plain text or HTML.
 	 */
-	public function set_help_sidebar( $content ) {
+	public function set_help_sidebar($content) {
 		$this->_help_sidebar = $content;
 	}
 
@@ -676,11 +676,11 @@ 
 	 * @param string $key Screen reader text array named key.
 	 * @return string Screen reader text string.
 	 */
-	public function get_screen_reader_text( $key ) {
-		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+	public function get_screen_reader_text($key) {
+		if ( ! isset($this->_screen_reader_content[$key])) {
 			return null;
 		}
-		return $this->_screen_reader_content[ $key ];
+		return $this->_screen_reader_content[$key];
 	}
 
 	/**
@@ -699,13 +699,13 @@ 
 	 *                                      Default 'Items list'.
 	 * }
 	 */
-	public function set_screen_reader_content( $content = array() ) {
+	public function set_screen_reader_content($content = array()) {
 		$defaults = array(
-			'heading_views'      => __( 'Filter items list' ),
-			'heading_pagination' => __( 'Items list navigation' ),
-			'heading_list'       => __( 'Items list' ),
+			'heading_views'      => __('Filter items list'),
+			'heading_pagination' => __('Items list navigation'),
+			'heading_list'       => __('Items list'),
 		);
-		$content = wp_parse_args( $content, $defaults );
+		$content = wp_parse_args($content, $defaults);
 
 		$this->_screen_reader_content = $content;
 	}
@@ -740,9 +740,9 @@ 
 		 * @param array     $old_compat_help Old contextual help.
 		 * @param WP_Screen $this            Current WP_Screen instance.
 		 */
-		self::$_old_compat_help = apply_filters( 'contextual_help_list', self::$_old_compat_help, $this );
+		self::$_old_compat_help = apply_filters('contextual_help_list', self::$_old_compat_help, $this);
 
-		$old_help = isset( self::$_old_compat_help[ $this->id ] ) ? self::$_old_compat_help[ $this->id ] : '';
+		$old_help = isset(self::$_old_compat_help[$this->id]) ? self::$_old_compat_help[$this->id] : '';
 
 		/**
 		 * Filter the legacy contextual help text.
@@ -756,10 +756,10 @@ 
 		 * @param WP_Screen $this      Current WP_Screen instance.
 		 *
 		 */
-		$old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this );
+		$old_help = apply_filters('contextual_help', $old_help, $this->id, $this);
 
 		// Default help only if there is no old-style block of text and no new-style help tabs.
-		if ( empty( $old_help ) && ! $this->get_help_tabs() ) {
+		if (empty($old_help) && ! $this->get_help_tabs()) {
 
 			/**
 			 * Filter the default legacy contextual help text.
@@ -770,44 +770,44 @@ 
 			 *
 			 * @param string $old_help_default Default contextual help text.
 			 */
-			$default_help = apply_filters( 'default_contextual_help', '' );
-			if ( $default_help )
-				$old_help = '<p>' . $default_help . '</p>';
+			$default_help = apply_filters('default_contextual_help', '');
+			if ($default_help)
+				$old_help = '<p>'.$default_help.'</p>';
 		}
 
-		if ( $old_help ) {
-			$this->add_help_tab( array(
+		if ($old_help) {
+			$this->add_help_tab(array(
 				'id'      => 'old-contextual-help',
 				'title'   => __('Overview'),
 				'content' => $old_help,
-			) );
+			));
 		}
 
 		$help_sidebar = $this->get_help_sidebar();
 
 		$help_class = 'hidden';
-		if ( ! $help_sidebar )
+		if ( ! $help_sidebar)
 			$help_class .= ' no-sidebar';
 
 		// Time to render!
 		?>
 		<div id="screen-meta" class="metabox-prefs">
 
-			<div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
+			<div id="contextual-help-wrap" class="<?php echo esc_attr($help_class); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
 				<div id="contextual-help-back"></div>
 				<div id="contextual-help-columns">
 					<div class="contextual-help-tabs">
 						<ul>
 						<?php
 						$class = ' class="active"';
-						foreach ( $this->get_help_tabs() as $tab ) :
+						foreach ($this->get_help_tabs() as $tab) :
 							$link_id  = "tab-link-{$tab['id']}";
 							$panel_id = "tab-panel-{$tab['id']}";
 							?>
 
-							<li id="<?php echo esc_attr( $link_id ); ?>"<?php echo $class; ?>>
-								<a href="<?php echo esc_url( "#$panel_id" ); ?>" aria-controls="<?php echo esc_attr( $panel_id ); ?>">
-									<?php echo esc_html( $tab['title'] ); ?>
+							<li id="<?php echo esc_attr($link_id); ?>"<?php echo $class; ?>>
+								<a href="<?php echo esc_url("#$panel_id"); ?>" aria-controls="<?php echo esc_attr($panel_id); ?>">
+									<?php echo esc_html($tab['title']); ?>
 								</a>
 							</li>
 						<?php
@@ -817,7 +817,7 @@ 
 						</ul>
 					</div>
 
-					<?php if ( $help_sidebar ) : ?>
+					<?php if ($help_sidebar) : ?>
 					<div class="contextual-help-sidebar">
 						<?php echo $help_sidebar; ?>
 					</div>
@@ -826,18 +826,18 @@ 
 					<div class="contextual-help-tabs-wrap">
 						<?php
 						$classes = 'help-tab-content active';
-						foreach ( $this->get_help_tabs() as $tab ):
+						foreach ($this->get_help_tabs() as $tab):
 							$panel_id = "tab-panel-{$tab['id']}";
 							?>
 
-							<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo $classes; ?>">
+							<div id="<?php echo esc_attr($panel_id); ?>" class="<?php echo $classes; ?>">
 								<?php
 								// Print tab content.
 								echo $tab['content'];
 
 								// If it exists, fire tab callback.
-								if ( ! empty( $tab['callback'] ) )
-									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								if ( ! empty($tab['callback']))
+									call_user_func_array($tab['callback'], array($this, $tab));
 								?>
 							</div>
 						<?php
@@ -862,37 +862,37 @@ 
 		 * @param string    $screen_id     Screen ID.
 		 * @param WP_Screen $this          Current WP_Screen instance.
 		 */
-		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
+		$columns = apply_filters('screen_layout_columns', array(), $this->id, $this);
 
-		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
-			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		if ( ! empty($columns) && isset($columns[$this->id]))
+			$this->add_option('layout_columns', array('max' => $columns[$this->id]));
 
-		if ( $this->get_option( 'layout_columns' ) ) {
+		if ($this->get_option('layout_columns')) {
 			$this->columns = (int) get_user_option("screen_layout_$this->id");
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
-				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $this->get_option('layout_columns', 'default'))
+				$this->columns = $this->get_option('layout_columns', 'default');
 		}
-		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
+		$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.
 
 		// Add screen options
-		if ( $this->show_screen_options() )
+		if ($this->show_screen_options())
 			$this->render_screen_options();
 		?>
 		</div>
 		<?php
-		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options())
 			return;
 		?>
 		<div id="screen-meta-links">
-		<?php if ( $this->get_help_tabs() ) : ?>
+		<?php if ($this->get_help_tabs()) : ?>
 			<div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
+			<button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e('Help'); ?></button>
 			</div>
 		<?php endif;
-		if ( $this->show_screen_options() ) : ?>
+		if ($this->show_screen_options()) : ?>
 			<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
+			<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e('Screen Options'); ?></button>
 			</div>
 		<?php endif; ?>
 		</div>
@@ -908,21 +908,21 @@ 
 	public function show_screen_options() {
 		global $wp_meta_boxes;
 
-		if ( is_bool( $this->_show_screen_options ) )
+		if (is_bool($this->_show_screen_options))
 			return $this->_show_screen_options;
 
-		$columns = get_column_headers( $this );
+		$columns = get_column_headers($this);
 
-		$show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' );
+		$show_screen = ! empty($wp_meta_boxes[$this->id]) || $columns || $this->get_option('per_page');
 
-		switch ( $this->base ) {
+		switch ($this->base) {
 			case 'widgets':
-				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
+				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">'.__('Enable accessibility mode').'</a><a id="access-off" href="widgets.php?widgets-access=off">'.__('Disable accessibility mode')."</a></p>\n";
 				break;
 			case 'post' :
-				$expand = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
-				$expand .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
-				$expand .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
+				$expand = '<fieldset class="editor-expand hidden"><legend>'.__('Additional settings').'</legend><label for="editor-expand-toggle">';
+				$expand .= '<input type="checkbox" id="editor-expand-toggle"'.checked(get_user_setting('editor_expand', 'on'), 'on', false).' />';
+				$expand .= __('Enable full-height editor and distraction-free functionality.').'</label></fieldset>';
 				$this->_screen_settings = $expand;
 				break;
 			default:
@@ -941,9 +941,9 @@ 
 		 * @param string    $screen_settings Screen settings.
 		 * @param WP_Screen $this            WP_Screen object.
 		 */
-		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
+		$this->_screen_settings = apply_filters('screen_settings', $this->_screen_settings, $this);
 
-		if ( $this->_screen_settings || $this->_options )
+		if ($this->_screen_settings || $this->_options)
 			$show_screen = true;
 
 		/**
@@ -955,7 +955,7 @@ 
 		 *                               Default true.
 		 * @param WP_Screen $this        Current WP_Screen instance.
 		 */
-		$this->_show_screen_options = apply_filters( 'screen_options_show_screen', $show_screen, $this );
+		$this->_show_screen_options = apply_filters('screen_options_show_screen', $show_screen, $this);
 		return $this->_show_screen_options;
 	}
 
@@ -968,26 +968,26 @@ 
 	 *     @type bool $wrap  Whether the screen-options-wrap div will be included. Defaults to true.
 	 * }
 	 */
-	public function render_screen_options( $options = array() ) {
-		$options = wp_parse_args( $options, array(
+	public function render_screen_options($options = array()) {
+		$options = wp_parse_args($options, array(
 			'wrap' => true,
-		) );
+		));
 
 		$wrapper_start = $wrapper_end = $form_start = $form_end = '';
 
 		// Output optional wrapper.
-		if ( $options['wrap'] ) {
-			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Screen Options Tab' ) . '">';
+		if ($options['wrap']) {
+			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="'.esc_attr__('Screen Options Tab').'">';
 			$wrapper_end = '</div>';
 		}
 
 		// Don't output the form and nonce for the widgets accessibility mode links.
-		if ( 'widgets' !== $this->base ) {
+		if ('widgets' !== $this->base) {
 			$form_start = "\n<form id='adv-settings' method='post'>\n";
-			$form_end = "\n" . wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false, false ) . "\n</form>\n";
+			$form_end = "\n".wp_nonce_field('screen-options-nonce', 'screenoptionnonce', false, false)."\n</form>\n";
 		}
 
-		echo $wrapper_start . $form_start;
+		echo $wrapper_start.$form_start;
 
 		$this->render_meta_boxes_preferences();
 		$this->render_list_table_columns_preferences();
@@ -1005,13 +1005,13 @@ 
 		 *                               Default false.
 		 * @param WP_Screen $this        Current WP_Screen instance.
 		 */
-		$show_button = apply_filters( 'screen_options_show_submit', false, $this );
+		$show_button = apply_filters('screen_options_show_submit', false, $this);
 
-		if ( $show_button ) {
-			submit_button( __( 'Apply' ), 'primary', 'screen-options-apply', true );
+		if ($show_button) {
+			submit_button(__('Apply'), 'primary', 'screen-options-apply', true);
 		}
 
-		echo $form_end . $wrapper_end;
+		echo $form_end.$wrapper_end;
 	}
 
 	/**
@@ -1024,28 +1024,28 @@ 
 	public function render_meta_boxes_preferences() {
 		global $wp_meta_boxes;
 
-		if ( ! isset( $wp_meta_boxes[ $this->id ] ) ) {
+		if ( ! isset($wp_meta_boxes[$this->id])) {
 			return;
 		}
 		?>
 		<fieldset class="metabox-prefs">
-		<legend><?php _e( 'Boxes' ); ?></legend>
+		<legend><?php _e('Boxes'); ?></legend>
 		<?php
-			meta_box_prefs( $this );
+			meta_box_prefs($this);
 
-			if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
-				if ( isset( $_GET['welcome'] ) ) {
-					$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
-					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
+			if ('dashboard' === $this->id && has_action('welcome_panel') && current_user_can('edit_theme_options')) {
+				if (isset($_GET['welcome'])) {
+					$welcome_checked = empty($_GET['welcome']) ? 0 : 1;
+					update_user_meta(get_current_user_id(), 'show_welcome_panel', $welcome_checked);
 				} else {
-					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+					$welcome_checked = get_user_meta(get_current_user_id(), 'show_welcome_panel', true);
+					if (2 == $welcome_checked && wp_get_current_user()->user_email != get_option('admin_email')) {
 						$welcome_checked = false;
 					}
 				}
 				echo '<label for="wp_welcome_panel-hide">';
-				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
-				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+				echo '<input type="checkbox" id="wp_welcome_panel-hide"'.checked((bool) $welcome_checked, true, false).' />';
+				echo _x('Welcome', 'Welcome panel')."</label>\n";
 			}
 		?>
 		</fieldset>
@@ -1059,37 +1059,37 @@ 
 	 */
 	public function render_list_table_columns_preferences() {
 
-		$columns = get_column_headers( $this );
-		$hidden  = get_hidden_columns( $this );
+		$columns = get_column_headers($this);
+		$hidden  = get_hidden_columns($this);
 
-		if ( ! $columns ) {
+		if ( ! $columns) {
 			return;
 		}
 
-		$legend = ! empty( $columns['_title'] ) ? $columns['_title'] : __( 'Columns' );
+		$legend = ! empty($columns['_title']) ? $columns['_title'] : __('Columns');
 		?>
 		<fieldset class="metabox-prefs">
 		<legend><?php echo $legend; ?></legend>
 		<?php
-		$special = array( '_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname' );
+		$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
 
-		foreach ( $columns as $column => $title ) {
+		foreach ($columns as $column => $title) {
 			// Can't hide these for they are special
-			if ( in_array( $column, $special ) ) {
+			if (in_array($column, $special)) {
 				continue;
 			}
 
-			if ( empty( $title ) ) {
+			if (empty($title)) {
 				continue;
 			}
 
-			if ( 'comments' == $column ) {
-				$title = __( 'Comments' );
+			if ('comments' == $column) {
+				$title = __('Comments');
 			}
 
 			$id = "$column-hide";
 			echo '<label>';
-			echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
+			echo '<input class="hide-column-tog" name="'.$id.'" type="checkbox" id="'.$id.'" value="'.$column.'"'.checked( ! in_array($column, $hidden), true, false).' />';
 			echo "$title</label>\n";
 		}
 		?>
@@ -1103,22 +1103,22 @@ 
 	 * @since 3.3.0
 	 */
 	public function render_screen_layout() {
-		if ( ! $this->get_option( 'layout_columns' ) ) {
+		if ( ! $this->get_option('layout_columns')) {
 			return;
 		}
 
 		$screen_layout_columns = $this->get_columns();
-		$num = $this->get_option( 'layout_columns', 'max' );
+		$num = $this->get_option('layout_columns', 'max');
 
 		?>
 		<fieldset class='columns-prefs'>
-		<legend class="screen-layout"><?php _e( 'Layout' ); ?></legend><?php
-			for ( $i = 1; $i <= $num; ++$i ):
+		<legend class="screen-layout"><?php _e('Layout'); ?></legend><?php
+			for ($i = 1; $i <= $num; ++$i):
 				?>
 				<label class="columns-prefs-<?php echo $i; ?>">
-					<input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
-						<?php checked( $screen_layout_columns, $i ); ?> />
-					<?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
+					<input type='radio' name='screen_columns' value='<?php echo esc_attr($i); ?>'
+						<?php checked($screen_layout_columns, $i); ?> />
+					<?php printf(_n('%s column', '%s columns', $i), number_format_i18n($i)); ?>
 				</label>
 				<?php
 			endfor; ?>
@@ -1132,60 +1132,60 @@ 
 	 * @since 3.3.0
 	 */
 	public function render_per_page_options() {
-		if ( null === $this->get_option( 'per_page' ) ) {
+		if (null === $this->get_option('per_page')) {
 			return;
 		}
 
-		$per_page_label = $this->get_option( 'per_page', 'label' );
-		if ( null === $per_page_label ) {
-			$per_page_label = __( 'Number of items per page:' );
+		$per_page_label = $this->get_option('per_page', 'label');
+		if (null === $per_page_label) {
+			$per_page_label = __('Number of items per page:');
 		}
 
-		$option = $this->get_option( 'per_page', 'option' );
-		if ( ! $option ) {
-			$option = str_replace( '-', '_', "{$this->id}_per_page" );
+		$option = $this->get_option('per_page', 'option');
+		if ( ! $option) {
+			$option = str_replace('-', '_', "{$this->id}_per_page");
 		}
 
-		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 ) {
-			$per_page = $this->get_option( 'per_page', 'default' );
-			if ( ! $per_page ) {
+		$per_page = (int) get_user_option($option);
+		if (empty($per_page) || $per_page < 1) {
+			$per_page = $this->get_option('per_page', 'default');
+			if ( ! $per_page) {
 				$per_page = 20;
 			}
 		}
 
-		if ( 'edit_comments_per_page' == $option ) {
-			$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
+		if ('edit_comments_per_page' == $option) {
+			$comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
 
 			/** This filter is documented in wp-admin/includes/class-wp-comments-list-table.php */
-			$per_page = apply_filters( 'comments_per_page', $per_page, $comment_status );
-		} elseif ( 'categories_per_page' == $option ) {
+			$per_page = apply_filters('comments_per_page', $per_page, $comment_status);
+		} elseif ('categories_per_page' == $option) {
 			/** This filter is documented in wp-admin/includes/class-wp-terms-list-table.php */
-			$per_page = apply_filters( 'edit_categories_per_page', $per_page );
+			$per_page = apply_filters('edit_categories_per_page', $per_page);
 		} else {
 			/** This filter is documented in wp-admin/includes/class-wp-list-table.php */
-			$per_page = apply_filters( $option, $per_page );
+			$per_page = apply_filters($option, $per_page);
 		}
 
 		// Back compat
-		if ( isset( $this->post_type ) ) {
+		if (isset($this->post_type)) {
 			/** This filter is documented in wp-admin/includes/post.php */
-			$per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type );
+			$per_page = apply_filters('edit_posts_per_page', $per_page, $this->post_type);
 		}
 
 		// This needs a submit button
-		add_filter( 'screen_options_show_submit', '__return_true' );
+		add_filter('screen_options_show_submit', '__return_true');
 
 		?>
 		<fieldset class="screen-options">
-		<legend><?php _e( 'Pagination' ); ?></legend>
-			<?php if ( $per_page_label ) : ?>
-				<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
+		<legend><?php _e('Pagination'); ?></legend>
+			<?php if ($per_page_label) : ?>
+				<label for="<?php echo esc_attr($option); ?>"><?php echo $per_page_label; ?></label>
 				<input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
-					id="<?php echo esc_attr( $option ); ?>" maxlength="3"
-					value="<?php echo esc_attr( $per_page ); ?>" />
+					id="<?php echo esc_attr($option); ?>" maxlength="3"
+					value="<?php echo esc_attr($per_page); ?>" />
 			<?php endif; ?>
-				<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
+				<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr($option); ?>" />
 		</fieldset>
 		<?php
 	}
@@ -1199,11 +1199,11 @@ 
 		$screen = get_current_screen();
 
 		// Currently only enabled for posts lists
-		if ( 'edit' !== $screen->base ) {
+		if ('edit' !== $screen->base) {
 			return;
 		}
 
-		$view_mode_post_types = get_post_types( array( 'hierarchical' => false, 'show_ui' => true ) );
+		$view_mode_post_types = get_post_types(array('hierarchical' => false, 'show_ui' => true));
 
 		/**
 		 * Filter the post types that have different view mode options.
@@ -1213,26 +1213,26 @@ 
 		 * @param array $view_mode_post_types Array of post types that can change view modes.
 		 *                                    Default hierarchical post types with show_ui on.
 		 */
-		$view_mode_post_types = apply_filters( 'view_mode_post_types', $view_mode_post_types );
+		$view_mode_post_types = apply_filters('view_mode_post_types', $view_mode_post_types);
 
-		if ( ! in_array( $this->post_type, $view_mode_post_types ) ) {
+		if ( ! in_array($this->post_type, $view_mode_post_types)) {
 			return;
 		}
 
 		global $mode;
 
 		// This needs a submit button
-		add_filter( 'screen_options_show_submit', '__return_true' );
+		add_filter('screen_options_show_submit', '__return_true');
 ?>
 		<fieldset class="metabox-prefs view-mode">
-		<legend><?php _e( 'View Mode' ); ?></legend>
+		<legend><?php _e('View Mode'); ?></legend>
 				<label for="list-view-mode">
-					<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked( 'list', $mode ); ?> />
-					<?php _e( 'List View' ); ?>
+					<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked('list', $mode); ?> />
+					<?php _e('List View'); ?>
 				</label>
 				<label for="excerpt-view-mode">
-					<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
-					<?php _e( 'Excerpt View' ); ?>
+					<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked('excerpt', $mode); ?> />
+					<?php _e('Excerpt View'); ?>
 				</label>
 		</fieldset>
 <?php
@@ -1246,11 +1246,11 @@ 
 	 * @param string $key The screen reader text array named key.
 	 * @param string $tag Optional. The HTML tag to wrap the screen reader text. Default h2.
 	 */
-	public function render_screen_reader_content( $key = '', $tag = 'h2' ) {
+	public function render_screen_reader_content($key = '', $tag = 'h2') {
 
-		if ( ! isset( $this->_screen_reader_content[ $key ] ) ) {
+		if ( ! isset($this->_screen_reader_content[$key])) {
 			return;
 		}
-		echo "<$tag class='screen-reader-text'>" . $this->_screen_reader_content[ $key ] . "</$tag>";
+		echo "<$tag class='screen-reader-text'>".$this->_screen_reader_content[$key]."</$tag>";
 	}
 }

Braces +99 added lines, -70 removed lines

@@ -223,18 +223,20 @@ 
 		$in_admin = false;
 		$action = '';
 
-		if ( $hook_name )
-			$id = $hook_name;
-		else
-			$id = $GLOBALS['hook_suffix'];
+		if ( $hook_name ) {
+					$id = $hook_name;
+		} else {
+					$id = $GLOBALS['hook_suffix'];
+		}
 
 		// For those pesky meta boxes.
 		if ( $hook_name && post_type_exists( $hook_name ) ) {
 			$post_type = $id;
 			$id = 'post'; // changes later. ends up being $base.
 		} else {
-			if ( '.php' == substr( $id, -4 ) )
-				$id = substr( $id, 0, -4 );
+			if ( '.php' == substr( $id, -4 ) ) {
+							$id = substr( $id, 0, -4 );
+			}
 
 			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
 				$id = substr( $id, 0, -4 );
@@ -263,74 +265,86 @@ 
 				}
 			}
 
-			if ( ! $in_admin )
-				$in_admin = 'site';
+			if ( ! $in_admin ) {
+							$in_admin = 'site';
+			}
 		} else {
-			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
-				$in_admin = 'network';
-			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
-				$in_admin = 'user';
-			else
-				$in_admin = 'site';
+			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN ) {
+							$in_admin = 'network';
+			} elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN ) {
+							$in_admin = 'user';
+			} else {
+							$in_admin = 'site';
+			}
 		}
 
-		if ( 'index' == $id )
-			$id = 'dashboard';
-		elseif ( 'front' == $id )
-			$in_admin = false;
+		if ( 'index' == $id ) {
+					$id = 'dashboard';
+		} elseif ( 'front' == $id ) {
+					$in_admin = false;
+		}
 
 		$base = $id;
 
 		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
 		if ( ! $hook_name ) {
-			if ( isset( $_REQUEST['post_type'] ) )
-				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
-			if ( isset( $_REQUEST['taxonomy'] ) )
-				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+			if ( isset( $_REQUEST['post_type'] ) ) {
+							$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
+			}
+			if ( isset( $_REQUEST['taxonomy'] ) ) {
+							$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+			}
 
 			switch ( $base ) {
 				case 'post' :
-					if ( isset( $_GET['post'] ) )
-						$post_id = (int) $_GET['post'];
-					elseif ( isset( $_POST['post_ID'] ) )
-						$post_id = (int) $_POST['post_ID'];
-					else
-						$post_id = 0;
+					if ( isset( $_GET['post'] ) ) {
+											$post_id = (int) $_GET['post'];
+					} elseif ( isset( $_POST['post_ID'] ) ) {
+											$post_id = (int) $_POST['post_ID'];
+					} else {
+											$post_id = 0;
+					}
 
 					if ( $post_id ) {
 						$post = get_post( $post_id );
-						if ( $post )
-							$post_type = $post->post_type;
+						if ( $post ) {
+													$post_type = $post->post_type;
+						}
 					}
 					break;
 				case 'edit-tags' :
 				case 'term' :
-					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
-						$post_type = 'post';
+					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) ) {
+											$post_type = 'post';
+					}
 					break;
 			}
 		}
 
 		switch ( $base ) {
 			case 'post' :
-				if ( null === $post_type )
-					$post_type = 'post';
+				if ( null === $post_type ) {
+									$post_type = 'post';
+				}
 				$id = $post_type;
 				break;
 			case 'edit' :
-				if ( null === $post_type )
-					$post_type = 'post';
+				if ( null === $post_type ) {
+									$post_type = 'post';
+				}
 				$id .= '-' . $post_type;
 				break;
 			case 'edit-tags' :
 			case 'term' :
-				if ( null === $taxonomy )
-					$taxonomy = 'post_tag';
+				if ( null === $taxonomy ) {
+									$taxonomy = 'post_tag';
+				}
 				// The edit-tags ID does not contain the post type. Look for it in the request.
 				if ( null === $post_type ) {
 					$post_type = 'post';
-					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
-						$post_type = $_REQUEST['post_type'];
+					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
+											$post_type = $_REQUEST['post_type'];
+					}
 				}
 
 				$id = 'edit-' . $taxonomy;
@@ -347,8 +361,9 @@ 
 
 		if ( isset( self::$_registry[ $id ] ) ) {
 			$screen = self::$_registry[ $id ];
-			if ( $screen === get_current_screen() )
-				return $screen;
+			if ( $screen === get_current_screen() ) {
+							return $screen;
+			}
 		} else {
 			$screen = new WP_Screen();
 			$screen->id     = $id;
@@ -411,8 +426,9 @@ 
 	 * @return bool True if the screen is in the indicated admin, false otherwise.
 	 */
 	public function in_admin( $admin = null ) {
-		if ( empty( $admin ) )
-			return (bool) $this->in_admin;
+		if ( empty( $admin ) ) {
+					return (bool) $this->in_admin;
+		}
 
 		return ( $admin == $this->in_admin );
 	}
@@ -502,11 +518,13 @@ 
 	 * @return string The option value if set, null otherwise.
 	 */
 	public function get_option( $option, $key = false ) {
-		if ( ! isset( $this->_options[ $option ] ) )
-			return null;
+		if ( ! isset( $this->_options[ $option ] ) ) {
+					return null;
+		}
 		if ( $key ) {
-			if ( isset( $this->_options[ $option ][ $key ] ) )
-				return $this->_options[ $option ][ $key ];
+			if ( isset( $this->_options[ $option ][ $key ] ) ) {
+							return $this->_options[ $option ][ $key ];
+			}
 			return null;
 		}
 		return $this->_options[ $option ];
@@ -553,8 +571,9 @@ 
 	 * @return array Help tab arguments.
 	 */
 	public function get_help_tab( $id ) {
-		if ( ! isset( $this->_help_tabs[ $id ] ) )
-			return null;
+		if ( ! isset( $this->_help_tabs[ $id ] ) ) {
+					return null;
+		}
 		return $this->_help_tabs[ $id ];
 	}
 
@@ -588,8 +607,9 @@ 
 		$args['id'] = sanitize_html_class( $args['id'] );
 
 		// Ensure we have an ID and title.
-		if ( ! $args['id'] || ! $args['title'] )
-			return;
+		if ( ! $args['id'] || ! $args['title'] ) {
+					return;
+		}
 
 		// Allows for overriding an existing tab with that ID.
 		$this->_help_tabs[ $args['id'] ] = $args;
@@ -771,8 +791,9 @@ 
 			 * @param string $old_help_default Default contextual help text.
 			 */
 			$default_help = apply_filters( 'default_contextual_help', '' );
-			if ( $default_help )
-				$old_help = '<p>' . $default_help . '</p>';
+			if ( $default_help ) {
+							$old_help = '<p>' . $default_help . '</p>';
+			}
 		}
 
 		if ( $old_help ) {
@@ -786,8 +807,9 @@ 
 		$help_sidebar = $this->get_help_sidebar();
 
 		$help_class = 'hidden';
-		if ( ! $help_sidebar )
-			$help_class .= ' no-sidebar';
+		if ( ! $help_sidebar ) {
+					$help_class .= ' no-sidebar';
+		}
 
 		// Time to render!
 		?>
@@ -836,8 +858,9 @@ 
 								echo $tab['content'];
 
 								// If it exists, fire tab callback.
-								if ( ! empty( $tab['callback'] ) )
-									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								if ( ! empty( $tab['callback'] ) ) {
+																	call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								}
 								?>
 							</div>
 						<?php
@@ -864,25 +887,29 @@ 
 		 */
 		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
 
-		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
-			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) {
+					$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		}
 
 		if ( $this->get_option( 'layout_columns' ) ) {
 			$this->columns = (int) get_user_option("screen_layout_$this->id");
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
-				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {
+							$this->columns = $this->get_option( 'layout_columns', 'default' );
+			}
 		}
 		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
 
 		// Add screen options
-		if ( $this->show_screen_options() )
-			$this->render_screen_options();
+		if ( $this->show_screen_options() ) {
+					$this->render_screen_options();
+		}
 		?>
 		</div>
 		<?php
-		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
-			return;
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() ) {
+					return;
+		}
 		?>
 		<div id="screen-meta-links">
 		<?php if ( $this->get_help_tabs() ) : ?>
@@ -908,8 +935,9 @@ 
 	public function show_screen_options() {
 		global $wp_meta_boxes;
 
-		if ( is_bool( $this->_show_screen_options ) )
-			return $this->_show_screen_options;
+		if ( is_bool( $this->_show_screen_options ) ) {
+					return $this->_show_screen_options;
+		}
 
 		$columns = get_column_headers( $this );
 
@@ -943,8 +971,9 @@ 
 		 */
 		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
 
-		if ( $this->_screen_settings || $this->_options )
-			$show_screen = true;
+		if ( $this->_screen_settings || $this->_options ) {
+					$show_screen = true;
+		}
 
 		/**
 		 * Filter whether to show the Screen Options tab.

src/wp-admin/includes/class-wp-internal-pointers.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Administration API: WP_Internal_Pointers class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * Administration API: WP_Internal_Pointers class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement an internal admin pointers API.

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param string $hook_suffix The current admin page.
 	 */
-	public static function enqueue_scripts( $hook_suffix ) {
+	public static function enqueue_scripts($hook_suffix) {
 		/*
 		 * Register feature pointers
 		 *
@@ -47,10 +47,10 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
+		if (empty($registered_pointers[$hook_suffix]))
 			return;
 
-		$pointers = (array) $registered_pointers[ $hook_suffix ];
+		$pointers = (array) $registered_pointers[$hook_suffix];
 
 		/*
 		 * Specify required capabilities for feature pointers
@@ -70,28 +70,28 @@ 
 		);
 
 		// Get dismissed pointers
-		$dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+		$dismissed = explode(',', (string) get_user_meta(get_current_user_id(), 'dismissed_wp_pointers', true));
 
 		$got_pointers = false;
-		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
-			if ( isset( $caps_required[ $pointer ] ) ) {
-				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
+		foreach (array_diff($pointers, $dismissed) as $pointer) {
+			if (isset($caps_required[$pointer])) {
+				foreach ($caps_required[$pointer] as $cap) {
+					if ( ! current_user_can($cap))
 						continue 2;
 				}
 			}
 
 			// Bind pointer print function
-			add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
+			add_action('admin_print_footer_scripts', array('WP_Internal_Pointers', 'pointer_'.$pointer));
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
+		if ( ! $got_pointers)
 			return;
 
 		// Add pointers script and style to queue
-		wp_enqueue_style( 'wp-pointer' );
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_style('wp-pointer');
+		wp_enqueue_script('wp-pointer');
 	}
 
 	/**
@@ -105,14 +105,14 @@ 
 	 * @param string $selector The HTML elements, on which the pointer should be attached.
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
-	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+	private static function print_js($pointer_id, $selector, $args) {
+		if (empty($pointer_id) || empty($selector) || empty($args) || empty($args['content']))
 			return;
 
 		?>
 		<script type="text/javascript">
 		(function($){
-			var options = <?php echo wp_json_encode( $args ); ?>, setup;
+			var options = <?php echo wp_json_encode($args); ?>, setup;
 
 			if ( ! options )
 				return;
@@ -160,7 +160,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', '' );
+	public static function dismiss_pointers_for_new_users($user_id) {
+		add_user_meta($user_id, 'dismissed_wp_pointers', '');
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -47,8 +47,9 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
-			return;
+		if ( empty( $registered_pointers[ $hook_suffix ] ) ) {
+					return;
+		}
 
 		$pointers = (array) $registered_pointers[ $hook_suffix ];
 
@@ -76,8 +77,9 @@ 
 		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
 			if ( isset( $caps_required[ $pointer ] ) ) {
 				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
-						continue 2;
+					if ( ! current_user_can( $cap ) ) {
+											continue 2;
+					}
 				}
 			}
 
@@ -86,8 +88,9 @@ 
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
-			return;
+		if ( ! $got_pointers ) {
+					return;
+		}
 
 		// Add pointers script and style to queue
 		wp_enqueue_style( 'wp-pointer' );
@@ -106,8 +109,9 @@ 
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
 	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
-			return;
+		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
+					return;
+		}
 
 		?>
 		<script type="text/javascript">

src/wp-admin/includes/class-walker-category-checklist.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Taxonomy API: Walker_Category_Checklist class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * Taxonomy API: Walker_Category_Checklist class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Core walker class to output an unordered list of category checkbox input elements.

Spacing +22 added lines, -22 removed lines

@@ -18,7 +18,7 @@ 
  */
 class Walker_Category_Checklist extends Walker {
 	public $tree_type = 'category';
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
 
 	/**
 	 * Starts the list before the elements are added.
@@ -31,7 +31,7 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent<ul class='children'>\n";
 	}
@@ -47,7 +47,7 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
 	}
@@ -65,45 +65,45 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		if ( empty( $args['taxonomy'] ) ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
+		if (empty($args['taxonomy'])) {
 			$taxonomy = 'category';
 		} else {
 			$taxonomy = $args['taxonomy'];
 		}
 
-		if ( $taxonomy == 'category' ) {
+		if ($taxonomy == 'category') {
 			$name = 'post_category';
 		} else {
-			$name = 'tax_input[' . $taxonomy . ']';
+			$name = 'tax_input['.$taxonomy.']';
 		}
 
-		$args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
-		$class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+		$args['popular_cats'] = empty($args['popular_cats']) ? array() : $args['popular_cats'];
+		$class = in_array($category->term_id, $args['popular_cats']) ? ' class="popular-category"' : '';
 
-		$args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
+		$args['selected_cats'] = empty($args['selected_cats']) ? array() : $args['selected_cats'];
 
-		if ( ! empty( $args['list_only'] ) ) {
+		if ( ! empty($args['list_only'])) {
 			$aria_cheched = 'false';
 			$inner_class = 'category';
 
-			if ( in_array( $category->term_id, $args['selected_cats'] ) ) {
+			if (in_array($category->term_id, $args['selected_cats'])) {
 				$inner_class .= ' selected';
 				$aria_cheched = 'true';
 			}
 
 			/** This filter is documented in wp-includes/category-template.php */
-			$output .= "\n" . '<li' . $class . '>' .
-				'<div class="' . $inner_class . '" data-term-id=' . $category->term_id .
-				' tabindex="0" role="checkbox" aria-checked="' . $aria_cheched . '">' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</div>';
+			$output .= "\n".'<li'.$class.'>'.
+				'<div class="'.$inner_class.'" data-term-id='.$category->term_id.
+				' tabindex="0" role="checkbox" aria-checked="'.$aria_cheched.'">'.
+				esc_html(apply_filters('the_category', $category->name)).'</div>';
 		} else {
 			/** This filter is documented in wp-includes/category-template.php */
-			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
-				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
-				checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
-				disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
+			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>".
+				'<label class="selectit"><input value="'.$category->term_id.'" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-'.$category->term_id.'"'.
+				checked(in_array($category->term_id, $args['selected_cats']), true, false).
+				disabled(empty($args['disabled']), false, false).' /> '.
+				esc_html(apply_filters('the_category', $category->name)).'</label>';
 		}
 	}
 
@@ -119,7 +119,7 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		$output .= "</li>\n";
 	}
 }