ntwb / wordpress

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Helper functions for displaying a list of items in an ajaxified HTML table.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- */
+	 * Helper functions for displaying a list of items in an ajaxified HTML table.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 */
 
 /**
  * Fetch an instance of a WP_List_Table class.

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
  * @return object|bool Object on success, false if the class does not exist.
  */
-function _get_list_table( $class, $args = array() ) {
+function _get_list_table($class, $args = array()) {
 	$core_classes = array(
 		//Site Admin
 		'WP_Posts_List_Table' => 'posts',
@@ -31,7 +31,7 @@ 
 		'WP_Links_List_Table' => 'links',
 		'WP_Plugin_Install_List_Table' => 'plugin-install',
 		'WP_Themes_List_Table' => 'themes',
-		'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
+		'WP_Theme_Install_List_Table' => array('themes', 'theme-install'),
 		'WP_Plugins_List_Table' => 'plugins',
 		// Network Admin
 		'WP_MS_Sites_List_Table' => 'ms-sites',
@@ -39,18 +39,18 @@ 
 		'WP_MS_Themes_List_Table' => 'ms-themes',
 	);
 
-	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+	if (isset($core_classes[$class])) {
+		foreach ((array) $core_classes[$class] as $required)
+			require_once(ABSPATH.'wp-admin/includes/class-wp-'.$required.'-list-table.php');
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
+		if (isset($args['screen']))
+			$args['screen'] = convert_to_screen($args['screen']);
+		elseif (isset($GLOBALS['hook_suffix']))
 			$args['screen'] = get_current_screen();
 		else
 			$args['screen'] = null;
 
-		return new $class( $args );
+		return new $class($args);
 	}
 
 	return false;
@@ -89,15 +89,15 @@ 
 	public $_screen;
 	public $_columns;
 
-	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) )
-			$screen = convert_to_screen( $screen );
+	public function __construct($screen, $columns = array()) {
+		if (is_string($screen))
+			$screen = convert_to_screen($screen);
 
 		$this->_screen = $screen;
 
-		if ( !empty( $columns ) ) {
+		if ( ! empty($columns)) {
 			$this->_columns = $columns;
-			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
+			add_filter('manage_'.$screen->id.'_columns', array($this, 'get_columns'), 0);
 		}
 	}
 
@@ -107,11 +107,11 @@ 
 	 * @return array
 	 */
 	protected function get_column_info() {
-		$columns = get_column_headers( $this->_screen );
-		$hidden = get_hidden_columns( $this->_screen );
+		$columns = get_column_headers($this->_screen);
+		$hidden = get_hidden_columns($this->_screen);
 		$sortable = array();
 
-		return array( $columns, $hidden, $sortable );
+		return array($columns, $hidden, $sortable);
 	}
 
 	/**

Braces +13 added lines, -10 removed lines

@@ -40,15 +40,17 @@ 
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		foreach ( (array) $core_classes[ $class ] as $required ) {
+					require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		}
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
-			$args['screen'] = get_current_screen();
-		else
-			$args['screen'] = null;
+		if ( isset( $args['screen'] ) ) {
+					$args['screen'] = convert_to_screen( $args['screen'] );
+		} elseif ( isset( $GLOBALS['hook_suffix'] ) ) {
+					$args['screen'] = get_current_screen();
+		} else {
+					$args['screen'] = null;
+		}
 
 		return new $class( $args );
 	}
@@ -90,8 +92,9 @@ 
 	public $_columns;
 
 	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) )
-			$screen = convert_to_screen( $screen );
+		if ( is_string( $screen ) ) {
+					$screen = convert_to_screen( $screen );
+		}
 
 		$this->_screen = $screen;
 

src/wp-admin/includes/revision.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Administration Revisions API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Revisions API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Get the revision UI diff.

Spacing +99 added lines, -99 removed lines

@@ -18,43 +18,43 @@ 
  * @return array|bool Associative array of a post's revisioned fields and their diffs.
  *                    Or, false on failure.
  */
-function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
+function wp_get_revision_ui_diff($post, $compare_from, $compare_to) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
+	if ($compare_from) {
+		if ( ! $compare_from = get_post($compare_from))
 			return false;
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
+	if ( ! $compare_to = get_post($compare_to))
 		return false;
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
+	if ($compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID)
 		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
+	if ($compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID)
 		return false;
 
-	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
+	if ($compare_from && strtotime($compare_from->post_date_gmt) > strtotime($compare_to->post_date_gmt)) {
 		$temp = $compare_from;
 		$compare_from = $compare_to;
 		$compare_to = $temp;
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ($compare_from && empty($compare_from->post_title))
+		$compare_from->post_title = __('(no title)');
+	if (empty($compare_to->post_title))
+		$compare_to->post_title = __('(no title)');
 
 	$return = array();
 
-	foreach ( _wp_post_revision_fields() as $field => $name ) {
+	foreach (_wp_post_revision_fields() as $field => $name) {
 		/**
 		 * Contextually filter a post revision field.
 		 *
@@ -69,10 +69,10 @@ 
 		 * @param string  null                  The context of whether the current revision is the old
 		 *                                      or the new one. Values are 'to' or 'from'.
 		 */
-		$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from' ) : '';
+		$content_from = $compare_from ? apply_filters("_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from') : '';
 
 		/** This filter is documented in wp-admin/includes/revision.php */
-		$content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to' );
+		$content_to = apply_filters("_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to');
 
 		$args = array(
 			'show_split_view' => true
@@ -95,20 +95,20 @@ 
 		 * @param WP_Post $compare_from The revision post to compare from.
 		 * @param WP_Post $compare_to   The revision post to compare to.
 		 */
-		$args = apply_filters( 'revision_text_diff_options', $args, $field, $compare_from, $compare_to );
+		$args = apply_filters('revision_text_diff_options', $args, $field, $compare_from, $compare_to);
 
-		$diff = wp_text_diff( $content_from, $content_to, $args );
+		$diff = wp_text_diff($content_from, $content_to, $args);
 
-		if ( ! $diff && 'post_title' === $field ) {
+		if ( ! $diff && 'post_title' === $field) {
 			// It's a better user experience to still show the Title, even if it didn't change.
 			// No, you didn't see this.
 			$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
-			$diff .= '<td>' . esc_html( $compare_from->post_title ) . '</td><td></td><td>' . esc_html( $compare_to->post_title ) . '</td>';
+			$diff .= '<td>'.esc_html($compare_from->post_title).'</td><td></td><td>'.esc_html($compare_to->post_title).'</td>';
 			$diff .= '</tr></tbody>';
 			$diff .= '</table>';
 		}
 
-		if ( $diff ) {
+		if ($diff) {
 			$return[] = array(
 				'id' => $field,
 				'name' => $name,
@@ -126,7 +126,7 @@ 
 	 * @param WP_Post $compare_from The revision post to compare from.
 	 * @param WP_Post $compare_to   The revision post to compare to.
 	 */
-	return apply_filters( 'wp_get_revision_ui_diff', $return, $compare_from, $compare_to );
+	return apply_filters('wp_get_revision_ui_diff', $return, $compare_from, $compare_to);
 
 }
 
@@ -141,71 +141,71 @@ 
  *
  * @return array An associative array of revision data and related settings.
  */
-function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
-	$post = get_post( $post );
+function wp_prepare_revisions_for_js($post, $selected_revision_id, $from = null) {
+	$post = get_post($post);
 	$authors = array();
 	$now_gmt = time();
 
-	$revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) );
+	$revisions = wp_get_post_revisions($post->ID, array('order' => 'ASC', 'check_enabled' => false));
 	// If revisions are disabled, we only want autosaves and the current post.
-	if ( ! wp_revisions_enabled( $post ) ) {
-		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+	if ( ! wp_revisions_enabled($post)) {
+		foreach ($revisions as $revision_id => $revision) {
+			if ( ! wp_is_post_autosave($revision))
+				unset($revisions[$revision_id]);
 		}
-		$revisions = array( $post->ID => $post ) + $revisions;
+		$revisions = array($post->ID => $post) + $revisions;
 	}
 
-	$show_avatars = get_option( 'show_avatars' );
+	$show_avatars = get_option('show_avatars');
 
-	cache_users( wp_list_pluck( $revisions, 'post_author' ) );
+	cache_users(wp_list_pluck($revisions, 'post_author'));
 
-	$can_restore = current_user_can( 'edit_post', $post->ID );
+	$can_restore = current_user_can('edit_post', $post->ID);
 	$current_id = false;
 
-	foreach ( $revisions as $revision ) {
-		$modified = strtotime( $revision->post_modified );
-		$modified_gmt = strtotime( $revision->post_modified_gmt );
-		if ( $can_restore ) {
-			$restore_link = str_replace( '&amp;', '&', wp_nonce_url(
+	foreach ($revisions as $revision) {
+		$modified = strtotime($revision->post_modified);
+		$modified_gmt = strtotime($revision->post_modified_gmt);
+		if ($can_restore) {
+			$restore_link = str_replace('&amp;', '&', wp_nonce_url(
 				add_query_arg(
-					array( 'revision' => $revision->ID,
-						'action' => 'restore' ),
-						admin_url( 'revision.php' )
+					array('revision' => $revision->ID,
+						'action' => 'restore'),
+						admin_url('revision.php')
 				),
 				"restore-post_{$revision->ID}"
-			) );
+			));
 		}
 
-		if ( ! isset( $authors[ $revision->post_author ] ) ) {
-			$authors[ $revision->post_author ] = array(
+		if ( ! isset($authors[$revision->post_author])) {
+			$authors[$revision->post_author] = array(
 				'id' => (int) $revision->post_author,
-				'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
-				'name' => get_the_author_meta( 'display_name', $revision->post_author ),
+				'avatar' => $show_avatars ? get_avatar($revision->post_author, 32) : '',
+				'name' => get_the_author_meta('display_name', $revision->post_author),
 			);
 		}
 
-		$autosave = (bool) wp_is_post_autosave( $revision );
+		$autosave = (bool) wp_is_post_autosave($revision);
 		$current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
-		if ( $current && ! empty( $current_id ) ) {
+		if ($current && ! empty($current_id)) {
 			// If multiple revisions have the same post_modified_gmt, highest ID is current.
-			if ( $current_id < $revision->ID ) {
-				$revisions[ $current_id ]['current'] = false;
+			if ($current_id < $revision->ID) {
+				$revisions[$current_id]['current'] = false;
 				$current_id = $revision->ID;
 			} else {
 				$current = false;
 			}
-		} elseif ( $current ) {
+		} elseif ($current) {
 			$current_id = $revision->ID;
 		}
 
-		$revisions[ $revision->ID ] = array(
+		$revisions[$revision->ID] = array(
 			'id'         => $revision->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $revision->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$revision->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), $modified),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), $modified),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff($modified_gmt, $now_gmt)),
 			'autosave'   => $autosave,
 			'current'    => $current,
 			'restoreUrl' => $can_restore ? $restore_link : false,
@@ -216,14 +216,14 @@ 
 	 * If we only have one revision, the initial revision is missing; This happens
 	 * when we have an autsosave and the user has clicked 'View the Autosave'
 	 */
-	if ( 1 === sizeof( $revisions ) ) {
-		$revisions[ $post->ID ] = array(
+	if (1 === sizeof($revisions)) {
+		$revisions[$post->ID] = array(
 			'id'         => $post->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $post->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$post->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), strtotime($post->post_modified)),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), strtotime($post->post_modified)),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff(strtotime($post->post_modified_gmt), $now_gmt)),
 			'autosave'   => false,
 			'current'    => true,
 			'restoreUrl' => false,
@@ -236,48 +236,48 @@ 
 	 * were changed), we may not have a "current" revision. Mark the latest
 	 * revision as "current".
 	 */
-	if ( empty( $current_id ) ) {
-		if ( $revisions[ $revision->ID ]['autosave'] ) {
-			$revision = end( $revisions );
-			while ( $revision['autosave'] ) {
-				$revision = prev( $revisions );
+	if (empty($current_id)) {
+		if ($revisions[$revision->ID]['autosave']) {
+			$revision = end($revisions);
+			while ($revision['autosave']) {
+				$revision = prev($revisions);
 			}
 			$current_id = $revision['id'];
 		} else {
 			$current_id = $revision->ID;
 		}
-		$revisions[ $current_id ]['current'] = true;
+		$revisions[$current_id]['current'] = true;
 	}
 
 	// Now, grab the initial diff.
-	$compare_two_mode = is_numeric( $from );
-	if ( ! $compare_two_mode ) {
-		$found = array_search( $selected_revision_id, array_keys( $revisions ) );
-		if ( $found ) {
-			$from = array_keys( array_slice( $revisions, $found - 1, 1, true ) );
-			$from = reset( $from );
+	$compare_two_mode = is_numeric($from);
+	if ( ! $compare_two_mode) {
+		$found = array_search($selected_revision_id, array_keys($revisions));
+		if ($found) {
+			$from = array_keys(array_slice($revisions, $found - 1, 1, true));
+			$from = reset($from);
 		} else {
 			$from = 0;
 		}
 	}
 
-	$from = absint( $from );
+	$from = absint($from);
 
-	$diffs = array( array(
-		'id' => $from . ':' . $selected_revision_id,
-		'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
+	$diffs = array(array(
+		'id' => $from.':'.$selected_revision_id,
+		'fields' => wp_get_revision_ui_diff($post->ID, $from, $selected_revision_id),
 	));
 
 	return array(
 		'postId'           => $post->ID,
-		'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
-		'revisionData'     => array_values( $revisions ),
+		'nonce'            => wp_create_nonce('revisions-ajax-nonce'),
+		'revisionData'     => array_values($revisions),
 		'to'               => $selected_revision_id,
 		'from'             => $from,
 		'diffData'         => $diffs,
-		'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
-		'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
-		'revisionIds'      => array_keys( $revisions ),
+		'baseUrl'          => parse_url(admin_url('revision.php'), PHP_URL_PATH),
+		'compareTwoMode'   => absint($compare_two_mode), // Apparently booleans are not allowed
+		'revisionIds'      => array_keys($revisions),
 	);
 }
 
@@ -297,11 +297,11 @@ 
 
 	<script id="tmpl-revisions-buttons" type="text/html">
 		<div class="revisions-previous">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Previous', 'Button label for a previous revision'); ?>" />
 		</div>
 
 		<div class="revisions-next">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Next', 'Button label for a next revision'); ?>" />
 		</div>
 	</script>
 
@@ -315,7 +315,7 @@ 
 				}
 				#>
 				/>
-				<?php esc_attr_e( 'Compare any two revisions' ); ?>
+				<?php esc_attr_e('Compare any two revisions'); ?>
 			</label>
 		</div>
 	</script>
@@ -324,28 +324,28 @@ 
 		<# if ( ! _.isUndefined( data.attributes ) ) { #>
 			<div class="diff-title">
 				<# if ( 'from' === data.type ) { #>
-					<strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('From:', 'Followed by post revision info'); ?></strong>
 				<# } else if ( 'to' === data.type ) { #>
-					<strong><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('To:', 'Followed by post revision info'); ?></strong>
 				<# } #>
 				<div class="author-card<# if ( data.attributes.autosave ) { #> autosave<# } #>">
 					{{{ data.attributes.author.avatar }}}
 					<div class="author-info">
 					<# if ( data.attributes.autosave ) { #>
-						<span class="byline"><?php printf( __( 'Autosave by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Autosave by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else if ( data.attributes.current ) { #>
-						<span class="byline"><?php printf( __( 'Current Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Current Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else { #>
-						<span class="byline"><?php printf( __( 'Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } #>
 						<span class="time-ago">{{ data.attributes.timeAgo }}</span>
 						<span class="date">({{ data.attributes.dateShort }})</span>
 					</div>
 				<# if ( 'to' === data.type && data.attributes.restoreUrl ) { #>
-					<input  <?php if ( wp_check_post_lock( $post->ID ) ) { ?>
+					<input  <?php if (wp_check_post_lock($post->ID)) { ?>
 						disabled="disabled"
 					<?php } else { ?>
 						<# if ( data.attributes.current ) { #>
@@ -353,9 +353,9 @@ 
 						<# } #>
 					<?php } ?>
 					<# if ( data.attributes.autosave ) { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Autosave'); ?>" />
 					<# } else { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Revision' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Revision'); ?>" />
 					<# } #>
 				<# } #>
 			</div>
@@ -367,7 +367,7 @@ 
 
 	<script id="tmpl-revisions-diff" type="text/html">
 		<div class="loading-indicator"><span class="spinner"></span></div>
-		<div class="diff-error"><?php _e( 'Sorry, something went wrong. The requested comparison could not be loaded.' ); ?></div>
+		<div class="diff-error"><?php _e('Sorry, something went wrong. The requested comparison could not be loaded.'); ?></div>
 		<div class="diff">
 		<# _.each( data.fields, function( field ) { #>
 			<h3>{{ field.name }}</h3>

Braces +24 added lines, -16 removed lines

@@ -19,26 +19,31 @@ 
  *                    Or, false on failure.
  */
 function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
 	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
-			return false;
+		if ( ! $compare_from = get_post( $compare_from ) ) {
+					return false;
+		}
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
-		return false;
+	if ( ! $compare_to = get_post( $compare_to ) ) {
+			return false;
+	}
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
-		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
-		return false;
+	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID ) {
+			return false;
+	}
+	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID ) {
+			return false;
+	}
 
 	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
 		$temp = $compare_from;
@@ -47,10 +52,12 @@ 
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ( $compare_from && empty( $compare_from->post_title ) ) {
+			$compare_from->post_title = __( '(no title)' );
+	}
+	if ( empty( $compare_to->post_title ) ) {
+			$compare_to->post_title = __( '(no title)' );
+	}
 
 	$return = array();
 
@@ -150,8 +157,9 @@ 
 	// If revisions are disabled, we only want autosaves and the current post.
 	if ( ! wp_revisions_enabled( $post ) ) {
 		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+			if ( ! wp_is_post_autosave( $revision ) ) {
+							unset( $revisions[ $revision_id ] );
+			}
 		}
 		$revisions = array( $post->ID => $post ) + $revisions;
 	}

src/wp-admin/includes/admin-filters.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Administration hooks
- *
- * @package WordPress
- * @subpackage Hooks
- *
- * @since 4.3.0
- */
+							 * Administration hooks
+							 *
+							 * @package WordPress
+							 * @subpackage Hooks
+							 *
+							 * @since 4.3.0
+							 */
 
 // Bookmark hooks.
 add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );

Spacing +55 added lines, -55 removed lines

@@ -9,77 +9,77 @@ 
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action('activity_box_end', 'wp_dashboard_quota');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Misc hooks.
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', '_ipad_meta');
 
-add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );
+add_action('post_edit_form_tag', 'post_form_autocomplete_off');
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'whitelist_options', 'option_update_filter' );
+add_filter('whitelist_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
@@ -88,26 +88,26 @@ 
 // add_action('install_themes_featured', 'display_themes');
 // add_action('install_themes_new', 'display_themes');
 // add_action('install_themes_updated', 'display_themes');
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
+add_action('admin_notices', 'default_password_nag');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
 // Update hooks.
-add_action( 'admin_init', 'wp_plugin_update_rows' );
-add_action( 'admin_init', 'wp_theme_update_rows'  );
+add_action('admin_init', 'wp_plugin_update_rows');
+add_action('admin_init', 'wp_theme_update_rows');
 
-add_action( 'admin_notices', 'update_nag',      3  );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'maintenance_nag', 10);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // Upgrade hooks.
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
+add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);

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

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	/**
 	 * Check the current user's permissions.
 	 *
- 	 * @since 3.1.0
+	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @return bool

Spacing +98 added lines, -98 removed lines

@@ -38,17 +38,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;
 	}
 
 	/**
@@ -60,10 +60,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');
 	}
 
 	/**
@@ -78,44 +78,44 @@ 
 	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();
 
 		$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'];
 
 		// 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,
-		) );
+		));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -147,9 +147,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 {
@@ -157,26 +157,26 @@ 
 			$users_of_blog = count_users();
 		}
 		$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>";
 		}
 
 		return $role_links;
@@ -193,12 +193,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;
@@ -213,19 +213,19 @@ 
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'top' != $which )
+	protected function extra_tablenav($which) {
+		if ('top' != $which)
 			return;
 	?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) ) : ?>
-		<label class="screen-reader-text" for="new_role"><?php _e( 'Change role to&hellip;' ) ?></label>
+		<?php if (current_user_can('promote_users')) : ?>
+		<label class="screen-reader-text" for="new_role"><?php _e('Change role to&hellip;') ?></label>
 		<select name="new_role" id="new_role">
-			<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;
 
 		/**
@@ -234,7 +234,7 @@ 
 		 *
 		 * @since 3.5.0
 		 */
-		do_action( 'restrict_manage_users' );
+		do_action('restrict_manage_users');
 		echo '</div>';
 	}
 
@@ -250,7 +250,7 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
+		if (isset($_REQUEST['changeit']) && ! empty($_REQUEST['new_role']))
 			return 'promote';
 
 		return parent::current_action();
@@ -268,15 +268,15 @@ 
 	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'E-mail' ),
-			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' )
+			'username' => __('Username'),
+			'name'     => __('Name'),
+			'email'    => __('E-mail'),
+			'role'     => __('Role'),
+			'posts'    => __('Posts')
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ($this->is_site_users)
+			unset($c['posts']);
 
 		return $c;
 	}
@@ -296,8 +296,8 @@ 
 			'email'    => 'email',
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ($this->is_site_users)
+			unset($c['posts']);
 
 		return $c;
 	}
@@ -310,24 +310,24 @@ 
 	 */
 	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));
 
-		$editable_roles = array_keys( get_editable_roles() );
+		$editable_roles = array_keys(get_editable_roles());
 
-		foreach ( $this->items as $userid => $user_object ) {
-			if ( count( $user_object->roles ) <= 1 ) {
-				$role = reset( $user_object->roles );
-			} elseif ( $roles = array_intersect( array_values( $user_object->roles ), $editable_roles ) ) {
-				$role = reset( $roles );
+		foreach ($this->items as $userid => $user_object) {
+			if (count($user_object->roles) <= 1) {
+				$role = reset($user_object->roles);
+			} elseif ($roles = array_intersect(array_values($user_object->roles), $editable_roles)) {
+				$role = reset($roles);
 			} else {
-				$role = reset( $user_object->roles );
+				$role = reset($user_object->roles);
 			}
 
-			if ( is_multisite() && empty( $user_object->allcaps ) )
+			if (is_multisite() && empty($user_object->allcaps))
 				continue;
 
-			echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+			echo "\n\t".$this->single_row($user_object, $style = '', $role, isset($post_counts) ? $post_counts[$userid] : 0);
 		}
 	}
 
@@ -345,40 +345,40 @@ 
 	 *                            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 ) {
+	public function single_row($user_object, $style = '', $role = '', $numposts = 0) {
 		$wp_roles = wp_roles();
 
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
+		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?';
 
 		$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)));
 
 			// Set up the hover actions for this user
 			$actions = array();
 
-			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.
@@ -390,44 +390,44 @@ 
 			 *                             '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);
 
 			// 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' value='{$user_object->ID}' />";
 
 		} else {
-			$edit = '<strong>' . $user_object->user_login . '</strong>';
+			$edit = '<strong>'.$user_object->user_login.'</strong>';
 		}
-		$role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
-		$avatar = get_avatar( $user_object->ID, 32 );
+		$role_name = isset($wp_roles->role_names[$role]) ? translate_user_role($wp_roles->role_names[$role]) : __('None');
+		$avatar = get_avatar($user_object->ID, 32);
 
 		$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;
@@ -441,10 +441,10 @@ 
 						$r .= $role_name;
 						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;
@@ -460,11 +460,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>";
 			}

Braces +58 added lines, -40 removed lines

@@ -47,8 +47,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;
+		}
 	}
 
 	/**
@@ -60,10 +61,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' );
+		}
 	}
 
 	/**
@@ -95,17 +97,21 @@ 
 			'fields' => 'all_with_meta'
 		);
 
-		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'];
+		}
 
 		// Query the user IDs for this page
 		$wp_user_search = new WP_User_Query( $args );
@@ -164,8 +170,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 = '';
 
@@ -194,11 +201,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;
@@ -214,8 +223,9 @@ 
 	 *                      or below the table ("bottom").
 	 */
 	protected function extra_tablenav( $which ) {
-		if ( 'top' != $which )
-			return;
+		if ( 'top' != $which ) {
+					return;
+		}
 	?>
 	<div class="alignleft actions">
 		<?php if ( current_user_can( 'promote_users' ) ) : ?>
@@ -250,8 +260,9 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
-			return 'promote';
+		if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) ) {
+					return 'promote';
+		}
 
 		return parent::current_action();
 	}
@@ -275,8 +286,9 @@ 
 			'posts'    => __( 'Posts' )
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ( $this->is_site_users ) {
+					unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -296,8 +308,9 @@ 
 			'email'    => 'email',
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ( $this->is_site_users ) {
+					unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -310,8 +323,9 @@ 
 	 */
 	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 ) );
+		}
 
 		$editable_roles = array_keys( get_editable_roles() );
 
@@ -324,8 +338,9 @@ 
 				$role = reset( $user_object->roles );
 			}
 
-			if ( is_multisite() && empty( $user_object->allcaps ) )
-				continue;
+			if ( is_multisite() && empty( $user_object->allcaps ) ) {
+							continue;
+			}
 
 			echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
 		}
@@ -354,10 +369,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?';
+		}
 
 		$checkbox = '';
 		// Check if the user for this row is editable
@@ -375,10 +391,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/theme.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Theme Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Theme Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Remove a theme

Spacing +185 added lines, -185 removed lines

@@ -20,71 +20,71 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return false;
 
 	ob_start();
-	if ( empty( $redirect ) )
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
-	if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
+	if (empty($redirect))
+		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet='.urlencode($stylesheet), 'delete-theme_'.$stylesheet);
+	if (false === ($credentials = request_filesystem_credentials($redirect))) {
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem($credentials) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ) {
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
-	if ( empty( $themes_dir ) ) {
-		return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+	if (empty($themes_dir)) {
+		return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
 	}
 
-	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir = trailingslashit( $themes_dir . $stylesheet );
-	$deleted = $wp_filesystem->delete( $theme_dir, true );
+	$themes_dir = trailingslashit($themes_dir);
+	$theme_dir = trailingslashit($themes_dir.$stylesheet);
+	$deleted = $wp_filesystem->delete($theme_dir, true);
 
-	if ( ! $deleted ) {
-		return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
+	if ( ! $deleted) {
+		return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $stylesheet));
 	}
 
-	$theme_translations = wp_get_installed_translations( 'themes' );
+	$theme_translations = wp_get_installed_translations('themes');
 
 	// Remove language files, silently.
-	if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
-		$translations = $theme_translations[ $stylesheet ];
+	if ( ! empty($theme_translations[$stylesheet])) {
+		$translations = $theme_translations[$stylesheet];
 
-		foreach ( $translations as $translation => $data ) {
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
+		foreach ($translations as $translation => $data) {
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.po');
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.mo');
 		}
 	}
 
 	// Force refresh of theme update information.
-	delete_site_transient( 'update_themes' );
+	delete_site_transient('update_themes');
 
 	return true;
 }
@@ -97,8 +97,8 @@ 
  * @param WP_Post|null $post Optional. The post being edited, provided for context.
  * @return array Key is the template name, value is the filename of the template
  */
-function get_page_templates( $post = null ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post ) );
+function get_page_templates($post = null) {
+	return array_flip(wp_get_theme()->get_page_templates($post));
 }
 
 /**
@@ -112,7 +112,7 @@ 
  * @return string
  */
 function _get_template_edit_filename($fullpath, $containingfolder) {
-	return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+	return str_replace(dirname(dirname($containingfolder)), '', $fullpath);
 }
 
 /**
@@ -125,8 +125,8 @@ 
  *
  * @param WP_Theme $theme Theme data object.
  */
-function theme_update_available( $theme ) {
-	echo get_theme_update_available( $theme );
+function theme_update_available($theme) {
+	echo get_theme_update_available($theme);
 }
 
 /**
@@ -141,16 +141,16 @@ 
  * @param WP_Theme $theme WP_Theme object.
  * @return false|string HTML for the update link, or false if invalid info was passed.
  */
-function get_theme_update_available( $theme ) {
+function get_theme_update_available($theme) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return false;
 
-	if ( !isset($themes_update) )
+	if ( ! isset($themes_update))
 		$themes_update = get_site_transient('update_themes');
 
-	if ( ! ( $theme instanceof WP_Theme ) ) {
+	if ( ! ($theme instanceof WP_Theme)) {
 		return false;
 	}
 
@@ -158,23 +158,23 @@ 
 
 	$html = '';
 
-	if ( isset($themes_update->response[ $stylesheet ]) ) {
-		$update = $themes_update->response[ $stylesheet ];
+	if (isset($themes_update->response[$stylesheet])) {
+		$update = $themes_update->response[$stylesheet];
 		$theme_name = $theme->display('Name');
 		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
-		$update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
-		$update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
-
-		if ( !is_multisite() ) {
-			if ( ! current_user_can('update_themes') ) {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.' ) . '</strong></p>',
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
-			} elseif ( empty( $update['package'] ) ) {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
+		$update_url = wp_nonce_url(admin_url('update.php?action=upgrade-theme&amp;theme='.urlencode($stylesheet)), 'upgrade-theme_'.$stylesheet);
+		$update_onclick = 'onclick="if ( confirm(\''.esc_js(__("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.")).'\') ) {return true;}return false;"';
+
+		if ( ! is_multisite()) {
+			if ( ! current_user_can('update_themes')) {
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.').'</strong></p>',
+					$theme_name, esc_url($details_url), esc_attr($theme['Name']), $update['new_version']);
+			} elseif (empty($update['package'])) {
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>').'</strong></p>',
+					$theme_name, esc_url($details_url), esc_attr($theme['Name']), $update['new_version']);
 			} else {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.' ) . '</strong></p>',
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'], $update_url, $update_onclick );
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.').'</strong></p>',
+					$theme_name, esc_url($details_url), esc_attr($theme['Name']), $update['new_version'], $update_url, $update_onclick);
 			}
 		}
 	}
@@ -190,102 +190,102 @@ 
  * @param bool $api Optional. Whether try to fetch tags from the WP.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
  */
-function get_theme_feature_list( $api = true ) {
+function get_theme_feature_list($api = true) {
 	// Hard-coded list is used if api not accessible.
 	$features = array(
-			__( 'Colors' ) => array(
-				'black'   => __( 'Black' ),
-				'blue'    => __( 'Blue' ),
-				'brown'   => __( 'Brown' ),
-				'gray'    => __( 'Gray' ),
-				'green'   => __( 'Green' ),
-				'orange'  => __( 'Orange' ),
-				'pink'    => __( 'Pink' ),
-				'purple'  => __( 'Purple' ),
-				'red'     => __( 'Red' ),
-				'silver'  => __( 'Silver' ),
-				'tan'     => __( 'Tan' ),
-				'white'   => __( 'White' ),
-				'yellow'  => __( 'Yellow' ),
-				'dark'    => __( 'Dark' ),
-				'light'   => __( 'Light' ),
+			__('Colors') => array(
+				'black'   => __('Black'),
+				'blue'    => __('Blue'),
+				'brown'   => __('Brown'),
+				'gray'    => __('Gray'),
+				'green'   => __('Green'),
+				'orange'  => __('Orange'),
+				'pink'    => __('Pink'),
+				'purple'  => __('Purple'),
+				'red'     => __('Red'),
+				'silver'  => __('Silver'),
+				'tan'     => __('Tan'),
+				'white'   => __('White'),
+				'yellow'  => __('Yellow'),
+				'dark'    => __('Dark'),
+				'light'   => __('Light'),
 			),
 
-		__( 'Layout' ) => array(
-			'fixed-layout'      => __( 'Fixed Layout' ),
-			'fluid-layout'      => __( 'Fluid Layout' ),
-			'responsive-layout' => __( 'Responsive Layout' ),
-			'one-column'    => __( 'One Column' ),
-			'two-columns'   => __( 'Two Columns' ),
-			'three-columns' => __( 'Three Columns' ),
-			'four-columns'  => __( 'Four Columns' ),
-			'left-sidebar'  => __( 'Left Sidebar' ),
-			'right-sidebar' => __( 'Right Sidebar' ),
+		__('Layout') => array(
+			'fixed-layout'      => __('Fixed Layout'),
+			'fluid-layout'      => __('Fluid Layout'),
+			'responsive-layout' => __('Responsive Layout'),
+			'one-column'    => __('One Column'),
+			'two-columns'   => __('Two Columns'),
+			'three-columns' => __('Three Columns'),
+			'four-columns'  => __('Four Columns'),
+			'left-sidebar'  => __('Left Sidebar'),
+			'right-sidebar' => __('Right Sidebar'),
 		),
 
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'blavatar'              => __( 'Blavatar' ),
-			'buddypress'            => __( 'BuddyPress' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-menu'           => __( 'Custom Menu' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'flexible-header'       => __( 'Flexible Header' ),
-			'front-page-post-form'  => __( 'Front Page Posting' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'microformats'          => __( 'Microformats' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'rtl-language-support'  => __( 'RTL Language Support' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'theme-options'         => __( 'Theme Options' ),
-			'threaded-comments'     => __( 'Threaded Comments' ),
-			'translation-ready'     => __( 'Translation Ready' ),
+		__('Features') => array(
+			'accessibility-ready'   => __('Accessibility Ready'),
+			'blavatar'              => __('Blavatar'),
+			'buddypress'            => __('BuddyPress'),
+			'custom-background'     => __('Custom Background'),
+			'custom-colors'         => __('Custom Colors'),
+			'custom-header'         => __('Custom Header'),
+			'custom-menu'           => __('Custom Menu'),
+			'editor-style'          => __('Editor Style'),
+			'featured-image-header' => __('Featured Image Header'),
+			'featured-images'       => __('Featured Images'),
+			'flexible-header'       => __('Flexible Header'),
+			'front-page-post-form'  => __('Front Page Posting'),
+			'full-width-template'   => __('Full Width Template'),
+			'microformats'          => __('Microformats'),
+			'post-formats'          => __('Post Formats'),
+			'rtl-language-support'  => __('RTL Language Support'),
+			'sticky-post'           => __('Sticky Post'),
+			'theme-options'         => __('Theme Options'),
+			'threaded-comments'     => __('Threaded Comments'),
+			'translation-ready'     => __('Translation Ready'),
 		),
 
-		__( 'Subject' )  => array(
-			'holiday'       => __( 'Holiday' ),
-			'photoblogging' => __( 'Photoblogging' ),
-			'seasonal'      => __( 'Seasonal' ),
+		__('Subject')  => array(
+			'holiday'       => __('Holiday'),
+			'photoblogging' => __('Photoblogging'),
+			'seasonal'      => __('Seasonal'),
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
+	if ( ! $api || ! current_user_can('install_themes'))
 		return $features;
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( ! $feature_list = get_site_transient('wporg_theme_feature_list'))
+		set_site_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 
-	if ( !$feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
+	if ( ! $feature_list) {
+		$feature_list = themes_api('feature_list', array());
+		if (is_wp_error($feature_list))
 			return $features;
 	}
 
-	if ( !$feature_list )
+	if ( ! $feature_list)
 		return $features;
 
-	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_site_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	$category_translations = array(
-		'Colors'   => __( 'Colors' ),
-		'Layout'   => __( 'Layout' ),
-		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' )
+		'Colors'   => __('Colors'),
+		'Layout'   => __('Layout'),
+		'Features' => __('Features'),
+		'Subject'  => __('Subject')
 	);
 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
-	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
+	foreach ((array) $feature_list as $feature_category => $feature_items) {
+		if (isset($category_translations[$feature_category]))
 			$feature_category = $category_translations[$feature_category];
 		$wporg_features[$feature_category] = array();
 
-		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
+		foreach ($feature_items as $feature) {
+			if (isset($features[$feature_category][$feature]))
 				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
 			else
 				$wporg_features[$feature_category][$feature] = $feature;
@@ -316,17 +316,17 @@ 
  * @param array|object $args   Optional. Arguments to serialize for the Theme Info API.
  * @return mixed
  */
-function themes_api( $action, $args = null ) {
+function themes_api($action, $args = null) {
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( ! isset( $args->per_page ) ) {
+	if ( ! isset($args->per_page)) {
 		$args->per_page = 24;
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if ( ! isset($args->locale)) {
 		$args->locale = get_locale();
 	}
 
@@ -341,7 +341,7 @@ 
 	 * @param string $action Requested action. Likely values are 'theme_information',
 	 *                       'feature_list', or 'query_themes'.
 	 */
-	$args = apply_filters( 'themes_api_args', $args, $action );
+	$args = apply_filters('themes_api_args', $args, $action);
 
 	/**
 	 * Filter whether to override the WordPress.org Themes API.
@@ -356,34 +356,34 @@ 
 	 *                       'feature_list', or 'query_themes'.
 	 * @param object $args   Arguments used to query for installer pages from the Themes API.
 	 */
-	$res = apply_filters( 'themes_api', false, $action, $args );
+	$res = apply_filters('themes_api', false, $action, $args);
 
-	if ( ! $res ) {
+	if ( ! $res) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ($ssl = wp_http_supports(array('ssl')))
+			$url = set_url_scheme($url, 'https');
 
 		$http_args = array(
 			'body' => array(
 				'action' => $action,
-				'request' => serialize( $args )
+				'request' => serialize($args)
 			)
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request = wp_remote_post($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
-				trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+		if ($ssl && is_wp_error($request)) {
+			if ( ! defined('DOING_AJAX') || ! DOING_AJAX) {
+				trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
 			}
-			$request = wp_remote_post( $http_url, $http_args );
+			$request = wp_remote_post($http_url, $http_args);
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+		if (is_wp_error($request)) {
+			$res = new WP_Error('themes_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), $request->get_error_message());
 		} else {
-			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			$res = maybe_unserialize(wp_remote_retrieve_body($request));
+			if ( ! is_object($res) && ! is_array($res))
+				$res = new WP_Error('themes_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), wp_remote_retrieve_body($request));
 		}
 	}
 
@@ -397,7 +397,7 @@ 
 	 *                             'feature_list', or 'query_themes'.
 	 * @param object       $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
-	return apply_filters( 'themes_api_result', $res, $action, $args );
+	return apply_filters('themes_api_result', $res, $action, $args);
 }
 
 /**
@@ -410,7 +410,7 @@ 
  *
  * @return array An associative array of theme data, sorted by name.
  */
-function wp_prepare_themes_for_js( $themes = null ) {
+function wp_prepare_themes_for_js($themes = null) {
 	$current_theme = get_stylesheet();
 
 	/**
@@ -425,68 +425,68 @@ 
 	 * @param null|array $themes          An array of WP_Theme objects to prepare, if any.
 	 * @param string     $current_theme   The current theme slug.
 	 */
-	$prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
+	$prepared_themes = (array) apply_filters('pre_prepare_themes_for_js', array(), $themes, $current_theme);
 
-	if ( ! empty( $prepared_themes ) ) {
+	if ( ! empty($prepared_themes)) {
 		return $prepared_themes;
 	}
 
 	// Make sure the current theme is listed first.
-	$prepared_themes[ $current_theme ] = array();
+	$prepared_themes[$current_theme] = array();
 
-	if ( null === $themes ) {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
-		if ( ! isset( $themes[ $current_theme ] ) ) {
-			$themes[ $current_theme ] = wp_get_theme();
+	if (null === $themes) {
+		$themes = wp_get_themes(array('allowed' => true));
+		if ( ! isset($themes[$current_theme])) {
+			$themes[$current_theme] = wp_get_theme();
 		}
 	}
 
 	$updates = array();
-	if ( current_user_can( 'update_themes' ) ) {
-		$updates_transient = get_site_transient( 'update_themes' );
-		if ( isset( $updates_transient->response ) ) {
+	if (current_user_can('update_themes')) {
+		$updates_transient = get_site_transient('update_themes');
+		if (isset($updates_transient->response)) {
 			$updates = $updates_transient->response;
 		}
 	}
 
-	WP_Theme::sort_by_name( $themes );
+	WP_Theme::sort_by_name($themes);
 
 	$parents = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$slug = $theme->get_stylesheet();
-		$encoded_slug = urlencode( $slug );
+		$encoded_slug = urlencode($slug);
 
 		$parent = false;
-		if ( $theme->parent() ) {
-			$parent = $theme->parent()->display( 'Name' );
-			$parents[ $slug ] = $theme->parent()->get_stylesheet();
+		if ($theme->parent()) {
+			$parent = $theme->parent()->display('Name');
+			$parents[$slug] = $theme->parent()->get_stylesheet();
 		}
 
-		$prepared_themes[ $slug ] = array(
+		$prepared_themes[$slug] = array(
 			'id'           => $slug,
-			'name'         => $theme->display( 'Name' ),
-			'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
-			'description'  => $theme->display( 'Description' ),
-			'author'       => $theme->display( 'Author', false, true ),
-			'authorAndUri' => $theme->display( 'Author' ),
-			'version'      => $theme->display( 'Version' ),
-			'tags'         => $theme->display( 'Tags' ),
+			'name'         => $theme->display('Name'),
+			'screenshot'   => array($theme->get_screenshot()), // @todo multiple
+			'description'  => $theme->display('Description'),
+			'author'       => $theme->display('Author', false, true),
+			'authorAndUri' => $theme->display('Author'),
+			'version'      => $theme->display('Version'),
+			'tags'         => $theme->display('Tags'),
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
-			'hasUpdate'    => isset( $updates[ $slug ] ),
-			'update'       => get_theme_update_available( $theme ),
+			'hasUpdate'    => isset($updates[$slug]),
+			'update'       => get_theme_update_available($theme),
 			'actions'      => array(
-				'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
-				'customize' => ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) ? wp_customize_url( $slug ) : null,
-				'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+				'activate' => current_user_can('switch_themes') ? wp_nonce_url(admin_url('themes.php?action=activate&amp;stylesheet='.$encoded_slug), 'switch-theme_'.$slug) : null,
+				'customize' => (current_user_can('edit_theme_options') && current_user_can('customize')) ? wp_customize_url($slug) : null,
+				'delete'   => current_user_can('delete_themes') ? wp_nonce_url(admin_url('themes.php?action=delete&amp;stylesheet='.$encoded_slug), 'delete-theme_'.$slug) : null,
 			),
 		);
 	}
 
 	// Remove 'delete' action if theme has an active child
-	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
-		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+	if ( ! empty($parents) && array_key_exists($current_theme, $parents)) {
+		unset($prepared_themes[$parents[$current_theme]]['actions']['delete']);
 	}
 
 	/**
@@ -498,9 +498,9 @@ 
 	 *
 	 * @param array $prepared_themes Array of themes.
 	 */
-	$prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
-	$prepared_themes = array_values( $prepared_themes );
-	return array_filter( $prepared_themes );
+	$prepared_themes = apply_filters('wp_prepare_themes_for_js', $prepared_themes);
+	$prepared_themes = array_values($prepared_themes);
+	return array_filter($prepared_themes);
 }
 
 /**
@@ -509,16 +509,16 @@ 
  * @since 4.2.0
  */
 function customize_themes_print_templates() {
-	$preview_url = esc_url( add_query_arg( 'theme', '__THEME__' ) ); // Token because esc_url() strips curly braces.
-	$preview_url = str_replace( '__THEME__', '{{ data.id }}', $preview_url );
+	$preview_url = esc_url(add_query_arg('theme', '__THEME__')); // Token because esc_url() strips curly braces.
+	$preview_url = str_replace('__THEME__', '{{ data.id }}', $preview_url);
 	?>
 	<script type="text/html" id="tmpl-customize-themes-details-view">
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap">
 			<div class="theme-header">
-				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show previous theme'); ?></span></button>
+				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show next theme'); ?></span></button>
+				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close details dialog'); ?></span></button>
 			</div>
 			<div class="theme-about">
 				<div class="theme-screenshots">
@@ -531,18 +531,18 @@ 
 
 				<div class="theme-info">
 					<# if ( data.active ) { #>
-						<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+						<span class="current-label"><?php _e('Current Theme'); ?></span>
 					<# } #>
-					<h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h3>
-					<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h4>
+					<h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></span></h3>
+					<h4 class="theme-author"><?php printf(__('By %s'), '{{{ data.authorAndUri }}}'); ?></h4>
 					<p class="theme-description">{{{ data.description }}}</p>
 
 					<# if ( data.parent ) { #>
-						<p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+						<p class="parent-theme"><?php printf(__('This is a child theme of %s.'), '<strong>{{{ data.parent }}}</strong>'); ?></p>
 					<# } #>
 
 					<# if ( data.tags ) { #>
-						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{ data.tags }}</p>
+						<p class="theme-tags"><span><?php _e('Tags:'); ?></span> {{ data.tags }}</p>
 					<# } #>
 				</div>
 			</div>
@@ -550,7 +550,7 @@ 
 			<# if ( ! data.active ) { #>
 				<div class="theme-actions">
 					<div class="inactive-theme">
-						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e('Live Preview'); ?></a>
 					</div>
 				</div>
 			<# } #>

Braces +44 added lines, -30 removed lines

@@ -20,12 +20,14 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
-		return false;
+	if ( empty($stylesheet) ) {
+			return false;
+	}
 
 	ob_start();
-	if ( empty( $redirect ) )
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	if ( empty( $redirect ) ) {
+			$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	}
 	if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
 		$data = ob_get_clean();
 
@@ -51,11 +53,13 @@ 
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	}
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
@@ -144,11 +148,13 @@ 
 function get_theme_update_available( $theme ) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
-		return false;
+	if ( !current_user_can('update_themes' ) ) {
+			return false;
+	}
 
-	if ( !isset($themes_update) )
-		$themes_update = get_site_transient('update_themes');
+	if ( !isset($themes_update) ) {
+			$themes_update = get_site_transient('update_themes');
+	}
 
 	if ( ! ( $theme instanceof WP_Theme ) ) {
 		return false;
@@ -253,20 +259,24 @@ 
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
-		return $features;
+	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
+			return $features;
+	}
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) {
+			set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
 	if ( !$feature_list ) {
 		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
-			return $features;
+		if ( is_wp_error( $feature_list ) ) {
+					return $features;
+		}
 	}
 
-	if ( !$feature_list )
-		return $features;
+	if ( !$feature_list ) {
+			return $features;
+	}
 
 	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -280,15 +290,17 @@ 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
 	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
-			$feature_category = $category_translations[$feature_category];
+		if ( isset($category_translations[$feature_category]) ) {
+					$feature_category = $category_translations[$feature_category];
+		}
 		$wporg_features[$feature_category] = array();
 
 		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
-				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
-			else
-				$wporg_features[$feature_category][$feature] = $feature;
+			if ( isset($features[$feature_category][$feature]) ) {
+							$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
+			} else {
+							$wporg_features[$feature_category][$feature] = $feature;
+			}
 		}
 	}
 
@@ -360,8 +372,9 @@ 
 
 	if ( ! $res ) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+					$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'body' => array(
@@ -382,8 +395,9 @@ 
 			$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+							$res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			}
 		}
 	}
 

src/wp-admin/includes/class-wp-site-icon.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Class for implementing site icon functionality.
- *
- * @since 4.3.0
- */
+	 * Class for implementing site icon functionality.
+	 *
+	 * @since 4.3.0
+	 */
 class WP_Site_Icon {
 
 	/**

Spacing +36 added lines, -36 removed lines

@@ -13,7 +13,7 @@ 
 	 * @access public
 	 * @var int
 	 */
-	public $min_size  = 512;
+	public $min_size = 512;
 
 	/**
 	 * The size to which to crop the image so that we can display it in the UI nicely.
@@ -65,8 +65,8 @@ 
 	 * @access public
 	 */
 	public function __construct() {
-		add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
-		add_filter( 'get_post_metadata', array( $this, 'get_post_metadata' ), 10, 4 );
+		add_action('delete_attachment', array($this, 'delete_attachment_data'));
+		add_filter('get_post_metadata', array($this, 'get_post_metadata'), 10, 4);
 	}
 
 	/**
@@ -78,17 +78,17 @@ 
 	 * @param int    $parent_attachment_id Attachment ID of parent image.
 	 * @return array Attachment object.
 	 */
-	public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent     = get_post( $parent_attachment_id );
+	public function create_attachment_object($cropped, $parent_attachment_id) {
+		$parent     = get_post($parent_attachment_id);
 		$parent_url = $parent->guid;
-		$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+		$url        = str_replace(basename($parent_url), basename($cropped), $parent_url);
 
-		$size       = @getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size       = @getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
 			'ID'             => $parent_attachment_id,
-			'post_title'     => basename( $cropped ),
+			'post_title'     => basename($cropped),
 			'post_content'   => $url,
 			'post_mime_type' => $image_type,
 			'guid'           => $url,
@@ -108,9 +108,9 @@ 
 	 * @param string $file   File path of the attached image.
 	 * @return int           Attachment ID
 	 */
-	public function insert_attachment( $object, $file ) {
-		$attachment_id = wp_insert_attachment( $object, $file );
-		$metadata      = wp_generate_attachment_metadata( $attachment_id, $file );
+	public function insert_attachment($object, $file) {
+		$attachment_id = wp_insert_attachment($object, $file);
+		$metadata      = wp_generate_attachment_metadata($attachment_id, $file);
 
 		/**
 		 * Filter the site icon attachment metadata.
@@ -121,8 +121,8 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		$metadata = apply_filters('site_icon_attachment_metadata', $metadata);
+		wp_update_attachment_metadata($attachment_id, $metadata);
 
 		return $attachment_id;
 	}
@@ -136,7 +136,7 @@ 
 	 * @param array $sizes List of additional sizes.
 	 * @return array Additional image sizes.
 	 */
-	public function additional_sizes( $sizes = array() ) {
+	public function additional_sizes($sizes = array()) {
 		$only_crop_sizes = array();
 
 		/**
@@ -146,22 +146,22 @@ 
 		 *
 		 * @param array $site_icon_sizes Sizes available for the Site Icon.
 		 */
-		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
+		$this->site_icon_sizes = apply_filters('site_icon_image_sizes', $this->site_icon_sizes);
 
 		// Use a natural sort of numbers.
-		natsort( $this->site_icon_sizes );
-		$this->site_icon_sizes = array_reverse( $this->site_icon_sizes );
+		natsort($this->site_icon_sizes);
+		$this->site_icon_sizes = array_reverse($this->site_icon_sizes);
 
 		// ensure that we only resize the image into
-		foreach ( $sizes as $name => $size_array ) {
-			if ( isset( $size_array['crop'] ) ) {
-				$only_crop_sizes[ $name ] = $size_array;
+		foreach ($sizes as $name => $size_array) {
+			if (isset($size_array['crop'])) {
+				$only_crop_sizes[$name] = $size_array;
 			}
 		}
 
-		foreach ( $this->site_icon_sizes as $size ) {
-			if ( $size < $this->min_size ) {
-				$only_crop_sizes[ 'site_icon-' . $size ] = array(
+		foreach ($this->site_icon_sizes as $size) {
+			if ($size < $this->min_size) {
+				$only_crop_sizes['site_icon-'.$size] = array(
 					'width ' => $size,
 					'height' => $size,
 					'crop'   => true,
@@ -181,11 +181,11 @@ 
 	 * @param array $sizes List of image sizes.
 	 * @return array List of intermediate image sizes.
 	 */
-	public function intermediate_image_sizes( $sizes = array() ) {
+	public function intermediate_image_sizes($sizes = array()) {
 		/** This filter is documented in wp-admin/includes/class-wp-site-icon.php */
-		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
-		foreach ( $this->site_icon_sizes as $size ) {
-			$sizes[] = 'site_icon-' . $size;
+		$this->site_icon_sizes = apply_filters('site_icon_image_sizes', $this->site_icon_sizes);
+		foreach ($this->site_icon_sizes as $size) {
+			$sizes[] = 'site_icon-'.$size;
 		}
 
 		return $sizes;
@@ -199,11 +199,11 @@ 
 	 *
 	 * @param int $post_id Attachment ID.
 	 */
-	public function delete_attachment_data( $post_id ) {
-		$site_icon_id = get_option( 'site_icon' );
+	public function delete_attachment_data($post_id) {
+		$site_icon_id = get_option('site_icon');
 
-		if ( $site_icon_id && $post_id == $site_icon_id ) {
-			delete_option( 'site_icon' );
+		if ($site_icon_id && $post_id == $site_icon_id) {
+			delete_option('site_icon');
 		}
 	}
 
@@ -220,11 +220,11 @@ 
 	 * @param string|array      $single   Meta value, or an array of values.
 	 * @return array|null|string The attachment metadata value, array of values, or null.
 	 */
-	public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
-		$site_icon_id = get_option( 'site_icon' );
+	public function get_post_metadata($value, $post_id, $meta_key, $single) {
+		$site_icon_id = get_option('site_icon');
 
-		if ( $post_id == $site_icon_id && '_wp_attachment_backup_sizes' == $meta_key && $single ) {
-			add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+		if ($post_id == $site_icon_id && '_wp_attachment_backup_sizes' == $meta_key && $single) {
+			add_filter('intermediate_image_sizes', array($this, 'intermediate_image_sizes'));
 		}
 
 		return $value;

src/wp-admin/includes/class-wp-ms-sites-list-table.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Sites List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Sites List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_MS_Sites_List_Table extends WP_List_Table {
 
 	/**

Spacing +135 added lines, -135 removed lines

@@ -28,18 +28,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$this->status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) )
+			'archived' => array('site-archived', __('Archived')),
+			'spam'     => array('site-spammed', _x('Spam', 'site')),
+			'deleted'  => array('site-deleted', __('Deleted')),
+			'mature'   => array('site-mature', __('Mature'))
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'sites',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_sites' );
+		return current_user_can('manage_sites');
 	}
 
 	/**
@@ -61,15 +61,15 @@ 
 
 		$current_site = get_current_site();
 
-		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
+		$mode = (empty($_REQUEST['mode'])) ? 'list' : $_REQUEST['mode'];
 
-		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
+		$per_page = $this->get_items_per_page('sites_network_per_page');
 
 		$pagenum = $this->get_pagenum();
 
-		$s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
+		$s = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 		$wild = '';
-		if ( false !== strpos($s, '*') ) {
+		if (false !== strpos($s, '*')) {
 			$wild = '%';
 			$s = trim($s, '*');
 		}
@@ -78,92 +78,92 @@ 
 		 * If the network is large and a search is not being performed, show only
 		 * the latest blogs with no paging in order to avoid expensive count queries.
 		 */
-		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $s && wp_is_large_network()) {
+			if ( ! isset($_REQUEST['orderby']))
 				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
+			if ( ! isset($_REQUEST['order']))
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
 		}
 
 		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
 
-		if ( empty($s) ) {
+		if (empty($s)) {
 			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+		} elseif (preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.$/', $s)) {
 			// IPv4 address
-			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
-			$reg_blog_ids = $wpdb->get_col( $sql );
+			$sql = $wpdb->prepare("SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like($s).$wild);
+			$reg_blog_ids = $wpdb->get_col($sql);
 
-			if ( !$reg_blog_ids )
-				$reg_blog_ids = array( 0 );
+			if ( ! $reg_blog_ids)
+				$reg_blog_ids = array(0);
 
 			$query = "SELECT *
 				FROM {$wpdb->blogs}
 				WHERE site_id = '{$wpdb->siteid}'
-				AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
+				AND {$wpdb->blogs}.blog_id IN (".implode(', ', $reg_blog_ids).")";
 		} else {
-			if ( is_numeric($s) && empty( $wild ) ) {
-				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
-			} elseif ( is_subdomain_install() ) {
-				$blog_s = str_replace( '.' . $current_site->domain, '', $s );
-				$blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
-				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
+			if (is_numeric($s) && empty($wild)) {
+				$query .= $wpdb->prepare(" AND ( {$wpdb->blogs}.blog_id = %s )", $s);
+			} elseif (is_subdomain_install()) {
+				$blog_s = str_replace('.'.$current_site->domain, '', $s);
+				$blog_s = $wpdb->esc_like($blog_s).$wild.$wpdb->esc_like('.'.$current_site->domain);
+				$query .= $wpdb->prepare(" AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s);
 			} else {
-				if ( $s != trim('/', $current_site->path) ) {
-					$blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
+				if ($s != trim('/', $current_site->path)) {
+					$blog_s = $wpdb->esc_like($current_site->path.$s).$wild.$wpdb->esc_like('/');
 				} else {
-					$blog_s = $wpdb->esc_like( $s );
+					$blog_s = $wpdb->esc_like($s);
 				}
-				$query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
+				$query .= $wpdb->prepare(" AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s);
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( $order_by == 'registered' ) {
+		$order_by = isset($_REQUEST['orderby']) ? $_REQUEST['orderby'] : '';
+		if ($order_by == 'registered') {
 			$query .= ' ORDER BY registered ';
-		} elseif ( $order_by == 'lastupdated' ) {
+		} elseif ($order_by == 'lastupdated') {
 			$query .= ' ORDER BY last_updated ';
-		} elseif ( $order_by == 'blogname' ) {
-			if ( is_subdomain_install() ) {
+		} elseif ($order_by == 'blogname') {
+			if (is_subdomain_install()) {
 				$query .= ' ORDER BY domain ';
 			} else {
 				$query .= ' ORDER BY path ';
 			}
-		} elseif ( $order_by == 'blog_id' ) {
+		} elseif ($order_by == 'blog_id') {
 			$query .= ' ORDER BY blog_id ';
 		} else {
 			$order_by = null;
 		}
 
-		if ( isset( $order_by ) ) {
-			$order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+		if (isset($order_by)) {
+			$order = (isset($_REQUEST['order']) && 'DESC' == strtoupper($_REQUEST['order'])) ? "DESC" : "ASC";
 			$query .= $order;
 		}
 
 		// Don't do an unbounded count on large networks
-		if ( ! wp_is_large_network() )
-			$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		if ( ! wp_is_large_network())
+			$total = $wpdb->get_var(str_replace('SELECT *', 'SELECT COUNT( blog_id )', $query));
 
-		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
-		$this->items = $wpdb->get_results( $query, ARRAY_A );
+		$query .= " LIMIT ".intval(($pagenum - 1) * $per_page).", ".intval($per_page);
+		$this->items = $wpdb->get_results($query, ARRAY_A);
 
-		if ( wp_is_large_network() )
+		if (wp_is_large_network())
 			$total = count($this->items);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total,
 			'per_page' => $per_page,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No sites found.' );
+		_e('No sites found.');
 	}
 
 	/**
@@ -172,10 +172,10 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'site' );
-		$actions['notspam'] = _x( 'Not Spam', 'site' );
+		if (current_user_can('delete_sites'))
+			$actions['delete'] = __('Delete');
+		$actions['spam'] = _x('Mark as Spam', 'site');
+		$actions['notspam'] = _x('Not Spam', 'site');
 
 		return $actions;
 	}
@@ -185,13 +185,13 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
+	protected function pagination($which) {
 		global $mode;
 
-		parent::pagination( $which );
+		parent::pagination($which);
 
-		if ( 'top' == $which )
-			$this->view_switcher( $mode );
+		if ('top' == $which)
+			$this->view_switcher($mode);
 	}
 
 	/**
@@ -200,14 +200,14 @@ 
 	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'blogname'    => __( 'URL' ),
-			'lastupdated' => __( 'Last Updated' ),
-			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' ),
+			'blogname'    => __('URL'),
+			'lastupdated' => __('Last Updated'),
+			'registered'  => _x('Registered', 'site'),
+			'users'       => __('Users'),
 		);
 
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			$sites_columns['plugins'] = __( 'Actions' );
+		if (has_filter('wpmublogsaction')) {
+			$sites_columns['plugins'] = __('Actions');
 		}
 
 		/**
@@ -218,7 +218,7 @@ 
 		 * @param array $sites_columns An array of displayed site columns. Default 'cb',
 		 *                             'blogname', 'lastupdated', 'registered', 'users'.
 		 */
-		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
+		return apply_filters('wpmu_blogs_columns', $sites_columns);
 	}
 
 	/**
@@ -240,14 +240,14 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_cb( $blog ) {
-		if ( ! is_main_site( $blog['blog_id'] ) ) :
-			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+	public function column_cb($blog) {
+		if ( ! is_main_site($blog['blog_id'])) :
+			$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
-				printf( __( 'Select %s' ), $blogname );
+				printf(__('Select %s'), $blogname);
 			?></label>
-			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr($blog['blog_id']) ?>" />
 		<?php endif;
 	}
 
@@ -261,37 +261,37 @@ 
 	 *
 	 * @param array $blog Current blog.
 	 */
-	public function column_blogname( $blog ) {
+	public function column_blogname($blog) {
 		global $mode;
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		$blog_states = array();
-		reset( $this->status_list );
+		reset($this->status_list);
 
-		foreach ( $this->status_list as $status => $col ) {
-			if ( $blog[ $status ] == 1 ) {
+		foreach ($this->status_list as $status => $col) {
+			if ($blog[$status] == 1) {
 				$blog_states[] = $col[1];
 			}
 		}
 		$blog_state = '';
-		if ( ! empty( $blog_states ) ) {
-			$state_count = count( $blog_states );
+		if ( ! empty($blog_states)) {
+			$state_count = count($blog_states);
 			$i = 0;
 			$blog_state .= ' - ';
-			foreach ( $blog_states as $state ) {
+			foreach ($blog_states as $state) {
 				++$i;
-				$sep = ( $i == $state_count ) ? '' : ', ';
+				$sep = ($i == $state_count) ? '' : ', ';
 				$blog_state .= "<span class='post-state'>$state$sep</span>";
 			}
 		}
 
 		?>
-		<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+		<a href="<?php echo esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])); ?>" class="edit"><?php echo $blogname.$blog_state; ?></a>
 		<?php
-		if ( 'list' !== $mode ) {
-			switch_to_blog( $blog['blog_id'] );
+		if ('list' !== $mode) {
+			switch_to_blog($blog['blog_id']);
 			/* translators: 1: site name, 2: site tagline. */
-			echo '<p>' . sprintf( __( '%1$s &#8211; <em>%2$s</em>' ), get_option( 'blogname' ), get_option( 'blogdescription ' ) ) . '</p>';
+			echo '<p>'.sprintf(__('%1$s &#8211; <em>%2$s</em>'), get_option('blogname'), get_option('blogdescription ')).'</p>';
 			restore_current_blog();
 		}
 	}
@@ -304,16 +304,16 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_lastupdated( $blog ) {
+	public function column_lastupdated($blog) {
 		global $mode;
 
-		if ( 'list' == $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' == $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+		echo ($blog['last_updated'] == '0000-00-00 00:00:00') ? __('Never') : mysql2date($date, $blog['last_updated']);
 	}
 
 	/**
@@ -324,19 +324,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_registered( $blog ) {
+	public function column_registered($blog) {
 		global $mode;
 
-		if ( 'list' == $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' == $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		if ( $blog['registered'] == '0000-00-00 00:00:00' ) {
+		if ($blog['registered'] == '0000-00-00 00:00:00') {
 			echo '&#x2014;';
 		} else {
-			echo mysql2date( $date, $blog['registered'] );
+			echo mysql2date($date, $blog['registered']);
 		}
 	}
 
@@ -348,19 +348,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_users( $blog ) {
-		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
-		if ( ! $user_count ) {
-			$blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
-			$user_count = count( $blog_users );
-			unset( $blog_users );
-			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+	public function column_users($blog) {
+		$user_count = wp_cache_get($blog['blog_id'].'_user_count', 'blog-details');
+		if ( ! $user_count) {
+			$blog_users = get_users(array('blog_id' => $blog['blog_id'], 'fields' => 'ID'));
+			$user_count = count($blog_users);
+			unset($blog_users);
+			wp_cache_set($blog['blog_id'].'_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS);
 		}
 
 		printf(
 			'<a href="%s">%s</a>',
-			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
-			number_format_i18n( $user_count )
+			esc_url(network_admin_url('site-users.php?id='.$blog['blog_id'])),
+			number_format_i18n($user_count)
 		);
 	}
 
@@ -372,8 +372,8 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_plugins( $blog ) {
-		if ( has_filter( 'wpmublogsaction' ) ) {
+	public function column_plugins($blog) {
+		if (has_filter('wpmublogsaction')) {
 			/**
 			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
 			 *
@@ -383,7 +383,7 @@ 
 			 *
 			 * @param int $blog_id The site ID.
 			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
+			do_action('wpmublogsaction', $blog['blog_id']);
 		}
 	}
 
@@ -396,7 +396,7 @@ 
 	 * @param array  $blog        Current site.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $blog, $column_name ) {
+	public function column_default($blog, $column_name) {
 		/**
 		 * Fires for each registered custom column in the Sites list table.
 		 *
@@ -405,7 +405,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $blog_id     The site ID.
 		 */
-		do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+		do_action('manage_sites_custom_column', $column_name, $blog['blog_id']);
 	}
 
 	/**
@@ -413,19 +413,19 @@ 
 	 * @global string $mode
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $blog ) {
+		foreach ($this->items as $blog) {
 			$class = '';
-			reset( $this->status_list );
+			reset($this->status_list);
 
-			foreach ( $this->status_list as $status => $col ) {
-				if ( $blog[ $status ] == 1 ) {
+			foreach ($this->status_list as $status => $col) {
+				if ($blog[$status] == 1) {
 					$class = " class='{$col[0]}'";
 				}
 			}
 
 			echo "<tr{$class}>";
 
-			$this->single_row_columns( $blog );
+			$this->single_row_columns($blog);
 
 			echo '</tr>';
 		}
@@ -454,12 +454,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output.
 	 */
-	protected function handle_row_actions( $blog, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($blog, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return;
 		}
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 
 		// Preordered.
 		$actions = array(
@@ -471,33 +471,33 @@ 
 			'visit' => '',
 		);
 
-		$actions['edit']	= '<span class="edit"><a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a></span>';
-		$actions['backend']	= "<span class='backend'><a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a></span>';
-		if ( get_current_site()->blog_id != $blog['blog_id'] ) {
-			if ( $blog['deleted'] == '1' ) {
-				$actions['activate']   = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a></span>';
+		$actions['edit'] = '<span class="edit"><a href="'.esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])).'">'.__('Edit').'</a></span>';
+		$actions['backend'] = "<span class='backend'><a href='".esc_url(get_admin_url($blog['blog_id']))."' class='edit'>".__('Dashboard').'</a></span>';
+		if (get_current_site()->blog_id != $blog['blog_id']) {
+			if ($blog['deleted'] == '1') {
+				$actions['activate']   = '<span class="activate"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=activateblog&amp;id='.$blog['blog_id']), 'activateblog_'.$blog['blog_id'])).'">'.__('Activate').'</a></span>';
 			} else {
-				$actions['deactivate'] = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
+				$actions['deactivate'] = '<span class="activate"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deactivateblog&amp;id='.$blog['blog_id']), 'deactivateblog_'.$blog['blog_id'])).'">'.__('Deactivate').'</a></span>';
 			}
 
-			if ( $blog['archived'] == '1' ) {
-				$actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
+			if ($blog['archived'] == '1') {
+				$actions['unarchive'] = '<span class="archive"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unarchiveblog&amp;id='.$blog['blog_id']), 'unarchiveblog_'.$blog['blog_id'])).'">'.__('Unarchive').'</a></span>';
 			} else {
-				$actions['archive']   = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
+				$actions['archive']   = '<span class="archive"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=archiveblog&amp;id='.$blog['blog_id']), 'archiveblog_'.$blog['blog_id'])).'">'._x('Archive', 'verb; site').'</a></span>';
 			}
 
-			if ( $blog['spam'] == '1' ) {
-				$actions['unspam'] = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a></span>';
+			if ($blog['spam'] == '1') {
+				$actions['unspam'] = '<span class="spam"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unspamblog&amp;id='.$blog['blog_id']), 'unspamblog_'.$blog['blog_id'])).'">'._x('Not Spam', 'site').'</a></span>';
 			} else {
-				$actions['spam']   = '<span class="spam"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a></span>';
+				$actions['spam']   = '<span class="spam"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=spamblog&amp;id='.$blog['blog_id']), 'spamblog_'.$blog['blog_id'])).'">'._x('Spam', 'site').'</a></span>';
 			}
 
-			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<span class="delete"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a></span>';
+			if (current_user_can('delete_site', $blog['blog_id'])) {
+				$actions['delete'] = '<span class="delete"><a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deleteblog&amp;id='.$blog['blog_id']), 'deleteblog_'.$blog['blog_id'])).'">'.__('Delete').'</a></span>';
 			}
 		}
 
-		$actions['visit']	= "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a></span>';
+		$actions['visit'] = "<span class='view'><a href='".esc_url(get_home_url($blog['blog_id'], '/'))."' rel='permalink'>".__('Visit').'</a></span>';
 
 		/**
 		 * Filter the action links displayed for each site in the Sites list table.
@@ -514,7 +514,7 @@ 
 		 * @param string $blogname Site path, formatted depending on whether it is a sub-domain
 		 *                         or subdirectory multisite install.
 		 */
-		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
-		return $this->row_actions( $actions );
+		$actions = apply_filters('manage_sites_action_links', array_filter($actions), $blog['blog_id'], $blogname);
+		return $this->row_actions($actions);
 	}
 }

Braces +21 added lines, -14 removed lines

@@ -79,10 +79,12 @@ 
 		 * the latest blogs with no paging in order to avoid expensive count queries.
 		 */
 		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
-				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
-				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			if ( !isset($_REQUEST['orderby']) ) {
+							$_GET['orderby'] = $_REQUEST['orderby'] = '';
+			}
+			if ( !isset($_REQUEST['order']) ) {
+							$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 		}
 
 		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
@@ -97,8 +99,9 @@ 
 			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
 			$reg_blog_ids = $wpdb->get_col( $sql );
 
-			if ( !$reg_blog_ids )
-				$reg_blog_ids = array( 0 );
+			if ( !$reg_blog_ids ) {
+							$reg_blog_ids = array( 0 );
+			}
 
 			$query = "SELECT *
 				FROM {$wpdb->blogs}
@@ -144,14 +147,16 @@ 
 		}
 
 		// Don't do an unbounded count on large networks
-		if ( ! wp_is_large_network() )
-			$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		if ( ! wp_is_large_network() ) {
+					$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		}
 
 		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
 		$this->items = $wpdb->get_results( $query, ARRAY_A );
 
-		if ( wp_is_large_network() )
-			$total = count($this->items);
+		if ( wp_is_large_network() ) {
+					$total = count($this->items);
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total,
@@ -172,8 +177,9 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
+		if ( current_user_can( 'delete_sites' ) ) {
+					$actions['delete'] = __( 'Delete' );
+		}
 		$actions['spam'] = _x( 'Mark as Spam', 'site' );
 		$actions['notspam'] = _x( 'Not Spam', 'site' );
 
@@ -190,8 +196,9 @@ 
 
 		parent::pagination( $which );
 
-		if ( 'top' == $which )
-			$this->view_switcher( $mode );
+		if ( 'top' == $which ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**

src/wp-admin/includes/screen.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Administration Screen API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Screen API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Get the column headers for a screen

Spacing +220 added lines, -220 removed lines

@@ -16,13 +16,13 @@ 
  * @param string|WP_Screen $screen The screen you want the headers for
  * @return array Containing the headers in the format id => UI String
  */
-function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_column_headers($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	static $column_headers = array();
 
-	if ( ! isset( $column_headers[ $screen->id ] ) ) {
+	if ( ! isset($column_headers[$screen->id])) {
 
 		/**
 		 * Filter the column headers for a list table on a specific screen.
@@ -36,10 +36,10 @@ 
 		 *
 		 * @param array $columns An array of column headers. Default empty.
 		 */
-		$column_headers[ $screen->id ] = apply_filters( "manage_{$screen->id}_columns", array() );
+		$column_headers[$screen->id] = apply_filters("manage_{$screen->id}_columns", array());
 	}
 
-	return $column_headers[ $screen->id ];
+	return $column_headers[$screen->id];
 }
 
 /**
@@ -50,11 +50,11 @@ 
  * @param string|WP_Screen $screen The screen you want the hidden columns for
  * @return array
  */
-function get_hidden_columns( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_hidden_columns($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
+	return (array) get_user_option('manage'.$screen->id.'columnshidden');
 }
 
 /**
@@ -66,31 +66,31 @@ 
  *
  * @param WP_Screen $screen
  */
-function meta_box_prefs( $screen ) {
+function meta_box_prefs($screen) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
+	if (empty($wp_meta_boxes[$screen->id]))
 		return;
 
 	$hidden = get_hidden_meta_boxes($screen);
 
-	foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( ! isset( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] ) ) {
+	foreach (array_keys($wp_meta_boxes[$screen->id]) as $context) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if ( ! isset($wp_meta_boxes[$screen->id][$context][$priority])) {
 				continue;
 			}
-			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
+			foreach ($wp_meta_boxes[$screen->id][$context][$priority] as $box) {
+				if (false == $box || ! $box['title'])
 					continue;
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+				if ('submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'])
 					continue;
 				$box_id = $box['id'];
-				echo '<label for="' . $box_id . '-hide">';
-				echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
+				echo '<label for="'.$box_id.'-hide">';
+				echo '<input class="hide-postbox-tog" name="'.$box_id.'-hide" type="checkbox" id="'.$box_id.'-hide" value="'.$box_id.'"'.( ! in_array($box_id, $hidden) ? ' checked="checked"' : '').' />';
 				echo "{$box['title']}</label>\n";
 			}
 		}
@@ -105,22 +105,22 @@ 
  * @param string|WP_Screen $screen Screen identifier
  * @return array Hidden Meta Boxes
  */
-function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+function get_hidden_meta_boxes($screen) {
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
+	$hidden = get_user_option("metaboxhidden_{$screen->id}");
 
-	$use_defaults = ! is_array( $hidden );
+	$use_defaults = ! is_array($hidden);
 
 	// Hide slug boxes by default
-	if ( $use_defaults ) {
+	if ($use_defaults) {
 		$hidden = array();
-		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
+		if ('post' == $screen->base) {
+			if ('post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type)
 				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
 			else
-				$hidden = array( 'slugdiv' );
+				$hidden = array('slugdiv');
 		}
 
 		/**
@@ -131,7 +131,7 @@ 
 		 * @param array     $hidden An array of meta boxes hidden by default.
 		 * @param WP_Screen $screen WP_Screen object of the current screen.
 		 */
-		$hidden = apply_filters( 'default_hidden_meta_boxes', $hidden, $screen );
+		$hidden = apply_filters('default_hidden_meta_boxes', $hidden, $screen);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @param bool      $use_defaults Whether to show the default meta boxes.
 	 *                                Default true.
 	 */
-	return apply_filters( 'hidden_meta_boxes', $hidden, $screen, $use_defaults );
+	return apply_filters('hidden_meta_boxes', $hidden, $screen, $use_defaults);
 }
 
 /**
@@ -155,13 +155,13 @@ 
  * @param string $option An option name.
  * @param mixed $args Option-dependent arguments.
  */
-function add_screen_option( $option, $args = array() ) {
+function add_screen_option($option, $args = array()) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return;
 
-	$current_screen->add_option( $option, $args );
+	$current_screen->add_option($option, $args);
 }
 
 /**
@@ -176,7 +176,7 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
+	if ( ! isset($current_screen))
 		return null;
 
 	return $current_screen;
@@ -190,8 +190,8 @@ 
  * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
  *	                       or an existing screen object.
  */
-function set_current_screen( $hook_name = '' ) {
-	WP_Screen::get( $hook_name )->set_current_screen();
+function set_current_screen($hook_name = '') {
+	WP_Screen::get($hook_name)->set_current_screen();
 }
 
 /**
@@ -393,8 +393,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;
 		}
 
@@ -402,144 +402,144 @@ 
 		$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' :
-					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' :
-				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;
 	}
@@ -567,7 +567,7 @@ 
 		 *
 		 * @param WP_Screen $current_screen Current WP_Screen object.
 		 */
-		do_action( 'current_screen', $current_screen );
+		do_action('current_screen', $current_screen);
 	}
 
 	/**
@@ -587,11 +587,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);
 	}
 
 	/**
@@ -606,8 +606,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;
 	}
 
 	/**
@@ -618,10 +618,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);
 	}
 
 	/**
@@ -633,8 +633,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;
 	}
 
 	/**
@@ -644,8 +644,8 @@ 
 	 *
 	 * @param string $option Option ID.
 	 */
-	public function remove_option( $option ) {
-		unset( $this->_options[ $option ] );
+	public function remove_option($option) {
+		unset($this->_options[$option]);
 	}
 
 	/**
@@ -678,15 +678,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];
 	}
 
 	/**
@@ -708,10 +708,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];
 	}
 
 	/**
@@ -727,23 +727,23 @@ 
 	 * - callback - callback - A callback to generate the tab content. Optional.
 	 *
 	 */
-	public function add_help_tab( $args ) {
+	public function add_help_tab($args) {
 		$defaults = array(
 			'title'    => false,
 			'id'       => false,
 			'content'  => '',
 			'callback' => false,
 		);
-		$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;
 	}
 
 	/**
@@ -753,8 +753,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]);
 	}
 
 	/**
@@ -785,7 +785,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;
 	}
 
@@ -827,9 +827,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.
@@ -843,10 +843,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.
@@ -857,44 +857,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
@@ -904,7 +904,7 @@ 
 						</ul>
 					</div>
 
-					<?php if ( $help_sidebar ) : ?>
+					<?php if ($help_sidebar) : ?>
 					<div class="contextual-help-sidebar">
 						<?php echo $help_sidebar; ?>
 					</div>
@@ -913,18 +913,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
@@ -949,37 +949,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>
@@ -995,21 +995,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 = '<div class="editor-expand hidden"><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></div>';
+				$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></div>';
 				$this->_screen_settings = $expand;
 				break;
 			default:
@@ -1028,9 +1028,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;
 
 		/**
@@ -1042,7 +1042,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;
 	}
 
@@ -1056,59 +1056,59 @@ 
 	public function render_screen_options() {
 		global $wp_meta_boxes;
 
-		$columns = get_column_headers( $this );
-		$hidden  = get_hidden_columns( $this );
+		$columns = get_column_headers($this);
+		$hidden  = get_hidden_columns($this);
 
 		?>
 		<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="<?php esc_attr_e('Screen Options Tab'); ?>">
 		<form id="adv-settings" method="post">
-		<?php if ( isset( $wp_meta_boxes[ $this->id ] ) || $this->get_option( 'per_page' ) || ( $columns && empty( $columns['_title'] ) ) ) : ?>
-			<h5><?php _e( 'Show on screen' ); ?></h5>
+		<?php if (isset($wp_meta_boxes[$this->id]) || $this->get_option('per_page') || ($columns && empty($columns['_title']))) : ?>
+			<h5><?php _e('Show on screen'); ?></h5>
 		<?php
 		endif;
 
-		if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
+		if (isset($wp_meta_boxes[$this->id])) : ?>
 			<div class="metabox-prefs">
 				<?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";
 					}
 				?>
 				<br class="clear" />
 			</div>
 			<?php endif;
-			if ( $columns ) :
-				if ( ! empty( $columns['_title'] ) ) : ?>
+			if ($columns) :
+				if ( ! empty($columns['_title'])) : ?>
 			<h5><?php echo $columns['_title']; ?></h5>
 			<?php endif; ?>
 			<div class="metabox-prefs">
 				<?php
 				$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 for="' . $id . '">';
-					echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
+					echo '<label for="'.$id.'">';
+					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";
 				}
 				?>
@@ -1121,7 +1121,7 @@ 
 		echo $this->_screen_settings;
 
 		?>
-		<div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
+		<div><?php wp_nonce_field('screen-options-nonce', 'screenoptionnonce', false); ?></div>
 		</form>
 		</div>
 		<?php
@@ -1133,22 +1133,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');
 
 		?>
 		<h5 class="screen-layout"><?php _e('Screen Layout'); ?></h5>
 		<div class='columns-prefs'><?php
 			_e('Number of Columns:');
-			for ( $i = 1; $i <= $num; ++$i ):
+			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 echo esc_html( $i ); ?>
+					<input type='radio' name='screen_columns' value='<?php echo esc_attr($i); ?>'
+						<?php checked($screen_layout_columns, $i); ?> />
+					<?php echo esc_html($i); ?>
 				</label>
 				<?php
 			endfor; ?>
@@ -1162,58 +1162,58 @@ 
 	 * @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/class-wp-posts-list-table.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);
 		}
 
 		?>
 		<div class="screen-options">
-			<?php if ( $per_page_label ) : ?>
-				<label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
+			<?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;
 
-			echo get_submit_button( __( 'Apply' ), 'button', 'screen-options-apply', false ); ?>
-			<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
+			echo get_submit_button(__('Apply'), 'button', 'screen-options-apply', false); ?>
+			<input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr($option); ?>" />
 		</div>
 		<?php
 	}

Braces +146 added lines, -102 removed lines

@@ -17,8 +17,9 @@ 
  * @return array Containing the headers in the format id => UI String
  */
 function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	static $column_headers = array();
 
@@ -51,8 +52,9 @@ 
  * @return array
  */
 function get_hidden_columns( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
 }
@@ -69,11 +71,13 @@ 
 function meta_box_prefs( $screen ) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
-		return;
+	if ( empty($wp_meta_boxes[$screen->id]) ) {
+			return;
+	}
 
 	$hidden = get_hidden_meta_boxes($screen);
 
@@ -83,11 +87,13 @@ 
 				continue;
 			}
 			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
-					continue;
+				if ( false == $box || ! $box['title'] ) {
+									continue;
+				}
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
-					continue;
+				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
+									continue;
+				}
 				$box_id = $box['id'];
 				echo '<label for="' . $box_id . '-hide">';
 				echo '<input class="hide-postbox-tog" name="' . $box_id . '-hide" type="checkbox" id="' . $box_id . '-hide" value="' . $box_id . '"' . (! in_array($box_id, $hidden) ? ' checked="checked"' : '') . ' />';
@@ -106,8 +112,9 @@ 
  * @return array Hidden Meta Boxes
  */
 function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
 
@@ -117,10 +124,11 @@ 
 	if ( $use_defaults ) {
 		$hidden = array();
 		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-			else
-				$hidden = array( 'slugdiv' );
+			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
+							$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
+			} else {
+							$hidden = array( 'slugdiv' );
+			}
 		}
 
 		/**
@@ -158,8 +166,9 @@ 
 function add_screen_option( $option, $args = array() ) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return;
+	if ( ! $current_screen ) {
+			return;
+	}
 
 	$current_screen->add_option( $option, $args );
 }
@@ -176,8 +185,9 @@ 
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
-		return null;
+	if ( ! isset( $current_screen ) ) {
+			return null;
+	}
 
 	return $current_screen;
 }
@@ -402,18 +412,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 );
@@ -442,72 +454,84 @@ 
 				}
 			}
 
-			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' :
-					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' :
-				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;
@@ -524,8 +548,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;
@@ -588,8 +613,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 );
 	}
@@ -679,11 +705,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 ];
@@ -709,8 +737,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 ];
 	}
 
@@ -739,8 +768,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;
@@ -858,8 +888,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 ) {
@@ -873,8 +904,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!
 		?>
@@ -923,8 +955,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
@@ -951,25 +984,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() ) : ?>
@@ -995,8 +1032,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 );
 
@@ -1030,8 +1068,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.
@@ -1078,8 +1117,9 @@ 
 							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 = false;
+							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 ) . ' />';
@@ -1099,13 +1139,16 @@ 
 
 				foreach ( $columns as $column => $title ) {
 					// Can't hide these for they are special
-					if ( in_array( $column, $special ) )
-						continue;
-					if ( empty( $title ) )
-						continue;
+					if ( in_array( $column, $special ) ) {
+											continue;
+					}
+					if ( empty( $title ) ) {
+											continue;
+					}
 
-					if ( 'comments' == $column )
-						$title = __( 'Comments' );
+					if ( 'comments' == $column ) {
+											$title = __( 'Comments' );
+					}
 					$id = "$column-hide";
 					echo '<label for="' . $id . '">';
 					echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
@@ -1133,8 +1176,9 @@ 
 	 * @since 3.3.0
 	 */
 	public function render_screen_layout() {
-		if ( ! $this->get_option('layout_columns') )
-			return;
+		if ( ! $this->get_option('layout_columns') ) {
+					return;
+		}
 
 		$screen_layout_columns = $this->get_columns();
 		$num = $this->get_option( 'layout_columns', 'max' );

src/wp-admin/includes/comment.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Comment Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Comment Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Determine if a comment exists based on author and date.

Spacing +40 added lines, -40 removed lines

@@ -20,11 +20,11 @@ 
 function comment_exists($comment_author, $comment_date) {
 	global $wpdb;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+	return $wpdb->get_var($wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND comment_date = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
-	) );
+			stripslashes($comment_author),
+			stripslashes($comment_date)
+	));
 }
 
 /**
@@ -33,44 +33,44 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
+	if ( ! current_user_can('edit_comment', (int) $_POST['comment_ID']))
+		wp_die(__('You are not allowed to edit comments on this post.'));
 
-	if ( isset( $_POST['newcomment_author'] ) )
+	if (isset($_POST['newcomment_author']))
 		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
+	if (isset($_POST['newcomment_author_email']))
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
+	if (isset($_POST['newcomment_author_url']))
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
+	if (isset($_POST['comment_status']))
 		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
+	if (isset($_POST['content']))
 		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
+	if (isset($_POST['comment_ID']))
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
-	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($_POST['hidden_'.$timeunit]) && $_POST['hidden_'.$timeunit] != $_POST[$timeunit]) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty ( $_POST['edit_date'] ) ) {
+	if ( ! empty ($_POST['edit_date'])) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	wp_update_comment( $_POST );
+	wp_update_comment($_POST);
 }
 
 /**
@@ -81,14 +81,14 @@ 
  * @param int $id ID of comment to retrieve.
  * @return object|false Comment if found. False on failure.
  */
-function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
+function get_comment_to_edit($id) {
+	if ( ! $comment = get_comment($id))
 		return false;
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
-	$comment->comment_content = format_to_edit( $comment->comment_content );
+	$comment->comment_content = format_to_edit($comment->comment_content);
 	/**
 	 * Filter the comment content before editing.
 	 *
@@ -96,11 +96,11 @@ 
 	 *
 	 * @param string $comment->comment_content Comment content.
 	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
+	$comment->comment_author = format_to_edit($comment->comment_author);
+	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
+	$comment->comment_author_url = format_to_edit($comment->comment_author_url);
 	$comment->comment_author_url = esc_url($comment->comment_author_url);
 
 	return $comment;
@@ -116,23 +116,23 @@ 
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
-function get_pending_comments_num( $post_id ) {
+function get_pending_comments_num($post_id) {
 	global $wpdb;
 
 	$single = false;
-	if ( !is_array($post_id) ) {
+	if ( ! is_array($post_id)) {
 		$post_id_array = (array) $post_id;
 		$single = true;
 	} else {
 		$post_id_array = $post_id;
 	}
 	$post_id_array = array_map('intval', $post_id_array);
-	$post_id_in = "'" . implode("', '", $post_id_array) . "'";
+	$post_id_in = "'".implode("', '", $post_id_array)."'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results("SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A);
 
-	if ( $single ) {
-		if ( empty($pending) )
+	if ($single) {
+		if (empty($pending))
 			return 0;
 		else
 			return absint($pending[0]['num_comments']);
@@ -141,11 +141,11 @@ 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
+	foreach ($post_id_array as $id)
 		$pending_keyed[$id] = 0;
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( ! empty($pending))
+		foreach ($pending as $pend)
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
 
 	return $pending_keyed;
@@ -161,9 +161,9 @@ 
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
-function floated_admin_avatar( $name ) {
+function floated_admin_avatar($name) {
 	global $comment;
-	$avatar = get_avatar( $comment, 32, 'mystery' );
+	$avatar = get_avatar($comment, 32, 'mystery');
 	return "$avatar $name";
 }
 
@@ -171,6 +171,6 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
+	if ('true' == get_user_option('comment_shortcuts'))
+		wp_enqueue_script('jquery-table-hotkeys');
 }

Braces +40 added lines, -28 removed lines

@@ -33,21 +33,28 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
-
-	if ( isset( $_POST['newcomment_author'] ) )
-		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
-		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
-		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
-		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
-		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
-		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+			wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
+	}
+
+	if ( isset( $_POST['newcomment_author'] ) ) {
+			$_POST['comment_author'] = $_POST['newcomment_author'];
+	}
+	if ( isset( $_POST['newcomment_author_email'] ) ) {
+			$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+	}
+	if ( isset( $_POST['newcomment_author_url'] ) ) {
+			$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+	}
+	if ( isset( $_POST['comment_status'] ) ) {
+			$_POST['comment_approved'] = $_POST['comment_status'];
+	}
+	if ( isset( $_POST['content'] ) ) {
+			$_POST['comment_content'] = $_POST['content'];
+	}
+	if ( isset( $_POST['comment_ID'] ) ) {
+			$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	}
 
 	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
@@ -82,8 +89,9 @@ 
  * @return object|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
-		return false;
+	if ( !$comment = get_comment($id) ) {
+			return false;
+	}
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
@@ -132,21 +140,24 @@ 
 	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
-		if ( empty($pending) )
-			return 0;
-		else
-			return absint($pending[0]['num_comments']);
+		if ( empty($pending) ) {
+					return 0;
+		} else {
+					return absint($pending[0]['num_comments']);
+		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
-		$pending_keyed[$id] = 0;
+	foreach ( $post_id_array as $id ) {
+			$pending_keyed[$id] = 0;
+	}
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( !empty($pending) ) {
+			foreach ( $pending as $pend )
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+	}
 
 	return $pending_keyed;
 }
@@ -171,6 +182,7 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-}
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
+			wp_enqueue_script( 'jquery-table-hotkeys' );
+	}
+	}