ntwb / wordpress

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

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Base class for displaying a list of items in an ajaxified HTML table.
- *
- * @since 3.1.0
- * @access private
- *
- * @package WordPress
- * @subpackage List_Table
- */
+	 * Base class for displaying a list of items in an ajaxified HTML table.
+	 *
+	 * @since 3.1.0
+	 * @access private
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 */
 class WP_List_Table {
 
 	/**

Spacing +258 added lines, -258 removed lines

@@ -79,12 +79,12 @@ 
 	 */
 	protected $_column_headers;
 
-	protected $compat_fields = array( '_args', '_pagination_args', 'screen', '_actions', '_pagination' );
+	protected $compat_fields = array('_args', '_pagination_args', 'screen', '_actions', '_pagination');
 
-	protected $compat_methods = array( 'set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
+	protected $compat_methods = array('set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
 		'row_actions', 'months_dropdown', 'view_switcher', 'comments_bubble', 'get_items_per_page', 'pagination',
 		'get_sortable_columns', 'get_column_info', 'get_table_classes', 'display_tablenav', 'extra_tablenav',
-		'single_row_columns' );
+		'single_row_columns');
 
 	/**
 	 * Constructor.
@@ -112,35 +112,35 @@ 
 	 *                            Default null.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
-		$args = wp_parse_args( $args, array(
+	public function __construct($args = array()) {
+		$args = wp_parse_args($args, array(
 			'plural' => '',
 			'singular' => '',
 			'ajax' => false,
 			'screen' => null,
-		) );
+		));
 
-		$this->screen = convert_to_screen( $args['screen'] );
+		$this->screen = convert_to_screen($args['screen']);
 
-		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
+		add_filter("manage_{$this->screen->id}_columns", array($this, 'get_columns'), 0);
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'])
 			$args['plural'] = $this->screen->base;
 
-		$args['plural'] = sanitize_key( $args['plural'] );
-		$args['singular'] = sanitize_key( $args['singular'] );
+		$args['plural'] = sanitize_key($args['plural']);
+		$args['singular'] = sanitize_key($args['singular']);
 
 		$this->_args = $args;
 
-		if ( $args['ajax'] ) {
+		if ($args['ajax']) {
 			// wp_enqueue_script( 'list-table' );
-			add_action( 'admin_footer', array( $this, '_js_vars' ) );
+			add_action('admin_footer', array($this, '_js_vars'));
 		}
 
-		if ( empty( $this->modes ) ) {
+		if (empty($this->modes)) {
 			$this->modes = array(
-				'list'    => __( 'List View' ),
-				'excerpt' => __( 'Excerpt View' )
+				'list'    => __('List View'),
+				'excerpt' => __('Excerpt View')
 			);
 		}
 	}
@@ -154,8 +154,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -170,8 +170,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -185,9 +185,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -199,9 +199,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -215,9 +215,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -230,7 +230,7 @@ 
 	 * @abstract
 	 */
 	public function ajax_user_can() {
-		die( 'function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	 * @abstract
 	 */
 	public function prepare_items() {
-		die( 'function WP_List_Table::prepare_items() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::prepare_items() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -253,19 +253,19 @@ 
 	 *
 	 * @param array|string $args
 	 */
-	protected function set_pagination_args( $args ) {
-		$args = wp_parse_args( $args, array(
+	protected function set_pagination_args($args) {
+		$args = wp_parse_args($args, array(
 			'total_items' => 0,
 			'total_pages' => 0,
 			'per_page' => 0,
-		) );
+		));
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( ! $args['total_pages'] && $args['per_page'] > 0)
+			$args['total_pages'] = ceil($args['total_items'] / $args['per_page']);
 
 		// Redirect if page number is invalid and headers are not already sent.
-		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
-			wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+		if ( ! headers_sent() && ( ! defined('DOING_AJAX') || ! DOING_AJAX) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages']) {
+			wp_redirect(add_query_arg('paged', $args['total_pages']));
 			exit;
 		}
 
@@ -282,11 +282,11 @@ 
 	 *                    'total_pages', 'per_page', or 'infinite_scroll'.
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
-	public function get_pagination_arg( $key ) {
-		if ( 'page' == $key )
+	public function get_pagination_arg($key) {
+		if ('page' == $key)
 			return $this->get_pagenum();
 
-		if ( isset( $this->_pagination_args[$key] ) )
+		if (isset($this->_pagination_args[$key]))
 			return $this->_pagination_args[$key];
 	}
 
@@ -299,7 +299,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty($this->items);
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No items found.' );
+		_e('No items found.');
 	}
 
 	/**
@@ -321,25 +321,25 @@ 
 	 * @param string $text The search button text
 	 * @param string $input_id The search input id
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items())
 			return;
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby']))
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
+		if ( ! empty($_REQUEST['order']))
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
+		if ( ! empty($_REQUEST['post_mime_type']))
+			echo '<input type="hidden" name="post_mime_type" value="'.esc_attr($_REQUEST['post_mime_type']).'" />';
+		if ( ! empty($_REQUEST['detached']))
+			echo '<input type="hidden" name="detached" value="'.esc_attr($_REQUEST['detached']).'" />';
 ?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', '', false, array('id' => 'search-submit') ); ?>
+	<?php submit_button($text, 'button', '', false, array('id' => 'search-submit')); ?>
 </p>
 <?php
 	}
@@ -375,16 +375,16 @@ 
 		 *
 		 * @param array $views An array of available list table views.
 		 */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
-		if ( empty( $views ) )
+		if (empty($views))
 			return;
 
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+		foreach ($views as $class => $view) {
+			$views[$class] = "\t<li class='$class'>$view";
 		}
-		echo implode( " |</li>\n", $views ) . "</li>\n";
+		echo implode(" |</li>\n", $views)."</li>\n";
 		echo "</ul>";
 	}
 
@@ -410,8 +410,8 @@ 
 	 * @param string $which The location of the bulk actions: 'top' or 'bottom'.
 	 *                      This is designated as optional for backwards-compatibility.
 	 */
-	protected function bulk_actions( $which = '' ) {
-		if ( is_null( $this->_actions ) ) {
+	protected function bulk_actions($which = '') {
+		if (is_null($this->_actions)) {
 			$no_new_actions = $this->_actions = $this->get_bulk_actions();
 			/**
 			 * Filter the list table Bulk Actions drop-down.
@@ -425,21 +425,21 @@ 
 			 *
 			 * @param array $actions An array of the available bulk actions.
 			 */
-			$this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );
-			$this->_actions = array_intersect_assoc( $this->_actions, $no_new_actions );
+			$this->_actions = apply_filters("bulk_actions-{$this->screen->id}", $this->_actions);
+			$this->_actions = array_intersect_assoc($this->_actions, $no_new_actions);
 			$two = '';
 		} else {
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
+		if (empty($this->_actions))
 			return;
 
-		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
-		echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
-		echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
+		echo "<label for='bulk-action-selector-".esc_attr($which)."' class='screen-reader-text'>".__('Select bulk action')."</label>";
+		echo "<select name='action$two' id='bulk-action-selector-".esc_attr($which)."'>\n";
+		echo "<option value='-1' selected='selected'>".__('Bulk Actions')."</option>\n";
 
-		foreach ( $this->_actions as $name => $title ) {
+		foreach ($this->_actions as $name => $title) {
 			$class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
 
 			echo "\t<option value='$name'$class>$title</option>\n";
@@ -447,7 +447,7 @@ 
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+		submit_button(__('Apply'), 'action', '', false, array('id' => "doaction$two"));
 		echo "\n";
 	}
 
@@ -460,13 +460,13 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
+		if (isset($_REQUEST['filter_action']) && ! empty($_REQUEST['filter_action']))
 			return false;
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+		if (isset($_REQUEST['action']) && -1 != $_REQUEST['action'])
 			return $_REQUEST['action'];
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+		if (isset($_REQUEST['action2']) && -1 != $_REQUEST['action2'])
 			return $_REQUEST['action2'];
 
 		return false;
@@ -482,22 +482,22 @@ 
 	 * @param bool $always_visible Whether the actions should be always visible
 	 * @return string
 	 */
-	protected function row_actions( $actions, $always_visible = false ) {
-		$action_count = count( $actions );
+	protected function row_actions($actions, $always_visible = false) {
+		$action_count = count($actions);
 		$i = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count)
 			return '';
 
-		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
-		foreach ( $actions as $action => $link ) {
+		$out = '<div class="'.($always_visible ? 'row-actions visible' : 'row-actions').'">';
+		foreach ($actions as $action => $link) {
 			++$i;
-			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+			($i == $action_count) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
 		$out .= '</div>';
 
-		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>';
 
 		return $out;
 	}
@@ -513,7 +513,7 @@ 
 	 *
 	 * @param string $post_type
 	 */
-	protected function months_dropdown( $post_type ) {
+	protected function months_dropdown($post_type) {
 		global $wpdb, $wp_locale;
 
 		/**
@@ -524,16 +524,16 @@ 
 		 * @param bool   $disable   Whether to disable the drop-down. Default false.
 		 * @param string $post_type The post type.
 		 */
-		if ( apply_filters( 'disable_months_dropdown', false, $post_type ) ) {
+		if (apply_filters('disable_months_dropdown', false, $post_type)) {
 			return;
 		}
 
-		$months = $wpdb->get_results( $wpdb->prepare( "
+		$months = $wpdb->get_results($wpdb->prepare("
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			ORDER BY post_date DESC
-		", $post_type ) );
+		", $post_type));
 
 		/**
 		 * Filter the 'Months' drop-down results.
@@ -543,31 +543,31 @@ 
 		 * @param object $months    The months drop-down query results.
 		 * @param string $post_type The post type.
 		 */
-		$months = apply_filters( 'months_dropdown_results', $months, $post_type );
+		$months = apply_filters('months_dropdown_results', $months, $post_type);
 
-		$month_count = count( $months );
+		$month_count = count($months);
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || (1 == $month_count && 0 == $months[0]->month))
 			return;
 
-		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
+		$m = isset($_GET['m']) ? (int) $_GET['m'] : 0;
 ?>
-		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
+		<label for="filter-by-date" class="screen-reader-text"><?php _e('Filter by date'); ?></label>
 		<select name="m" id="filter-by-date">
-			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
+			<option<?php selected($m, 0); ?> value="0"><?php _e('All dates'); ?></option>
 <?php
-		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
+		foreach ($months as $arc_row) {
+			if (0 == $arc_row->year)
 				continue;
 
-			$month = zeroise( $arc_row->month, 2 );
+			$month = zeroise($arc_row->month, 2);
 			$year = $arc_row->year;
 
-			printf( "<option %s value='%s'>%s</option>\n",
-				selected( $m, $year . $month, false ),
-				esc_attr( $arc_row->year . $month ),
+			printf("<option %s value='%s'>%s</option>\n",
+				selected($m, $year.$month, false),
+				esc_attr($arc_row->year.$month),
 				/* translators: 1: month name, 2: 4-digit year */
-				sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
+				sprintf(__('%1$s %2$d'), $wp_locale->get_month($month), $year)
 			);
 		}
 ?>
@@ -583,19 +583,19 @@ 
 	 *
 	 * @param string $current_mode
 	 */
-	protected function view_switcher( $current_mode ) {
+	protected function view_switcher($current_mode) {
 ?>
-		<input type="hidden" name="mode" value="<?php echo esc_attr( $current_mode ); ?>" />
+		<input type="hidden" name="mode" value="<?php echo esc_attr($current_mode); ?>" />
 		<div class="view-switch">
 <?php
-			foreach ( $this->modes as $mode => $title ) {
-				$classes = array( 'view-' . $mode );
-				if ( $current_mode == $mode )
+			foreach ($this->modes as $mode => $title) {
+				$classes = array('view-'.$mode);
+				if ($current_mode == $mode)
 					$classes[] = 'current';
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
-					esc_url( add_query_arg( 'mode', $mode ) ),
-					implode( ' ', $classes ),
+					esc_url(add_query_arg('mode', $mode)),
+					implode(' ', $classes),
 					$title
 				);
 			}
@@ -613,45 +613,45 @@ 
 	 * @param int $post_id          The post ID.
 	 * @param int $pending_comments Number of pending comments.
 	 */
-	protected function comments_bubble( $post_id, $pending_comments ) {
+	protected function comments_bubble($post_id, $pending_comments) {
 		$approved_comments = get_comments_number();
 
-		$approved_comments_number = number_format_i18n( $approved_comments );
-		$pending_comments_number = number_format_i18n( $pending_comments );
+		$approved_comments_number = number_format_i18n($approved_comments);
+		$pending_comments_number = number_format_i18n($pending_comments);
 
-		$approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
-		$approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
-		$pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
+		$approved_only_phrase = sprintf(_n('%s comment', '%s comments', $approved_comments), $approved_comments_number);
+		$approved_phrase = sprintf(_n('%s approved comment', '%s approved comments', $approved_comments), $approved_comments_number);
+		$pending_phrase = sprintf(_n('%s pending comment', '%s pending comments', $pending_comments), $pending_comments_number);
 
 		// No comments at all.
-		if ( ! $approved_comments && ! $pending_comments ) {
-			printf( '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
-				__( 'No comments' )
+		if ( ! $approved_comments && ! $pending_comments) {
+			printf('<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
+				__('No comments')
 			);
 		// Approved comments have different display depending on some conditions.
-		} elseif ( $approved_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+		} elseif ($approved_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'approved'), admin_url('edit-comments.php'))),
 				$approved_comments_number,
 				$pending_comments ? $approved_phrase : $approved_only_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$approved_comments_number,
-				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+				$pending_comments ? __('No approved comments') : __('No comments')
 			);
 		}
 
-		if ( $pending_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+		if ($pending_comments) {
+			printf('<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(add_query_arg(array('p' => $post_id, 'comment_status' => 'moderated'), admin_url('edit-comments.php'))),
 				$pending_comments_number,
 				$pending_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf('<span class="post-com-count post-com-count-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$pending_comments_number,
-				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
+				$approved_comments ? __('No pending comments') : __('No comments')
 			);
 		}
 	}
@@ -665,12 +665,12 @@ 
 	 * @return int
 	 */
 	public function get_pagenum() {
-		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
+		$pagenum = isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
+		if (isset($this->_pagination_args['total_pages']) && $pagenum > $this->_pagination_args['total_pages'])
 			$pagenum = $this->_pagination_args['total_pages'];
 
-		return max( 1, $pagenum );
+		return max(1, $pagenum);
 	}
 
 	/**
@@ -683,9 +683,9 @@ 
 	 * @param int    $default
 	 * @return int
 	 */
-	protected function get_items_per_page( $option, $default = 20 ) {
-		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
+	protected function get_items_per_page($option, $default = 20) {
+		$per_page = (int) get_user_option($option);
+		if (empty($per_page) || $per_page < 1)
 			$per_page = $default;
 
 		/**
@@ -701,7 +701,7 @@ 
 		 *
 		 * @param int $per_page Number of items to be displayed. Default 20.
 		 */
-		return (int) apply_filters( $option, $per_page );
+		return (int) apply_filters($option, $per_page);
 	}
 
 	/**
@@ -712,25 +712,25 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
-		if ( empty( $this->_pagination_args ) ) {
+	protected function pagination($which) {
+		if (empty($this->_pagination_args)) {
 			return;
 		}
 
 		$total_items = $this->_pagination_args['total_items'];
 		$total_pages = $this->_pagination_args['total_pages'];
 		$infinite_scroll = false;
-		if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
+		if (isset($this->_pagination_args['infinite_scroll'])) {
 			$infinite_scroll = $this->_pagination_args['infinite_scroll'];
 		}
 
-		$output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
+		$output = '<span class="displaying-num">'.sprintf(_n('%s item', '%s items', $total_items), number_format_i18n($total_items)).'</span>';
 
 		$current = $this->get_pagenum();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
-		$current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
+		$current_url = remove_query_arg(array('hotkeys_highlight_last', 'hotkeys_highlight_first'), $current_url);
 
 		$page_links = array();
 
@@ -739,81 +739,81 @@ 
 
 		$disable_first = $disable_last = $disable_prev = $disable_next = false;
 
- 		if ( $current == 1 ) {
+ 		if ($current == 1) {
 			$disable_first = true;
 			$disable_prev = true;
  		}
-		if ( $current == 2 ) {
+		if ($current == 2) {
 			$disable_first = true;
 		}
- 		if ( $current == $total_pages ) {
+ 		if ($current == $total_pages) {
 			$disable_last = true;
 			$disable_next = true;
  		}
-		if ( $current == $total_pages - 1 ) {
+		if ($current == $total_pages - 1) {
 			$disable_last = true;
 		}
 
-		if ( $disable_first ) {
+		if ($disable_first) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( remove_query_arg( 'paged', $current_url ) ),
-				__( 'First page' ),
+			$page_links[] = sprintf("<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(remove_query_arg('paged', $current_url)),
+				__('First page'),
 				'&laquo;'
 			);
 		}
 
-		if ( $disable_prev ) {
+		if ($disable_prev) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
-				__( 'Previous page' ),
+			$page_links[] = sprintf("<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', max(1, $current - 1), $current_url)),
+				__('Previous page'),
 				'&lsaquo;'
 			);
 		}
 
-		if ( 'bottom' == $which ) {
+		if ('bottom' == $which) {
 			$html_current_page  = $current;
-			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
+			$total_pages_before = '<span class="screen-reader-text">'.__('Current Page').'</span><span id="table-paging" class="paging-input">';
 		} else {
-			$html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
-				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
+			$html_current_page = sprintf("%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' />",
+				'<label for="current-page-selector" class="screen-reader-text">'.__('Current Page').'</label>',
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
-		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
+		$html_total_pages = sprintf("<span class='total-pages'>%s</span>", number_format_i18n($total_pages));
+		$page_links[] = $total_pages_before.sprintf(_x('%1$s of %2$s', 'paging'), $html_current_page, $html_total_pages).$total_pages_after;
 
-		if ( $disable_next ) {
+		if ($disable_next) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
-				__( 'Next page' ),
+			$page_links[] = sprintf("<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', min($total_pages, $current + 1), $current_url)),
+				__('Next page'),
 				'&rsaquo;'
 			);
 		}
 
-		if ( $disable_last ) {
+		if ($disable_last) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
-				__( 'Last page' ),
+			$page_links[] = sprintf("<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url(add_query_arg('paged', $total_pages, $current_url)),
+				__('Last page'),
 				'&raquo;'
 			);
 		}
 
 		$pagination_links_class = 'pagination-links';
-		if ( ! empty( $infinite_scroll ) ) {
+		if ( ! empty($infinite_scroll)) {
 			$pagination_links_class = ' hide-if-js';
 		}
-		$output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
+		$output .= "\n<span class='$pagination_links_class'>".join("\n", $page_links).'</span>';
 
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
@@ -834,7 +834,7 @@ 
 	 * @return array
 	 */
 	public function get_columns() {
-		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
+		die('function WP_List_Table::get_columns() must be over-ridden in a sub-class.');
 	}
 
 	/**
@@ -868,8 +868,8 @@ 
 
 		// We need a primary defined so responsive views show something,
 		// so let's fall back to the first non-checkbox column.
-		foreach( $columns as $col => $column_name ) {
-			if ( 'cb' === $col ) {
+		foreach ($columns as $col => $column_name) {
+			if ('cb' === $col) {
 				continue;
 			}
 
@@ -894,7 +894,7 @@ 
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset($columns[$default])) {
 			$default = WP_List_Table::get_default_primary_column_name();
 		}
 
@@ -906,9 +906,9 @@ 
 		 * @param string $default Column name default for the specific list table, e.g. 'name'.
 		 * @param string $context Screen ID for specific list table, e.g. 'plugins'.
 		 */
-		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
+		$column  = apply_filters('list_table_primary_column', $default, $this->screen->id);
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if (empty($column) || ! isset($columns[$column])) {
 			$column = $default;
 		}
 
@@ -925,19 +925,19 @@ 
 	 */
 	protected function get_column_info() {
 		// $_column_headers is already set / cached
-		if ( isset( $this->_column_headers ) && is_array( $this->_column_headers ) ) {
+		if (isset($this->_column_headers) && is_array($this->_column_headers)) {
 			// Back-compat for list tables that have been manually setting $_column_headers for horse reasons.
 			// In 4.3, we added a fourth argument for primary column.
-			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
-			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+			$column_headers = array(array(), array(), array(), $this->get_primary_column_name());
+			foreach ($this->_column_headers as $key => $value) {
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
 		}
 
-		$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_columns = $this->get_sortable_columns();
 		/**
@@ -950,22 +950,22 @@ 
 		 *
 		 * @param array $sortable_columns An array of sortable columns.
 		 */
-		$_sortable = apply_filters( "manage_{$this->screen->id}_sortable_columns", $sortable_columns );
+		$_sortable = apply_filters("manage_{$this->screen->id}_sortable_columns", $sortable_columns);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$data[1] = false;
 
 			$sortable[$id] = $data;
 		}
 
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 
 		return $this->_column_headers;
 	}
@@ -979,9 +979,9 @@ 
 	 * @return int
 	 */
 	public function get_column_count() {
-		list ( $columns, $hidden ) = $this->get_column_info();
-		$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
-		return count( $columns ) - count( $hidden );
+		list ($columns, $hidden) = $this->get_column_info();
+		$hidden = array_intersect(array_keys($columns), array_filter($hidden));
+		return count($columns) - count($hidden);
 	}
 
 	/**
@@ -994,49 +994,49 @@ 
 	 *
 	 * @param bool $with_id Whether to set the id attribute or not
 	 */
-	public function print_column_headers( $with_id = true ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function print_column_headers($with_id = true) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-		$current_url = remove_query_arg( 'paged', $current_url );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+		$current_url = remove_query_arg('paged', $current_url);
 
-		if ( isset( $_GET['orderby'] ) )
+		if (isset($_GET['orderby']))
 			$current_orderby = $_GET['orderby'];
 		else
 			$current_orderby = '';
 
-		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+		if (isset($_GET['order']) && 'desc' == $_GET['order'])
 			$current_order = 'desc';
 		else
 			$current_order = 'asc';
 
-		if ( ! empty( $columns['cb'] ) ) {
+		if ( ! empty($columns['cb'])) {
 			static $cb_counter = 1;
-			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
-				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
+			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-'.$cb_counter.'">'.__('Select All').'</label>'
+				. '<input id="cb-select-all-'.$cb_counter.'" type="checkbox" />';
 			$cb_counter++;
 		}
 
-		foreach ( $columns as $column_key => $column_display_name ) {
-			$class = array( 'manage-column', "column-$column_key" );
+		foreach ($columns as $column_key => $column_display_name) {
+			$class = array('manage-column', "column-$column_key");
 
-			if ( in_array( $column_key, $hidden ) ) {
+			if (in_array($column_key, $hidden)) {
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' == $column_key )
+			if ('cb' == $column_key)
 				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
+			elseif (in_array($column_key, array('posts', 'comments', 'links')))
 				$class[] = 'num';
 
-			if ( $column_key === $primary ) {
+			if ($column_key === $primary) {
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[$column_key] ) ) {
-				list( $orderby, $desc_first ) = $sortable[$column_key];
+			if (isset($sortable[$column_key])) {
+				list($orderby, $desc_first) = $sortable[$column_key];
 
-				if ( $current_orderby == $orderby ) {
+				if ($current_orderby == $orderby) {
 					$order = 'asc' == $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
@@ -1046,15 +1046,15 @@ 
 					$class[] = $desc_first ? 'asc' : 'desc';
 				}
 
-				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
+				$column_display_name = '<a href="'.esc_url(add_query_arg(compact('orderby', 'order'), $current_url)).'"><span>'.$column_display_name.'</span><span class="sorting-indicator"></span></a>';
 			}
 
-			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
-			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
+			$tag = ('cb' === $column_key) ? 'td' : 'th';
+			$scope = ('th' === $tag) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( ! empty($class))
+				$class = "class='".join(' ', $class)."'";
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1069,9 +1069,9 @@ 
 	public function display() {
 		$singular = $this->_args['singular'];
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 ?>
-<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<table class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -1079,7 +1079,7 @@ 
 	</thead>
 
 	<tbody id="the-list"<?php
-		if ( $singular ) {
+		if ($singular) {
 			echo " data-wp-lists='list:$singular'";
 		} ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
@@ -1087,13 +1087,13 @@ 
 
 	<tfoot>
 	<tr>
-		<?php $this->print_column_headers( false ); ?>
+		<?php $this->print_column_headers(false); ?>
 	</tr>
 	</tfoot>
 
 </table>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -1105,7 +1105,7 @@ 
 	 * @return array List of CSS classes for the table tag.
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', $this->_args['plural'] );
+		return array('widefat', 'fixed', 'striped', $this->_args['plural']);
 	}
 
 	/**
@@ -1115,18 +1115,18 @@ 
 	 * @access protected
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' == $which )
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' == $which)
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 ?>
-	<div class="tablenav <?php echo esc_attr( $which ); ?>">
+	<div class="tablenav <?php echo esc_attr($which); ?>">
 
 		<div class="alignleft actions bulkactions">
-			<?php $this->bulk_actions( $which ); ?>
+			<?php $this->bulk_actions($which); ?>
 		</div>
 <?php
-		$this->extra_tablenav( $which );
-		$this->pagination( $which );
+		$this->extra_tablenav($which);
+		$this->pagination($which);
 ?>
 
 		<br class="clear" />
@@ -1142,7 +1142,7 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {}
+	protected function extra_tablenav($which) {}
 
 	/**
 	 * Generate the tbody element for the list table.
@@ -1151,10 +1151,10 @@ 
 	 * @access public
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+			echo '<tr class="no-items"><td class="colspanchange" colspan="'.$this->get_column_count().'">';
 			$this->no_items();
 			echo '</td></tr>';
 		}
@@ -1167,8 +1167,8 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
-			$this->single_row( $item );
+		foreach ($this->items as $item)
+			$this->single_row($item);
 	}
 
 	/**
@@ -1179,9 +1179,9 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		echo '<tr>';
-		$this->single_row_columns( $item );
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -1190,13 +1190,13 @@ 
 	 * @param object $item
 	 * @param string $column_name
 	 */
-	protected function column_default( $item, $column_name ) {}
+	protected function column_default($item, $column_name) {}
 
 	/**
 	 *
 	 * @param object $item
 	 */
-	protected function column_cb( $item ) {}
+	protected function column_cb($item) {}
 
 	/**
 	 * Generates the columns for a single row of the table
@@ -1206,46 +1206,46 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	protected function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	protected function single_row_columns($item) {
+		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 ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
 			// Comments column uses HTML in the display name with screen reader text.
 			// Instead of using esc_attr(), we strip tags to get closer to a user-friendly string.
-			$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) {
 				echo '<th scope="row" class="check-column">';
-				echo $this->column_cb( $item );
+				echo $this->column_cb($item);
 				echo '</th>';
-			} elseif ( method_exists( $this, '_column_' . $column_name ) ) {
+			} elseif (method_exists($this, '_column_'.$column_name)) {
 				echo call_user_func(
-					array( $this, '_column_' . $column_name ),
+					array($this, '_column_'.$column_name),
 					$item,
 					$classes,
 					$data,
 					$primary
 				);
-			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo call_user_func(array($this, 'column_'.$column_name), $item);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			} else {
 				echo "<td $attributes>";
-				echo $this->column_default( $item, $column_name );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo $this->column_default($item, $column_name);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -1262,8 +1262,8 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string The row actions HTML, or an empty string if the current column is the primary column.
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		return $column_name == $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+	protected function handle_row_actions($item, $column_name, $primary) {
+		return $column_name == $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">'.__('Show more details').'</span></button>' : '';
  	}
 
 	/**
@@ -1276,7 +1276,7 @@ 
 		$this->prepare_items();
 
 		ob_start();
-		if ( ! empty( $_REQUEST['no_placeholder'] ) ) {
+		if ( ! empty($_REQUEST['no_placeholder'])) {
 			$this->display_rows();
 		} else {
 			$this->display_rows_or_placeholder();
@@ -1284,20 +1284,20 @@ 
 
 		$rows = ob_get_clean();
 
-		$response = array( 'rows' => $rows );
+		$response = array('rows' => $rows);
 
-		if ( isset( $this->_pagination_args['total_items'] ) ) {
+		if (isset($this->_pagination_args['total_items'])) {
 			$response['total_items_i18n'] = sprintf(
-				_n( '%s item', '%s items', $this->_pagination_args['total_items'] ),
-				number_format_i18n( $this->_pagination_args['total_items'] )
+				_n('%s item', '%s items', $this->_pagination_args['total_items']),
+				number_format_i18n($this->_pagination_args['total_items'])
 			);
 		}
-		if ( isset( $this->_pagination_args['total_pages'] ) ) {
+		if (isset($this->_pagination_args['total_pages'])) {
 			$response['total_pages'] = $this->_pagination_args['total_pages'];
-			$response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
+			$response['total_pages_i18n'] = number_format_i18n($this->_pagination_args['total_pages']);
 		}
 
-		die( wp_json_encode( $response ) );
+		die(wp_json_encode($response));
 	}
 
 	/**
@@ -1307,13 +1307,13 @@ 
 	 */
 	public function _js_vars() {
 		$args = array(
-			'class'  => get_class( $this ),
+			'class'  => get_class($this),
 			'screen' => array(
 				'id'   => $this->screen->id,
 				'base' => $this->screen->base,
 			)
 		);
 
-		printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode($args));
 	}
 }

Braces +92 added lines, -64 removed lines

@@ -124,8 +124,9 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
-			$args['plural'] = $this->screen->base;
+		if ( !$args['plural'] ) {
+					$args['plural'] = $this->screen->base;
+		}
 
 		$args['plural'] = sanitize_key( $args['plural'] );
 		$args['singular'] = sanitize_key( $args['singular'] );
@@ -260,8 +261,9 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( !$args['total_pages'] && $args['per_page'] > 0 ) {
+					$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		}
 
 		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
@@ -283,11 +285,13 @@ 
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
 	public function get_pagination_arg( $key ) {
-		if ( 'page' == $key )
-			return $this->get_pagenum();
+		if ( 'page' == $key ) {
+					return $this->get_pagenum();
+		}
 
-		if ( isset( $this->_pagination_args[$key] ) )
-			return $this->_pagination_args[$key];
+		if ( isset( $this->_pagination_args[$key] ) ) {
+					return $this->_pagination_args[$key];
+		}
 	}
 
 	/**
@@ -322,20 +326,25 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
-			return;
+		if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) {
+					return;
+		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
-?>
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
+					echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['order'] ) ) {
+					echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
+					echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['detached'] ) ) {
+					echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		}
+		?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
@@ -377,8 +386,9 @@ 
 		 */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
-		if ( empty( $views ) )
-			return;
+		if ( empty( $views ) ) {
+					return;
+		}
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
@@ -432,8 +442,9 @@ 
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
-			return;
+		if ( empty( $this->_actions ) ) {
+					return;
+		}
 
 		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
 		echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
@@ -460,14 +471,17 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
-			return false;
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) ) {
+					return false;
+		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
-			return $_REQUEST['action'];
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
+					return $_REQUEST['action'];
+		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
-			return $_REQUEST['action2'];
+		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
+					return $_REQUEST['action2'];
+		}
 
 		return false;
 	}
@@ -486,8 +500,9 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
-			return '';
+		if ( !$action_count ) {
+					return '';
+		}
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
@@ -547,8 +562,9 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-			return;
+		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+					return;
+		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
@@ -557,8 +573,9 @@ 
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
-				continue;
+			if ( 0 == $arc_row->year ) {
+							continue;
+			}
 
 			$month = zeroise( $arc_row->month, 2 );
 			$year = $arc_row->year;
@@ -590,8 +607,9 @@ 
 <?php
 			foreach ( $this->modes as $mode => $title ) {
 				$classes = array( 'view-' . $mode );
-				if ( $current_mode == $mode )
-					$classes[] = 'current';
+				if ( $current_mode == $mode ) {
+									$classes[] = 'current';
+				}
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
 					esc_url( add_query_arg( 'mode', $mode ) ),
@@ -667,8 +685,9 @@ 
 	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
-			$pagenum = $this->_pagination_args['total_pages'];
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) {
+					$pagenum = $this->_pagination_args['total_pages'];
+		}
 
 		return max( 1, $pagenum );
 	}
@@ -685,8 +704,9 @@ 
 	 */
 	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
-			$per_page = $default;
+		if ( empty( $per_page ) || $per_page < 1 ) {
+					$per_page = $default;
+		}
 
 		/**
 		 * Filter the number of items to be displayed on each page of the list table.
@@ -954,12 +974,14 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
-				$data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$data[1] = false;
+			}
 
 			$sortable[$id] = $data;
 		}
@@ -1000,15 +1022,17 @@ 
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$current_url = remove_query_arg( 'paged', $current_url );
 
-		if ( isset( $_GET['orderby'] ) )
-			$current_orderby = $_GET['orderby'];
-		else
-			$current_orderby = '';
+		if ( isset( $_GET['orderby'] ) ) {
+					$current_orderby = $_GET['orderby'];
+		} else {
+					$current_orderby = '';
+		}
 
-		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
-			$current_order = 'desc';
-		else
-			$current_order = 'asc';
+		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] ) {
+					$current_order = 'desc';
+		} else {
+					$current_order = 'asc';
+		}
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
@@ -1024,10 +1048,11 @@ 
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' == $column_key )
-				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
-				$class[] = 'num';
+			if ( 'cb' == $column_key ) {
+							$class[] = 'check-column';
+			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
+							$class[] = 'num';
+			}
 
 			if ( $column_key === $primary ) {
 				$class[] = 'column-primary';
@@ -1053,8 +1078,9 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( !empty( $class ) ) {
+							$class = "class='" . join( ' ', $class ) . "'";
+			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1116,9 +1142,10 @@ 
 	 * @param string $which
 	 */
 	protected function display_tablenav( $which ) {
-		if ( 'top' == $which )
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-?>
+		if ( 'top' == $which ) {
+					wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		}
+		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
 		<div class="alignleft actions bulkactions">
@@ -1167,8 +1194,9 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
-			$this->single_row( $item );
+		foreach ( $this->items as $item ) {
+					$this->single_row( $item );
+		}
 	}
 
 	/**

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +153 added lines, -153 removed lines

@@ -27,24 +27,24 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'themes',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
-		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
+		$status = isset($_REQUEST['theme_status']) ? $_REQUEST['theme_status'] : 'all';
+		if ( ! in_array($status, array('all', 'enabled', 'disabled', 'upgrade', 'search', 'broken')))
 			$status = 'all';
 
 		$page = $this->get_pagenum();
 
-		$this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
+		$this->is_site_themes = ('site-themes-network' == $this->screen->id) ? true : false;
 
-		if ( $this->is_site_themes )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ($this->is_site_themes)
+			$this->site_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	protected function get_table_classes() {
 		// todo: remove and add CSS for .themes
-		return array( 'widefat', 'plugins' );
+		return array('widefat', 'plugins');
 	}
 
 	/**
@@ -61,10 +61,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_themes )
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_themes)
+			return current_user_can('manage_sites');
 		else
-			return current_user_can( 'manage_network_themes' );
+			return current_user_can('manage_network_themes');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	public function prepare_items() {
 		global $status, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('orderby', 'order', 's'));
 
 		$themes = array(
 			/**
@@ -90,78 +90,78 @@ 
 			 *
 			 * @param array $all An array of WP_Theme objects to display in the list table.
 			 */
-			'all' => apply_filters( 'all_themes', wp_get_themes() ),
+			'all' => apply_filters('all_themes', wp_get_themes()),
 			'search' => array(),
 			'enabled' => array(),
 			'disabled' => array(),
 			'upgrade' => array(),
-			'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
+			'broken' => $this->is_site_themes ? array() : wp_get_themes(array('errors' => true)),
 		);
 
-		if ( $this->is_site_themes ) {
-			$themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
+		if ($this->is_site_themes) {
+			$themes_per_page = $this->get_items_per_page('site_themes_network_per_page');
 			$allowed_where = 'site';
 		} else {
-			$themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
+			$themes_per_page = $this->get_items_per_page('themes_network_per_page');
 			$allowed_where = 'network';
 		}
 
-		$maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
+		$maybe_update = current_user_can('update_themes') && ! $this->is_site_themes && $current = get_site_transient('update_themes');
 
-		foreach ( (array) $themes['all'] as $key => $theme ) {
-			if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
-				unset( $themes['all'][ $key ] );
+		foreach ((array) $themes['all'] as $key => $theme) {
+			if ($this->is_site_themes && $theme->is_allowed('network')) {
+				unset($themes['all'][$key]);
 				continue;
 			}
 
-			if ( $maybe_update && isset( $current->response[ $key ] ) ) {
-				$themes['all'][ $key ]->update = true;
-				$themes['upgrade'][ $key ] = $themes['all'][ $key ];
+			if ($maybe_update && isset($current->response[$key])) {
+				$themes['all'][$key]->update = true;
+				$themes['upgrade'][$key] = $themes['all'][$key];
 			}
 
-			$filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
-			$themes[ $filter ][ $key ] = $themes['all'][ $key ];
+			$filter = $theme->is_allowed($allowed_where, $this->site_id) ? 'enabled' : 'disabled';
+			$themes[$filter][$key] = $themes['all'][$key];
 		}
 
-		if ( $s ) {
+		if ($s) {
 			$status = 'search';
-			$themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
+			$themes['search'] = array_filter(array_merge($themes['all'], $themes['broken']), array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $themes as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($themes as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($themes[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
-		$this->items = $themes[ $status ];
-		WP_Theme::sort_by_name( $this->items );
+		$this->items = $themes[$status];
+		WP_Theme::sort_by_name($this->items);
 
-		$this->has_items = ! empty( $themes['all'] );
-		$total_this_page = $totals[ $status ];
+		$this->has_items = ! empty($themes['all']);
+		$total_this_page = $totals[$status];
 
-		if ( $orderby ) {
-			$orderby = ucfirst( $orderby );
-			$order = strtoupper( $order );
+		if ($orderby) {
+			$orderby = ucfirst($orderby);
+			$order = strtoupper($order);
 
-			if ( $orderby == 'Name' ) {
-				if ( 'ASC' == $order )
-					$this->items = array_reverse( $this->items );
+			if ($orderby == 'Name') {
+				if ('ASC' == $order)
+					$this->items = array_reverse($this->items);
 			} else {
-				uasort( $this->items, array( $this, '_order_callback' ) );
+				uasort($this->items, array($this, '_order_callback'));
 			}
 		}
 
-		$start = ( $page - 1 ) * $themes_per_page;
+		$start = ($page - 1) * $themes_per_page;
 
-		if ( $total_this_page > $themes_per_page )
-			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		if ($total_this_page > $themes_per_page)
+			$this->items = array_slice($this->items, $start, $themes_per_page, true);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $themes_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -169,21 +169,21 @@ 
 	 * @param WP_Theme $theme
 	 * @return bool
 	 */
-	public function _search_callback( $theme ) {
+	public function _search_callback($theme) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if (is_null($term))
+			$term = wp_unslash($_REQUEST['s']);
 
-		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
+		foreach (array('Name', 'Description', 'Author', 'Author', 'AuthorURI') as $field) {
 			// Don't mark up; Do translate.
-			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
+			if (false !== stripos($theme->display($field, false, true), $term))
 				return true;
 		}
 
-		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
+		if (false !== stripos($theme->get_stylesheet(), $term))
 			return true;
 
-		if ( false !== stripos( $theme->get_template(), $term ) )
+		if (false !== stripos($theme->get_template(), $term))
 			return true;
 
 		return false;
@@ -197,29 +197,29 @@ 
 	 * @param array $theme_b
 	 * @return int
 	 */
-	public function _order_callback( $theme_a, $theme_b ) {
+	public function _order_callback($theme_a, $theme_b) {
 		global $orderby, $order;
 
-		$a = $theme_a[ $orderby ];
-		$b = $theme_b[ $orderby ];
+		$a = $theme_a[$orderby];
+		$b = $theme_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' == $order )
-			return ( $a < $b ) ? 1 : -1;
+		if ('DESC' == $order)
+			return ($a < $b) ? 1 : -1;
 		else
-			return ( $a < $b ) ? -1 : 1;
+			return ($a < $b) ? -1 : 1;
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		if ( ! $this->has_items )
-			_e( 'No themes found.' );
+		if ( ! $this->has_items)
+			_e('No themes found.');
 		else
-			_e( 'You do not appear to have any themes available at this time.' );
+			_e('You do not appear to have any themes available at this time.');
 	}
 
 	/**
@@ -229,8 +229,8 @@ 
 	public function get_columns() {
 		return array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => __( 'Theme' ),
-			'description' => __( 'Description' ),
+			'name'        => __('Theme'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -266,38 +266,38 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes');
 					break;
 				case 'enabled':
-					$text = _n( 'Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count );
+					$text = _n('Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count);
 					break;
 				case 'disabled':
-					$text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count );
+					$text = _n('Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 				case 'broken' :
-					$text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
+					$text = _n('Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( $this->is_site_themes )
-				$url = 'site-themes.php?id=' . $this->site_id;
+			if ($this->is_site_themes)
+				$url = 'site-themes.php?id='.$this->site_id;
 			else
 				$url = 'themes.php';
 
-			if ( 'search' != $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-					esc_url( add_query_arg('theme_status', $type, $url) ),
-					( $type == $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+			if ('search' != $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
+					esc_url(add_query_arg('theme_status', $type, $url)),
+					($type == $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 				);
 			}
 		}
@@ -314,15 +314,15 @@ 
 		global $status;
 
 		$actions = array();
-		if ( 'enabled' != $status )
-			$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-		if ( 'disabled' != $status )
-			$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
-		if ( ! $this->is_site_themes ) {
-			if ( current_user_can( 'update_themes' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_themes' ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ('enabled' != $status)
+			$actions['enable-selected'] = $this->is_site_themes ? __('Enable') : __('Network Enable');
+		if ('disabled' != $status)
+			$actions['disable-selected'] = $this->is_site_themes ? __('Disable') : __('Network Disable');
+		if ( ! $this->is_site_themes) {
+			if (current_user_can('update_themes'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_themes'))
+				$actions['delete-selected'] = __('Delete');
 		}
 		return $actions;
 	}
@@ -331,8 +331,8 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $theme )
-			$this->single_row( $theme );
+		foreach ($this->items as $theme)
+			$this->single_row($theme);
 	}
 
 	/**
@@ -343,11 +343,11 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_cb( $theme ) {
-		$checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+	public function column_cb($theme) {
+		$checkbox_id = 'checkbox_'.md5($theme->get('Name'));
 		?>
-		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
-		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+		<input type="checkbox" name="checked[]" value="<?php echo esc_attr($theme->get_stylesheet()) ?>" id="<?php echo $checkbox_id ?>" />
+		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e('Select') ?>  <?php echo $theme->display('Name') ?></label>
 		<?php
 	}
 
@@ -363,17 +363,17 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_name( $theme ) {
+	public function column_name($theme) {
 		global $status, $page, $s;
 
 		$context = $status;
 
-		if ( $this->is_site_themes ) {
+		if ($this->is_site_themes) {
 			$url = "site-themes.php?id={$this->site_id}&amp;";
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
 			$url = 'themes.php?';
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		// Pre-order.
@@ -385,22 +385,22 @@ 
 		);
 
 		$stylesheet = $theme->get_stylesheet();
-		$theme_key = urlencode( $stylesheet );
+		$theme_key = urlencode($stylesheet);
 
-		if ( ! $allowed ) {
-			if ( ! $theme->errors() ) {
-				$actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
+		if ( ! $allowed) {
+			if ( ! $theme->errors()) {
+				$actions['enable'] = '<a href="'.esc_url(wp_nonce_url($url.'action=enable&amp;theme='.$theme_key.'&amp;paged='.$page.'&amp;s='.$s, 'enable-theme_'.$stylesheet)).'" title="'.esc_attr__('Enable this theme').'" class="edit">'.($this->is_site_themes ? __('Enable') : __('Network Enable')).'</a>';
 			}
 		} else {
-			$actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
+			$actions['disable'] = '<a href="'.esc_url(wp_nonce_url($url.'action=disable&amp;theme='.$theme_key.'&amp;paged='.$page.'&amp;s='.$s, 'disable-theme_'.$stylesheet)).'" title="'.esc_attr__('Disable this theme').'">'.($this->is_site_themes ? __('Disable') : __('Network Disable')).'</a>';
 		}
 
-		if ( current_user_can('edit_themes') ) {
-			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . $theme_key ) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
+		if (current_user_can('edit_themes')) {
+			$actions['edit'] = '<a href="'.esc_url('theme-editor.php?theme='.$theme_key).'" title="'.esc_attr__('Open this theme in the Theme Editor').'" class="edit">'.__('Edit').'</a>';
 		}
 
-		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
-			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&amp;checked[]=' . $theme_key . '&amp;theme_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+		if ( ! $allowed && current_user_can('delete_themes') && ! $this->is_site_themes && $stylesheet != get_option('stylesheet') && $stylesheet != get_option('template')) {
+			$actions['delete'] = '<a href="'.esc_url(wp_nonce_url('themes.php?action=delete-selected&amp;checked[]='.$theme_key.'&amp;theme_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-themes')).'" title="'.esc_attr__('Delete this theme').'" class="delete">'.__('Delete').'</a>';
 		}
 		/**
 		 * Filter the action links displayed for each theme in the Multisite
@@ -424,7 +424,7 @@ 
 		 * @param WP_Theme $theme   The current WP_Theme object.
 		 * @param string   $context Status of the theme.
 		 */
-		$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
+		$actions = apply_filters('theme_action_links', array_filter($actions), $theme, $context);
 
 		/**
 		 * Filter the action links of a specific theme in the Multisite themes
@@ -440,9 +440,9 @@ 
 		 * @param WP_Theme $theme   The current WP_Theme object.
 		 * @param string   $context Status of the theme.
 		 */
-		$actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
+		$actions = apply_filters("theme_action_links_$stylesheet", $actions, $theme, $context);
 
-		echo $this->row_actions( $actions, true );
+		echo $this->row_actions($actions, true);
 	}
 
 	/**
@@ -456,36 +456,36 @@ 
 	 *
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function column_description( $theme ) {
+	public function column_description($theme) {
 		global $status, $totals;
-		if ( $theme->errors() ) {
-			$pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
-			echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+		if ($theme->errors()) {
+			$pre = $status == 'broken' ? __('Broken Theme:').' ' : '';
+			echo '<p><strong class="error-message">'.$pre.$theme->errors()->get_error_message().'</strong></p>';
 		}
 
-		if ( $this->is_site_themes ) {
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		if ($this->is_site_themes) {
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+		if ( ! empty($totals['upgrade']) && ! empty($theme->update))
 			$class .= ' update';
 
-		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+		echo "<div class='theme-description'><p>".$theme->display('Description')."</p></div>
 			<div class='$class second theme-version-author-uri'>";
 
 		$stylesheet = $theme->get_stylesheet();
 		$theme_meta = array();
 
-		if ( $theme->get('Version') ) {
-			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+		if ($theme->get('Version')) {
+			$theme_meta[] = sprintf(__('Version %s'), $theme->display('Version'));
 		}
-		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+		$theme_meta[] = sprintf(__('By %s'), $theme->display('Author'));
 
-		if ( $theme->get('ThemeURI') ) {
-			$theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
+		if ($theme->get('ThemeURI')) {
+			$theme_meta[] = '<a href="'.$theme->display('ThemeURI').'" title="'.esc_attr__('Visit theme homepage').'">'.__('Visit Theme Site').'</a>';
 		}
 		/**
 		 * Filter the array of row meta for each theme in the Multisite themes
@@ -500,8 +500,8 @@ 
 		 * @param WP_Theme $theme      WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
-		echo implode( ' | ', $theme_meta );
+		$theme_meta = apply_filters('theme_row_meta', $theme_meta, $stylesheet, $theme, $status);
+		echo implode(' | ', $theme_meta);
 
 		echo '</div>';
 	}
@@ -515,7 +515,7 @@ 
 	 * @param WP_Theme $theme       The current WP_Theme object.
 	 * @param string   $column_name The current column name.
 	 */
-	public function column_default( $theme, $column_name ) {
+	public function column_default($theme, $column_name) {
 		$stylesheet = $theme->get_stylesheet();
 
 		/**
@@ -527,7 +527,7 @@ 
 		 * @param string   $stylesheet  Directory name of the theme.
 		 * @param WP_Theme $theme       Current WP_Theme object.
 		 */
-		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+		do_action('manage_themes_custom_column', $column_name, $stylesheet, $theme);
 	}
 
 	/**
@@ -538,28 +538,28 @@ 
 	 *
 	 * @param WP_Theme $item The current WP_Theme object.
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes .= ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo '<th scope="row" class="check-column">';
 
-					$this->column_cb( $item );
+					$this->column_cb($item);
 
 					echo '</th>';
 					break;
 
 				case 'name':
-					echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+					echo "<td class='theme-title column-primary{$extra_classes}'><strong>".$item->display('Name')."</strong>";
 
-					$this->column_name( $item );
+					$this->column_name($item);
 
 					echo "</td>";
 					break;
@@ -567,7 +567,7 @@ 
 				case 'description':
 					echo "<td class='column-description desc{$extra_classes}'>";
 
-					$this->column_description( $item );
+					$this->column_description($item);
 
 					echo '</td>';
 					break;
@@ -575,7 +575,7 @@ 
 				default:
 					echo "<td class='$column_name column-$column_name{$extra_classes}'>";
 
-					$this->column_default( $item, $column_name );
+					$this->column_default($item, $column_name);
 
 					echo "</td>";
 					break;
@@ -589,33 +589,33 @@ 
 	 *
 	 * @param WP_Theme $theme
 	 */
-	public function single_row( $theme ) {
+	public function single_row($theme) {
 		global $status, $totals;
 
-		if ( $this->is_site_themes ) {
-			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		if ($this->is_site_themes) {
+			$allowed = $theme->is_allowed('site', $this->site_id);
 		} else {
-			$allowed = $theme->is_allowed( 'network' );
+			$allowed = $theme->is_allowed('network');
 		}
 
 		$stylesheet = $theme->get_stylesheet();
 
 		$class = ! $allowed ? 'inactive' : 'active';
 
-		$id = sanitize_html_class( $theme->get_stylesheet() );
+		$id = sanitize_html_class($theme->get_stylesheet());
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+		if ( ! empty($totals['upgrade']) && ! empty($theme->update)) {
 			$class .= ' update';
 		}
 
 		echo "<tr id='$id' class='$class'>";
 
-		$this->single_row_columns( $theme );
+		$this->single_row_columns($theme);
 
 		echo "</tr>";
 
-		if ( $this->is_site_themes )
-			remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		if ($this->is_site_themes)
+			remove_action("after_theme_row_$stylesheet", 'wp_theme_update_row');
 
 		/**
 		 * Fires after each row in the Multisite themes list table.
@@ -626,7 +626,7 @@ 
 		 * @param WP_Theme $theme      Current WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		do_action( 'after_theme_row', $stylesheet, $theme, $status );
+		do_action('after_theme_row', $stylesheet, $theme, $status);
 
 		/**
 		 * Fires after each specific row in the Multisite themes list table.
@@ -641,6 +641,6 @@ 
 		 * @param WP_Theme $theme      Current WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		do_action( "after_theme_row_$stylesheet", $stylesheet, $theme, $status );
+		do_action("after_theme_row_$stylesheet", $stylesheet, $theme, $status);
 	}
 }

Braces +77 added lines, -54 removed lines

@@ -36,15 +36,17 @@ 
 		) );
 
 		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
-			$status = 'all';
+		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) {
+					$status = 'all';
+		}
 
 		$page = $this->get_pagenum();
 
 		$this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
 
-		if ( $this->is_site_themes )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ( $this->is_site_themes ) {
+					$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
@@ -61,10 +63,11 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_themes )
-			return current_user_can( 'manage_sites' );
-		else
-			return current_user_can( 'manage_network_themes' );
+		if ( $this->is_site_themes ) {
+					return current_user_can( 'manage_sites' );
+		} else {
+					return current_user_can( 'manage_network_themes' );
+		}
 	}
 
 	/**
@@ -129,11 +132,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $themes as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $themes as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = $themes[ $status ];
 		WP_Theme::sort_by_name( $this->items );
@@ -146,8 +151,9 @@ 
 			$order = strtoupper( $order );
 
 			if ( $orderby == 'Name' ) {
-				if ( 'ASC' == $order )
-					$this->items = array_reverse( $this->items );
+				if ( 'ASC' == $order ) {
+									$this->items = array_reverse( $this->items );
+				}
 			} else {
 				uasort( $this->items, array( $this, '_order_callback' ) );
 			}
@@ -155,8 +161,9 @@ 
 
 		$start = ( $page - 1 ) * $themes_per_page;
 
-		if ( $total_this_page > $themes_per_page )
-			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		if ( $total_this_page > $themes_per_page ) {
+					$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -171,20 +178,24 @@ 
 	 */
 	public function _search_callback( $theme ) {
 		static $term = null;
-		if ( is_null( $term ) )
-			$term = wp_unslash( $_REQUEST['s'] );
+		if ( is_null( $term ) ) {
+					$term = wp_unslash( $_REQUEST['s'] );
+		}
 
 		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
 			// Don't mark up; Do translate.
-			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
-				return true;
+			if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) {
+							return true;
+			}
 		}
 
-		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
-			return true;
+		if ( false !== stripos( $theme->get_stylesheet(), $term ) ) {
+					return true;
+		}
 
-		if ( false !== stripos( $theme->get_template(), $term ) )
-			return true;
+		if ( false !== stripos( $theme->get_template(), $term ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -203,23 +214,26 @@ 
 		$a = $theme_a[ $orderby ];
 		$b = $theme_b[ $orderby ];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
-		if ( 'DESC' == $order )
-			return ( $a < $b ) ? 1 : -1;
-		else
-			return ( $a < $b ) ? -1 : 1;
+		if ( 'DESC' == $order ) {
+					return ( $a < $b ) ? 1 : -1;
+		} else {
+					return ( $a < $b ) ? -1 : 1;
+		}
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		if ( ! $this->has_items )
-			_e( 'No themes found.' );
-		else
-			_e( 'You do not appear to have any themes available at this time.' );
+		if ( ! $this->has_items ) {
+					_e( 'No themes found.' );
+		} else {
+					_e( 'You do not appear to have any themes available at this time.' );
+		}
 	}
 
 	/**
@@ -267,8 +281,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -288,10 +303,11 @@ 
 					break;
 			}
 
-			if ( $this->is_site_themes )
-				$url = 'site-themes.php?id=' . $this->site_id;
-			else
-				$url = 'themes.php';
+			if ( $this->is_site_themes ) {
+							$url = 'site-themes.php?id=' . $this->site_id;
+			} else {
+							$url = 'themes.php';
+			}
 
 			if ( 'search' != $type ) {
 				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
@@ -314,15 +330,19 @@ 
 		global $status;
 
 		$actions = array();
-		if ( 'enabled' != $status )
-			$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-		if ( 'disabled' != $status )
-			$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+		if ( 'enabled' != $status ) {
+					$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
+		}
+		if ( 'disabled' != $status ) {
+					$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+		}
 		if ( ! $this->is_site_themes ) {
-			if ( current_user_can( 'update_themes' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_themes' ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_themes' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_themes' ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 		return $actions;
 	}
@@ -331,8 +351,9 @@ 
 	 * @access public
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $theme )
-			$this->single_row( $theme );
+		foreach ( $this->items as $theme ) {
+					$this->single_row( $theme );
+		}
 	}
 
 	/**
@@ -470,8 +491,9 @@ 
 		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+					$class .= ' update';
+		}
 
 		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
 			<div class='$class second theme-version-author-uri'>";
@@ -614,8 +636,9 @@ 
 
 		echo "</tr>";
 
-		if ( $this->is_site_themes )
-			remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		if ( $this->is_site_themes ) {
+					remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		}
 
 		/**
 		 * Fires after each row in the Multisite themes list table.

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

Doc Comments +1 added lines, -1 removed lines

@@ -389,7 +389,7 @@
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $user        User being acted upon.
+	 * @param WP_User $user        User being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for users in Multisite.

Indentation +7 added lines, -7 removed lines

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

Spacing +90 added lines, -90 removed lines

@@ -13,7 +13,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_network_users' );
+		return current_user_can('manage_network_users');
 	}
 
 	/**
@@ -26,28 +26,28 @@ 
 	public function prepare_items() {
 		global $usersearch, $role, $wpdb, $mode;
 
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$usersearch = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 
-		$users_per_page = $this->get_items_per_page( 'users_network_per_page' );
+		$users_per_page = $this->get_items_per_page('users_network_per_page');
 
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+		$role = isset($_REQUEST['role']) ? $_REQUEST['role'] : '';
 
 		$paged = $this->get_pagenum();
 
 		$args = array(
 			'number' => $users_per_page,
-			'offset' => ( $paged-1 ) * $users_per_page,
+			'offset' => ($paged - 1) * $users_per_page,
 			'search' => $usersearch,
 			'blog_id' => 0,
 			'fields' => 'all_with_meta'
 		);
 
-		if ( wp_is_large_network( 'users' ) )
-			$args['search'] = ltrim( $args['search'], '*' );
+		if (wp_is_large_network('users'))
+			$args['search'] = ltrim($args['search'], '*');
 
-		if ( $role == 'super' ) {
-			$logins = implode( "', '", get_super_admins() );
-			$args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
+		if ($role == 'super') {
+			$logins = implode("', '", get_super_admins());
+			$args['include'] = $wpdb->get_col("SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')");
 		}
 
 		/*
@@ -55,31 +55,31 @@ 
 		 * show only the latest users with no paging in order to avoid
 		 * expensive count queries.
 		 */
-		if ( !$usersearch && wp_is_large_network( 'users' ) ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $usersearch && wp_is_large_network('users')) {
+			if ( ! isset($_REQUEST['orderby']))
 				$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
-			if ( !isset($_REQUEST['order']) )
+			if ( ! isset($_REQUEST['order']))
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
 			$args['count_total'] = false;
 		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if (isset($_REQUEST['orderby']))
 			$args['orderby'] = $_REQUEST['orderby'];
 
-		if ( isset( $_REQUEST['order'] ) )
+		if (isset($_REQUEST['order']))
 			$args['order'] = $_REQUEST['order'];
 
-		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		$mode = empty($_REQUEST['mode']) ? 'list' : $_REQUEST['mode'];
 
 		// 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,
-		) );
+		));
 	}
 
 	/**
@@ -88,10 +88,10 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_users' ) )
-			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'user' );
-		$actions['notspam'] = _x( 'Not Spam', 'user' );
+		if (current_user_can('delete_users'))
+			$actions['delete'] = __('Delete');
+		$actions['spam'] = _x('Mark as Spam', 'user');
+		$actions['notspam'] = _x('Not Spam', 'user');
 
 		return $actions;
 	}
@@ -100,7 +100,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -113,13 +113,13 @@ 
 
 		$total_users = get_user_count();
 		$super_admins = get_super_admins();
-		$total_admins = count( $super_admins );
+		$total_admins = count($super_admins);
 
 		$class = $role != 'super' ? ' class="current"' : '';
 		$role_links = array();
-		$role_links['all'] = "<a href='" . network_admin_url('users.php') . "'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+		$role_links['all'] = "<a href='".network_admin_url('users.php')."'$class>".sprintf(_nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users'), number_format_i18n($total_users)).'</a>';
 		$class = $role == 'super' ? ' class="current"' : '';
-		$role_links['super'] = "<a href='" . network_admin_url('users.php?role=super') . "'$class>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
+		$role_links['super'] = "<a href='".network_admin_url('users.php?role=super')."'$class>".sprintf(_n('Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins), number_format_i18n($total_admins)).'</a>';
 
 		return $role_links;
 	}
@@ -128,13 +128,13 @@ 
 	 * @global string $mode
 	 * @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);
 	}
 
 	/**
@@ -144,11 +144,11 @@ 
 	public function get_columns() {
 		$users_columns = array(
 			'cb'         => '<input type="checkbox" />',
-			'username'   => __( 'Username' ),
-			'name'       => __( 'Name' ),
-			'email'      => __( 'E-mail' ),
-			'registered' => _x( 'Registered', 'user' ),
-			'blogs'      => __( 'Sites' )
+			'username'   => __('Username'),
+			'name'       => __('Name'),
+			'email'      => __('E-mail'),
+			'registered' => _x('Registered', 'user'),
+			'blogs'      => __('Sites')
 		);
 		/**
 		 * Filter the columns displayed in the Network Admin Users list table.
@@ -158,7 +158,7 @@ 
 		 * @param array $users_columns An array of user columns. Default 'cb', 'username',
 		 *                             'name', 'email', 'registered', 'blogs'.
 		 */
-		return apply_filters( 'wpmu_users_columns', $users_columns );
+		return apply_filters('wpmu_users_columns', $users_columns);
 	}
 
 	/**
@@ -182,10 +182,10 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_cb( $user ) {
+	public function column_cb($user) {
 		?>
-		<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
-		<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
+		<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf(__('Select %s'), $user->user_login); ?></label>
+		<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr($user->ID) ?>" />
 		<?php
 	}
 
@@ -197,16 +197,16 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_username( $user ) {
+	public function column_username($user) {
 		$super_admins = get_super_admins();
-		$avatar	= get_avatar( $user->user_email, 32 );
-		$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
+		$avatar = get_avatar($user->user_email, 32);
+		$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user->ID)));
 
 		echo $avatar;
 
 		?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo $user->user_login; ?></a><?php
-		if ( in_array( $user->user_login, $super_admins ) ) {
-			echo ' - ' . __( 'Super Admin' );
+		if (in_array($user->user_login, $super_admins)) {
+			echo ' - '.__('Super Admin');
 		}
 		?></strong>
 	<?php
@@ -220,7 +220,7 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_name( $user ) {
+	public function column_name($user) {
 		echo "$user->first_name $user->last_name";
 	}
 
@@ -232,7 +232,7 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_email( $user ) {
+	public function column_email($user) {
 		echo "<a href='mailto:$user->user_email'>$user->user_email</a>";
 	}
 
@@ -246,14 +246,14 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_registered( $user ) {
+	public function column_registered($user) {
 		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 mysql2date( $date, $user->user_registered );
+		echo mysql2date($date, $user->user_registered);
 	}
 
 	/**
@@ -265,10 +265,10 @@ 
 	 * @param string  $data
 	 * @param string  $primary
 	 */
-	protected function _column_blogs( $user, $classes, $data, $primary ) {
+	protected function _column_blogs($user, $classes, $data, $primary) {
 		echo '<td class="', $classes, ' has-row-actions" ', $data, '>';
-		echo $this->column_blogs( $user );
-		echo $this->handle_row_actions( $user, 'blogs', $primary );
+		echo $this->column_blogs($user);
+		echo $this->handle_row_actions($user, 'blogs', $primary);
 		echo '</td>';
 	}
 
@@ -280,39 +280,39 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object.
 	 */
-	public function column_blogs( $user ) {
-		$blogs = get_blogs_of_user( $user->ID, true );
-		if ( ! is_array( $blogs ) ) {
+	public function column_blogs($user) {
+		$blogs = get_blogs_of_user($user->ID, true);
+		if ( ! is_array($blogs)) {
 			return;
 		}
 
-		foreach ( $blogs as $val ) {
-			if ( ! can_edit_network( $val->site_id ) ) {
+		foreach ($blogs as $val) {
+			if ( ! can_edit_network($val->site_id)) {
 				continue;
 			}
 
-			$path	= ( $val->path == '/' ) ? '' : $val->path;
-			echo '<span class="site-' . $val->site_id . '" >';
-			echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
+			$path = ($val->path == '/') ? '' : $val->path;
+			echo '<span class="site-'.$val->site_id.'" >';
+			echo '<a href="'.esc_url(network_admin_url('site-info.php?id='.$val->userblog_id)).'">'.str_replace('.'.get_current_site()->domain, '', $val->domain.$path).'</a>';
 			echo ' <small class="row-actions">';
 			$actions = array();
-			$actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
+			$actions['edit'] = '<a href="'.esc_url(network_admin_url('site-info.php?id='.$val->userblog_id)).'">'.__('Edit').'</a>';
 
 			$class = '';
-			if ( $val->spam == 1 ) {
+			if ($val->spam == 1) {
 				$class .= 'site-spammed ';
 			}
-			if ( $val->mature == 1 ) {
+			if ($val->mature == 1) {
 				$class .= 'site-mature ';
 			}
-			if ( $val->deleted == 1 ) {
+			if ($val->deleted == 1) {
 				$class .= 'site-deleted ';
 			}
-			if ( $val->archived == 1 ) {
+			if ($val->archived == 1) {
 				$class .= 'site-archived ';
 			}
 
-			$actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
+			$actions['view'] = '<a class="'.$class.'" href="'.esc_url(get_home_url($val->userblog_id)).'">'.__('View').'</a>';
 
 			/**
 			 * Filter the action links displayed next the sites a user belongs to
@@ -324,13 +324,13 @@ 
 			 *                           Default 'Edit', 'View'.
 			 * @param int   $userblog_id The site ID.
 			 */
-			$actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
+			$actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);
 
-			$i=0;
-			$action_count = count( $actions );
-			foreach ( $actions as $action => $link ) {
+			$i = 0;
+			$action_count = count($actions);
+			foreach ($actions as $action => $link) {
 				++$i;
-				$sep = ( $i == $action_count ) ? '' : ' | ';
+				$sep = ($i == $action_count) ? '' : ' | ';
 				echo "<span class='$action'>$link$sep</span>";
 			}
 			echo '</small></span><br/>';
@@ -346,26 +346,26 @@ 
 	 * @param WP_User $user       The current WP_User object.
 	 * @param string $column_name The current column name.
 	 */
-	public function column_default( $user, $column_name ) {
+	public function column_default($user, $column_name) {
 		/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
-		echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
+		echo apply_filters('manage_users_custom_column', '', $column_name, $user->ID);
 	}
 
 	public function display_rows() {
-		foreach ( $this->items as $user ) {
+		foreach ($this->items as $user) {
 			$class = '';
 
-			$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
+			$status_list = array('spam' => 'site-spammed', 'deleted' => 'site-deleted');
 
-			foreach ( $status_list as $status => $col ) {
-				if ( $user->$status ) {
+			foreach ($status_list as $status => $col) {
+				if ($user->$status) {
 					$class .= " $col";
 				}
 			}
 
 			?>
-			<tr class="<?php echo trim( $class ); ?>">
-				<?php $this->single_row_columns( $user ); ?>
+			<tr class="<?php echo trim($class); ?>">
+				<?php $this->single_row_columns($user); ?>
 			</tr>
 			<?php
 		}
@@ -394,19 +394,19 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for users in Multisite.
 	 */
-	protected function handle_row_actions( $user, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($user, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		$super_admins = get_super_admins();
-		$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
+		$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user->ID)));
 
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+		$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
 
-		if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
-			$actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+		if (current_user_can('delete_user', $user->ID) && ! in_array($user->user_login, $super_admins)) {
+			$actions['delete'] = '<a href="'.$delete = esc_url(network_admin_url(add_query_arg('_wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), wp_nonce_url('users.php', 'deleteuser').'&amp;action=deleteuser&amp;id='.$user->ID))).'" class="delete">'.__('Delete').'</a>';
 		}
 
 		/**
@@ -418,7 +418,7 @@ 
 		 *                         Default 'Edit', 'Delete'.
 		 * @param WP_User $user    WP_User object.
 		 */
-		$actions = apply_filters( 'ms_user_row_actions', $actions, $user );
-		return $this->row_actions( $actions );
+		$actions = apply_filters('ms_user_row_actions', $actions, $user);
+		return $this->row_actions($actions);
 	}
 }

Braces +21 added lines, -14 removed lines

@@ -42,8 +42,9 @@ 
 			'fields' => 'all_with_meta'
 		);
 
-		if ( wp_is_large_network( 'users' ) )
-			$args['search'] = ltrim( $args['search'], '*' );
+		if ( wp_is_large_network( 'users' ) ) {
+					$args['search'] = ltrim( $args['search'], '*' );
+		}
 
 		if ( $role == 'super' ) {
 			$logins = implode( "', '", get_super_admins() );
@@ -56,18 +57,22 @@ 
 		 * expensive count queries.
 		 */
 		if ( !$usersearch && wp_is_large_network( 'users' ) ) {
-			if ( !isset($_REQUEST['orderby']) )
-				$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
-			if ( !isset($_REQUEST['order']) )
-				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			if ( !isset($_REQUEST['orderby']) ) {
+							$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
+			}
+			if ( !isset($_REQUEST['order']) ) {
+							$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 			$args['count_total'] = false;
 		}
 
-		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'];
+		}
 
 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
@@ -88,8 +93,9 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_users' ) )
-			$actions['delete'] = __( 'Delete' );
+		if ( current_user_can( 'delete_users' ) ) {
+					$actions['delete'] = __( 'Delete' );
+		}
 		$actions['spam'] = _x( 'Mark as Spam', 'user' );
 		$actions['notspam'] = _x( 'Not Spam', 'user' );
 
@@ -133,8 +139,9 @@ 
 
 		parent::pagination ( $which );
 
-		if ( 'top' == $which )
-			$this->view_switcher( $mode );
+		if ( 'top' == $which ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**

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

Doc Comments +3 added lines, -3 removed lines

@@ -183,7 +183,7 @@ 
 	 *
 	 * @since 4.2.0
 	 *
-	 * @return bool Whether the current view is the "All" view.
+	 * @return boolean|null Whether the current view is the "All" view.
 	 */
 	protected function is_base_request() {
 		if ( empty( $_GET ) ) {
@@ -375,7 +375,7 @@ 
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
@@ -1044,7 +1044,7 @@ 
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $post        Post being acted upon.
+	 * @param WP_Post $post        Post being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.

Indentation +11 added lines, -11 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * Posts List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Posts List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_Posts_List_Table extends WP_List_Table {
 
 	/**
@@ -1013,10 +1013,10 @@ 
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-'. $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1347,7 +1347,7 @@ 
     				<?php
 					/** This filter is documented in wp-admin/includes/meta-boxes.php */
 					$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-    				?>
+					?>
 					<option value="default"><?php echo esc_html( $default_title ); ?></option>
 					<?php page_template_dropdown() ?>
 				</select>

Spacing +390 added lines, -390 removed lines

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

Braces +125 added lines, -83 removed lines

@@ -88,8 +88,9 @@ 
 				AND post_author = %d
 			", $post_type, get_current_user_id() ) );
 
-			if ( $this->user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) )
-				$_GET['author'] = get_current_user_id();
+			if ( $this->user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+							$_GET['author'] = get_current_user_id();
+			}
 		}
 
 		if ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
@@ -139,10 +140,11 @@ 
 		/** This filter is documented in wp-admin/includes/post.php */
  		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
 
-		if ( $this->hierarchical_display )
-			$total_pages = ceil( $total_items / $per_page );
-		else
-			$total_pages = $wp_query->max_num_pages;
+		if ( $this->hierarchical_display ) {
+					$total_pages = ceil( $total_items / $per_page );
+		} else {
+					$total_pages = $wp_query->max_num_pages;
+		}
 
 		if ( ! empty( $_REQUEST['mode'] ) ) {
 			$mode = $_REQUEST['mode'] == 'excerpt' ? 'excerpt' : 'list';
@@ -172,10 +174,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -204,8 +207,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -215,8 +219,9 @@ 
 		$current_user_id = get_current_user_id();
 
 		if ( $this->user_posts_count ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
-				$class = ' class="current"';
+			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+							$class = ' class="current"';
+			}
 			$status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
 			$allposts = '&all_posts=1';
 			$class = '';
@@ -225,8 +230,9 @@ 
 		$total_posts = array_sum( (array) $num_posts );
 
 		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
-			$total_posts -= $num_posts->$state;
+		foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state ) {
+					$total_posts -= $num_posts->$state;
+		}
 
 		if ( empty( $class ) && ( ( $this->is_base_request() && ! $this->user_posts_count ) || isset( $_REQUEST['all_posts'] ) ) ) {
 			$class =  ' class="current"';
@@ -249,14 +255,17 @@ 
 
 			$status_name = $status->name;
 
-			if ( !in_array( $status_name, $avail_post_stati ) )
-				continue;
+			if ( !in_array( $status_name, $avail_post_stati ) ) {
+							continue;
+			}
 
-			if ( empty( $num_posts->$status_name ) )
-				continue;
+			if ( empty( $num_posts->$status_name ) ) {
+							continue;
+			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
-				$class = ' class="current"';
+			if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] ) {
+							$class = ' class="current"';
+			}
 
 			$status_links[$status_name] = "<a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
 		}
@@ -354,8 +363,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -369,8 +379,9 @@ 
 
 		parent::pagination( $which );
 
-		if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
-			$this->view_switcher( $mode );
+		if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**
@@ -417,19 +428,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' == $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' == $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' == $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' == $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -490,8 +503,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -513,13 +527,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -537,8 +553,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -562,10 +579,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -577,8 +595,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -586,16 +605,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -635,15 +656,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -658,8 +681,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1064,12 +1088,14 @@ 
 		}
 
 		if ( current_user_can( 'delete_post', $post->ID ) ) {
-			if ( 'trash' == $post->post_status )
-				$actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
-			elseif ( EMPTY_TRASH_DAYS )
-				$actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
-			if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-				$actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			if ( 'trash' == $post->post_status ) {
+							$actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+			} elseif ( EMPTY_TRASH_DAYS ) {
+							$actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+			}
+			if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS ) {
+							$actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			}
 		}
 
 		if ( is_post_type_viewable( $post_type_object ) ) {
@@ -1158,10 +1184,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
@@ -1190,10 +1217,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1225,8 +1255,9 @@ 
 					'multi' => 1,
 					'echo' => 0
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1237,7 +1268,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1286,8 +1319,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1305,8 +1339,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1397,13 +1432,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1448,11 +1486,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1494,8 +1535,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

src/wp-admin/includes/class-wp-upgrader-skins.php

Doc Comments +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param bool   $error
 	 * @param string $context
 	 * @param bool   $allow_relaxed_file_ownership
-	 * @return type
+	 * @return boolean
 	 */
 	public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
 		$url = $this->options['url'];
@@ -885,7 +885,7 @@ 
 	}
 
 	/**
-	 * @param string|array|WP_Error $data
+	 * @param string $data
 	 */
 	public function feedback( $data ) {
 		if ( is_wp_error( $data ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * The User Interface "Skins" for the WordPress File Upgrader
- *
- * @package WordPress
- * @subpackage Upgrader
- * @since 2.8.0
- */
+	 * The User Interface "Skins" for the WordPress File Upgrader
+	 *
+	 * @package WordPress
+	 * @subpackage Upgrader
+	 * @since 2.8.0
+	 */
 
 /**
  * Generic Skin for the WordPress Upgrader classes. This skin is designed to be extended for specific purposes.

Spacing +189 added lines, -189 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
+		$defaults = array('url' => '', 'nonce' => '', 'title' => '', 'context' => false);
 		$this->options = wp_parse_args($args, $defaults);
 	}
 
@@ -35,8 +35,8 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if (is_object($upgrader))
+			$this->upgrader = & $upgrader;
 		$this->add_strings();
 	}
 
@@ -61,37 +61,37 @@ 
 	 * @param bool   $allow_relaxed_file_ownership
 	 * @return type
 	 */
-	public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
+	public function request_filesystem_credentials($error = false, $context = false, $allow_relaxed_file_ownership = false) {
 		$url = $this->options['url'];
-		if ( ! $context ) {
+		if ( ! $context) {
 			$context = $this->options['context'];
 		}
-		if ( !empty($this->options['nonce']) ) {
+		if ( ! empty($this->options['nonce'])) {
 			$url = wp_nonce_url($url, $this->options['nonce']);
 		}
 
 		$extra_fields = array();
 
-		return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
+		return request_filesystem_credentials($url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function header() {
-		if ( $this->done_header ) {
+		if ($this->done_header) {
 			return;
 		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h1>' . $this->options['title'] . '</h1>';
+		echo '<h1>'.$this->options['title'].'</h1>';
 	}
 
 	/**
 	 * @access public
 	 */
 	public function footer() {
-		if ( $this->done_footer ) {
+		if ($this->done_footer) {
 			return;
 		}
 		$this->done_footer = true;
@@ -103,14 +103,14 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
+		if ( ! $this->done_header)
 			$this->header();
-		if ( is_string($errors) ) {
+		if (is_string($errors)) {
 			$this->feedback($errors);
-		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
-			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+		} elseif (is_wp_error($errors) && $errors->get_error_code()) {
+			foreach ($errors->get_error_messages() as $message) {
+				if ($errors->get_error_data() && is_string($errors->get_error_data()))
+					$this->feedback($message.' '.esc_html(strip_tags($errors->get_error_data())));
 				else
 					$this->feedback($message);
 			}
@@ -122,19 +122,19 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
 		show_message($string);
 	}
@@ -157,22 +157,22 @@ 
 	 * @param string $type Type of update count to decrement. Likely values include 'plugin',
 	 *                     'theme', 'translation', etc.
 	 */
-	protected function decrement_update_count( $type ) {
-		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+	protected function decrement_update_count($type) {
+		if ( ! $this->result || is_wp_error($this->result) || 'up_to_date' === $this->result) {
 			return;
 		}
 
-		if ( defined( 'IFRAME_REQUEST' ) ) {
+		if (defined('IFRAME_REQUEST')) {
 			echo '<script type="text/javascript">
 					if ( window.postMessage && JSON ) {
-						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type.'" } ), window.location.protocol + "//" + window.location.hostname );
 					}
 				</script>';
 		} else {
 			echo '<script type="text/javascript">
 					(function( wp ) {
 						if ( wp && wp.updates.decrementCount ) {
-							wp.updates.decrementCount( "' . $type . '" );
+							wp.updates.decrementCount( "' . $type.'" );
 						}
 					})( window.wp );
 				</script>';
@@ -206,14 +206,14 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->plugin = $args['plugin'];
 
-		$this->plugin_active = is_plugin_active( $this->plugin );
-		$this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
+		$this->plugin_active = is_plugin_active($this->plugin);
+		$this->plugin_network_active = is_plugin_active_for_network($this->plugin);
 
 		parent::__construct($args);
 	}
@@ -223,18 +223,18 @@ 
 	 */
 	public function after() {
 		$this->plugin = $this->upgrader->plugin_info();
-		if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
-			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) .'"></iframe>';
+		if ( ! empty($this->plugin) && ! is_wp_error($this->result) && $this->plugin_active) {
+			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="'.wp_nonce_url('update.php?action=activate-plugin&networkwide='.$this->plugin_network_active.'&plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'"></iframe>';
 		}
 
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 
-		$update_actions =  array(
-			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
+		$update_actions = array(
+			'activate_plugin' => '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'" target="_parent">'.__('Activate Plugin').'</a>',
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ($this->plugin_active || ! $this->result || is_wp_error($this->result) || ! current_user_can('activate_plugins'))
+			unset($update_actions['activate_plugin']);
 
 		/**
 		 * Filter the list of action links available following a single plugin update.
@@ -244,10 +244,10 @@ 
 		 * @param array  $update_actions Array of plugin action links.
 		 * @param string $plugin         Path to the plugin file.
 		 */
-		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
+		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -270,7 +270,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '' );
+		$defaults = array('url' => '', 'nonce' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		parent::__construct($args);
@@ -283,7 +283,7 @@ 
 		$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
 		$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>');
 		$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
-		$this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' ) . ' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>' . __( 'Show Details' ) . '</span><span class="hidden">' . __( 'Hide Details' ) . '</span></a>';
+		$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span></a>';
 		$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
 	}
 
@@ -291,21 +291,21 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
-		if ( $this->in_loop )
+		if ($this->in_loop)
 			echo "$string<br />\n";
 		else
 			echo "<p>$string</p>\n";
@@ -330,20 +330,20 @@ 
 	 * @param string|WP_Error $error
 	 */
 	public function error($error) {
-		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
+		if (is_string($error) && isset($this->upgrader->strings[$error]))
 			$this->error = $this->upgrader->strings[$error];
 
-		if ( is_wp_error($error) ) {
+		if (is_wp_error($error)) {
 			$messages = array();
-			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+			foreach ($error->get_error_messages() as $emessage) {
+				if ($error->get_error_data() && is_string($error->get_error_data()))
+					$messages[] = $emessage.' '.esc_html(strip_tags($error->get_error_data()));
 				else
 					$messages[] = $emessage;
 			}
 			$this->error = implode(', ', $messages);
 		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+		echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').hide();</script>';
 	}
 
 	/**
@@ -366,9 +366,9 @@ 
 	 */
 	public function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
-		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
+		printf('<h4>'.$this->upgrader->strings['skin_before_update_header'].' <span class="spinner waiting-'.$this->upgrader->update_current.'"></span></h4>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').css("display", "inline-block");</script>';
+		echo '<div class="update-messages hide-if-js" id="progress-'.esc_attr($this->upgrader->update_current).'"><p>';
 		$this->flush_output();
 	}
 
@@ -378,18 +378,18 @@ 
 	 */
 	public function after($title = '') {
 		echo '</p></div>';
-		if ( $this->error || ! $this->result ) {
-			if ( $this->error )
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '</p></div>';
+		if ($this->error || ! $this->result) {
+			if ($this->error)
+				echo '<div class="error"><p>'.sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error).'</p></div>';
 			else
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+				echo '<div class="error"><p>'.sprintf($this->upgrader->strings['skin_update_failed'], $title).'</p></div>';
 
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+			echo '<script type="text/javascript">jQuery(\'#progress-'.esc_js($this->upgrader->update_current).'\').show();</script>';
 		}
-		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error )
-				echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+		if ($this->result && ! is_wp_error($this->result)) {
+			if ( ! $this->error)
+				echo '<div class="updated"><p>'.sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-'.esc_js($this->upgrader->update_current).'\').toggle();jQuery(\'span\', this).toggle(); return false;').'</p></div>';
+			echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').hide();</script>';
 		}
 
 		$this->reset();
@@ -435,7 +435,7 @@ 
 	 */
 	public function after($title = '') {
 		parent::after($this->plugin_info['Title']);
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 	}
 
 	/**
@@ -443,12 +443,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can('activate_plugins'))
+			unset($update_actions['plugins_page']);
 
 		/**
 		 * Filter the list of action links available following bulk plugin updates.
@@ -458,10 +458,10 @@ 
 		 * @param array $update_actions Array of plugin action links.
 		 * @param array $plugin_info    Array of information for the last-updated plugin.
 		 */
-		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+		$update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -478,7 +478,7 @@ 
 	 * @param string $title
 	 */
 	public function before($title = '') {
-		parent::before( $this->theme_info->display('Name') );
+		parent::before($this->theme_info->display('Name'));
 	}
 
 	/**
@@ -486,8 +486,8 @@ 
 	 * @param string $title
 	 */
 	public function after($title = '') {
-		parent::after( $this->theme_info->display('Name') );
-		$this->decrement_update_count( 'theme' );
+		parent::after($this->theme_info->display('Name'));
+		$this->decrement_update_count('theme');
 	}
 
 	/**
@@ -495,12 +495,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'themes_page' => '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can('switch_themes') && ! current_user_can('edit_theme_options'))
+			unset($update_actions['themes_page']);
 
 		/**
 		 * Filter the list of action links available following bulk theme updates.
@@ -510,10 +510,10 @@ 
 		 * @param array $update_actions Array of theme action links.
 		 * @param array $theme_info     Array of information for the last-updated theme.
 		 */
-		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
+		$update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -533,7 +533,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
+		$defaults = array('type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		$this->type = $args['type'];
@@ -546,8 +546,8 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		if ( ! empty($this->api))
+			$this->upgrader->strings['process_success'] = sprintf(__('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
 	}
 
 	/**
@@ -558,30 +558,30 @@ 
 
 		$install_actions = array();
 
-		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
+		$from = isset($_GET['from']) ? wp_unslash($_GET['from']) : 'plugins';
 
-		if ( 'import' == $from )
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
+		if ('import' == $from)
+			$install_actions['activate_plugin'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;from=import&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Activate Plugin &amp; Run Importer').'</a>';
 		else
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+			$install_actions['activate_plugin'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Activate Plugin').'</a>';
 
-		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-			$install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
-			unset( $install_actions['activate_plugin'] );
+		if (is_multisite() && current_user_can('manage_network_plugins')) {
+			$install_actions['network_activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Network Activate').'</a>';
+			unset($install_actions['activate_plugin']);
 		}
 
-		if ( 'import' == $from ) {
-			$install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
-		} elseif ( $this->type == 'web' ) {
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
+		if ('import' == $from) {
+			$install_actions['importers_page'] = '<a href="'.admin_url('import.php').'" target="_parent">'.__('Return to Importers').'</a>';
+		} elseif ($this->type == 'web') {
+			$install_actions['plugins_page'] = '<a href="'.self_admin_url('plugin-install.php').'" target="_parent">'.__('Return to Plugin Installer').'</a>';
 		} else {
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
+			$install_actions['plugins_page'] = '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>';
 		}
 
-		if ( ! $this->result || is_wp_error($this->result) ) {
-			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
-		} elseif ( ! current_user_can( 'activate_plugins' ) ) {
-			unset( $install_actions['activate_plugin'] );
+		if ( ! $this->result || is_wp_error($this->result)) {
+			unset($install_actions['activate_plugin'], $install_actions['network_activate']);
+		} elseif ( ! current_user_can('activate_plugins')) {
+			unset($install_actions['activate_plugin']);
 		}
 
 		/**
@@ -595,10 +595,10 @@ 
 		 *                                via upload.
 		 * @param string $plugin_file     Path to the plugin file.
 		 */
-		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
+		$install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
 
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions))
+			$this->feedback(implode(' | ', (array) $install_actions));
 	}
 }
 
@@ -618,7 +618,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
+		$defaults = array('type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		$this->type = $args['type'];
@@ -631,49 +631,49 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( ! empty($this->api))
+			$this->upgrader->strings['process_success'] = sprintf($this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
+		if (empty($this->upgrader->result['destination_name']))
 			return;
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
+		if (empty($theme_info))
 			return;
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
 		$template   = $theme_info->get_template();
 
-		$activate_link = add_query_arg( array(
+		$activate_link = add_query_arg(array(
 			'action'     => 'activate',
-			'template'   => urlencode( $template ),
-			'stylesheet' => urlencode( $stylesheet ),
-		), admin_url('themes.php') );
-		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+			'template'   => urlencode($template),
+			'stylesheet' => urlencode($stylesheet),
+		), admin_url('themes.php'));
+		$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
 
 		$install_actions = array();
 
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$install_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+			$install_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 		}
-		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		$install_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if (is_network_admin() && current_user_can('manage_network_themes'))
+			$install_actions['network_enable'] = '<a href="'.esc_url(wp_nonce_url('themes.php?action=enable&amp;theme='.urlencode($stylesheet), 'enable-theme_'.$stylesheet)).'" target="_parent">'.__('Network Enable').'</a>';
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ($this->type == 'web')
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('theme-install.php').'" target="_parent">'.__('Return to Theme Installer').'</a>';
+		elseif (current_user_can('switch_themes') || current_user_can('edit_theme_options'))
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can('switch_themes'))
+			unset($install_actions['activate'], $install_actions['preview']);
 
 		/**
 		 * Filter the list of action links available following a single theme installation.
@@ -685,9 +685,9 @@ 
 		 * @param string   $stylesheet      Theme directory name.
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
-		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		$install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
+		if ( ! empty($install_actions))
+			$this->feedback(implode(' | ', (array) $install_actions));
 	}
 }
 
@@ -706,7 +706,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
+		$defaults = array('url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->theme = $args['theme'];
@@ -718,37 +718,37 @@ 
 	 * @access public
 	 */
 	public function after() {
-		$this->decrement_update_count( 'theme' );
+		$this->decrement_update_count('theme');
 
 		$update_actions = array();
-		if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
+		if ( ! empty($this->upgrader->result['destination_name']) && $theme_info = $this->upgrader->theme_info()) {
 			$name       = $theme_info->display('Name');
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
-			$activate_link = add_query_arg( array(
+			$activate_link = add_query_arg(array(
 				'action'     => 'activate',
-				'template'   => urlencode( $template ),
-				'stylesheet' => urlencode( $stylesheet ),
-			), admin_url('themes.php') );
-			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
-
-			if ( get_stylesheet() == $stylesheet ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
+				'template'   => urlencode($template),
+				'stylesheet' => urlencode($stylesheet),
+			), admin_url('themes.php'));
+			$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
+
+			if (get_stylesheet() == $stylesheet) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Customize').'</span><span class="screen-reader-text">'.sprintf(__('Customize &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-			} elseif ( current_user_can( 'switch_themes' ) ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+			} elseif (current_user_can('switch_themes')) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+				$update_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error($this->result) || is_network_admin())
+				unset($update_actions['preview'], $update_actions['activate']);
 		}
 
-		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		$update_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
 		/**
 		 * Filter the list of action links available following a single theme update.
@@ -758,10 +758,10 @@ 
 		 * @param array  $update_actions Array of theme action links.
 		 * @param string $theme          Theme directory name.
 		 */
-		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
+		$update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -782,35 +782,35 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
-		$args = wp_parse_args( $args, $defaults );
-		if ( $args['skip_header_footer'] ) {
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'nonce' => '', 'title' => __('Update Translations'), 'skip_header_footer' => false);
+		$args = wp_parse_args($args, $defaults);
+		if ($args['skip_header_footer']) {
 			$this->done_header = true;
 			$this->done_footer = true;
 			$this->display_footer_actions = false;
 		}
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function before() {
-		$name = $this->upgrader->get_name_for_update( $this->language_update );
+		$name = $this->upgrader->get_name_for_update($this->language_update);
 
 		echo '<div class="update-messages lp-show-latest">';
 
-		printf( '<h4>' . __( 'Updating translations for %1$s (%2$s)&#8230;' ) . '</h4>', $name, $this->language_update->language );
+		printf('<h4>'.__('Updating translations for %1$s (%2$s)&#8230;').'</h4>', $name, $this->language_update->language);
 	}
 
 	/**
 	 *
 	 * @param string|WP_Error $error
 	 */
-	public function error( $error ) {
+	public function error($error) {
 		echo '<div class="lp-error">';
-		parent::error( $error );
+		parent::error($error);
 		echo '</div>';
 	}
 
@@ -825,9 +825,9 @@ 
 	 * @access public
 	 */
 	public function bulk_footer() {
-		$this->decrement_update_count( 'translation' );
+		$this->decrement_update_count('translation');
 		$update_actions = array();
-		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
+		$update_actions['updates_page'] = '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>';
 
 		/**
 		 * Filter the list of action links available following a translations update.
@@ -836,10 +836,10 @@ 
 		 *
 		 * @param array $update_actions Array of translations update links.
 		 */
-		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
+		$update_actions = apply_filters('update_translations_complete_actions', $update_actions);
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ($update_actions && $this->display_footer_actions)
+			$this->feedback(implode(' | ', $update_actions));
 	}
 }
 
@@ -863,14 +863,14 @@ 
 	 * @param bool   $allow_relaxed_file_ownership
 	 * @return bool
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
-		if ( $context ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
+		if ($context) {
 			$this->options['context'] = $context;
 		}
 		// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
 		// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
+		$result = parent::request_filesystem_credentials($error, $context, $allow_relaxed_file_ownership);
 		ob_end_clean();
 		return $result;
 	}
@@ -887,37 +887,37 @@ 
 	/**
 	 * @param string|array|WP_Error $data
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
+	public function feedback($data) {
+		if (is_wp_error($data)) {
 			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
+		} elseif (is_array($data)) {
 			return;
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty($this->upgrader->strings[$string]))
+			$string = $this->upgrader->strings[$string];
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
-			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			$args = array_splice($args, 1);
+			if ( ! empty($args))
+				$string = vsprintf($string, $args);
 		}
 
-		$string = trim( $string );
+		$string = trim($string);
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
-		$string = wp_kses( $string, array(
+		$string = wp_kses($string, array(
 			'a' => array(
 				'href' => true
 			),
 			'br' => true,
 			'em' => true,
 			'strong' => true,
-		) );
+		));
 
-		if ( empty( $string ) )
+		if (empty($string))
 			return;
 
 		$this->messages[] = $string;
@@ -935,7 +935,7 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty($output))
+			$this->feedback($output);
 	}
 }

Braces +117 added lines, -82 removed lines

@@ -35,8 +35,9 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if ( is_object($upgrader) ) {
+					$this->upgrader =& $upgrader;
+		}
 		$this->add_strings();
 	}
 
@@ -103,16 +104,18 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
-			$this->header();
+		if ( ! $this->done_header ) {
+					$this->header();
+		}
 		if ( is_string($errors) ) {
 			$this->feedback($errors);
 		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
 			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
-				else
-					$this->feedback($message);
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+									$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+				} else {
+									$this->feedback($message);
+				}
 			}
 		}
 	}
@@ -122,8 +125,9 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+		if ( isset( $this->upgrader->strings[$string] ) ) {
+					$string = $this->upgrader->strings[$string];
+		}
 
 		if ( strpos($string, '%') !== false ) {
 			$args = func_get_args();
@@ -134,8 +138,9 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
+		if ( empty($string) ) {
+					return;
+		}
 		show_message($string);
 	}
 
@@ -233,8 +238,9 @@ 
 			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['activate_plugin'] );
+		}
 
 		/**
 		 * Filter the list of action links available following a single plugin update.
@@ -246,8 +252,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -291,8 +298,9 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+		if ( isset( $this->upgrader->strings[$string] ) ) {
+					$string = $this->upgrader->strings[$string];
+		}
 
 		if ( strpos($string, '%') !== false ) {
 			$args = func_get_args();
@@ -303,12 +311,14 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
-		if ( $this->in_loop )
-			echo "$string<br />\n";
-		else
-			echo "<p>$string</p>\n";
+		if ( empty($string) ) {
+					return;
+		}
+		if ( $this->in_loop ) {
+					echo "$string<br />\n";
+		} else {
+					echo "<p>$string</p>\n";
+		}
 	}
 
 	/**
@@ -330,16 +340,18 @@ 
 	 * @param string|WP_Error $error
 	 */
 	public function error($error) {
-		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
-			$this->error = $this->upgrader->strings[$error];
+		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) {
+					$this->error = $this->upgrader->strings[$error];
+		}
 
 		if ( is_wp_error($error) ) {
 			$messages = array();
 			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
-				else
-					$messages[] = $emessage;
+				if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) {
+									$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+				} else {
+									$messages[] = $emessage;
+				}
 			}
 			$this->error = implode(', ', $messages);
 		}
@@ -379,16 +391,18 @@ 
 	public function after($title = '') {
 		echo '</p></div>';
 		if ( $this->error || ! $this->result ) {
-			if ( $this->error )
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '</p></div>';
-			else
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+			if ( $this->error ) {
+							echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, $this->error) . '</p></div>';
+			} else {
+							echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+			}
 
 			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
 		}
 		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error )
-				echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+			if ( ! $this->error ) {
+							echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+			}
 			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
 		}
 
@@ -447,8 +461,9 @@ 
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['plugins_page'] );
+		}
 
 		/**
 		 * Filter the list of action links available following bulk plugin updates.
@@ -460,8 +475,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -499,8 +515,9 @@ 
 			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
+					unset( $update_actions['themes_page'] );
+		}
 
 		/**
 		 * Filter the list of action links available following bulk theme updates.
@@ -512,8 +529,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -546,8 +564,9 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		if ( !empty($this->api) ) {
+					$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		}
 	}
 
 	/**
@@ -560,10 +579,11 @@ 
 
 		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
-		if ( 'import' == $from )
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
-		else
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+		if ( 'import' == $from ) {
+					$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
+		} else {
+					$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+		}
 
 		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
 			$install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
@@ -597,8 +617,9 @@ 
 		 */
 		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
 
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions) ) {
+					$this->feedback(implode(' | ', (array)$install_actions));
+		}
 	}
 }
 
@@ -631,20 +652,23 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( !empty($this->api) ) {
+					$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		}
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
-			return;
+		if ( empty($this->upgrader->result['destination_name']) ) {
+					return;
+		}
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
-			return;
+		if ( empty( $theme_info ) ) {
+					return;
+		}
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
@@ -664,16 +688,19 @@ 
 		}
 		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
+					$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		}
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ( $this->type == 'web' ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
+		} elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		}
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) {
+					unset( $install_actions['activate'], $install_actions['preview'] );
+		}
 
 		/**
 		 * Filter the list of action links available following a single theme installation.
@@ -686,8 +713,9 @@ 
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
 		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions) ) {
+					$this->feedback(implode(' | ', (array)$install_actions));
+		}
 	}
 }
 
@@ -744,8 +772,9 @@ 
 				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
+							unset( $update_actions['preview'], $update_actions['activate'] );
+			}
 		}
 
 		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
@@ -760,8 +789,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -838,8 +868,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ( $update_actions && $this->display_footer_actions ) {
+					$this->feedback( implode( ' | ', $update_actions ) );
+		}
 	}
 }
 
@@ -895,14 +926,16 @@ 
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
+					$string = $this->upgrader->strings[ $string ];
+		}
 
 		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
 			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			if ( ! empty( $args ) ) {
+							$string = vsprintf( $string, $args );
+			}
 		}
 
 		$string = trim( $string );
@@ -917,8 +950,9 @@ 
 			'strong' => true,
 		) );
 
-		if ( empty( $string ) )
-			return;
+		if ( empty( $string ) ) {
+					return;
+		}
 
 		$this->messages[] = $string;
 	}
@@ -935,7 +969,8 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty( $output ) ) {
+					$this->feedback( $output );
+		}
 	}
 }

src/wp-admin/includes/dashboard.php

Doc Comments +1 added lines, -1 removed lines

@@ -1277,7 +1277,7 @@
  *
  * @global string $wp_version
  *
- * @return array|bool False on failure, array of browser data on success.
+ * @return string False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
 	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )

Indentation +7 added lines, -7 removed lines

@@ -1245,13 +1245,13 @@
 	}
 
 	/**
-	* Filter the notice output for the 'Browse Happy' nag meta box.
-	*
-	* @since 3.2.0
-	*
-	* @param string $notice   The notice content.
-	* @param array  $response An array containing web browser information.
-	*/
+	 * Filter the notice output for the 'Browse Happy' nag meta box.
+	 *
+	 * @since 3.2.0
+	 *
+	 * @param string $notice   The notice content.
+	 * @param array  $response An array containing web browser information.
+	 */
 	echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 

Spacing +346 added lines, -346 removed lines

@@ -26,43 +26,43 @@ 
 
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['upgrade'] ) {
-		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+	if ($response && $response['upgrade']) {
+		add_filter('postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class');
+		if ($response['insecure'])
+			wp_add_dashboard_widget('dashboard_browser_nag', __('You are using an insecure browser!'), 'wp_dashboard_browser_nag');
 		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+			wp_add_dashboard_widget('dashboard_browser_nag', __('Your browser is out of date!'), 'wp_dashboard_browser_nag');
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if (is_blog_admin() && current_user_can('edit_posts'))
+		wp_add_dashboard_widget('dashboard_right_now', __('At a Glance'), 'wp_dashboard_right_now');
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if (is_network_admin())
+		wp_add_dashboard_widget('network_dashboard_right_now', __('Right Now'), 'wp_network_dashboard_right_now');
 
 	// Activity Widget
-	if ( is_blog_admin() ) {
-		wp_add_dashboard_widget( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_site_activity' );
+	if (is_blog_admin()) {
+		wp_add_dashboard_widget('dashboard_activity', __('Activity'), 'wp_dashboard_site_activity');
 	}
 
 	// QuickPress Widget
-	if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
-		$quick_draft_title = sprintf( '<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __( 'Quick Draft' ), __( 'Drafts' ) );
-		wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
+	if (is_blog_admin() && current_user_can('edit_posts')) {
+		$quick_draft_title = sprintf('<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __('Quick Draft'), __('Drafts'));
+		wp_add_dashboard_widget('dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press');
 	}
 
 	// WordPress News
-	wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
+	wp_add_dashboard_widget('dashboard_primary', __('WordPress News'), 'wp_dashboard_primary');
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 
 		/**
 		 * Fires after core widgets for the Network Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_network_dashboard_setup' );
+		do_action('wp_network_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the Network Admin dashboard.
@@ -71,15 +71,15 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
-	} elseif ( is_user_admin() ) {
+		$dashboard_widgets = apply_filters('wp_network_dashboard_widgets', array());
+	} elseif (is_user_admin()) {
 
 		/**
 		 * Fires after core widgets for the User Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_user_dashboard_setup' );
+		do_action('wp_user_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the User Admin dashboard.
@@ -88,7 +88,7 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_user_dashboard_widgets', array());
 	} else {
 
 		/**
@@ -96,7 +96,7 @@ 
 		 *
 		 * @since 2.5.0
 		 */
-		do_action( 'wp_dashboard_setup' );
+		do_action('wp_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the admin dashboard.
@@ -105,28 +105,28 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_dashboard_widgets', array());
 	}
 
-	foreach ( $dashboard_widgets as $widget_id ) {
-		$name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
-		wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback'] );
+	foreach ($dashboard_widgets as $widget_id) {
+		$name = empty($wp_registered_widgets[$widget_id]['all_link']) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name']." <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>".__('View all').'</a>';
+		wp_add_dashboard_widget($widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback']);
 	}
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
-		check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id'])) {
+		check_admin_referer('edit-dashboard-widget_'.$_POST['widget_id'], 'dashboard-widget-nonce');
 		ob_start(); // hack - but the same hack wp-admin/widgets.php uses
-		wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
+		wp_dashboard_trigger_widget_control($_POST['widget_id']);
 		ob_end_clean();
-		wp_redirect( remove_query_arg( 'edit' ) );
+		wp_redirect(remove_query_arg('edit'));
 		exit;
 	}
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'normal', '' );
+	do_action('do_meta_boxes', $screen->id, 'normal', '');
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'side', '' );
+	do_action('do_meta_boxes', $screen->id, 'side', '');
 }
 
 /**
@@ -139,33 +139,33 @@ 
  * @param callback $control_callback
  * @param array    $callback_args
  */
-function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
+function wp_add_dashboard_widget($widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null) {
 	$screen = get_current_screen();
 	global $wp_dashboard_control_callbacks;
 
-	if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
+	if ($control_callback && current_user_can('edit_dashboard') && is_callable($control_callback)) {
 		$wp_dashboard_control_callbacks[$widget_id] = $control_callback;
-		if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
-			list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
+		if (isset($_GET['edit']) && $widget_id == $_GET['edit']) {
+			list($url) = explode('#', add_query_arg('edit', false), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url($url).'">'.__('Cancel').'</a></span>';
 			$callback = '_wp_dashboard_control_callback';
 		} else {
-			list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
+			list($url) = explode('#', add_query_arg('edit', $widget_id), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url("$url#$widget_id").'" class="edit-box open-box">'.__('Configure').'</a></span>';
 		}
 	}
 
-	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
+	$side_widgets = array('dashboard_quick_press', 'dashboard_primary');
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
+	if (in_array($widget_id, $side_widgets))
 		$location = 'side';
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
+	if ('dashboard_browser_nag' === $widget_id)
 		$priority = 'high';
 
-	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
+	add_meta_box($widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args);
 }
 
 /**
@@ -173,12 +173,12 @@ 
  * @param type $dashboard
  * @param type $meta_box
  */
-function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
+function _wp_dashboard_control_callback($dashboard, $meta_box) {
 	echo '<form method="post" class="dashboard-widget-control-form">';
-	wp_dashboard_trigger_widget_control( $meta_box['id'] );
-	wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
-	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
-	submit_button( __('Submit') );
+	wp_dashboard_trigger_widget_control($meta_box['id']);
+	wp_nonce_field('edit-dashboard-widget_'.$meta_box['id'], 'dashboard-widget-nonce');
+	echo '<input type="hidden" name="widget_id" value="'.esc_attr($meta_box['id']).'" />';
+	submit_button(__('Submit'));
 	echo '</form>';
 }
 
@@ -189,31 +189,31 @@ 
  */
 function wp_dashboard() {
 	$screen = get_current_screen();
-	$columns = absint( $screen->get_columns() );
+	$columns = absint($screen->get_columns());
 	$columns_css = '';
-	if ( $columns ) {
+	if ($columns) {
 		$columns_css = " columns-$columns";
 	}
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
 	<div id="postbox-container-1" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'normal', ''); ?>
 	</div>
 	<div id="postbox-container-2" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'side', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'side', ''); ?>
 	</div>
 	<div id="postbox-container-3" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column3', ''); ?>
 	</div>
 	<div id="postbox-container-4" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column4', ''); ?>
 	</div>
 </div>
 
 <?php
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-	wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+	wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 
 }
 
@@ -234,34 +234,34 @@ 
 	<ul>
 	<?php
 	// Posts and Pages
-	foreach ( array( 'post', 'page' ) as $post_type ) {
-		$num_posts = wp_count_posts( $post_type );
-		if ( $num_posts && $num_posts->publish ) {
-			if ( 'post' == $post_type ) {
-				$text = _n( '%s Post', '%s Posts', $num_posts->publish );
+	foreach (array('post', 'page') as $post_type) {
+		$num_posts = wp_count_posts($post_type);
+		if ($num_posts && $num_posts->publish) {
+			if ('post' == $post_type) {
+				$text = _n('%s Post', '%s Posts', $num_posts->publish);
 			} else {
-				$text = _n( '%s Page', '%s Pages', $num_posts->publish );
+				$text = _n('%s Page', '%s Pages', $num_posts->publish);
 			}
-			$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
-				printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
+			$text = sprintf($text, number_format_i18n($num_posts->publish));
+			$post_type_object = get_post_type_object($post_type);
+			if ($post_type_object && current_user_can($post_type_object->cap->edit_posts)) {
+				printf('<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text);
 			} else {
-				printf( '<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text );
+				printf('<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text);
 			}
 
 		}
 	}
 	// Comments
 	$num_comm = wp_count_comments();
-	if ( $num_comm && $num_comm->approved ) {
-		$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
+	if ($num_comm && $num_comm->approved) {
+		$text = sprintf(_n('%s Comment', '%s Comments', $num_comm->approved), number_format_i18n($num_comm->approved));
 		?>
 		<li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
 		<?php
-		if ( $num_comm->moderated ) {
+		if ($num_comm->moderated) {
 			/* translators: Number of comments in moderation */
-			$text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+			$text = sprintf(_nx('%s in moderation', '%s in moderation', $num_comm->moderated, 'comments'), number_format_i18n($num_comm->moderated));
 			?>
 			<li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
 			<?php
@@ -279,10 +279,10 @@ 
 	 *
 	 * @param array $items Array of extra 'At a Glance' widget items.
 	 */
-	$elements = apply_filters( 'dashboard_glance_items', array() );
+	$elements = apply_filters('dashboard_glance_items', array());
 
-	if ( $elements ) {
-		echo '<li>' . implode( "</li>\n<li>", $elements ) . "</li>\n";
+	if ($elements) {
+		echo '<li>'.implode("</li>\n<li>", $elements)."</li>\n";
 	}
 
 	?>
@@ -291,7 +291,7 @@ 
 	update_right_now_message();
 
 	// Check if search engines are asked not to index this site.
-	if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '1' != get_option( 'blog_public' ) ) {
+	if ( ! is_network_admin() && ! is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public')) {
 
 		/**
 		 * Filter the link title attribute for the 'Search Engines Discouraged'
@@ -303,7 +303,7 @@ 
 		 *
 		 * @param string $title Default attribute text.
 		 */
-		$title = apply_filters( 'privacy_on_link_title', __( 'Your site is asking search engines not to index its content' ) );
+		$title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content'));
 
 		/**
 		 * Filter the link label for the 'Search Engines Discouraged' message
@@ -315,7 +315,7 @@ 
 		 *
 		 * @param string $content Default text.
 		 */
-		$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+		$content = apply_filters('privacy_on_link_text', __('Search Engines Discouraged'));
 
 		echo "<p><a href='options-reading.php' title='$title'>$content</a></p>";
 	}
@@ -335,7 +335,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'rightnow_end' );
+	do_action('rightnow_end');
 
 	/**
 	 * Fires at the end of the 'At a Glance' dashboard widget.
@@ -344,11 +344,11 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'activity_box_end' );
+	do_action('activity_box_end');
 
 	$actions = ob_get_clean();
 
-	if ( !empty( $actions ) ) : ?>
+	if ( ! empty($actions)) : ?>
 	<div class="sub">
 		<?php echo $actions; ?>
 	</div>
@@ -360,25 +360,25 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if (current_user_can('create_sites'))
+		$actions['create-site'] = '<a href="'.network_admin_url('site-new.php').'">'.__('Create a New Site').'</a>';
+	if (current_user_can('create_users'))
+		$actions['create-user'] = '<a href="'.network_admin_url('user-new.php').'">'.__('Create a New User').'</a>';
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
 
-	$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
-	$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
+	$user_text = sprintf(_n('%s user', '%s users', $c_users), number_format_i18n($c_users));
+	$blog_text = sprintf(_n('%s site', '%s sites', $c_blogs), number_format_i18n($c_blogs));
 
-	$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
+	$sentence = sprintf(__('You have %1$s and %2$s.'), $blog_text, $user_text);
 
-	if ( $actions ) {
+	if ($actions) {
 		echo '<ul class="subsubsub">';
-		foreach ( $actions as $class => $action ) {
-			 $actions[ $class ] = "\t<li class='$class'>$action";
+		foreach ($actions as $class => $action) {
+			 $actions[$class] = "\t<li class='$class'>$action";
 		}
-		echo implode( " |</li>\n", $actions ) . "</li>\n";
+		echo implode(" |</li>\n", $actions)."</li>\n";
 		echo '</ul>';
 	}
 ?>
@@ -396,22 +396,22 @@ 
 		 *
 		 * @param null $unused
 		 */
-		do_action( 'wpmuadminresult', '' );
+		do_action('wpmuadminresult', '');
 	?>
 
 	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+			<label class="screen-reader-text" for="search-users"><?php _e('Search Users'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
-			<?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+			<?php submit_button(__('Search Users'), 'button', 'submit', false, array('id' => 'submit_users')); ?>
 		</p>
 	</form>
 
 	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+			<label class="screen-reader-text" for="search-sites"><?php _e('Search Sites'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
-			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+			<?php submit_button(__('Search Sites'), 'button', 'submit', false, array('id' => 'submit_sites')); ?>
 		</p>
 	</form>
 <?php
@@ -420,14 +420,14 @@ 
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_rightnow_end' );
+	do_action('mu_rightnow_end');
 
 	/**
 	 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_activity_box_end' );
+	do_action('mu_activity_box_end');
 }
 
 /**
@@ -439,37 +439,37 @@ 
  *
  * @param string $error_msg Optional. Error message. Default false.
  */
-function wp_dashboard_quick_press( $error_msg = false ) {
+function wp_dashboard_quick_press($error_msg = false) {
 	global $post_ID;
 
-	if ( ! current_user_can( 'edit_posts' ) ) {
+	if ( ! current_user_can('edit_posts')) {
 		return;
 	}
 
 	/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
-	$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
-	if ( $last_post_id ) {
-		$post = get_post( $last_post_id );
-		if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
-			$post = get_default_post_to_edit( 'post', true );
-			update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+	$last_post_id = (int) get_user_option('dashboard_quick_press_last_post_id'); // Get the last post_ID
+	if ($last_post_id) {
+		$post = get_post($last_post_id);
+		if (empty($post) || $post->post_status != 'auto-draft') { // auto-draft doesn't exists anymore
+			$post = get_default_post_to_edit('post', true);
+			update_user_option(get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 		} else {
 			$post->post_title = ''; // Remove the auto draft title
 		}
 	} else {
-		$post = get_default_post_to_edit( 'post' , true);
+		$post = get_default_post_to_edit('post', true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( ! (is_super_admin($user_id) && ! in_array(get_current_blog_id(), array_keys(get_blogs_of_user($user_id)))))
+			update_user_option($user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
 ?>
 
-	<form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
+	<form name="post" action="<?php echo esc_url(admin_url('post.php')); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
 
-		<?php if ( $error_msg ) : ?>
+		<?php if ($error_msg) : ?>
 		<div class="error"><?php echo $error_msg; ?></div>
 		<?php endif; ?>
 
@@ -478,14 +478,14 @@ 
 
 				<?php
 				/** This filter is documented in wp-admin/edit-form-advanced.php */
-				echo apply_filters( 'enter_title_here', __( 'Title' ), $post );
+				echo apply_filters('enter_title_here', __('Title'), $post);
 				?>
 			</label>
 			<input type="text" name="post_title" id="title" autocomplete="off" />
 		</div>
 
 		<div class="textarea-wrap" id="description-wrap">
-			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What&#8217;s on your mind?' ); ?></label>
+			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e('What&#8217;s on your mind?'); ?></label>
 			<textarea name="content" id="content" class="mceEditor" rows="3" cols="15" autocomplete="off"></textarea>
 		</div>
 
@@ -493,8 +493,8 @@ 
 			<input type="hidden" name="action" id="quickpost-action" value="post-quickdraft-save" />
 			<input type="hidden" name="post_ID" value="<?php echo $post_ID; ?>" />
 			<input type="hidden" name="post_type" value="post" />
-			<?php wp_nonce_field( 'add-post' ); ?>
-			<?php submit_button( __( 'Save Draft' ), 'primary', 'save', false, array( 'id' => 'save-post' ) ); ?>
+			<?php wp_nonce_field('add-post'); ?>
+			<?php submit_button(__('Save Draft'), 'primary', 'save', false, array('id' => 'save-post')); ?>
 			<br class="clear" />
 		</p>
 
@@ -510,8 +510,8 @@ 
  *
  * @param array $drafts
  */
-function wp_dashboard_recent_drafts( $drafts = false ) {
-	if ( ! $drafts ) {
+function wp_dashboard_recent_drafts($drafts = false) {
+	if ( ! $drafts) {
 		$query_args = array(
 			'post_type'      => 'post',
 			'post_status'    => 'draft',
@@ -520,27 +520,27 @@ 
 			'orderby'        => 'modified',
 			'order'          => 'DESC'
 		);
-		$drafts = get_posts( $query_args );
-		if ( ! $drafts ) {
+		$drafts = get_posts($query_args);
+		if ( ! $drafts) {
 			return;
  		}
  	}
 
 	echo '<div class="drafts">';
-	if ( count( $drafts ) > 3 ) {
-		echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . _x( 'View all', 'drafts' ) . "</a></p>\n";
+	if (count($drafts) > 3) {
+		echo '<p class="view-all"><a href="'.esc_url(admin_url('edit.php?post_status=draft')).'">'._x('View all', 'drafts')."</a></p>\n";
  	}
-	echo '<h4 class="hide-if-no-js">' . __( 'Drafts' ) . "</h4>\n<ul>";
+	echo '<h4 class="hide-if-no-js">'.__('Drafts')."</h4>\n<ul>";
 
-	$drafts = array_slice( $drafts, 0, 3 );
-	foreach ( $drafts as $draft ) {
-		$url = get_edit_post_link( $draft->ID );
-		$title = _draft_or_post_title( $draft->ID );
+	$drafts = array_slice($drafts, 0, 3);
+	foreach ($drafts as $draft) {
+		$url = get_edit_post_link($draft->ID);
+		$title = _draft_or_post_title($draft->ID);
 		echo "<li>\n";
-		echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
-		echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
-		if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
-			echo '<p>' . $the_content . '</p>';
+		echo '<div class="draft-title"><a href="'.esc_url($url).'" title="'.esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)).'">'.esc_html($title).'</a>';
+		echo '<time datetime="'.get_the_time('c', $draft).'">'.get_the_time(get_option('date_format'), $draft).'</time></div>';
+		if ($the_content = wp_trim_words($draft->post_content, 10)) {
+			echo '<p>'.$the_content.'</p>';
  		}
 		echo "</li>\n";
  	}
@@ -553,22 +553,22 @@ 
  * @param object $comment
  * @param bool   $show_date
  */
-function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
-	$GLOBALS['comment'] =& $comment;
+function _wp_dashboard_recent_comments_row(&$comment, $show_date = true) {
+	$GLOBALS['comment'] = & $comment;
 
-	$comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
+	$comment_post_title = _draft_or_post_title($comment->comment_post_ID);
 
-	if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
-		$comment_post_url = get_edit_post_link( $comment->comment_post_ID );
+	if (current_user_can('edit_post', $comment->comment_post_ID)) {
+		$comment_post_url = get_edit_post_link($comment->comment_post_ID);
 		$comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
 	} else {
 		$comment_post_link = $comment_post_title;
 	}
 
-	$comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
+	$comment_link = '<a class="comment-link" href="'.esc_url(get_comment_link()).'">#</a>';
 
 	$actions_string = '';
-	if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if (current_user_can('edit_comment', $comment->comment_ID)) {
 		// Pre-order it: Approve | Reply | Edit | Spam | Trash.
 		$actions = array(
 			'approve' => '', 'unapprove' => '',
@@ -578,24 +578,24 @@ 
 			'trash' => '', 'delete' => ''
 		);
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
-
-		$approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-
-		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
-		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
-		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-		if ( !EMPTY_TRASH_DAYS )
-			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
+		$del_nonce = esc_html('_wpnonce='.wp_create_nonce("delete-comment_$comment->comment_ID"));
+		$approve_nonce = esc_html('_wpnonce='.wp_create_nonce("approve-comment_$comment->comment_ID"));
+
+		$approve_url = esc_url("comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$unapprove_url = esc_url("comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$spam_url = esc_url("comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$trash_url = esc_url("comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$delete_url = esc_url("comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+
+		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='".esc_attr__('Approve this comment')."'>".__('Approve').'</a>';
+		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='".esc_attr__('Unapprove this comment')."'>".__('Unapprove').'</a>';
+		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='".esc_attr__('Edit comment')."'>".__('Edit').'</a>';
+		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">'.__('Reply').'</a>';
+		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='".esc_attr__('Mark this comment as spam')."'>"./* translators: mark as spam link */ _x('Spam', 'verb').'</a>';
+		if ( ! EMPTY_TRASH_DAYS)
+			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>".__('Delete Permanently').'</a>';
 		else
-			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
+			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='".esc_attr__('Move this comment to the trash')."'>"._x('Trash', 'verb').'</a>';
 
 		/**
 		 * Filter the action links displayed for each comment in the 'Recent Comments'
@@ -608,15 +608,15 @@ 
 		 *                        'Delete', and 'Trash'.
 		 * @param object $comment The comment object.
 		 */
-		$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
+		$actions = apply_filters('comment_row_actions', array_filter($actions), $comment);
 
 		$i = 0;
-		foreach ( $actions as $action => $link ) {
+		foreach ($actions as $action => $link) {
 			++$i;
-			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+			((('approve' == $action || 'unapprove' == $action) && 2 === $i) || 1 === $i) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
+			if ('reply' == $action || 'quickedit' == $action)
 				$action .= ' hide-if-no-js';
 
 			$actions_string .= "<span class='$action'>$sep$link</span>";
@@ -625,35 +625,35 @@ 
 
 ?>
 
-		<div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>>
+		<div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class(array('comment-item', wp_get_comment_status($comment->comment_ID))); ?>>
 
-			<?php echo get_avatar( $comment, 50, 'mystery' ); ?>
+			<?php echo get_avatar($comment, 50, 'mystery'); ?>
 
-			<?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
+			<?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type) : ?>
 
 			<div class="dashboard-comment-wrap has-row-actions">
 			<h4 class="comment-meta">
-				<?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
-					'<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
+				<?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__('From %1$s on %2$s%3$s'),
+					'<cite class="comment-author">'.get_comment_author_link().'</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">'.__('[Pending]').'</span>' ); ?>
 			</h4>
 
 			<?php
 			else :
-				switch ( $comment->comment_type ) {
+				switch ($comment->comment_type) {
 					case 'pingback' :
-						$type = __( 'Pingback' );
+						$type = __('Pingback');
 						break;
 					case 'trackback' :
-						$type = __( 'Trackback' );
+						$type = __('Trackback');
 						break;
 					default :
-						$type = ucwords( $comment->comment_type );
+						$type = ucwords($comment->comment_type);
 				}
-				$type = esc_html( $type );
+				$type = esc_html($type);
 			?>
 			<div class="dashboard-comment-wrap has-row-actions">
 			<?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
-			<h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link." ".$comment_link ); ?></h4>
+			<h4 class="comment-meta"><?php printf(_x('%1$s on %2$s', 'dashboard'), "<strong>$type</strong>", $comment_post_link." ".$comment_link); ?></h4>
 			<p class="comment-author"><?php comment_author_link(); ?></p>
 
 			<?php endif; // comment_type ?>
@@ -673,27 +673,27 @@ 
 
 	echo '<div id="activity-widget">';
 
-	$future_posts = wp_dashboard_recent_posts( array(
+	$future_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'future',
 		'order'   => 'ASC',
-		'title'   => __( 'Publishing Soon' ),
+		'title'   => __('Publishing Soon'),
 		'id'      => 'future-posts',
-	) );
-	$recent_posts = wp_dashboard_recent_posts( array(
+	));
+	$recent_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'publish',
 		'order'   => 'DESC',
-		'title'   => __( 'Recently Published' ),
+		'title'   => __('Recently Published'),
 		'id'      => 'published-posts',
-	) );
+	));
 
 	$recent_comments = wp_dashboard_recent_comments();
 
-	if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+	if ( ! $future_posts && ! $recent_posts && ! $recent_comments) {
 		echo '<div class="no-activity">';
 		echo '<p class="smiley"></p>';
-		echo '<p>' . __( 'No activity yet!' ) . '</p>';
+		echo '<p>'.__('No activity yet!').'</p>';
 		echo '</div>';
 	}
 
@@ -716,16 +716,16 @@ 
  * }
  * @return bool False if no posts were found. True otherwise.
  */
-function wp_dashboard_recent_posts( $args ) {
+function wp_dashboard_recent_posts($args) {
 	$query_args = array(
 		'post_type'      => 'post',
 		'post_status'    => $args['status'],
 		'orderby'        => 'date',
 		'order'          => $args['order'],
-		'posts_per_page' => intval( $args['max'] ),
+		'posts_per_page' => intval($args['max']),
 		'no_found_rows'  => true,
 		'cache_results'  => false,
-		'perm'           => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
+		'perm'           => ('future' === $args['status']) ? 'editable' : 'readable',
 	);
 
 	/**
@@ -735,39 +735,39 @@ 
 	 *
 	 * @param array $query_args The arguments passed to WP_Query to produce the list of posts.
 	 */
-	$query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args );
-	$posts = new WP_Query( $query_args );
+	$query_args = apply_filters('dashboard_recent_posts_query_args', $query_args);
+	$posts = new WP_Query($query_args);
 
-	if ( $posts->have_posts() ) {
+	if ($posts->have_posts()) {
 
-		echo '<div id="' . $args['id'] . '" class="activity-block">';
+		echo '<div id="'.$args['id'].'" class="activity-block">';
 
-		echo '<h4>' . $args['title'] . '</h4>';
+		echo '<h4>'.$args['title'].'</h4>';
 
 		echo '<ul>';
 
-		$today    = date( 'Y-m-d', current_time( 'timestamp' ) );
-		$tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
+		$today    = date('Y-m-d', current_time('timestamp'));
+		$tomorrow = date('Y-m-d', strtotime('+1 day', current_time('timestamp')));
 
-		while ( $posts->have_posts() ) {
+		while ($posts->have_posts()) {
 			$posts->the_post();
 
-			$time = get_the_time( 'U' );
-			if ( date( 'Y-m-d', $time ) == $today ) {
-				$relative = __( 'Today' );
-			} elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
-				$relative = __( 'Tomorrow' );
+			$time = get_the_time('U');
+			if (date('Y-m-d', $time) == $today) {
+				$relative = __('Today');
+			} elseif (date('Y-m-d', $time) == $tomorrow) {
+				$relative = __('Tomorrow');
 			} else {
 				/* translators: date and time format for recent posts on the dashboard, see http://php.net/date */
-				$relative = date_i18n( __( 'M jS' ), $time );
+				$relative = date_i18n(__('M jS'), $time);
 			}
 
 			// Use the post edit link for those who can edit, the permalink otherwise.
-			$recent_post_link = current_user_can( 'edit_post', get_the_ID() ) ? get_edit_post_link() : get_permalink();
+			$recent_post_link = current_user_can('edit_post', get_the_ID()) ? get_edit_post_link() : get_permalink();
 
 			/* translators: 1: relative date, 2: time, 3: post edit link or permalink, 4: post title */
-			$format = __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' );
-			printf( "<li>$format</li>", $relative, get_the_time(), $recent_post_link, _draft_or_post_title() );
+			$format = __('<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>');
+			printf("<li>$format</li>", $relative, get_the_time(), $recent_post_link, _draft_or_post_title());
 		}
 
 		echo '</ul>';
@@ -790,7 +790,7 @@ 
  * @param int $total_items Optional. Number of comments to query. Default 5.
  * @return bool False if no comments were found. True otherwise.
  */
-function wp_dashboard_recent_comments( $total_items = 5 ) {
+function wp_dashboard_recent_comments($total_items = 5) {
 	// Select all comment types and filter out spam later for better query performance.
 	$comments = array();
 
@@ -798,34 +798,34 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
+	if ( ! current_user_can('edit_posts'))
 		$comments_query['status'] = 'approve';
 
-	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
-		if ( ! is_array( $possible ) ) {
+	while (count($comments) < $total_items && $possible = get_comments($comments_query)) {
+		if ( ! is_array($possible)) {
 			break;
 		}
-		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+		foreach ($possible as $comment) {
+			if ( ! current_user_can('read_post', $comment->comment_post_ID))
 				continue;
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
+			if (count($comments) == $total_items)
 				break 2;
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
 	}
 
-	if ( $comments ) {
+	if ($comments) {
 		echo '<div id="latest-comments" class="activity-block">';
-		echo '<h4>' . __( 'Comments' ) . '</h4>';
+		echo '<h4>'.__('Comments').'</h4>';
 
 		echo '<div id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ($comments as $comment)
+			_wp_dashboard_recent_comments_row($comment);
 		echo '</div>';
 
-		if ( current_user_can('edit_posts') )
+		if (current_user_can('edit_posts'))
 			_get_list_table('WP_Comments_List_Table')->views();
 
 		wp_comment_reply( -1, false, 'dashboard', false );
@@ -845,10 +845,10 @@ 
  *
  * @param string $widget_id
  */
-function wp_dashboard_rss_output( $widget_id ) {
-	$widgets = get_option( 'dashboard_widget_options' );
+function wp_dashboard_rss_output($widget_id) {
+	$widgets = get_option('dashboard_widget_options');
 	echo '<div class="rss-widget">';
-	wp_widget_rss_output( $widgets[ $widget_id ] );
+	wp_widget_rss_output($widgets[$widget_id]);
 	echo "</div>";
 }
 
@@ -867,37 +867,37 @@ 
  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */
-function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-	$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-	$doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
+function wp_dashboard_cached_rss_widget($widget_id, $callback, $check_urls = array()) {
+	$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+	$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
 
-	if ( empty($check_urls) ) {
-		$widgets = get_option( 'dashboard_widget_options' );
-		if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
+	if (empty($check_urls)) {
+		$widgets = get_option('dashboard_widget_options');
+		if (empty($widgets[$widget_id]['url']) && ! $doing_ajax) {
 			echo $loading;
 			return false;
 		}
-		$check_urls = array( $widgets[$widget_id]['url'] );
+		$check_urls = array($widgets[$widget_id]['url']);
 	}
 
 	$locale = get_locale();
-	$cache_key = 'dash_' . md5( $widget_id . '_' . $locale );
-	if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+	$cache_key = 'dash_'.md5($widget_id.'_'.$locale);
+	if (false !== ($output = get_transient($cache_key))) {
 		echo $output;
 		return true;
 	}
 
-	if ( ! $doing_ajax ) {
+	if ( ! $doing_ajax) {
 		echo $loading;
 		return false;
 	}
 
-	if ( $callback && is_callable( $callback ) ) {
-		$args = array_slice( func_get_args(), 3 );
-		array_unshift( $args, $widget_id, $check_urls );
+	if ($callback && is_callable($callback)) {
+		$args = array_slice(func_get_args(), 3);
+		array_unshift($args, $widget_id, $check_urls);
 		ob_start();
-		call_user_func_array( $callback, $args );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds)
+		call_user_func_array($callback, $args);
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS); // Default lifetime in cache of 12 hours (same as the feeds)
 	}
 
 	return true;
@@ -915,11 +915,11 @@ 
  *
  * @param int $widget_control_id Registered Widget ID.
  */
-function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
+function wp_dashboard_trigger_widget_control($widget_control_id = false) {
 	global $wp_dashboard_control_callbacks;
 
-	if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id]) ) {
-		call_user_func( $wp_dashboard_control_callbacks[$widget_control_id], '', array( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) );
+	if (is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id])) {
+		call_user_func($wp_dashboard_control_callbacks[$widget_control_id], '', array('id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id]));
 	}
 }
 
@@ -934,25 +934,25 @@ 
  * @param string $widget_id
  * @param array $form_inputs
  */
-function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
+function wp_dashboard_rss_control($widget_id, $form_inputs = array()) {
+	if ( ! $widget_options = get_option('dashboard_widget_options'))
 		$widget_options = array();
 
-	if ( !isset($widget_options[$widget_id]) )
+	if ( ! isset($widget_options[$widget_id]))
 		$widget_options[$widget_id] = array();
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
-		$_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
-		$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number])) {
+		$_POST['widget-rss'][$number] = wp_unslash($_POST['widget-rss'][$number]);
+		$widget_options[$widget_id] = wp_widget_rss_process($_POST['widget-rss'][$number]);
 		$widget_options[$widget_id]['number'] = $number;
 
 		// Title is optional. If black, fill it if possible.
-		if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
+		if ( ! $widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title'])) {
 			$rss = fetch_feed($widget_options[$widget_id]['url']);
-			if ( is_wp_error($rss) ) {
+			if (is_wp_error($rss)) {
 				$widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
 			} else {
 				$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
@@ -960,12 +960,12 @@ 
 				unset($rss);
 			}
 		}
-		update_option( 'dashboard_widget_options', $widget_options );
-		$cache_key = 'dash_' . md5( $widget_id );
-		delete_transient( $cache_key );
+		update_option('dashboard_widget_options', $widget_options);
+		$cache_key = 'dash_'.md5($widget_id);
+		delete_transient($cache_key);
 	}
 
-	wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
+	wp_widget_rss_form($widget_options[$widget_id], $form_inputs);
 }
 
 /**
@@ -984,7 +984,7 @@ 
 			 *
 			 * @param string $link The widget's primary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
+			'link' => apply_filters('dashboard_primary_link', __('http://wordpress.org/news/')),
 
 			/**
 			 * Filter the primary feed URL for the 'WordPress News' dashboard widget.
@@ -993,7 +993,7 @@ 
 			 *
 			 * @param string $url The widget's primary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
+			'url' => apply_filters('dashboard_primary_feed', __('http://wordpress.org/news/feed/')),
 
 			/**
 			 * Filter the primary link title for the 'WordPress News' dashboard widget.
@@ -1002,7 +1002,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's primary link.
 			 */
-			'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
+			'title'        => apply_filters('dashboard_primary_title', __('WordPress Blog')),
 			'items'        => 1,
 			'show_summary' => 1,
 			'show_author'  => 0,
@@ -1017,7 +1017,7 @@ 
 			 *
 			 * @param string $link The widget's secondary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
+			'link' => apply_filters('dashboard_secondary_link', __('https://planet.wordpress.org/')),
 
 			/**
 			 * Filter the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -1026,7 +1026,7 @@ 
 			 *
 			 * @param string $url The widget's secondary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
+			'url' => apply_filters('dashboard_secondary_feed', __('https://planet.wordpress.org/feed/')),
 
 			/**
 			 * Filter the secondary link title for the 'WordPress News' dashboard widget.
@@ -1035,7 +1035,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's secondary link.
 			 */
-			'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
+			'title'        => apply_filters('dashboard_secondary_title', __('Other WordPress News')),
 			'items'        => 3,
 			'show_summary' => 0,
 			'show_author'  => 0,
@@ -1043,7 +1043,7 @@ 
 		)
 	);
 
-	if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) {
+	if (( ! is_multisite() && is_blog_admin() && current_user_can('install_plugins')) || (is_network_admin() && current_user_can('manage_network_plugins') && current_user_can('install_plugins'))) {
 		$feeds['plugins'] = array(
 			'link'         => '',
 			'url'          => array(
@@ -1057,7 +1057,7 @@ 
 		);
 	}
 
-	wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
+	wp_dashboard_cached_rss_widget('dashboard_primary', 'wp_dashboard_primary_output', $feeds);
 }
 
 /**
@@ -1068,14 +1068,14 @@ 
  * @param string $widget_id Widget ID.
  * @param array  $feeds     Array of RSS feeds.
  */
-function wp_dashboard_primary_output( $widget_id, $feeds ) {
-	foreach( $feeds as $type => $args ) {
+function wp_dashboard_primary_output($widget_id, $feeds) {
+	foreach ($feeds as $type => $args) {
 		$args['type'] = $type;
 		echo '<div class="rss-widget">';
-		if ( $type === 'plugins' ) {
-			wp_dashboard_plugins_output( $args['url'], $args );
+		if ($type === 'plugins') {
+			wp_dashboard_plugins_output($args['url'], $args);
 		} else {
-			wp_widget_rss_output( $args['url'], $args );
+			wp_widget_rss_output($args['url'], $args);
 		}
 		echo "</div>";
 	}
@@ -1086,47 +1086,47 @@ 
  *
  * @since 2.5.0
  */
-function wp_dashboard_plugins_output( $rss, $args = array() ) {
+function wp_dashboard_plugins_output($rss, $args = array()) {
 	// Plugin feeds plus link to install them
-	$popular = fetch_feed( $args['url']['popular'] );
+	$popular = fetch_feed($args['url']['popular']);
 
-	if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
-		$plugin_slugs = array_keys( get_plugins() );
-		set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
+	if (false === $plugin_slugs = get_transient('plugin_slugs')) {
+		$plugin_slugs = array_keys(get_plugins());
+		set_transient('plugin_slugs', $plugin_slugs, DAY_IN_SECONDS);
 	}
 
 	echo '<ul>';
 
-	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
+	foreach (array($popular) as $feed) {
+		if (is_wp_error($feed) || ! $feed->get_item_quantity())
 			continue;
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin
-		while ( true ) {
+		while (true) {
 			// Abort this foreach loop iteration if there's no plugins left of this type
-			if ( 0 == count($items) )
+			if (0 == count($items))
 				continue 2;
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
 
-			list($link, $frag) = explode( '#', $item->get_link() );
+			list($link, $frag) = explode('#', $item->get_link());
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+			if (preg_match('|/([^/]+?)/?$|', $link, $matches))
 				$slug = $matches[1];
 			else {
-				unset( $items[$item_key] );
+				unset($items[$item_key]);
 				continue;
 			}
 
 			// Is this random plugin's slug already installed? If so, try again.
-			reset( $plugin_slugs );
-			foreach ( $plugin_slugs as $plugin_slug ) {
-				if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
-					unset( $items[$item_key] );
+			reset($plugin_slugs);
+			foreach ($plugin_slugs as $plugin_slug) {
+				if ($slug == substr($plugin_slug, 0, strlen($slug))) {
+					unset($items[$item_key]);
 					continue 2;
 				}
 			}
@@ -1136,19 +1136,19 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+		while ((null !== $item_key = array_rand($items)) && false !== strpos($items[$item_key]->get_description(), 'Plugin Name:'))
 			unset($items[$item_key]);
 
-		if ( !isset($items[$item_key]) )
+		if ( ! isset($items[$item_key]))
 			continue;
 
-		$title = esc_html( $item->get_title() );
+		$title = esc_html($item->get_title());
 
-		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
-		echo "<li class='dashboard-news-plugin'><span>" . __( 'Popular Plugin' ) . ":</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span></li>";
+		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin='.$slug, 'install-plugin_'.$slug).'&amp;TB_iframe=true&amp;width=600&amp;height=800';
+		echo "<li class='dashboard-news-plugin'><span>".__('Popular Plugin').":</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>".__('Install')."</a>)</span></li>";
 
 		$feed->__destruct();
-		unset( $feed );
+		unset($feed);
 	}
 
 	echo '</ul>';
@@ -1164,47 +1164,47 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
 */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+	if ( ! is_multisite() || ! current_user_can('upload_files') || get_site_option('upload_space_check_disabled'))
 		return true;
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
+	if ($used > $quota)
 		$percentused = '100';
 	else
-		$percentused = ( $used / $quota ) * 100;
-	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
-	$used = round( $used, 2 );
-	$percentused = number_format( $percentused );
+		$percentused = ($used / $quota) * 100;
+	$used_class = ($percentused >= 70) ? ' warning' : '';
+	$used = round($used, 2);
+	$percentused = number_format($percentused);
 
 	?>
-	<h4 class="mu-storage"><?php _e( 'Storage Space' ); ?></h4>
+	<h4 class="mu-storage"><?php _e('Storage Space'); ?></h4>
 	<div class="mu-storage">
 	<ul>
 		<li class="storage-count">
 			<?php $text = sprintf(
 				/* translators: number of megabytes */
-				__( '%s MB Space Allowed' ),
-				number_format_i18n( $quota )
+				__('%s MB Space Allowed'),
+				number_format_i18n($quota)
 			);
 			printf(
 				'<a href="%1$s" title="%2$s">%3$s</a>',
-				esc_url( admin_url( 'upload.php' ) ),
-				__( 'Manage Uploads' ),
+				esc_url(admin_url('upload.php')),
+				__('Manage Uploads'),
 				$text
 			); ?>
 		</li><li class="storage-count <?php echo $used_class; ?>">
 			<?php $text = sprintf(
 				/* translators: 1: number of megabytes, 2: percentage */
-				__( '%1$s MB (%2$s%%) Space Used' ),
-				number_format_i18n( $used, 2 ),
+				__('%1$s MB (%2$s%%) Space Used'),
+				number_format_i18n($used, 2),
 				$percentused
 			);
 			printf(
 				'<a href="%1$s" title="%2$s" class="musublink">%3$s</a>',
-				esc_url( admin_url( 'upload.php' ) ),
-				__( 'Manage Uploads' ),
+				esc_url(admin_url('upload.php')),
+				__('Manage Uploads'),
 				$text
 			); ?>
 		</li>
@@ -1218,29 +1218,29 @@ 
 	$notice = '';
 	$response = wp_check_browser_version();
 
-	if ( $response ) {
-		if ( $response['insecure'] ) {
-			$msg = sprintf( __( "It looks like you're using an insecure version of <a href='%s'>%s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+	if ($response) {
+		if ($response['insecure']) {
+			$msg = sprintf(__("It looks like you're using an insecure version of <a href='%s'>%s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser."), esc_attr($response['update_url']), esc_html($response['name']));
 		} else {
-			$msg = sprintf( __( "It looks like you're using an old version of <a href='%s'>%s</a>. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+			$msg = sprintf(__("It looks like you're using an old version of <a href='%s'>%s</a>. For the best WordPress experience, please update your browser."), esc_attr($response['update_url']), esc_html($response['name']));
 		}
 
 		$browser_nag_class = '';
-		if ( !empty( $response['img_src'] ) ) {
-			$img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+		if ( ! empty($response['img_src'])) {
+			$img_src = (is_ssl() && ! empty($response['img_src_ssl'])) ? $response['img_src_ssl'] : $response['img_src'];
 
-			$notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+			$notice .= '<div class="alignright browser-icon"><a href="'.esc_attr($response['update_url']).'"><img src="'.esc_attr($img_src).'" alt="" /></a></div>';
 			$browser_nag_class = ' has-browser-icon';
 		}
 		$notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ('en_US' !== $locale)
+			$browsehappy = add_query_arg('locale', $locale, $browsehappy);
 
-		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
-		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss">' . __( 'Dismiss' ) . '</a></p>';
+		$notice .= '<p>'.sprintf(__('<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>'), esc_attr($response['update_url']), esc_html($response['name']), esc_url($browsehappy)).'</p>';
+		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss">'.__('Dismiss').'</a></p>';
 		$notice .= '<div class="clear"></div>';
 	}
 
@@ -1252,7 +1252,7 @@ 
 	* @param string $notice   The notice content.
 	* @param array  $response An array containing web browser information.
 	*/
-	echo apply_filters( 'browse-happy-notice', $notice, $response );
+	echo apply_filters('browse-happy-notice', $notice, $response);
 }
 
 /**
@@ -1261,10 +1261,10 @@ 
  * @param array $classes
  * @return array
  */
-function dashboard_browser_nag_class( $classes ) {
+function dashboard_browser_nag_class($classes) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
+	if ($response && $response['insecure'])
 		$classes[] = 'browser-insecure';
 
 	return $classes;
@@ -1280,22 +1280,22 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+	if (empty($_SERVER['HTTP_USER_AGENT']))
 		return false;
 
-	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
+	$key = md5($_SERVER['HTTP_USER_AGENT']);
 
-	if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+	if (false === ($response = get_site_transient('browser_'.$key))) {
 		global $wp_version;
 
 		$options = array(
-			'body'			=> array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-			'user-agent'	=> 'WordPress/' . $wp_version . '; ' . home_url()
+			'body'			=> array('useragent' => $_SERVER['HTTP_USER_AGENT']),
+			'user-agent'	=> 'WordPress/'.$wp_version.'; '.home_url()
 		);
 
-		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+		$response = wp_remote_post('http://api.wordpress.org/core/browse-happy/1.1/', $options);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
 		/**
@@ -1309,12 +1309,12 @@ 
 		 *  'img_src' - string - An image representing the browser
 		 *  'img_src_ssl' - string - An image (over SSL) representing the browser
 		 */
-		$response = json_decode( wp_remote_retrieve_body( $response ), true );
+		$response = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $response ) )
+		if ( ! is_array($response))
 			return false;
 
-		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
+		set_site_transient('browser_'.$key, $response, WEEK_IN_SECONDS);
 	}
 
 	return $response;
@@ -1333,55 +1333,55 @@ 
 function wp_welcome_panel() {
 	?>
 	<div class="welcome-panel-content">
-	<h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
-	<p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
+	<h3><?php _e('Welcome to WordPress!'); ?></h3>
+	<p class="about-description"><?php _e('We&#8217;ve assembled some links to get you started:'); ?></p>
 	<div class="welcome-panel-column-container">
 	<div class="welcome-panel-column">
-		<?php if ( current_user_can( 'customize' ) ): ?>
-			<h4><?php _e( 'Get Started' ); ?></h4>
-			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+		<?php if (current_user_can('customize')): ?>
+			<h4><?php _e('Get Started'); ?></h4>
+			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e('Customize Your Site'); ?></a>
 		<?php endif; ?>
-		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
-		<?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-			<p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url('themes.php'); ?>"><?php _e('Customize Your Site'); ?></a>
+		<?php if (current_user_can('install_themes') || (current_user_can('switch_themes') && count(wp_get_themes(array('allowed' => true))) > 1)) : ?>
+			<p class="hide-if-no-customize"><?php printf(__('or, <a href="%s">change your theme completely</a>'), admin_url('themes.php')); ?></p>
 		<?php endif; ?>
 	</div>
 	<div class="welcome-panel-column">
-		<h4><?php _e( 'Next Steps' ); ?></h4>
+		<h4><?php _e('Next Steps'); ?></h4>
 		<ul>
-		<?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-		<?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php if ('page' == get_option('show_on_front') && ! get_option('page_for_posts')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+		<?php elseif ('page' == get_option('show_on_front')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Add a blog post').'</a>', admin_url('post-new.php')); ?></li>
 		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Write your first blog post').'</a>', admin_url('post-new.php')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add an About page').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-view-site">'.__('View your site').'</a>', home_url('/')); ?></li>
 		</ul>
 	</div>
 	<div class="welcome-panel-column welcome-panel-last">
-		<h4><?php _e( 'More Actions' ); ?></h4>
+		<h4><?php _e('More Actions'); ?></h4>
 		<ul>
-		<?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
+		<?php if (current_theme_supports('widgets') || current_theme_supports('menus')) : ?>
 			<li><div class="welcome-icon welcome-widgets-menus"><?php
-				if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
-					printf( __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
-						admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) );
-				} elseif ( current_theme_supports( 'widgets' ) ) {
-					echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
+				if (current_theme_supports('widgets') && current_theme_supports('menus')) {
+					printf(__('Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>'),
+						admin_url('widgets.php'), admin_url('nav-menus.php'));
+				} elseif (current_theme_supports('widgets')) {
+					echo '<a href="'.admin_url('widgets.php').'">'.__('Manage widgets').'</a>';
 				} else {
-					echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
+					echo '<a href="'.admin_url('nav-menus.php').'">'.__('Manage menus').'</a>';
 				}
 			?></div></li>
 		<?php endif; ?>
-		<?php if ( current_user_can( 'manage_options' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
+		<?php if (current_user_can('manage_options')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-comments">'.__('Turn comments on or off').'</a>', admin_url('options-discussion.php')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'https://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-learn-more">'.__('Learn more about getting started').'</a>', __('https://codex.wordpress.org/First_Steps_With_WordPress')); ?></li>
 		</ul>
 	</div>
 	</div>

Braces +102 added lines, -68 removed lines

@@ -28,18 +28,21 @@ 
 
 	if ( $response && $response['upgrade'] ) {
 		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
-		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		if ( $response['insecure'] ) {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+		} else {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		}
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if ( is_blog_admin() && current_user_can('edit_posts') ) {
+			wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	}
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if ( is_network_admin() ) {
+			wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	}
 
 	// Activity Widget
 	if ( is_blog_admin() ) {
@@ -158,12 +161,14 @@ 
 	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
-		$location = 'side';
+	if ( in_array($widget_id, $side_widgets) ) {
+			$location = 'side';
+	}
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
-		$priority = 'high';
+	if ( 'dashboard_browser_nag' === $widget_id ) {
+			$priority = 'high';
+	}
 
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
@@ -360,10 +365,12 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if ( current_user_can('create_sites') ) {
+			$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
+	}
+	if ( current_user_can('create_users') ) {
+			$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	}
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
@@ -460,8 +467,10 @@ 
 		$post = get_default_post_to_edit( 'post' , true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) ) {
+					update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID );
+		}
+		// Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
@@ -592,10 +601,11 @@ 
 		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
 		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
 		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-		if ( !EMPTY_TRASH_DAYS )
-			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
-		else
-			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
+		if ( !EMPTY_TRASH_DAYS ) {
+					$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
+		} else {
+					$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
+		}
 
 		/**
 		 * Filter the action links displayed for each comment in the 'Recent Comments'
@@ -616,8 +626,9 @@ 
 			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
-				$action .= ' hide-if-no-js';
+			if ( 'reply' == $action || 'quickedit' == $action ) {
+							$action .= ' hide-if-no-js';
+			}
 
 			$actions_string .= "<span class='$action'>$sep$link</span>";
 		}
@@ -638,10 +649,12 @@ 
 			</h4>
 
 			<?php
-			else :
+			else {
+				:
 				switch ( $comment->comment_type ) {
 					case 'pingback' :
 						$type = __( 'Pingback' );
+			}
 						break;
 					case 'trackback' :
 						$type = __( 'Trackback' );
@@ -798,19 +811,22 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
-		$comments_query['status'] = 'approve';
+	if ( ! current_user_can( 'edit_posts' ) ) {
+			$comments_query['status'] = 'approve';
+	}
 
 	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
 		if ( ! is_array( $possible ) ) {
 			break;
 		}
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
-				continue;
+			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
+							continue;
+			}
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
-				break 2;
+			if ( count( $comments ) == $total_items ) {
+							break 2;
+			}
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
@@ -821,12 +837,14 @@ 
 		echo '<h4>' . __( 'Comments' ) . '</h4>';
 
 		echo '<div id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ( $comments as $comment ) {
+					_wp_dashboard_recent_comments_row( $comment );
+		}
 		echo '</div>';
 
-		if ( current_user_can('edit_posts') )
-			_get_list_table('WP_Comments_List_Table')->views();
+		if ( current_user_can('edit_posts') ) {
+					_get_list_table('WP_Comments_List_Table')->views();
+		}
 
 		wp_comment_reply( -1, false, 'dashboard', false );
 		wp_comment_trashnotice();
@@ -935,11 +953,13 @@ 
  * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
-		$widget_options = array();
+	if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) {
+			$widget_options = array();
+	}
 
-	if ( !isset($widget_options[$widget_id]) )
-		$widget_options[$widget_id] = array();
+	if ( !isset($widget_options[$widget_id]) ) {
+			$widget_options[$widget_id] = array();
+	}
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
@@ -1098,16 +1118,18 @@ 
 	echo '<ul>';
 
 	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) {
+					continue;
+		}
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin
 		while ( true ) {
 			// Abort this foreach loop iteration if there's no plugins left of this type
-			if ( 0 == count($items) )
-				continue 2;
+			if ( 0 == count($items) ) {
+							continue 2;
+			}
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
@@ -1115,9 +1137,9 @@ 
 			list($link, $frag) = explode( '#', $item->get_link() );
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
+			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) {
+							$slug = $matches[1];
+			} else {
 				unset( $items[$item_key] );
 				continue;
 			}
@@ -1136,11 +1158,13 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) {
+					unset($items[$item_key]);
+		}
 
-		if ( !isset($items[$item_key]) )
-			continue;
+		if ( !isset($items[$item_key]) ) {
+					continue;
+		}
 
 		$title = esc_html( $item->get_title() );
 
@@ -1164,16 +1188,18 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
 */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
-		$percentused = '100';
-	else
-		$percentused = ( $used / $quota ) * 100;
+	if ( $used > $quota ) {
+			$percentused = '100';
+	} else {
+			$percentused = ( $used / $quota ) * 100;
+	}
 	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
 	$used = round( $used, 2 );
 	$percentused = number_format( $percentused );
@@ -1236,8 +1262,9 @@ 
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ( 'en_US' !== $locale ) {
+					$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		}
 
 		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
 		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss">' . __( 'Dismiss' ) . '</a></p>';
@@ -1264,8 +1291,9 @@ 
 function dashboard_browser_nag_class( $classes ) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
-		$classes[] = 'browser-insecure';
+	if ( $response && $response['insecure'] ) {
+			$classes[] = 'browser-insecure';
+	}
 
 	return $classes;
 }
@@ -1280,8 +1308,9 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
-		return false;
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
+			return false;
+	}
 
 	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
 
@@ -1295,8 +1324,9 @@ 
 
 		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		/**
 		 * Response should be an array with:
@@ -1311,8 +1341,9 @@ 
 		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $response ) )
-			return false;
+		if ( ! is_array( $response ) ) {
+					return false;
+		}
 
 		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
 	}
@@ -1356,8 +1387,11 @@ 
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php else {
+	: ?>
+			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) );
+}
+?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 		<?php endif; ?>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>

src/wp-admin/includes/deprecated.php

Doc Comments +2 added lines, -2 removed lines

@@ -127,8 +127,8 @@
  * @param int $currentparent
  * @param int $parent
  * @param int $level
- * @param array $categories
- * @return bool|null
+ * @param integer $categories
+ * @return null|false
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Deprecated admin functions from past WordPress versions. You shouldn't use these
- * functions and look for the alternatives instead. The functions will be removed
- * in a later version.
- *
- * @package WordPress
- * @subpackage Deprecated
- */
+	 * Deprecated admin functions from past WordPress versions. You shouldn't use these
+	 * functions and look for the alternatives instead. The functions will be removed
+	 * in a later version.
+	 *
+	 * @package WordPress
+	 * @subpackage Deprecated
+	 */
 
 /*
  * Deprecated functions come here to die.

Spacing +171 added lines, -171 removed lines

@@ -18,7 +18,7 @@ 
  * @see wp_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_editor()');
 
 	wp_tiny_mce();
 }
@@ -31,7 +31,7 @@ 
  *
  */
 function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function(__FUNCTION__, '2.5');
 }
 
 /**
@@ -47,9 +47,9 @@ 
  * @param int $hmax Maximum wanted height
  * @return array Shrunk dimensions (width, height).
  */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) {
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, $wmax, $hmax);
 }
 
 /**
@@ -63,9 +63,9 @@ 
  * @param int $height Current height of the image
  * @return array Shrunk dimensions (width, height).
  */
-function get_udims( $width, $height ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, 128, 96 );
+function get_udims($width, $height) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, 128, 96);
 }
 
 /**
@@ -79,10 +79,10 @@ 
  * @param int $parent
  * @param array $popular_ids
  */
-function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
-	_deprecated_function( __FUNCTION__, '2.6', 'wp_category_checklist()' );
+function dropdown_categories($default = 0, $parent = 0, $popular_ids = array()) {
+	_deprecated_function(__FUNCTION__, '2.6', 'wp_category_checklist()');
 	global $post_ID;
-	wp_category_checklist( $post_ID );
+	wp_category_checklist($post_ID);
 }
 
 /**
@@ -94,10 +94,10 @@ 
  *
  * @param int $default
  */
-function dropdown_link_categories( $default = 0 ) {
-	_deprecated_function( __FUNCTION__, '2.6', 'wp_link_category_checklist()' );
+function dropdown_link_categories($default = 0) {
+	_deprecated_function(__FUNCTION__, '2.6', 'wp_link_category_checklist()');
 	global $link_id;
-	wp_link_category_checklist( $link_id );
+	wp_link_category_checklist($link_id);
 }
 
 /**
@@ -110,10 +110,10 @@ 
  * @param string $file Filesystem path relative to the wp-content directory.
  * @return string Full filesystem path to edit.
  */
-function get_real_file_to_edit( $file ) {
-	_deprecated_function( __FUNCTION__, '2.9' );
+function get_real_file_to_edit($file) {
+	_deprecated_function(__FUNCTION__, '2.9');
 
-	return WP_CONTENT_DIR . $file;
+	return WP_CONTENT_DIR.$file;
 }
 
 /**
@@ -130,21 +130,21 @@ 
  * @param array $categories
  * @return bool|null
  */
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
-
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '– ', $level );
-				$category->name = esc_html( $category->name );
+function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_dropdown_categories()');
+	if ( ! $categories)
+		$categories = get_categories(array('hide_empty' => 0));
+
+	if ($categories) {
+		foreach ($categories as $category) {
+			if ($currentcat != $category->term_id && $parent == $category->parent) {
+				$pad = str_repeat('– ', $level);
+				$category->name = esc_html($category->name);
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
+				if ($currentparent == $category->term_id)
 					echo " selected='selected'";
 				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
+				wp_dropdown_cats($currentcat, $currentparent, $category->term_id, $level + 1, $categories);
 			}
 		}
 	} else {
@@ -164,9 +164,9 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'register_setting()' );
-	register_setting( $option_group, $option_name, $sanitize_callback );
+function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'register_setting()');
+	register_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -180,9 +180,9 @@ 
  * @param string $option_name
  * @param callable $sanitize_callback
  */
-function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'unregister_setting()' );
-	unregister_setting( $option_group, $option_name, $sanitize_callback );
+function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'unregister_setting()');
+	unregister_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -193,8 +193,8 @@ 
  *
  * @param string $filename
 **/
-function codepress_get_lang( $filename ) {
-	_deprecated_function( __FUNCTION__, '3.0' );
+function codepress_get_lang($filename) {
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -204,7 +204,7 @@ 
  * @deprecated 3.0.0
 **/
 function codepress_footer_js() {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -214,7 +214,7 @@ 
  * @deprecated 3.0.0
 **/
 function use_codepress() {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -225,15 +225,15 @@ 
  * @return array List of user IDs.
  */
 function get_author_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key));
 }
 
 /**
@@ -244,18 +244,18 @@ 
  * @param int $user_id User ID.
  * @return array|bool List of editable authors. False if no editable users.
  */
-function get_editable_authors( $user_id ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_editable_authors($user_id) {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		return false;
 	} else {
 		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+		$authors = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name");
 	}
 
 	return apply_filters('get_editable_authors', $authors);
@@ -270,32 +270,32 @@ 
  * @param bool $exclude_zeros Optional, default is true. Whether to exclude zeros.
  * @return mixed
  */
-function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_editable_user_ids($user_id, $exclude_zeros = true, $post_type = 'post') {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
+	if ( ! $user = get_userdata($user_id))
 		return array();
 	$post_type_obj = get_post_type_object($post_type);
 
-	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
+	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts)) {
+		if ($user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros)
 			return array($user->ID);
 		else
 			return array();
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
+	if ($exclude_zeros)
 		$query .= " AND meta_value != '0'";
 
-	return $wpdb->get_col( $query );
+	return $wpdb->get_col($query);
 }
 
 /**
@@ -304,19 +304,19 @@ 
  * @deprecated 3.1.0 Use get_users()
  */
 function get_nonauthor_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key));
 }
 
-if ( !class_exists('WP_User_Search') ) :
+if ( ! class_exists('WP_User_Search')) :
 /**
  * WordPress User Search class.
  *
@@ -479,12 +479,12 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
+	function __construct($search_term = '', $page = '', $role = '') {
+		_deprecated_function(__FUNCTION__, '3.1', 'WP_User_Query');
 
-		$this->search_term = wp_unslash( $search_term );
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = (int) ( '' == $page ) ? 1 : $page;
+		$this->search_term = wp_unslash($search_term);
+		$this->raw_page = ('' == $page) ? false : (int) $page;
+		$this->page = (int) ('' == $page) ? 1 : $page;
 		$this->role = $role;
 
 		$this->prepare_query();
@@ -502,8 +502,8 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
-		self::__construct( $search_term, $page, $role );
+	public function WP_User_Search($search_term = '', $page = '', $role = '') {
+		self::__construct($search_term, $page, $role);
 	}
 
 	/**
@@ -522,11 +522,11 @@ 
 		$this->query_orderby = ' ORDER BY user_login';
 
 		$search_sql = '';
-		if ( $this->search_term ) {
+		if ($this->search_term) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach (array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col)
+				$searches[] = $wpdb->prepare($col.' LIKE %s', '%'.like_escape($this->search_term).'%');
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -534,16 +534,16 @@ 
 		$this->query_from = " FROM $wpdb->users";
 		$this->query_where = " WHERE 1=1 $search_sql";
 
-		if ( $this->role ) {
+		if ($this->role) {
 			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
-			$level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
+			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%'.$this->role.'%');
+		} elseif (is_multisite()) {
+			$level_key = $wpdb->prefix.'capabilities'; // wpmu site admins don't have user_levels
 			$this->query_from .= ", $wpdb->usermeta";
 			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
 		}
 
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
+		do_action_ref_array('pre_user_search', array(&$this));
 	}
 
 	/**
@@ -557,10 +557,10 @@ 
 	function query() {
 		global $wpdb;
 
-		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)".$this->query_from.$this->query_where.$this->query_orderby.$this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
+		if ($this->results)
+			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))".$this->query_from.$this->query_where); // no limit
 		else
 			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
 	}
@@ -584,25 +584,25 @@ 
 	 * @access public
 	 */
 	function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
+		if ($this->total_users_for_query > $this->users_per_page) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
+			if ( ! empty($this->search_term))
 				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
+			if ( ! empty($this->role))
 				$args['role'] = urlencode($this->role);
 
-			$this->paging_text = paginate_links( array(
+			$this->paging_text = paginate_links(array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
 				'current' => $this->page,
 				'base' => 'users.php?%_%',
 				'format' => 'userspage=%#%',
 				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
-				$this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
+			));
+			if ($this->paging_text) {
+				$this->paging_text = sprintf('<span class="displaying-num">'.__('Displaying %s&#8211;%s of %s').'</span>%s',
+					number_format_i18n(($this->page - 1) * $this->users_per_page + 1),
+					number_format_i18n(min($this->page * $this->users_per_page, $this->total_users_for_query)),
+					number_format_i18n($this->total_users_for_query),
 					$this->paging_text
 				);
 			}
@@ -646,7 +646,7 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
+		if ($this->paging_text)
 			return true;
 		return false;
 	}
@@ -660,7 +660,7 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
+		if ($this->search_term)
 			return true;
 		return false;
 	}
@@ -677,25 +677,25 @@ 
  * @param string $type Optional, defaults to 'any'. Post type to retrieve, can be 'draft' or 'pending'.
  * @return array List of posts from others.
  */
-function get_others_unpublished_posts($user_id, $type='any') {
-	_deprecated_function( __FUNCTION__, '3.1' );
+function get_others_unpublished_posts($user_id, $type = 'any') {
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( in_array($type, array('draft', 'pending')) )
+	if (in_array($type, array('draft', 'pending')))
 		$type_sql = " post_status = '$type' ";
 	else
 		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
 
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
+	$dir = ('pending' == $type) ? 'ASC' : 'DESC';
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		$other_unpubs = '';
 	} else {
 		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
+		$other_unpubs = $wpdb->get_results($wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id));
 	}
 
 	return apply_filters('get_others_drafts', $other_unpubs);
@@ -711,7 +711,7 @@ 
  * @return array List of drafts from other users.
  */
 function get_others_drafts($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1' );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return get_others_unpublished_posts($user_id, 'draft');
 }
@@ -726,7 +726,7 @@ 
  * @return array List of posts with pending review post type from other users.
  */
 function get_others_pending($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1' );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return get_others_unpublished_posts($user_id, 'pending');
 }
@@ -739,7 +739,7 @@ 
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
-	_deprecated_function( __FUNCTION__, '3.2', 'wp_dashboard_quick_press()' );
+	_deprecated_function(__FUNCTION__, '3.2', 'wp_dashboard_quick_press()');
 	wp_dashboard_quick_press();
 }
 
@@ -752,15 +752,15 @@ 
  *
  * @staticvar int $num
  */
-function wp_tiny_mce( $teeny = false, $settings = false ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+function wp_tiny_mce($teeny = false, $settings = false) {
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 
 	static $num = 1;
 
-	if ( ! class_exists('_WP_Editors' ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists('_WP_Editors'))
+		require_once(ABSPATH.WPINC.'/class-wp-editor.php');
 
-	$editor_id = 'content' . $num++;
+	$editor_id = 'content'.$num++;
 
 	$set = array(
 		'teeny' => $teeny,
@@ -779,7 +779,7 @@ 
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -789,7 +789,7 @@ 
  * @see wp_editor()
  */
 function wp_print_editor_js() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -799,7 +799,7 @@ 
  * @see wp_editor()
  */
 function wp_quicktags() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -809,12 +809,12 @@ 
  * @deprecated 3.3.0 WP_Screen::render_screen_layout()
  * @see WP_Screen::render_screen_layout()
  */
-function screen_layout( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_screen_layout()' );
+function screen_layout($screen) {
+	_deprecated_function(__FUNCTION__, '3.3', '$current_screen->render_screen_layout()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -829,12 +829,12 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_per_page_options()
  * @see WP_Screen::render_per_page_options()
  */
-function screen_options( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_per_page_options()' );
+function screen_options($screen) {
+	_deprecated_function(__FUNCTION__, '3.3', '$current_screen->render_per_page_options()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -849,7 +849,7 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_screen_meta()
  * @see WP_Screen::render_screen_meta()
  */
-function screen_meta( $screen ) {
+function screen_meta($screen) {
 	$current_screen = get_current_screen();
 	$current_screen->render_screen_meta();
 }
@@ -862,7 +862,7 @@ 
  * @see WP_Admin_Bar
  */
 function favorite_actions() {
-	_deprecated_function( __FUNCTION__, '3.2', 'WP_Admin_Bar' );
+	_deprecated_function(__FUNCTION__, '3.2', 'WP_Admin_Bar');
 }
 
 /**
@@ -874,7 +874,7 @@ 
  * @return null|string
  */
 function media_upload_image() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -887,7 +887,7 @@ 
  * @return null|string
  */
 function media_upload_audio() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -900,7 +900,7 @@ 
  * @return null|string
  */
 function media_upload_video() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -913,7 +913,7 @@ 
  * @return null|string
  */
 function media_upload_file() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -926,8 +926,8 @@ 
  * @return string
  */
 function type_url_form_image() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('image')" );
-	return wp_media_insert_url_form( 'image' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('image')");
+	return wp_media_insert_url_form('image');
 }
 
 /**
@@ -939,8 +939,8 @@ 
  * @return string
  */
 function type_url_form_audio() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('audio')" );
-	return wp_media_insert_url_form( 'audio' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('audio')");
+	return wp_media_insert_url_form('audio');
 }
 
 /**
@@ -952,8 +952,8 @@ 
  * @return string
  */
 function type_url_form_video() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('video')" );
-	return wp_media_insert_url_form( 'video' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('video')");
+	return wp_media_insert_url_form('video');
 }
 
 /**
@@ -965,8 +965,8 @@ 
  * @return string
  */
 function type_url_form_file() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('file')" );
-	return wp_media_insert_url_form( 'file' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('file')");
+	return wp_media_insert_url_form('file');
 }
 
 /**
@@ -981,13 +981,13 @@ 
  * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
  * @param string    $help   The content of an 'Overview' help tab.
  */
-function add_contextual_help( $screen, $help ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()' );
+function add_contextual_help($screen, $help) {
+	_deprecated_function(__FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()');
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	WP_Screen::add_old_compat_help( $screen, $help );
+	WP_Screen::add_old_compat_help($screen, $help);
 }
 
 /**
@@ -1000,13 +1000,13 @@ 
  * @return array $themes Array of allowed themes.
  */
 function get_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', "wp_get_themes( array( 'allowed' => true ) )" );
+	_deprecated_function(__FUNCTION__, '3.4', "wp_get_themes( array( 'allowed' => true ) )");
 
-	$themes = wp_get_themes( array( 'allowed' => true ) );
+	$themes = wp_get_themes(array('allowed' => true));
 
 	$wp_themes = array();
-	foreach ( $themes as $theme ) {
-		$wp_themes[ $theme->get('Name') ] = $theme;
+	foreach ($themes as $theme) {
+		$wp_themes[$theme->get('Name')] = $theme;
 	}
 
 	return $wp_themes;
@@ -1022,13 +1022,13 @@ 
  * @return array
  */
 function get_broken_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', "wp_get_themes( array( 'errors' => true )" );
+	_deprecated_function(__FUNCTION__, '3.4', "wp_get_themes( array( 'errors' => true )");
 
-	$themes = wp_get_themes( array( 'errors' => true ) );
+	$themes = wp_get_themes(array('errors' => true));
 	$broken = array();
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		$broken[ $name ] = array(
+		$broken[$name] = array(
 			'Name' => $name,
 			'Title' => $name,
 			'Description' => $theme->errors()->get_error_message(),
@@ -1047,7 +1047,7 @@ 
  * @return WP_Theme
  */
 function current_theme_info() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
 
 	return wp_get_theme();
 }
@@ -1059,8 +1059,8 @@ 
  *
  * @deprecated 3.5.0
  */
-function _insert_into_post_button( $type ) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+function _insert_into_post_button($type) {
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -1071,7 +1071,7 @@ 
  * @deprecated 3.5.0
  */
 function _media_button($title, $icon, $type, $id) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -1084,10 +1084,10 @@ 
  * @param int $id
  * @return object
  */
-function get_post_to_edit( $id ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'get_post()' );
+function get_post_to_edit($id) {
+	_deprecated_function(__FUNCTION__, '3.5', 'get_post()');
 
-	return get_post( $id, OBJECT, 'edit' );
+	return get_post($id, OBJECT, 'edit');
 }
 
 /**
@@ -1100,7 +1100,7 @@ 
  * @return WP_Post Post object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
-	_deprecated_function( __FUNCTION__, '3.5', "get_default_post_to_edit( 'page' )" );
+	_deprecated_function(__FUNCTION__, '3.5', "get_default_post_to_edit( 'page' )");
 
 	$page = get_default_post_to_edit();
 	$page->post_type = 'page';
@@ -1119,9 +1119,9 @@ 
  * @param mixed $deprecated Never used.
  * @return string Thumbnail path on success, Error string on failure.
  */
-function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'image_resize()' );
-	return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
+function wp_create_thumbnail($file, $max_side, $deprecated = '') {
+	_deprecated_function(__FUNCTION__, '3.5', 'image_resize()');
+	return apply_filters('wp_create_thumbnail', image_resize($file, $max_side, $max_side));
 }
 
 /**
@@ -1133,7 +1133,7 @@ 
  * @deprecated 3.6.0
  */
 function wp_nav_menu_locations_meta_box() {
-	_deprecated_function( __FUNCTION__, '3.6' );
+	_deprecated_function(__FUNCTION__, '3.6');
 }
 
 /**
@@ -1147,12 +1147,12 @@ 
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Core_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Core_Upgrader();
 	return $upgrader->upgrade($current);
 
@@ -1170,12 +1170,12 @@ 
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Plugin_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Plugin_Upgrader();
 	return $upgrader->upgrade($plugin);
 }
@@ -1192,12 +1192,12 @@ 
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Theme_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Theme_Upgrader();
 	return $upgrader->upgrade($theme);
 }
@@ -1210,8 +1210,8 @@ 
  *
  * @param int|bool $id
  */
-function the_attachment_links( $id = false ) {
-	_deprecated_function( __FUNCTION__, '3.7' );
+function the_attachment_links($id = false) {
+	_deprecated_function(__FUNCTION__, '3.7');
 }
 
 /**
@@ -1312,6 +1312,6 @@ 
  * @param int $old_ID
  * @param int $new_ID
  */
-function _relocate_children( $old_ID, $new_ID ) {
-	_deprecated_function( __FUNCTION__, '3.9' );
+function _relocate_children($old_ID, $new_ID) {
+	_deprecated_function(__FUNCTION__, '3.9');
 }

Braces +83 added lines, -56 removed lines

@@ -132,8 +132,9 @@ 
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+	if (!$categories ) {
+			$categories = get_categories( array('hide_empty' => 0) );
+	}
 
 	if ( $categories ) {
 		foreach ( $categories as $category ) {
@@ -141,8 +142,9 @@ 
 				$pad = str_repeat( '– ', $level );
 				$category->name = esc_html( $category->name );
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
+				if ( $currentparent == $category->term_id ) {
+									echo " selected='selected'";
+				}
 				echo ">$pad$category->name</option>";
 				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
 			}
@@ -228,10 +230,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -275,25 +279,30 @@ 
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
+	if ( ! $user = get_userdata( $user_id ) ) {
+			return array();
+	}
 	$post_type_obj = get_post_type_object($post_type);
 
 	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
+		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros ) {
+					return array($user->ID);
+		} else {
+					return array();
+		}
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+	if ( $exclude_zeros ) {
+			$query .= " AND meta_value != '0'";
+	}
 
 	return $wpdb->get_col( $query );
 }
@@ -308,10 +317,12 @@ 
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
@@ -525,8 +536,9 @@ 
 		if ( $this->search_term ) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col ) {
+							$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			}
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -559,10 +571,13 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		if ( $this->results ) {
+					$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+		}
+		// no limit
+		else {
+					$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		}
 	}
 
 	/**
@@ -586,10 +601,12 @@ 
 	function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
+			if ( ! empty($this->search_term) ) {
+							$args['usersearch'] = urlencode($this->search_term);
+			}
+			if ( ! empty($this->role) ) {
+							$args['role'] = urlencode($this->role);
+			}
 
 			$this->paging_text = paginate_links( array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -646,8 +663,9 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
+		if ( $this->paging_text ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -660,8 +678,9 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
-			return true;
+		if ( $this->search_term ) {
+					return true;
+		}
 		return false;
 	}
 }
@@ -684,10 +703,11 @@ 
 
 	$editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	if ( in_array($type, array('draft', 'pending')) ) {
+			$type_sql = " post_status = '$type' ";
+	} else {
+			$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	}
 
 	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
@@ -757,8 +777,9 @@ 
 
 	static $num = 1;
 
-	if ( ! class_exists('_WP_Editors' ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists('_WP_Editors' ) ) {
+			require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	}
 
 	$editor_id = 'content' . $num++;
 
@@ -814,8 +835,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_screen_layout();
@@ -834,8 +856,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_per_page_options();
@@ -984,8 +1007,9 @@ 
 function add_contextual_help( $screen, $help ) {
 	_deprecated_function( __FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	WP_Screen::add_old_compat_help( $screen, $help );
 }
@@ -1149,8 +1173,9 @@ 
 function wp_update_core($current, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Core_Upgrader();
@@ -1172,8 +1197,9 @@ 
 function wp_update_plugin($plugin, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Plugin_Upgrader();
@@ -1194,8 +1220,9 @@ 
 function wp_update_theme($theme, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Theme_Upgrader();

src/wp-admin/includes/file.php

Doc Comments +1 added lines, -1 removed lines

@@ -833,7 +833,7 @@
  *
  * @global WP_Filesystem_Base $wp_filesystem Subclass
  *
- * @param array|false  $args                         Optional. Connection args, These are passed directly to
+ * @param boolean  $args                         Optional. Connection args, These are passed directly to
  *                                                   the `WP_Filesystem_*()` classes. Default false.
  * @param string|false $context                      Optional. Context for get_filesystem_method(). Default false.
  * @param bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Functions for reading, writing, modifying, and deleting files on the file system.
- * Includes functionality for theme-specific files as well as operations for uploading,
- * archiving, and rendering output when necessary.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Functions for reading, writing, modifying, and deleting files on the file system.
+	 * Includes functionality for theme-specific files as well as operations for uploading,
+	 * archiving, and rendering output when necessary.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** The descriptions for theme files. */
 $wp_file_descriptions = array(

Spacing +346 added lines, -346 removed lines

@@ -10,38 +10,38 @@ 
 
 /** The descriptions for theme files. */
 $wp_file_descriptions = array(
-	'index.php' => __( 'Main Index Template' ),
-	'style.css' => __( 'Stylesheet' ),
-	'editor-style.css' => __( 'Visual Editor Stylesheet' ),
-	'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ),
-	'rtl.css' => __( 'RTL Stylesheet' ),
-	'comments.php' => __( 'Comments' ),
-	'comments-popup.php' => __( 'Popup Comments' ),
-	'footer.php' => __( 'Footer' ),
-	'header.php' => __( 'Header' ),
-	'sidebar.php' => __( 'Sidebar' ),
-	'archive.php' => __( 'Archives' ),
-	'author.php' => __( 'Author Template' ),
-	'tag.php' => __( 'Tag Template' ),
-	'category.php' => __( 'Category Template' ),
-	'page.php' => __( 'Page Template' ),
-	'search.php' => __( 'Search Results' ),
-	'searchform.php' => __( 'Search Form' ),
-	'single.php' => __( 'Single Post' ),
-	'404.php' => __( '404 Template' ),
-	'link.php' => __( 'Links Template' ),
-	'functions.php' => __( 'Theme Functions' ),
-	'attachment.php' => __( 'Attachment Template' ),
+	'index.php' => __('Main Index Template'),
+	'style.css' => __('Stylesheet'),
+	'editor-style.css' => __('Visual Editor Stylesheet'),
+	'editor-style-rtl.css' => __('Visual Editor RTL Stylesheet'),
+	'rtl.css' => __('RTL Stylesheet'),
+	'comments.php' => __('Comments'),
+	'comments-popup.php' => __('Popup Comments'),
+	'footer.php' => __('Footer'),
+	'header.php' => __('Header'),
+	'sidebar.php' => __('Sidebar'),
+	'archive.php' => __('Archives'),
+	'author.php' => __('Author Template'),
+	'tag.php' => __('Tag Template'),
+	'category.php' => __('Category Template'),
+	'page.php' => __('Page Template'),
+	'search.php' => __('Search Results'),
+	'searchform.php' => __('Search Form'),
+	'single.php' => __('Single Post'),
+	'404.php' => __('404 Template'),
+	'link.php' => __('Links Template'),
+	'functions.php' => __('Theme Functions'),
+	'attachment.php' => __('Attachment Template'),
 	'image.php' => __('Image Attachment Template'),
 	'video.php' => __('Video Attachment Template'),
 	'audio.php' => __('Audio Attachment Template'),
 	'application.php' => __('Application Attachment Template'),
-	'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ),
-	'.htaccess' => __( '.htaccess (for rewrite rules )' ),
+	'my-hacks.php' => __('my-hacks.php (legacy hacks support)'),
+	'.htaccess' => __('.htaccess (for rewrite rules )'),
 	// Deprecated files
-	'wp-layout.css' => __( 'Stylesheet' ),
-	'wp-comments.php' => __( 'Comments Template' ),
-	'wp-comments-popup.php' => __( 'Popup Comments Template' ),
+	'wp-layout.css' => __('Stylesheet'),
+	'wp-comments.php' => __('Comments Template'),
+	'wp-comments-popup.php' => __('Popup Comments Template'),
 );
 
 /**
@@ -54,19 +54,19 @@ 
  * @param string $file Filesystem path or filename
  * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist
  */
-function get_file_description( $file ) {
+function get_file_description($file) {
 	global $wp_file_descriptions;
 
-	if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
-		return $wp_file_descriptions[basename( $file )];
+	if (isset($wp_file_descriptions[basename($file)])) {
+		return $wp_file_descriptions[basename($file)];
 	}
-	elseif ( file_exists( $file ) && is_file( $file ) ) {
-		$template_data = implode( '', file( $file ) );
-		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ))
-			return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+	elseif (file_exists($file) && is_file($file)) {
+		$template_data = implode('', file($file));
+		if (preg_match('|Template Name:(.*)$|mi', $template_data, $name))
+			return sprintf(__('%s Page Template'), _cleanup_header_comment($name[1]));
 	}
 
-	return trim( basename( $file ) );
+	return trim(basename($file));
 }
 
 /**
@@ -77,18 +77,18 @@ 
  * @return string Full filesystem path to the root of the WordPress installation
  */
 function get_home_path() {
-	$home    = set_url_scheme( get_option( 'home' ), 'http' );
-	$siteurl = set_url_scheme( get_option( 'siteurl' ), 'http' );
-	if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) {
-		$wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */
-		$pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
-		$home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
-		$home_path = trailingslashit( $home_path );
+	$home    = set_url_scheme(get_option('home'), 'http');
+	$siteurl = set_url_scheme(get_option('siteurl'), 'http');
+	if ( ! empty($home) && 0 !== strcasecmp($home, $siteurl)) {
+		$wp_path_rel_to_home = str_ireplace($home, '', $siteurl); /* $siteurl - $home */
+		$pos = strripos(str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']), trailingslashit($wp_path_rel_to_home));
+		$home_path = substr($_SERVER['SCRIPT_FILENAME'], 0, $pos);
+		$home_path = trailingslashit($home_path);
 	} else {
 		$home_path = ABSPATH;
 	}
 
-	return str_replace( '\\', '/', $home_path );
+	return str_replace('\\', '/', $home_path);
 }
 
 /**
@@ -101,30 +101,30 @@ 
  * @param int    $levels Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
  * @return bool|array False on failure, Else array of files
  */
-function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
+function list_files($folder = '', $levels = 100) {
+	if (empty($folder))
 		return false;
 
-	if ( ! $levels )
+	if ( ! $levels)
 		return false;
 
 	$files = array();
-	if ( $dir = @opendir( $folder ) ) {
-		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
+	if ($dir = @opendir($folder)) {
+		while (($file = readdir($dir)) !== false) {
+			if (in_array($file, array('.', '..')))
 				continue;
-			if ( is_dir( $folder . '/' . $file ) ) {
-				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
+			if (is_dir($folder.'/'.$file)) {
+				$files2 = list_files($folder.'/'.$file, $levels - 1);
+				if ($files2)
+					$files = array_merge($files, $files2);
 				else
-					$files[] = $folder . '/' . $file . '/';
+					$files[] = $folder.'/'.$file.'/';
 			} else {
-				$files[] = $folder . '/' . $file;
+				$files[] = $folder.'/'.$file;
 			}
 		}
 	}
-	@closedir( $dir );
+	@closedir($dir);
 	return $files;
 }
 
@@ -141,27 +141,27 @@ 
  * @param string $dir      Optional. Directory to store the file in. Default empty.
  * @return string a writable filename
  */
-function wp_tempnam( $filename = '', $dir = '' ) {
-	if ( empty( $dir ) ) {
+function wp_tempnam($filename = '', $dir = '') {
+	if (empty($dir)) {
 		$dir = get_temp_dir();
 	}
 
-	if ( empty( $filename ) || '.' == $filename || '/' == $filename ) {
+	if (empty($filename) || '.' == $filename || '/' == $filename) {
 		$filename = time();
 	}
 
 	// Use the basename of the given file without the extension as the name for the temporary directory
-	$temp_filename = basename( $filename );
-	$temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename );
+	$temp_filename = basename($filename);
+	$temp_filename = preg_replace('|\.[^.]*$|', '', $temp_filename);
 
 	// If the folder is falsey, use it's parent directory name instead
-	if ( ! $temp_filename ) {
-		return wp_tempnam( dirname( $filename ), $dir );
+	if ( ! $temp_filename) {
+		return wp_tempnam(dirname($filename), $dir);
 	}
 
 	$temp_filename .= '.tmp';
-	$temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
-	touch( $temp_filename );
+	$temp_filename = $dir.wp_unique_filename($dir, $temp_filename);
+	touch($temp_filename);
 
 	return $temp_filename;
 }
@@ -177,21 +177,21 @@ 
  * @param array $allowed_files Array of allowed files to edit, $file must match an entry exactly
  * @return string|null
  */
-function validate_file_to_edit( $file, $allowed_files = '' ) {
-	$code = validate_file( $file, $allowed_files );
+function validate_file_to_edit($file, $allowed_files = '') {
+	$code = validate_file($file, $allowed_files);
 
-	if (!$code )
+	if ( ! $code)
 		return $file;
 
-	switch ( $code ) {
+	switch ($code) {
 		case 1 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 
 		// case 2 :
 		// wp_die( __('Sorry, can’t call files with their real path.' ));
 
 		case 3 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 	}
 }
 
@@ -210,11 +210,11 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
 */
-function _wp_handle_upload( &$file, $overrides, $time, $action ) {
+function _wp_handle_upload(&$file, $overrides, $time, $action) {
 	// The default error handler.
-	if ( ! function_exists( 'wp_handle_upload_error' ) ) {
-		function wp_handle_upload_error( &$file, $message ) {
-			return array( 'error' => $message );
+	if ( ! function_exists('wp_handle_upload_error')) {
+		function wp_handle_upload_error(&$file, $message) {
+			return array('error' => $message);
 		}
 	}
 
@@ -228,24 +228,24 @@ 
 	 *
 	 * @param array $file An array of data for a single file.
 	 */
-	$file = apply_filters( "{$action}_prefilter", $file );
+	$file = apply_filters("{$action}_prefilter", $file);
 
 	// You may define your own function and pass the name in $overrides['upload_error_handler']
 	$upload_error_handler = 'wp_handle_upload_error';
-	if ( isset( $overrides['upload_error_handler'] ) ) {
+	if (isset($overrides['upload_error_handler'])) {
 		$upload_error_handler = $overrides['upload_error_handler'];
 	}
 
 	// You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
-	if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) {
-		return $upload_error_handler( $file, $file['error'] );
+	if (isset($file['error']) && ! is_numeric($file['error']) && $file['error']) {
+		return $upload_error_handler($file, $file['error']);
 	}
 
 	// Install user overrides. Did we mention that this voids your warranty?
 
 	// You may define your own function and pass the name in $overrides['unique_filename_callback']
 	$unique_filename_callback = null;
-	if ( isset( $overrides['unique_filename_callback'] ) ) {
+	if (isset($overrides['unique_filename_callback'])) {
 		$unique_filename_callback = $overrides['unique_filename_callback'];
 	}
 
@@ -253,72 +253,72 @@ 
 	 * This may not have orignially been intended to be overrideable,
 	 * but historically has been.
 	 */
-	if ( isset( $overrides['upload_error_strings'] ) ) {
+	if (isset($overrides['upload_error_strings'])) {
 		$upload_error_strings = $overrides['upload_error_strings'];
 	} else {
 		// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
 		$upload_error_strings = array(
 			false,
-			__( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.' ),
-			__( 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.' ),
-			__( 'The uploaded file was only partially uploaded.' ),
-			__( 'No file was uploaded.' ),
+			__('The uploaded file exceeds the upload_max_filesize directive in php.ini.'),
+			__('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'),
+			__('The uploaded file was only partially uploaded.'),
+			__('No file was uploaded.'),
 			'',
-			__( 'Missing a temporary folder.' ),
-			__( 'Failed to write file to disk.' ),
-			__( 'File upload stopped by extension.' )
+			__('Missing a temporary folder.'),
+			__('Failed to write file to disk.'),
+			__('File upload stopped by extension.')
 		);
 	}
 
 	// All tests are on by default. Most can be turned off by $overrides[{test_name}] = false;
-	$test_form = isset( $overrides['test_form'] ) ? $overrides['test_form'] : true;
-	$test_size = isset( $overrides['test_size'] ) ? $overrides['test_size'] : true;
+	$test_form = isset($overrides['test_form']) ? $overrides['test_form'] : true;
+	$test_size = isset($overrides['test_size']) ? $overrides['test_size'] : true;
 
 	// If you override this, you must provide $ext and $type!!
-	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-	$mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+	$test_type = isset($overrides['test_type']) ? $overrides['test_type'] : true;
+	$mimes = isset($overrides['mimes']) ? $overrides['mimes'] : false;
 
 	// A correct form post will pass this test.
-	if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
-		return call_user_func( $upload_error_handler, $file, __( 'Invalid form submission.' ) );
+	if ($test_form && ( ! isset($_POST['action']) || ($_POST['action'] != $action))) {
+		return call_user_func($upload_error_handler, $file, __('Invalid form submission.'));
 	}
 	// A successful upload will pass this test. It makes no sense to override this one.
-	if ( isset( $file['error'] ) && $file['error'] > 0 ) {
-		return call_user_func( $upload_error_handler, $file, $upload_error_strings[ $file['error'] ] );
+	if (isset($file['error']) && $file['error'] > 0) {
+		return call_user_func($upload_error_handler, $file, $upload_error_strings[$file['error']]);
 	}
 
-	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize( $file['tmp_name'] );
+	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize($file['tmp_name']);
 	// A non-empty file will pass this test.
-	if ( $test_size && ! ( $test_file_size > 0 ) ) {
-		if ( is_multisite() ) {
-			$error_msg = __( 'File is empty. Please upload something more substantial.' );
+	if ($test_size && ! ($test_file_size > 0)) {
+		if (is_multisite()) {
+			$error_msg = __('File is empty. Please upload something more substantial.');
 		} else {
-			$error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+			$error_msg = __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.');
 		}
-		return call_user_func( $upload_error_handler, $file, $error_msg );
+		return call_user_func($upload_error_handler, $file, $error_msg);
 	}
 
 	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] );
-	if ( ! $test_uploaded_file ) {
-		return call_user_func( $upload_error_handler, $file, __( 'Specified file failed upload test.' ) );
+	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file($file['tmp_name']) : @ is_file($file['tmp_name']);
+	if ( ! $test_uploaded_file) {
+		return call_user_func($upload_error_handler, $file, __('Specified file failed upload test.'));
 	}
 
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
-	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
-		$ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
-		$type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
-		$proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
+	if ($test_type) {
+		$wp_filetype = wp_check_filetype_and_ext($file['tmp_name'], $file['name'], $mimes);
+		$ext = empty($wp_filetype['ext']) ? '' : $wp_filetype['ext'];
+		$type = empty($wp_filetype['type']) ? '' : $wp_filetype['type'];
+		$proper_filename = empty($wp_filetype['proper_filename']) ? '' : $wp_filetype['proper_filename'];
 
 		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
-		if ( $proper_filename ) {
+		if ($proper_filename) {
 			$file['name'] = $proper_filename;
 		}
-		if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-			return call_user_func( $upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
+		if (( ! $type || ! $ext) && ! current_user_can('unfiltered_upload')) {
+			return call_user_func($upload_error_handler, $file, __('Sorry, this file type is not permitted for security reasons.'));
 		}
-		if ( ! $type ) {
+		if ( ! $type) {
 			$type = $file['type'];
 		}
 	} else {
@@ -329,39 +329,39 @@ 
 	 * A writable uploads dir will pass this test. Again, there's no point
 	 * overriding this one.
 	 */
-	if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
-		return call_user_func( $upload_error_handler, $file, $uploads['error'] );
+	if ( ! (($uploads = wp_upload_dir($time)) && false === $uploads['error'])) {
+		return call_user_func($upload_error_handler, $file, $uploads['error']);
 	}
 
-	$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
+	$filename = wp_unique_filename($uploads['path'], $file['name'], $unique_filename_callback);
 
 	// Move the file to the uploads dir.
-	$new_file = $uploads['path'] . "/$filename";
-	if ( 'wp_handle_upload' === $action ) {
-		$move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
+	$new_file = $uploads['path']."/$filename";
+	if ('wp_handle_upload' === $action) {
+		$move_new_file = @ move_uploaded_file($file['tmp_name'], $new_file);
 	} else {
-		$move_new_file = @ rename( $file['tmp_name'], $new_file );
+		$move_new_file = @ rename($file['tmp_name'], $new_file);
 	}
 
-	if ( false === $move_new_file ) {
-		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+	if (false === $move_new_file) {
+		if (0 === strpos($uploads['basedir'], ABSPATH)) {
+			$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 		} else {
-			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+			$error_path = basename($uploads['basedir']).$uploads['subdir'];
 		}
-		return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+		return $upload_error_handler($file, sprintf(__('The uploaded file could not be moved to %s.'), $error_path));
 	}
 
 	// Set correct file permissions.
-	$stat = stat( dirname( $new_file ));
+	$stat = stat(dirname($new_file));
 	$perms = $stat['mode'] & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 
 	// Compute the URL.
-	$url = $uploads['url'] . "/$filename";
+	$url = $uploads['url']."/$filename";
 
-	if ( is_multisite() ) {
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite()) {
+		delete_transient('dirsize_cache');
 	}
 
 	/**
@@ -378,11 +378,11 @@ 
 	 * }
 	 * @param string $context The type of upload action. Values include 'upload' or 'sideload'.
 	 */
-	return apply_filters( 'wp_handle_upload', array(
+	return apply_filters('wp_handle_upload', array(
 		'file' => $new_file,
 		'url'  => $url,
 		'type' => $type
-	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' ); }
+	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload'); }
 
 /**
  * Wrapper for _wp_handle_upload(), passes 'wp_handle_upload' action.
@@ -399,17 +399,17 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_upload( &$file, $overrides = false, $time = null ) {
+function wp_handle_upload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_upload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
 
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 /**
@@ -426,16 +426,16 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
+function wp_handle_sideload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_sideload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 
@@ -449,32 +449,32 @@ 
  * @param int $timeout The timeout for the request to download the file default 300 seconds
  * @return mixed WP_Error on failure, string Filename on success.
  */
-function download_url( $url, $timeout = 300 ) {
+function download_url($url, $timeout = 300) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
+	if ( ! $url)
 		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 
 	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
+	if ( ! $tmpfname)
 		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+	$response = wp_safe_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-	if ( is_wp_error( $response ) ) {
-		unlink( $tmpfname );
+	if (is_wp_error($response)) {
+		unlink($tmpfname);
 		return $response;
 	}
 
-	if ( 200 != wp_remote_retrieve_response_code( $response ) ){
-		unlink( $tmpfname );
-		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+	if (200 != wp_remote_retrieve_response_code($response)) {
+		unlink($tmpfname);
+		return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 	}
 
-	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-	if ( $content_md5 ) {
-		$md5_check = verify_file_md5( $tmpfname, $content_md5 );
-		if ( is_wp_error( $md5_check ) ) {
-			unlink( $tmpfname );
+	$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+	if ($content_md5) {
+		$md5_check = verify_file_md5($tmpfname, $content_md5);
+		if (is_wp_error($md5_check)) {
+			unlink($tmpfname);
 			return $md5_check;
 		}
 	}
@@ -491,20 +491,20 @@ 
  * @param string $expected_md5 The expected MD5 of the file, either a base64 encoded raw md5, or a hex-encoded md5
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
-function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
+function verify_file_md5($filename, $expected_md5) {
+	if (32 == strlen($expected_md5))
+		$expected_raw_md5 = pack('H*', $expected_md5);
+	elseif (24 == strlen($expected_md5))
+		$expected_raw_md5 = base64_decode($expected_md5);
 	else
 		return false; // unknown format
 
-	$file_md5 = md5_file( $filename, true );
+	$file_md5 = md5_file($filename, true);
 
-	if ( $file_md5 === $expected_raw_md5 )
+	if ($file_md5 === $expected_raw_md5)
 		return true;
 
-	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
+	return new WP_Error('md5_mismatch', sprintf(__('The checksum of the file (%1$s) does not match the expected checksum value (%2$s).'), bin2hex($file_md5), bin2hex($expected_raw_md5)));
 }
 
 /**
@@ -525,28 +525,28 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+	if ( ! $wp_filesystem || ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
 	// Unzip can use a lot of memory, but not this much hopefully
 	/** This filter is documented in wp-admin/admin.php */
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+	@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 
 	$needed_dirs = array();
 	$to = trailingslashit($to);
 
 	// Determine any parent dir's needed (of the upgrade directory)
-	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
+	if ( ! $wp_filesystem->is_dir($to)) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
-		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
+		for ($i = count($path); $i >= 0; $i--) {
+			if (empty($path[$i]))
 				continue;
 
-			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			$dir = implode('/', array_slice($path, 0, $i + 1));
+			if (preg_match('!^[a-z]:$!i', $dir)) // Skip it if it looks like a Windows Drive letter.
 				continue;
 
-			if ( ! $wp_filesystem->is_dir($dir) )
+			if ( ! $wp_filesystem->is_dir($dir))
 				$needed_dirs[] = $dir;
 			else
 				break; // A folder exists, therefor, we dont need the check the levels below this
@@ -560,12 +560,12 @@ 
 	 *
 	 * @param bool $ziparchive Whether to use ZipArchive. Default true.
 	 */
-	if ( class_exists( 'ZipArchive' ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+	if (class_exists('ZipArchive') && apply_filters('unzip_file_use_ziparchive', true)) {
 		$result = _unzip_file_ziparchive($file, $to, $needed_dirs);
-		if ( true === $result ) {
+		if (true === $result) {
 			return $result;
-		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
+		} elseif (is_wp_error($result)) {
+			if ('incompatible_archive' != $result->get_error_code())
 				return $result;
 		}
 	}
@@ -588,30 +588,30 @@ 
  * @param array $needed_dirs A partial list of required folders needed to be created.
  * @return mixed WP_Error on failure, True on success
  */
-function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
+function _unzip_file_ziparchive($file, $to, $needed_dirs = array()) {
 	global $wp_filesystem;
 
 	$z = new ZipArchive();
 
-	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	$zopen = $z->open($file, ZIPARCHIVE::CHECKCONS);
+	if (true !== $zopen)
+		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), array('ziparchive_error' => $zopen));
 
 	$uncompressed_size = 0;
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' == substr($info['name'], -1) ) // directory
-			$needed_dirs[] = $to . untrailingslashit($info['name']);
+		if ('/' == substr($info['name'], -1)) // directory
+			$needed_dirs[] = $to.untrailingslashit($info['name']);
 		else
-			$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+			$needed_dirs[] = $to.untrailingslashit(dirname($info['name']));
 	}
 
 	/*
@@ -619,22 +619,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -642,30 +642,30 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the Dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
-			return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir)) {
+			return new WP_Error('mkdir_failed_ziparchive', __('Could not create directory.'), substr($_dir, strlen($to)));
 		}
 	}
 	unset($needed_dirs);
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ('/' == substr($info['name'], -1)) // directory
 			continue;
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if (false === $contents)
+			return new WP_Error('extract_failed_ziparchive', __('Could not extract file from archive.'), $info['name']);
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents($to.$info['name'], $contents, FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_ziparchive', __('Could not copy file.'), $info['name']);
 	}
 
 	$z->close();
@@ -693,7 +693,7 @@ 
 
 	mbstring_binary_safe_encoding();
 
-	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+	require_once(ABSPATH.'wp-admin/includes/class-pclzip.php');
 
 	$archive = new PclZip($file);
 
@@ -702,22 +702,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
+	if ( ! is_array($archive_files))
 		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if (0 == count($archive_files))
+		return new WP_Error('empty_archive_pclzip', __('Empty archive.'));
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
-	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+	foreach ($archive_files as $file) {
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $file['size'];
 
-		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
+		$needed_dirs[] = $to.untrailingslashit($file['folder'] ? $file['filename'] : dirname($file['filename']));
 	}
 
 	/*
@@ -725,22 +725,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -748,23 +748,23 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir))
+			return new WP_Error('mkdir_failed_pclzip', __('Could not create directory.'), substr($_dir, strlen($to)));
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
-	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
+	foreach ($archive_files as $file) {
+		if ($file['folder'])
 			continue;
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents($to.$file['filename'], $file['content'], FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_pclzip', __('Could not copy file.'), $file['filename']);
 	}
 	return true;
 }
@@ -782,7 +782,7 @@ 
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to, $skip_list = array() ) {
+function copy_dir($from, $to, $skip_list = array()) {
 	global $wp_filesystem;
 
 	$dirlist = $wp_filesystem->dirlist($from);
@@ -790,32 +790,32 @@ 
 	$from = trailingslashit($from);
 	$to = trailingslashit($to);
 
-	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+	foreach ((array) $dirlist as $filename => $fileinfo) {
+		if (in_array($filename, $skip_list))
 			continue;
 
-		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+		if ('f' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE)) {
 				// If copy failed, chmod file to 0644 and try again.
-				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				$wp_filesystem->chmod($to.$filename, FS_CHMOD_FILE);
+				if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE))
+					return new WP_Error('copy_failed_copy_dir', __('Could not copy file.'), $to.$filename);
 			}
-		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+		} elseif ('d' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->is_dir($to.$filename)) {
+				if ( ! $wp_filesystem->mkdir($to.$filename, FS_CHMOD_DIR))
+					return new WP_Error('mkdir_failed_copy_dir', __('Could not create directory.'), $to.$filename);
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
-			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+			foreach ($skip_list as $skip_item) {
+				if (0 === strpos($skip_item, $filename.'/'))
+					$sub_skip_list[] = preg_replace('!^'.preg_quote($filename, '!').'/!i', '', $skip_item);
 			}
 
-			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = copy_dir($from.$filename, $to.$filename, $sub_skip_list);
+			if (is_wp_error($result))
 				return $result;
 		}
 	}
@@ -839,17 +839,17 @@ 
  * @param bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
  * @return null|bool false on failure, true on success.
  */
-function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
+function WP_Filesystem($args = false, $context = false, $allow_relaxed_file_ownership = false) {
 	global $wp_filesystem;
 
-	require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+	require_once(ABSPATH.'wp-admin/includes/class-wp-filesystem-base.php');
 
-	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
+	$method = get_filesystem_method($args, $context, $allow_relaxed_file_ownership);
 
-	if ( ! $method )
+	if ( ! $method)
 		return false;
 
-	if ( ! class_exists("WP_Filesystem_$method") ) {
+	if ( ! class_exists("WP_Filesystem_$method")) {
 
 		/**
 		 * Filter the path for a specific filesystem method class file.
@@ -861,9 +861,9 @@ 
 		 * @param string $path   Path to the specific filesystem method class file.
 		 * @param string $method The filesystem method to use.
 		 */
-		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
+		$abstraction_file = apply_filters('filesystem_method_file', ABSPATH.'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method);
 
-		if ( ! file_exists($abstraction_file) )
+		if ( ! file_exists($abstraction_file))
 			return;
 
 		require_once($abstraction_file);
@@ -873,22 +873,22 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
+	if ( ! defined('FS_CONNECT_TIMEOUT'))
 		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
+	if ( ! defined('FS_TIMEOUT'))
 		define('FS_TIMEOUT', 30);
 
-	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 false;
 
-	if ( !$wp_filesystem->connect() )
+	if ( ! $wp_filesystem->connect())
 		return false; //There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR'))
+		define('FS_CHMOD_DIR', (fileperms(ABSPATH) & 0777 | 0755));
+	if ( ! defined('FS_CHMOD_FILE'))
+		define('FS_CHMOD_FILE', (fileperms(ABSPATH.'index.php') & 0777 | 0644));
 
 	return true;
 }
@@ -919,39 +919,39 @@ 
  *                                             Default false.
  * @return string The transport to use, see description for valid return values.
  */
-function get_filesystem_method( $args = array(), $context = false, $allow_relaxed_file_ownership = false ) {
+function get_filesystem_method($args = array(), $context = false, $allow_relaxed_file_ownership = false) {
 	$method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
 
-	if ( ! $context ) {
+	if ( ! $context) {
 		$context = WP_CONTENT_DIR;
 	}
 
 	// If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it.
-	if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) {
-		$context = dirname( $context );
+	if (WP_LANG_DIR == $context && ! is_dir($context)) {
+		$context = dirname($context);
 	}
 
-	$context = trailingslashit( $context );
+	$context = trailingslashit($context);
 
-	if ( ! $method ) {
+	if ( ! $method) {
 
-		$temp_file_name = $context . 'temp-write-test-' . time();
+		$temp_file_name = $context.'temp-write-test-'.time();
 		$temp_handle = @fopen($temp_file_name, 'w');
-		if ( $temp_handle ) {
+		if ($temp_handle) {
 
 			// Attempt to determine the file owner of the WordPress files, and that of newly created files
 			$wp_file_owner = $temp_file_owner = false;
-			if ( function_exists('fileowner') ) {
-				$wp_file_owner = @fileowner( __FILE__ );
-				$temp_file_owner = @fileowner( $temp_file_name );
+			if (function_exists('fileowner')) {
+				$wp_file_owner = @fileowner(__FILE__);
+				$temp_file_owner = @fileowner($temp_file_name);
 			}
 
-			if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
+			if ($wp_file_owner !== false && $wp_file_owner === $temp_file_owner) {
 				// WordPress is creating files as the same owner as the WordPress files,
 				// this means it's safe to modify & create new files via PHP.
 				$method = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
-			} elseif ( $allow_relaxed_file_ownership ) {
+			} elseif ($allow_relaxed_file_ownership) {
 				// The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
 				// safely in this directory. This mode doesn't create new files, only alter existing ones.
 				$method = 'direct';
@@ -963,9 +963,9 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents')) $method = 'ssh2';
+	if ( ! $method && extension_loaded('ftp')) $method = 'ftpext';
+	if ( ! $method && (extension_loaded('sockets') || function_exists('fsockopen'))) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filter the filesystem method to use.
@@ -977,7 +977,7 @@ 
 	 * @param string $context Full path to the directory that is tested for being writable.
 	 * @param bool   $allow_relaxed_file_ownership Whether to allow Group/World writable.
 	 */
-	return apply_filters( 'filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership );
+	return apply_filters('filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership);
 }
 
 /**
@@ -1004,7 +1004,7 @@ 
  * @param bool   $allow_relaxed_file_ownership Whether to allow Group/World writable.
  * @return bool False on failure. True on success.
  */
-function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false) {
 
 	/**
 	 * Filter the filesystem credentials form output.
@@ -1024,87 +1024,87 @@ 
 	 * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable.
 	 * @param array  $extra_fields Extra POST fields.
 	 */
-	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
+	$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership);
+	if ('' !== $req_cred)
 		return $req_cred;
 
-	if ( empty($type) ) {
-		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
+	if (empty($type)) {
+		$type = get_filesystem_method(array(), $context, $allow_relaxed_file_ownership);
 	}
 
-	if ( 'direct' == $type )
+	if ('direct' == $type)
 		return true;
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if (is_null($extra_fields))
+		$extra_fields = array('version', 'locale');
 
-	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
+	$credentials = get_option('ftp_credentials', array('hostname' => '', 'username' => ''));
 
 	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? wp_unslash( $_POST['hostname'] ) : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? wp_unslash( $_POST['username'] ) : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? wp_unslash( $_POST['password'] ) : '');
+	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : ( ! empty($_POST['hostname']) ? wp_unslash($_POST['hostname']) : $credentials['hostname']);
+	$credentials['username'] = defined('FTP_USER') ? FTP_USER : ( ! empty($_POST['username']) ? wp_unslash($_POST['username']) : $credentials['username']);
+	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : ( ! empty($_POST['password']) ? wp_unslash($_POST['password']) : '');
 
 	// Check to see if we are setting the public/private keys for ssh
-	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
-	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
+	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : ( ! empty($_POST['public_key']) ? wp_unslash($_POST['public_key']) : '');
+	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : ( ! empty($_POST['private_key']) ? wp_unslash($_POST['private_key']) : '');
 
 	// Sanitize the hostname, Some people might pass in odd-data:
 	$credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
 
-	if ( strpos($credentials['hostname'], ':') ) {
-		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
+	if (strpos($credentials['hostname'], ':')) {
+		list($credentials['hostname'], $credentials['port']) = explode(':', $credentials['hostname'], 2);
+		if ( ! is_numeric($credentials['port']))
 			unset($credentials['port']);
 	} else {
 		unset($credentials['port']);
 	}
 
-	if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
+	if ((defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh2' == FS_METHOD)) {
 		$credentials['connection_type'] = 'ssh';
-	} elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
+	} elseif ((defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type) { //Only the FTP Extension understands SSL
 		$credentials['connection_type'] = 'ftps';
-	} elseif ( ! empty( $_POST['connection_type'] ) ) {
-		$credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
-	} elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
+	} elseif ( ! empty($_POST['connection_type'])) {
+		$credentials['connection_type'] = wp_unslash($_POST['connection_type']);
+	} elseif ( ! isset($credentials['connection_type'])) { //All else fails (And it's not defaulted to something else saved), Default to FTP
 		$credentials['connection_type'] = 'ftp';
 	}
 	if ( ! $error &&
 			(
-				( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) ||
-				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
-			) ) {
+				( ! empty($credentials['password']) && ! empty($credentials['username']) && ! empty($credentials['hostname'])) ||
+				('ssh' == $credentials['connection_type'] && ! empty($credentials['public_key']) && ! empty($credentials['private_key']))
+			)) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
-			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		if ( ! empty($stored_credentials['port'])) //save port as part of hostname to simplify above code.
+			$stored_credentials['hostname'] .= ':'.$stored_credentials['port'];
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
-		if ( ! defined( 'WP_INSTALLING' ) ) {
-			update_option( 'ftp_credentials', $stored_credentials );
+		if ( ! defined('WP_INSTALLING')) {
+			update_option('ftp_credentials', $stored_credentials);
 		}
 		return $credentials;
 	}
-	$hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
-	$username = isset( $credentials['username'] ) ? $credentials['username'] : '';
-	$public_key = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
-	$private_key = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
-	$port = isset( $credentials['port'] ) ? $credentials['port'] : '';
-	$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
-
-	if ( $error ) {
+	$hostname = isset($credentials['hostname']) ? $credentials['hostname'] : '';
+	$username = isset($credentials['username']) ? $credentials['username'] : '';
+	$public_key = isset($credentials['public_key']) ? $credentials['public_key'] : '';
+	$private_key = isset($credentials['private_key']) ? $credentials['private_key'] : '';
+	$port = isset($credentials['port']) ? $credentials['port'] : '';
+	$connection_type = isset($credentials['connection_type']) ? $credentials['connection_type'] : '';
+
+	if ($error) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
-		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
+		if (is_wp_error($error))
+			$error_string = esc_html($error->get_error_message());
+		echo '<div id="message" class="error"><p>'.$error_string.'</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
-		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	if (extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen'))
+		$types['ftp'] = __('FTP');
+	if (extension_loaded('ftp')) //Only this supports FTPS
+		$types['ftps'] = __('FTPS (SSL)');
+	if (extension_loaded('ssh2') && function_exists('stream_get_contents'))
+		$types['ssh'] = __('SSH2');
 
 	/**
 	 * Filter the connection types to output to the filesystem credentials form.
@@ -1118,7 +1118,7 @@ 
 	 * @param string $context     Full path to the directory that is tested
 	 *                            for being writable.
 	 */
-	$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
+	$types = apply_filters('fs_ftp_connection_types', $types, $credentials, $type, $error, $context);
 
 ?>
 <script type="text/javascript">
@@ -1134,16 +1134,16 @@ 
 });
 -->
 </script>
-<form action="<?php echo esc_url( $form_post ) ?>" method="post">
+<form action="<?php echo esc_url($form_post) ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
-<h3 id="request-filesystem-credentials-title"><?php _e( 'Connection Information' ) ?></h3>
+<h3 id="request-filesystem-credentials-title"><?php _e('Connection Information') ?></h3>
 <p id="request-filesystem-credentials-desc"><?php
 	$label_user = __('Username');
 	$label_pass = __('Password');
 	_e('To perform the requested action, WordPress needs to access your web server.');
 	echo ' ';
-	if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
-		if ( isset( $types['ssh'] ) ) {
+	if ((isset($types['ftp']) || isset($types['ftps']))) {
+		if (isset($types['ssh'])) {
 			_e('Please enter your FTP or SSH credentials to proceed.');
 			$label_user = __('FTP/SSH Username');
 			$label_pass = __('FTP/SSH Password');
@@ -1157,39 +1157,39 @@ 
 	_e('If you do not remember your credentials, you should contact your web host.');
 ?></p>
 <label for="hostname">
-	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<span class="field-title"><?php _e('Hostname') ?></span>
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e('example: www.wordpress.org') ?>" value="<?php echo esc_attr($hostname); if ( ! empty($port)) echo ":$port"; ?>"<?php disabled(defined('FTP_HOST')); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
 		<span class="field-title"><?php echo $label_user; ?></span>
-		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> />
+		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled(defined('FTP_USER')); ?> />
 	</label>
 </div>
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if (defined('FTP_PASS')) echo '*****'; ?>"<?php disabled(defined('FTP_PASS')); ?> />
+		<em><?php if ( ! defined('FTP_PASS')) _e('This password will not be stored on the server.'); ?></em>
 	</label>
 </div>
-<?php if ( isset($types['ssh']) ) : ?>
+<?php if (isset($types['ssh'])) : ?>
 <h4><?php _e('Authentication Keys') ?></h4>
 <label for="public_key">
 	<span class="field-title"><?php _e('Public Key:') ?></span>
-	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
+	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled(defined('FTP_PUBKEY')); ?> />
 </label>
 <label for="private_key">
 	<span class="field-title"><?php _e('Private Key:') ?></span>
-	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
+	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled(defined('FTP_PRIKEY')); ?> />
 </label>
 <span id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
 <?php endif; ?>
 <h4><?php _e('Connection Type') ?></h4>
 <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
 <?php
-	$disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
-	foreach ( $types as $name => $text ) : ?>
+	$disabled = disabled((defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false);
+	foreach ($types as $name => $text) : ?>
 	<label for="<?php echo esc_attr($name) ?>">
 		<input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />
 		<?php echo $text ?>
@@ -1197,14 +1197,14 @@ 
 	<?php endforeach; ?>
 </fieldset>
 <?php
-foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+foreach ((array) $extra_fields as $field) {
+	if (isset($_POST[$field]))
+		echo '<input type="hidden" name="'.esc_attr($field).'" value="'.esc_attr(wp_unslash($_POST[$field])).'" />';
 }
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
-		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
-		<?php submit_button( __( 'Proceed' ), 'button', 'upgrade', false ); ?>
+		<button class="button cancel-button" data-js-action="close" type="button"><?php _e('Cancel'); ?></button>
+		<?php submit_button(__('Proceed'), 'button', 'upgrade', false); ?>
 	</p>
 </div>
 </form>
@@ -1220,10 +1220,10 @@ 
 function wp_print_request_filesystem_credentials_modal() {
 	$filesystem_method = get_filesystem_method();
 	ob_start();
-	$filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
+	$filesystem_credentials_are_stored = request_filesystem_credentials(self_admin_url());
 	ob_end_clean();
-	$request_filesystem_credentials = ( $filesystem_method != 'direct' && ! $filesystem_credentials_are_stored );
-	if ( ! $request_filesystem_credentials ) {
+	$request_filesystem_credentials = ($filesystem_method != 'direct' && ! $filesystem_credentials_are_stored);
+	if ( ! $request_filesystem_credentials) {
 		return;
 	}
 	?>
@@ -1231,7 +1231,7 @@ 
 		<div class="notification-dialog-background"></div>
 		<div class="notification-dialog" role="dialog" aria-labelledby="request-filesystem-credentials-title" tabindex="0">
 			<div class="request-filesystem-credentials-dialog-content">
-				<?php request_filesystem_credentials( site_url() ); ?>
+				<?php request_filesystem_credentials(site_url()); ?>
 			<div>
 		</div>
 	</div>

Braces +217 added lines, -126 removed lines

@@ -59,11 +59,11 @@ 
 
 	if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
 		return $wp_file_descriptions[basename( $file )];
-	}
-	elseif ( file_exists( $file ) && is_file( $file ) ) {
+	} elseif ( file_exists( $file ) && is_file( $file ) ) {
 		$template_data = implode( '', file( $file ) );
-		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ))
-			return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name )) {
+					return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+		}
 	}
 
 	return trim( basename( $file ) );
@@ -102,23 +102,27 @@ 
  * @return bool|array False on failure, Else array of files
  */
 function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
-		return false;
+	if ( empty($folder) ) {
+			return false;
+	}
 
-	if ( ! $levels )
-		return false;
+	if ( ! $levels ) {
+			return false;
+	}
 
 	$files = array();
 	if ( $dir = @opendir( $folder ) ) {
 		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
-				continue;
+			if ( in_array($file, array('.', '..') ) ) {
+							continue;
+			}
 			if ( is_dir( $folder . '/' . $file ) ) {
 				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
-				else
-					$files[] = $folder . '/' . $file . '/';
+				if ( $files2 ) {
+									$files = array_merge($files, $files2 );
+				} else {
+									$files[] = $folder . '/' . $file . '/';
+				}
 			} else {
 				$files[] = $folder . '/' . $file;
 			}
@@ -180,8 +184,9 @@ 
 function validate_file_to_edit( $file, $allowed_files = '' ) {
 	$code = validate_file( $file, $allowed_files );
 
-	if (!$code )
-		return $file;
+	if (!$code ) {
+			return $file;
+	}
 
 	switch ( $code ) {
 		case 1 :
@@ -451,12 +456,14 @@ 
  */
 function download_url( $url, $timeout = 300 ) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
-		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	if ( ! $url ) {
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	}
 
 	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
-		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	if ( ! $tmpfname ) {
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	}
 
 	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
@@ -492,17 +499,20 @@ 
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
 function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
-	else
-		return false; // unknown format
+	if ( 32 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = pack( 'H*', $expected_md5 );
+	} elseif ( 24 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = base64_decode( $expected_md5 );
+	} else {
+			return false;
+	}
+	// unknown format
 
 	$file_md5 = md5_file( $filename, true );
 
-	if ( $file_md5 === $expected_raw_md5 )
-		return true;
+	if ( $file_md5 === $expected_raw_md5 ) {
+			return true;
+	}
 
 	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
 }
@@ -525,8 +535,9 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! $wp_filesystem || !is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
 	// Unzip can use a lot of memory, but not this much hopefully
 	/** This filter is documented in wp-admin/admin.php */
@@ -539,17 +550,22 @@ 
 	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
 		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
-				continue;
+			if ( empty($path[$i]) ) {
+							continue;
+			}
 
 			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			if ( preg_match('!^[a-z]:$!i', $dir) ) {
+				// Skip it if it looks like a Windows Drive letter.
 				continue;
+			}
 
-			if ( ! $wp_filesystem->is_dir($dir) )
-				$needed_dirs[] = $dir;
-			else
-				break; // A folder exists, therefor, we dont need the check the levels below this
+			if ( ! $wp_filesystem->is_dir($dir) ) {
+							$needed_dirs[] = $dir;
+			} else {
+							break;
+			}
+			// A folder exists, therefor, we dont need the check the levels below this
 		}
 	}
 
@@ -565,8 +581,9 @@ 
 		if ( true === $result ) {
 			return $result;
 		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
-				return $result;
+			if ( 'incompatible_archive' != $result->get_error_code() ) {
+							return $result;
+			}
 		}
 	}
 	// Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
@@ -594,24 +611,30 @@ 
 	$z = new ZipArchive();
 
 	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	if ( true !== $zopen ) {
+			return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	}
 
 	$uncompressed_size = 0;
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			$needed_dirs[] = $to . untrailingslashit($info['name']);
-		else
-			$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		} else {
+					$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		}
 	}
 
 	/*
@@ -621,17 +644,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -651,21 +679,28 @@ 
 	unset($needed_dirs);
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			continue;
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if ( false === $contents ) {
+					return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		}
 	}
 
 	$z->close();
@@ -702,18 +737,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
-		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	if ( !is_array($archive_files) ) {
+			return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	}
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if ( 0 == count($archive_files) ) {
+			return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	}
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
 	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $file['size'];
 
@@ -727,17 +766,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -750,21 +794,26 @@ 
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
+					return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		}
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
 	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
-			continue;
+		if ( $file['folder'] ) {
+					continue;
+		}
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		}
 	}
 	return true;
 }
@@ -791,32 +840,37 @@ 
 	$to = trailingslashit($to);
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
-			continue;
+		if ( in_array( $filename, $skip_list ) ) {
+					continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
 			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+									return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
 			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) {
+									return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
+									$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
 			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
-				return $result;
+			if ( is_wp_error($result) ) {
+							return $result;
+			}
 		}
 	}
 	return true;
@@ -846,8 +900,9 @@ 
 
 	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
-	if ( ! $method )
-		return false;
+	if ( ! $method ) {
+			return false;
+	}
 
 	if ( ! class_exists("WP_Filesystem_$method") ) {
 
@@ -863,8 +918,9 @@ 
 		 */
 		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-		if ( ! file_exists($abstraction_file) )
-			return;
+		if ( ! file_exists($abstraction_file) ) {
+					return;
+		}
 
 		require_once($abstraction_file);
 	}
@@ -873,22 +929,29 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
-		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
-		define('FS_TIMEOUT', 30);
+	if ( ! defined('FS_CONNECT_TIMEOUT') ) {
+			define('FS_CONNECT_TIMEOUT', 30);
+	}
+	if ( ! defined('FS_TIMEOUT') ) {
+			define('FS_TIMEOUT', 30);
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return false;
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return false;
+	}
 
-	if ( !$wp_filesystem->connect() )
-		return false; //There was an error connecting to the server.
+	if ( !$wp_filesystem->connect() ) {
+			return false;
+	}
+	//There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR') ) {
+			define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+	}
+	if ( ! defined('FS_CHMOD_FILE') ) {
+			define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	}
 
 	return true;
 }
@@ -963,9 +1026,16 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+		$method = 'ssh2';
+	}
+	if ( ! $method && extension_loaded('ftp') ) {
+		$method = 'ftpext';
+	}
+	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) {
+		$method = 'ftpsockets';
+	}
+	//Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filter the filesystem method to use.
@@ -1025,18 +1095,21 @@ 
 	 * @param array  $extra_fields Extra POST fields.
 	 */
 	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
-		return $req_cred;
+	if ( '' !== $req_cred ) {
+			return $req_cred;
+	}
 
 	if ( empty($type) ) {
 		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
 	}
 
-	if ( 'direct' == $type )
-		return true;
+	if ( 'direct' == $type ) {
+			return true;
+	}
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if ( is_null( $extra_fields ) ) {
+			$extra_fields = array( 'version', 'locale' );
+	}
 
 	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
 
@@ -1054,8 +1127,9 @@ 
 
 	if ( strpos($credentials['hostname'], ':') ) {
 		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
-			unset($credentials['port']);
+		if ( ! is_numeric($credentials['port']) ) {
+					unset($credentials['port']);
+		}
 	} else {
 		unset($credentials['port']);
 	}
@@ -1075,8 +1149,10 @@ 
 				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
 			) ) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
+		if ( !empty($stored_credentials['port']) ) {
+			//save port as part of hostname to simplify above code.
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		}
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
 		if ( ! defined( 'WP_INSTALLING' ) ) {
@@ -1093,18 +1169,23 @@ 
 
 	if ( $error ) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
+		if ( is_wp_error($error) ) {
+					$error_string = esc_html( $error->get_error_message() );
+		}
 		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
+	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') ) {
+			$types[ 'ftp' ] = __('FTP');
+	}
+	if ( extension_loaded('ftp') ) {
+		//Only this supports FTPS
 		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	}
+	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+			$types[ 'ssh' ] = __('SSH2');
+	}
 
 	/**
 	 * Filter the connection types to output to the filesystem credentials form.
@@ -1158,7 +1239,10 @@ 
 ?></p>
 <label for="hostname">
 	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) {
+	echo ":$port";
+}
+?>"<?php disabled( defined('FTP_HOST') ); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
@@ -1169,8 +1253,14 @@ 
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) {
+	echo '*****';
+}
+?>"<?php disabled( defined('FTP_PASS') ); ?> />
+		<em><?php if ( ! defined('FTP_PASS') ) {
+	_e( 'This password will not be stored on the server.' );
+}
+?></em>
 	</label>
 </div>
 <?php if ( isset($types['ssh']) ) : ?>
@@ -1198,9 +1288,10 @@ 
 </fieldset>
 <?php
 foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
-}
+	if ( isset( $_POST[ $field ] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+	}
+	}
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
 		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>

src/wp-admin/includes/image-edit.php

Doc Comments +2 added lines, -2 removed lines

@@ -341,7 +341,7 @@ 
  * @ignore
  * @param int $w Image width in pixels.
  * @param int $h Image height in pixels.
- * @return float|int Image preview ratio.
+ * @return integer Image preview ratio.
  */
 function _image_get_preview_ratio($w, $h) {
 	$max = max($w, $h);
@@ -356,7 +356,7 @@ 
  * @ignore
  * @param resource  $img   Image resource.
  * @param float|int $angle Image rotation angle, in degrees.
- * @return resource|false GD image resource, false otherwise.
+ * @return resource GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
 	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) );

Indentation +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Image Editor
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Image Editor
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Loads the WP image-editing interface.
@@ -491,7 +491,7 @@ 
 		 * @since 3.5.0
 		 *
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
- 		 * @param array           $changes Array of change operations.
+		 * @param array           $changes Array of change operations.
 		 */
 		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
 	} elseif ( is_resource( $image ) ) {
@@ -503,7 +503,7 @@ 
 		 * @deprecated 3.5.0 Use wp_image_editor_before_change instead.
 		 *
 		 * @param resource $image   GD image resource.
- 		 * @param array    $changes Array of change operations.
+		 * @param array    $changes Array of change operations.
 		 */
 		$image = apply_filters( 'image_edit_before_change', $image, $changes );
 	}
@@ -562,8 +562,8 @@ 
 
 	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
 
-    if ( is_wp_error( $img ) )
-        return false;
+	if ( is_wp_error( $img ) )
+		return false;
 
 	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
 	if ( $changes )

Spacing +201 added lines, -201 removed lines

@@ -20,22 +20,22 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
+	if (isset($meta['width'], $meta['height']))
+		$big = max($meta['width'], $meta['height']);
 	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+		die(__('Image data does not exist. Please re-upload the image.'));
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
-	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty($backup_sizes) && isset($backup_sizes['full-orig'], $meta['file']))
+		$can_restore = $backup_sizes['full-orig']['file'] != basename($meta['file']);
 
-	if ( $msg ) {
-		if ( isset($msg->error) )
+	if ($msg) {
+		if (isset($msg->error))
 			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
+		elseif (isset($msg->msg))
 			$note = "<div class='updated'><p>$msg->msg</p></div>";
 	}
 
@@ -46,22 +46,22 @@ 
 	<div class="imgedit-settings">
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h3><?php _e( 'Scale Image' ); ?> <a href="#" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;"></a></h3>
+		<h3><?php _e('Scale Image'); ?> <a href="#" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;"></a></h3>
 		<div class="imgedit-help">
 		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
-		<p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+		<?php if (isset($meta['width'], $meta['height'])): ?>
+		<p><?php printf(__('Original dimensions %s'), $meta['width'].' &times; '.$meta['height']); ?></p>
 		<?php endif ?>
 		<div class="imgedit-submit">
-		<span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" /> &times; <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" /> &times; <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span></span>
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e('Scale'); ?>" />
 		</div>
 	</div>
 	</div>
 
-<?php if ( $can_restore ) { ?>
+<?php if ($can_restore) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
@@ -69,12 +69,12 @@ 
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
+		if ( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE)
 			echo ' '.__('Previously edited copies of the image will not be deleted.');
 
 		?></p>
 		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e('Restore image'); ?>" <?php echo $can_restore; ?> />
 		</div>
 		</div>
 	</div>
@@ -116,8 +116,8 @@ 
 	</p>
 	</div>
 
-	<?php if ( $thumb && $sub_sizes ) {
-		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+	<?php if ($thumb && $sub_sizes) {
+		$thumb_img = wp_constrain_dimensions($thumb['width'], $thumb['height'], 160, 120);
 	?>
 
 	<div class="imgedit-group imgedit-applyto">
@@ -155,12 +155,12 @@ 
 	<div class="imgedit-panel-content">
 		<?php echo $note; ?>
 		<div class="imgedit-menu">
-			<div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
+			<div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e('Crop'); ?>"></div><?php
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?>
-			<div class="imgedit-rleft"  onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
-			<div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
+		if (wp_image_editor_supports(array('mime_type' => get_post_mime_type($post_id), 'methods' => array('rotate')))) { ?>
+			<div class="imgedit-rleft"  onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e('Rotate counter-clockwise'); ?>"></div>
+			<div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e('Rotate clockwise'); ?>"></div>
 	<?php } else {
 			$note_no_rotate = esc_attr__('Image rotation is not supported by your web host.');
 	?>
@@ -168,11 +168,11 @@ 
 		    <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></div>
 	<?php } ?>
 
-			<div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>
-			<div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e( 'Flip horizontally' ); ?>"></div>
+			<div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e('Flip vertically'); ?>"></div>
+			<div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e('Flip horizontally'); ?>"></div>
 
-			<div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e( 'Undo' ); ?>"></div>
-			<div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e( 'Redo' ); ?>"></div>
+			<div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e('Undo'); ?>"></div>
+			<div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e('Redo'); ?>"></div>
 			<br class="clear" />
 		</div>
 
@@ -180,16 +180,16 @@ 
 		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
 		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
 		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
+		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url('admin-ajax.php', 'relative'); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" />
 		</div>
 
 		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e('Cancel'); ?>" />
+			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e('Save'); ?>" />
 		</div>
 	</div>
 
@@ -210,8 +210,8 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_stream_image( $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_stream_image($image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filter the WP_Image_Editor instance for the image to be streamed to the browser.
@@ -221,14 +221,14 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
 		 * @param int             $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
+		if (is_wp_error($image->stream($mime_type)))
 			return false;
 
 		return true;
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
 		/**
 		 * Filter the GD image resource to be streamed to the browser.
@@ -239,18 +239,18 @@ 
 		 * @param resource $image   Image resource to be streamed.
 		 * @param int      $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $image, null, 90 );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($image, null, 90);
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $image );
+				header('Content-Type: image/png');
+				return imagepng($image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $image );
+				header('Content-Type: image/gif');
+				return imagegif($image);
 			default:
 				return false;
 		}
@@ -266,11 +266,11 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
 		/**
 		 * Filter whether to skip saving the image file.
@@ -286,17 +286,17 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		return $image->save( $filename, $mime_type );
+		return $image->save($filename, $mime_type);
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
 		/**
 		 * Filter whether to skip saving the image file.
@@ -313,20 +313,20 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
-				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+				return imagejpeg($image, $filename, apply_filters('jpeg_quality', 90, 'edit_image'));
 			case 'image/png':
-				return imagepng( $image, $filename );
+				return imagepng($image, $filename);
 			case 'image/gif':
-				return imagegif( $image, $filename );
+				return imagegif($image, $filename);
 			default:
 				return false;
 		}
@@ -359,10 +359,10 @@ 
  * @return resource|false GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
-	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) );
-	if ( function_exists('imagerotate') ) {
+	_deprecated_function(__FUNCTION__, '3.5', __('Use WP_Image_Editor::rotate'));
+	if (function_exists('imagerotate')) {
 		$rotated = imagerotate($img, $angle, 0);
-		if ( is_resource($rotated) ) {
+		if (is_resource($rotated)) {
 			imagedestroy($img);
 			$img = $rotated;
 		}
@@ -382,17 +382,17 @@ 
  * @return resource (maybe) flipped image resource.
  */
 function _flip_image_resource($img, $horz, $vert) {
-	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::flip' ) );
+	_deprecated_function(__FUNCTION__, '3.5', __('Use WP_Image_Editor::flip'));
 	$w = imagesx($img);
 	$h = imagesy($img);
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
+	if (is_resource($dst)) {
 		$sx = $vert ? ($w - 1) : 0;
 		$sy = $horz ? ($h - 1) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh) ) {
+		if (imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -415,8 +415,8 @@ 
  */
 function _crop_image_resource($img, $x, $y, $w, $h) {
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		if ( imagecopy($dst, $img, 0, 0, $x, $y, $w, $h) ) {
+	if (is_resource($dst)) {
+		if (imagecopy($dst, $img, 0, 0, $x, $y, $w, $h)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -433,24 +433,24 @@ 
  * @param array           $changes Array of change operations.
  * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied.
  */
-function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+function image_edit_apply_changes($image, $changes) {
+	if (is_resource($image))
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
-	if ( !is_array($changes) )
+	if ( ! is_array($changes))
 		return $image;
 
 	// Expand change operations.
-	foreach ( $changes as $key => $obj ) {
-		if ( isset($obj->r) ) {
+	foreach ($changes as $key => $obj) {
+		if (isset($obj->r)) {
 			$obj->type = 'rotate';
 			$obj->angle = $obj->r;
 			unset($obj->r);
-		} elseif ( isset($obj->f) ) {
+		} elseif (isset($obj->f)) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
 			unset($obj->f);
-		} elseif ( isset($obj->c) ) {
+		} elseif (isset($obj->c)) {
 			$obj->type = 'crop';
 			$obj->sel = $obj->c;
 			unset($obj->c);
@@ -459,12 +459,12 @@ 
 	}
 
 	// Combine operations.
-	if ( count($changes) > 1 ) {
+	if (count($changes) > 1) {
 		$filtered = array($changes[0]);
-		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
+		for ($i = 0, $j = 1, $c = count($changes); $j < $c; $j++) {
 			$combined = false;
-			if ( $filtered[$i]->type == $changes[$j]->type ) {
-				switch ( $filtered[$i]->type ) {
+			if ($filtered[$i]->type == $changes[$j]->type) {
+				switch ($filtered[$i]->type) {
 					case 'rotate':
 						$filtered[$i]->angle += $changes[$j]->angle;
 						$combined = true;
@@ -475,7 +475,7 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
+			if ( ! $combined)
 				$filtered[++$i] = $changes[$j];
 		}
 		$changes = $filtered;
@@ -483,7 +483,7 @@ 
 	}
 
 	// Image resource before applying the changes.
-	if ( $image instanceof WP_Image_Editor ) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filter the WP_Image_Editor instance before applying changes to the image.
@@ -493,8 +493,8 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
  		 * @param array           $changes Array of change operations.
 		 */
-		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-	} elseif ( is_resource( $image ) ) {
+		$image = apply_filters('wp_image_editor_before_change', $image, $changes);
+	} elseif (is_resource($image)) {
 
 		/**
 		 * Filter the GD image resource before applying changes to the image.
@@ -505,39 +505,39 @@ 
 		 * @param resource $image   GD image resource.
  		 * @param array    $changes Array of change operations.
 		 */
-		$image = apply_filters( 'image_edit_before_change', $image, $changes );
+		$image = apply_filters('image_edit_before_change', $image, $changes);
 	}
 
-	foreach ( $changes as $operation ) {
-		switch ( $operation->type ) {
+	foreach ($changes as $operation) {
+		switch ($operation->type) {
 			case 'rotate':
-				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
+				if ($operation->angle != 0) {
+					if ($image instanceof WP_Image_Editor)
+						$image->rotate($operation->angle);
 					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+						$image = _rotate_image_resource($image, $operation->angle);
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
-						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+				if ($operation->axis != 0)
+					if ($image instanceof WP_Image_Editor)
+						$image->flip(($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource($image, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
-				if ( $image instanceof WP_Image_Editor ) {
+				if ($image instanceof WP_Image_Editor) {
 					$size = $image->get_size();
 					$w = $size['width'];
 					$h = $size['height'];
 
-					$scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
-					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio($w, $h); // discard preview scaling
+					$image->crop($sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				} else {
-					$scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
-					$image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio(imagesx($image), imagesy($image)); // discard preview scaling
+					$image = _crop_image_resource($image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				}
 				break;
 		}
@@ -554,34 +554,34 @@ 
  * @param int $post_id
  * @return bool
  */
-function stream_preview_image( $post_id ) {
-	$post = get_post( $post_id );
+function stream_preview_image($post_id) {
+	$post = get_post($post_id);
 
 	/** This filter is documented in wp-admin/admin.php */
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+	@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id));
 
-    if ( is_wp_error( $img ) )
+    if (is_wp_error($img))
         return false;
 
-	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	$changes = ! empty($_REQUEST['history']) ? json_decode(wp_unslash($_REQUEST['history'])) : null;
+	if ($changes)
+		$img = image_edit_apply_changes($img, $changes);
 
 	// Scale the image.
 	$size = $img->get_size();
 	$w = $size['width'];
 	$h = $size['height'];
 
-	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2 = max ( 1, $w * $ratio );
-	$h2 = max ( 1, $h * $ratio );
+	$ratio = _image_get_preview_ratio($w, $h);
+	$w2 = max(1, $w * $ratio);
+	$h2 = max(1, $h * $ratio);
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+	if (is_wp_error($img->resize($w2, $h2)))
 		return false;
 
-	return wp_stream_image( $img, $post->post_mime_type, $post_id );
+	return wp_stream_image($img, $post->post_mime_type, $post_id);
 }
 
 /**
@@ -595,30 +595,30 @@ 
 function wp_restore_image($post_id) {
 	$meta = wp_get_attachment_metadata($post_id);
 	$file = get_attached_file($post_id);
-	$backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = $old_backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$restored = false;
 	$msg = new stdClass;
 
-	if ( !is_array($backup_sizes) ) {
+	if ( ! is_array($backup_sizes)) {
 		$msg->error = __('Cannot load image metadata.');
 		return $msg;
 	}
 
 	$parts = pathinfo($file);
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
+	if (isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig'])) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+		if ($parts['basename'] != $data['file']) {
+			if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 				// Delete only if it's edited image.
-				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-					wp_delete_file( $file );
+				if (preg_match('/-e[0-9]{13}\./', $parts['basename'])) {
+					wp_delete_file($file);
 				}
-			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
+			} elseif (isset($meta['width'], $meta['height'])) {
 				$backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
 			}
 		}
@@ -626,21 +626,21 @@ 
 		$restored_file = path_join($parts['dirname'], $data['file']);
 		$restored = update_attached_file($post_id, $restored_file);
 
-		$meta['file'] = _wp_relative_upload_path( $restored_file );
+		$meta['file'] = _wp_relative_upload_path($restored_file);
 		$meta['width'] = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
-	foreach ( $default_sizes as $default_size ) {
-		if ( isset($backup_sizes["$default_size-orig"]) ) {
+	foreach ($default_sizes as $default_size) {
+		if (isset($backup_sizes["$default_size-orig"])) {
 			$data = $backup_sizes["$default_size-orig"];
-			if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
-				if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+			if (isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file']) {
+				if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 					// Delete only if it's edited image
-					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
-						wp_delete_file( $delete_file );
+					if (preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file'])) {
+						$delete_file = path_join($parts['dirname'], $meta['sizes'][$default_size]['file']);
+						wp_delete_file($delete_file);
 					}
 				} else {
 					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
@@ -653,14 +653,14 @@ 
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+	if ( ! wp_update_attachment_metadata($post_id, $meta) ||
+		($old_backup_sizes !== $backup_sizes && ! update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes))) {
 
 		$msg->error = __('Cannot save image metadata.');
 		return $msg;
 	}
 
-	if ( !$restored )
+	if ( ! $restored)
 		$msg->error = __('Image metadata is inconsistent.');
 	else
 		$msg->msg = __('Image restored successfully.');
@@ -677,25 +677,25 @@ 
  * @param int $post_id
  * @return \stdClass
  */
-function wp_save_image( $post_id ) {
+function wp_save_image($post_id) {
 	global $_wp_additional_image_sizes;
 
 	$return = new stdClass;
 	$success = $delete = $scaled = $nocrop = false;
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
-	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __('Unable to create new image.') );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id, 'full'));
+	if (is_wp_error($img)) {
+		$return->error = esc_js(__('Unable to create new image.'));
 		return $return;
 	}
 
-	$fwidth = !empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
-	$fheight = !empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
-	$target = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
-	$scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
+	$fwidth = ! empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
+	$fheight = ! empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
+	$target = ! empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
+	$scale = ! empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+	if ($scale && $fwidth > 0 && $fheight > 0) {
 		$size = $img->get_size();
 		$sX = $size['width'];
 		$sY = $size['height'];
@@ -704,54 +704,54 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
+			if ($img->resize($fwidth, $fheight))
 				$scaled = true;
 		}
 
-		if ( !$scaled ) {
-			$return->error = esc_js( __('Error while saving the scaled image. Please reload the page and try again.') );
+		if ( ! $scaled) {
+			$return->error = esc_js(__('Error while saving the scaled image. Please reload the page and try again.'));
 			return $return;
 		}
-	} elseif ( !empty($_REQUEST['history']) ) {
-		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
+	} elseif ( ! empty($_REQUEST['history'])) {
+		$changes = json_decode(wp_unslash($_REQUEST['history']));
+		if ($changes)
 			$img = image_edit_apply_changes($img, $changes);
 	} else {
-		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
+		$return->error = esc_js(__('Nothing to save, the image has not changed.'));
 		return $return;
 	}
 
 	$meta = wp_get_attachment_metadata($post_id);
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
 
-	if ( !is_array($meta) ) {
-		$return->error = esc_js( __('Image data does not exist. Please re-upload the image.') );
+	if ( ! is_array($meta)) {
+		$return->error = esc_js(__('Image data does not exist. Please re-upload the image.'));
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
+	if ( ! is_array($backup_sizes))
 		$backup_sizes = array();
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
-	$path_parts = pathinfo( $path );
+	$path_parts = pathinfo($path);
 	$filename = $path_parts['filename'];
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 
-	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
+		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename']) {
 
-		if ( 'thumbnail' == $target )
+		if ('thumbnail' == $target)
 			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
 		else
 			$new_path = $path;
 	} else {
-		while( true ) {
-			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
+		while (true) {
+			$filename = preg_replace('/-e([0-9]+)$/', '', $filename);
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
+			if (file_exists($new_path))
 				$suffix++;
 			else
 				break;
@@ -759,92 +759,92 @@ 
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
-		$return->error = esc_js( __('Unable to save the image.') );
+	if ( ! wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id)) {
+		$return->error = esc_js(__('Unable to save the image.'));
 		return $return;
 	}
 
-	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
+	if ('nothumb' == $target || 'all' == $target || 'full' == $target || $scaled) {
 		$tag = false;
-		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
+		if (isset($backup_sizes['full-orig'])) {
+			if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes['full-orig']['file'] != $path_parts['basename'])
 				$tag = "full-$suffix";
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
+		if ($tag)
 			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
+		$success = ($path === $new_path) || update_attached_file($post_id, $new_path);
 
-		$meta['file'] = _wp_relative_upload_path( $new_path );
+		$meta['file'] = _wp_relative_upload_path($new_path);
 
 		$size = $img->get_size();
 		$meta['width'] = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
+		if ($success && ('nothumb' == $target || 'all' == $target)) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ('nothumb' == $target)
+				$sizes = array_diff($sizes, array('thumbnail'));
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' == $target ) {
-		$sizes = array( 'thumbnail' );
+	} elseif ('thumbnail' == $target) {
+		$sizes = array('thumbnail');
 		$success = $delete = $nocrop = true;
 	}
 
-	if ( isset( $sizes ) ) {
+	if (isset($sizes)) {
 		$_sizes = array();
 
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$tag = false;
-			if ( isset( $meta['sizes'][$size] ) ) {
-				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+			if (isset($meta['sizes'][$size])) {
+				if (isset($backup_sizes["$size-orig"])) {
+					if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'])
 						$tag = "$size-$suffix";
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
+				if ($tag)
 					$backup_sizes[$tag] = $meta['sizes'][$size];
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
-				$height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
-				$crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+			if (isset($_wp_additional_image_sizes[$size])) {
+				$width  = intval($_wp_additional_image_sizes[$size]['width']);
+				$height = intval($_wp_additional_image_sizes[$size]['height']);
+				$crop   = ($nocrop) ? false : $_wp_additional_image_sizes[$size]['crop'];
 			} else {
-				$height = get_option( "{$size}_size_h" );
-				$width  = get_option( "{$size}_size_w" );
-				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+				$height = get_option("{$size}_size_h");
+				$width  = get_option("{$size}_size_w");
+				$crop   = ($nocrop) ? false : get_option("{$size}_crop");
 			}
 
-			$_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
+			$_sizes[$size] = array('width' => $width, 'height' => $height, 'crop' => $crop);
 		}
 
-		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
+		$meta['sizes'] = array_merge($meta['sizes'], $img->multi_resize($_sizes));
 	}
 
-	unset( $img );
+	unset($img);
 
-	if ( $success ) {
-		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
+	if ($success) {
+		wp_update_attachment_metadata($post_id, $meta);
+		update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-		if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
+		if ($target == 'thumbnail' || $target == 'all' || $target == 'full') {
 			// Check if it's an image edit from attachment edit screen
-			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
-				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+			if ( ! empty($_REQUEST['context']) && 'edit-attachment' == $_REQUEST['context']) {
+				$thumb_url = wp_get_attachment_image_src($post_id, array(900, 600), true);
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url($post_id);
-				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
-					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+				if ( ! empty($meta['sizes']['thumbnail']) && $thumb = $meta['sizes']['thumbnail']) {
+					$return->thumbnail = path_join(dirname($file_url), $thumb['file']);
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -854,10 +854,10 @@ 
 		$delete = true;
 	}
 
-	if ( $delete ) {
-		wp_delete_file( $new_path );
+	if ($delete) {
+		wp_delete_file($new_path);
 	}
 
-	$return->msg = esc_js( __('Image saved') );
+	$return->msg = esc_js(__('Image saved'));
 	return $return;
 }

Braces +92 added lines, -66 removed lines

@@ -20,23 +20,26 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
-	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$big = max( $meta['width'], $meta['height'] );
+	} else {
+			die( __('Image data does not exist. Please re-upload the image.') );
+	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
+			$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	}
 
 	if ( $msg ) {
-		if ( isset($msg->error) )
-			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
-			$note = "<div class='updated'><p>$msg->msg</p></div>";
+		if ( isset($msg->error) ) {
+					$note = "<div class='error'><p>$msg->error</p></div>";
+		} elseif ( isset($msg->msg) ) {
+					$note = "<div class='updated'><p>$msg->msg</p></div>";
+		}
 	}
 
 	?>
@@ -69,8 +72,9 @@ 
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-			echo ' '.__('Previously edited copies of the image will not be deleted.');
+		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) {
+					echo ' '.__('Previously edited copies of the image will not be deleted.');
+		}
 
 		?></p>
 		<div class="imgedit-submit">
@@ -223,8 +227,9 @@ 
 		 */
 		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
-			return false;
+		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
+					return false;
+		}
 
 		return true;
 	} else {
@@ -288,8 +293,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		return $image->save( $filename, $mime_type );
 	} else {
@@ -315,8 +321,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		switch ( $mime_type ) {
 			case 'image/jpeg':
@@ -434,11 +441,13 @@ 
  * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+	if ( is_resource( $image ) ) {
+			_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+	}
 
-	if ( !is_array($changes) )
-		return $image;
+	if ( !is_array($changes) ) {
+			return $image;
+	}
 
 	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
@@ -475,8 +484,9 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
-				$filtered[++$i] = $changes[$j];
+			if ( !$combined ) {
+							$filtered[++$i] = $changes[$j];
+			}
 		}
 		$changes = $filtered;
 		unset($filtered);
@@ -512,18 +522,20 @@ 
 		switch ( $operation->type ) {
 			case 'rotate':
 				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
-					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+					if ( $image instanceof WP_Image_Editor ) {
+											$image->rotate( $operation->angle );
+					} else {
+											$image = _rotate_image_resource( $image, $operation->angle );
+					}
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
+				if ( $operation->axis != 0 ) {
+									if ( $image instanceof WP_Image_Editor )
 						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+				} else {
+											$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
@@ -562,12 +574,14 @@ 
 
 	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
 
-    if ( is_wp_error( $img ) )
-        return false;
+    if ( is_wp_error( $img ) ) {
+            return false;
+    }
 
 	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	if ( $changes ) {
+			$img = image_edit_apply_changes( $img, $changes );
+	}
 
 	// Scale the image.
 	$size = $img->get_size();
@@ -578,8 +592,9 @@ 
 	$w2 = max ( 1, $w * $ratio );
 	$h2 = max ( 1, $h * $ratio );
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
-		return false;
+	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
+			return false;
+	}
 
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
@@ -660,10 +675,11 @@ 
 		return $msg;
 	}
 
-	if ( !$restored )
-		$msg->error = __('Image metadata is inconsistent.');
-	else
-		$msg->msg = __('Image restored successfully.');
+	if ( !$restored ) {
+			$msg->error = __('Image metadata is inconsistent.');
+	} else {
+			$msg->msg = __('Image restored successfully.');
+	}
 
 	return $msg;
 }
@@ -704,8 +720,9 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
-				$scaled = true;
+			if ( $img->resize( $fwidth, $fheight ) ) {
+							$scaled = true;
+			}
 		}
 
 		if ( !$scaled ) {
@@ -714,8 +731,9 @@ 
 		}
 	} elseif ( !empty($_REQUEST['history']) ) {
 		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
-			$img = image_edit_apply_changes($img, $changes);
+		if ( $changes ) {
+					$img = image_edit_apply_changes($img, $changes);
+		}
 	} else {
 		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
 		return $return;
@@ -729,8 +747,9 @@ 
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
-		$backup_sizes = array();
+	if ( !is_array($backup_sizes) ) {
+			$backup_sizes = array();
+	}
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
@@ -741,20 +760,22 @@ 
 	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
 		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
 
-		if ( 'thumbnail' == $target )
-			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
-		else
-			$new_path = $path;
+		if ( 'thumbnail' == $target ) {
+					$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
+		} else {
+					$new_path = $path;
+		}
 	} else {
 		while( true ) {
 			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
-				$suffix++;
-			else
-				break;
+			if ( file_exists($new_path) ) {
+							$suffix++;
+			} else {
+							break;
+			}
 		}
 	}
 
@@ -767,14 +788,16 @@ 
 	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
 		$tag = false;
 		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
-				$tag = "full-$suffix";
+			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+							$tag = "full-$suffix";
+			}
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
-			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		if ( $tag ) {
+					$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		}
 
 		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
@@ -786,8 +809,9 @@ 
 
 		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ( 'nothumb' == $target ) {
+							$sizes = array_diff( $sizes, array('thumbnail') );
+			}
 		}
 
 		$return->fw = $meta['width'];
@@ -804,14 +828,16 @@ 
 			$tag = false;
 			if ( isset( $meta['sizes'][$size] ) ) {
 				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
-						$tag = "$size-$suffix";
+					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] ) {
+											$tag = "$size-$suffix";
+					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
-					$backup_sizes[$tag] = $meta['sizes'][$size];
+				if ( $tag ) {
+									$backup_sizes[$tag] = $meta['sizes'][$size];
+				}
 			}
 
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {