ntwb / wordpress

src/wp-admin/includes/ms-deprecated.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function(__FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 	// Deprecated. See #11763.
 }
 
@@ -26,10 +26,10 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function(__FUNCTION__, '3.0', 'is_upload_space_available()' );
+	_deprecated_function(__FUNCTION__, '3.0', 'is_upload_space_available()');
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	if ( ! is_upload_space_available())
+		wp_die(__('Sorry, you must delete files before you can upload any more.'));
 }
 
 /**
@@ -37,8 +37,8 @@ 
  *
  * @deprecated 3.0.0
  */
-function mu_options( $options ) {
-	_deprecated_function(__FUNCTION__, '3.0' );
+function mu_options($options) {
+	_deprecated_function(__FUNCTION__, '3.0');
 	return $options;
 }
 
@@ -49,7 +49,7 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function(__FUNCTION__, '3.0', 'activate_plugin()' );
+	_deprecated_function(__FUNCTION__, '3.0', 'activate_plugin()');
 	return false;
 }
 
@@ -59,8 +59,8 @@ 
  * @deprecated 3.0.0 Use deactivate_sitewide_plugin()
  * @see deactivate_sitewide_plugin()
  */
-function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function(__FUNCTION__, '3.0', 'deactivate_plugin()' );
+function deactivate_sitewide_plugin($plugin = false) {
+	_deprecated_function(__FUNCTION__, '3.0', 'deactivate_plugin()');
 }
 
 /**
@@ -69,9 +69,9 @@ 
  * @deprecated 3.0.0 Use is_network_only_plugin()
  * @see is_network_only_plugin()
  */
-function is_wpmu_sitewide_plugin( $file ) {
-	_deprecated_function(__FUNCTION__, '3.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+function is_wpmu_sitewide_plugin($file) {
+	_deprecated_function(__FUNCTION__, '3.0', 'is_network_only_plugin()');
+	return is_network_only_plugin($file);
 }
 
 /**
@@ -81,8 +81,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+	_deprecated_function(__FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_network()');
+	return array_map('intval', WP_Theme::get_allowed_on_network());
 }
 
 /**
@@ -91,9 +91,9 @@ 
  * @deprecated 3.4.0 Use WP_Theme::get_allowed_on_site()
  * @see WP_Theme::get_allowed_on_site()
  */
-function wpmu_get_blog_allowedthemes( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_site()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
+function wpmu_get_blog_allowedthemes($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.4', 'WP_Theme::get_allowed_on_site()');
+	return array_map('intval', WP_Theme::get_allowed_on_site($blog_id));
 }
 
 /**

Braces +4 added lines, -3 removed lines

@@ -28,9 +28,10 @@
 function wpmu_checkAvailableSpace() {
 	_deprecated_function(__FUNCTION__, '3.0', 'is_upload_space_available()' );
 
-	if ( !is_upload_space_available() )
-		wp_die( __('Sorry, you must delete files before you can upload any more.') );
-}
+	if ( !is_upload_space_available() ) {
+			wp_die( __('Sorry, you must delete files before you can upload any more.') );
+	}
+	}
 
 /**
  * WPMU options.

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

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Terms List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Terms List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_Terms_List_Table extends WP_List_Table {
 
 	public $callback_args;

Spacing +132 added lines, -132 removed lines

@@ -28,29 +28,29 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type, $taxonomy, $action, $tax;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'tags',
 			'singular' => 'tag',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$action    = $this->screen->action;
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) )
+		if (empty($taxonomy))
 			$taxonomy = 'post_tag';
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			wp_die( __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			wp_die(__('Invalid taxonomy'));
 
-		$tax = get_taxonomy( $taxonomy );
+		$tax = get_taxonomy($taxonomy);
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
+		if (empty($post_type) || ! in_array($post_type, get_post_types(array('show_ui' => true))))
 			$post_type = 'post';
 
 	}
@@ -60,16 +60,16 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
+		return current_user_can(get_taxonomy($this->screen->taxonomy)->cap->manage_terms);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function prepare_items() {
-		$tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
+		$tags_per_page = $this->get_items_per_page('edit_'.$this->screen->taxonomy.'_per_page');
 
-		if ( 'post_tag' == $this->screen->taxonomy ) {
+		if ('post_tag' == $this->screen->taxonomy) {
 			/**
 			 * Filter the number of terms displayed per page for the Tags list table.
 			 *
@@ -77,7 +77,7 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_tags_per_page', $tags_per_page);
 
 			/**
 			 * Filter the number of terms displayed per page for the Tags list table.
@@ -87,8 +87,8 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
-		} elseif ( 'category' == $this->screen->taxonomy ) {
+			$tags_per_page = apply_filters('tagsperpage', $tags_per_page);
+		} elseif ('category' == $this->screen->taxonomy) {
 			/**
 			 * Filter the number of terms displayed per page for the Categories list table.
 			 *
@@ -96,10 +96,10 @@ 
 			 *
 			 * @param int $tags_per_page Number of categories to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_categories_per_page', $tags_per_page);
 		}
 
-		$search = !empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
+		$search = ! empty($_REQUEST['s']) ? trim(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'search' => $search,
@@ -107,18 +107,18 @@ 
 			'number' => $tags_per_page,
 		);
 
-		if ( !empty( $_REQUEST['orderby'] ) )
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		if ( ! empty($_REQUEST['orderby']))
+			$args['orderby'] = trim(wp_unslash($_REQUEST['orderby']));
 
-		if ( !empty( $_REQUEST['order'] ) )
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		if ( ! empty($_REQUEST['order']))
+			$args['order'] = trim(wp_unslash($_REQUEST['order']));
 
 		$this->callback_args = $args;
 
-		$this->set_pagination_args( array(
-			'total_items' => wp_count_terms( $this->screen->taxonomy, compact( 'search' ) ),
+		$this->set_pagination_args(array(
+			'total_items' => wp_count_terms($this->screen->taxonomy, compact('search')),
 			'per_page' => $tags_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
+		echo get_taxonomy($this->screen->taxonomy)->labels->not_found;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -153,7 +153,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
+		if (isset($_REQUEST['action']) && isset($_REQUEST['delete_tags']) && ('delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2']))
 			return 'bulk-delete';
 
 		return parent::current_action();
@@ -166,15 +166,15 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => _x( 'Name', 'term name' ),
-			'description' => __( 'Description' ),
-			'slug'        => __( 'Slug' ),
+			'name'        => _x('Name', 'term name'),
+			'description' => __('Description'),
+			'slug'        => __('Slug'),
 		);
 
-		if ( 'link_category' == $this->screen->taxonomy ) {
-			$columns['links'] = __( 'Links' );
+		if ('link_category' == $this->screen->taxonomy) {
+			$columns['links'] = __('Links');
 		} else {
-			$columns['posts'] = _x( 'Count', 'Number/count of items' );
+			$columns['posts'] = _x('Count', 'Number/count of items');
 		}
 
 		return $columns;
@@ -200,47 +200,47 @@ 
 	public function display_rows_or_placeholder() {
 		$taxonomy = $this->screen->taxonomy;
 
-		$args = wp_parse_args( $this->callback_args, array(
+		$args = wp_parse_args($this->callback_args, array(
 			'page' => 1,
 			'number' => 20,
 			'search' => '',
 			'hide_empty' => 0
-		) );
+		));
 
 		$page = $args['page'];
 
 		// Set variable because $args['number'] can be subsequently overridden.
 		$number = $args['number'];
 
-		$args['offset'] = $offset = ( $page - 1 ) * $number;
+		$args['offset'] = $offset = ($page - 1) * $number;
 
 		// Convert it to table rows.
 		$count = 0;
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+		if (is_taxonomy_hierarchical($taxonomy) && ! isset($args['orderby'])) {
 			// We'll need the full set of terms then.
 			$args['number'] = $args['offset'] = 0;
 		}
-		$terms = get_terms( $taxonomy, $args );
+		$terms = get_terms($taxonomy, $args);
 
-		if ( empty( $terms ) || ! is_array( $terms ) ) {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+		if (empty($terms) || ! is_array($terms)) {
+			echo '<tr class="no-items"><td class="colspanchange" colspan="'.$this->get_column_count().'">';
 			$this->no_items();
 			echo '</td></tr>';
 			return;
 		}
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-			if ( ! empty( $args['search'] ) ) {// Ignore children on searches.
+		if (is_taxonomy_hierarchical($taxonomy) && ! isset($args['orderby'])) {
+			if ( ! empty($args['search'])) {// Ignore children on searches.
 				$children = array();
 			} else {
-				$children = _get_term_hierarchy( $taxonomy );
+				$children = _get_term_hierarchy($taxonomy);
 			}
 			// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
-			$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+			$this->_rows($taxonomy, $terms, $children, $offset, $number, $count);
 		} else {
-			foreach ( $terms as $term ) {
-				$this->single_row( $term );
+			foreach ($terms as $term) {
+				$this->single_row($term);
 			}
 		}
 	}
@@ -255,51 +255,51 @@ 
 	 * @param int   $parent
 	 * @param int   $level
 	 */
-	private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
+	private function _rows($taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0) {
 
 		$end = $start + $per_page;
 
-		foreach ( $terms as $key => $term ) {
+		foreach ($terms as $key => $term) {
 
-			if ( $count >= $end )
+			if ($count >= $end)
 				break;
 
-			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
+			if ($term->parent != $parent && empty($_REQUEST['s']))
 				continue;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
+			if ($count == $start && $term->parent > 0 && empty($_REQUEST['s'])) {
 				$my_parents = $parent_ids = array();
 				$p = $term->parent;
-				while ( $p ) {
-					$my_parent = get_term( $p, $taxonomy );
+				while ($p) {
+					$my_parent = get_term($p, $taxonomy);
 					$my_parents[] = $my_parent;
 					$p = $my_parent->parent;
-					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+					if (in_array($p, $parent_ids)) // Prevent parent loops.
 						break;
 					$parent_ids[] = $p;
 				}
-				unset( $parent_ids );
+				unset($parent_ids);
 
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					echo "\t";
-					$this->single_row( $my_parent, $level - $num_parents );
+					$this->single_row($my_parent, $level - $num_parents);
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				echo "\t";
-				$this->single_row( $term, $level );
+				$this->single_row($term, $level);
 			}
 
 			++$count;
 
-			unset( $terms[$key] );
+			unset($terms[$key]);
 
-			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			if (isset($children[$term->term_id]) && empty($_REQUEST['s']))
+				$this->_rows($taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1);
 		}
 	}
 
@@ -308,14 +308,14 @@ 
 	 * @param object $tag
 	 * @param int $level
 	 */
-	public function single_row( $tag, $level = 0 ) {
+	public function single_row($tag, $level = 0) {
 		global $taxonomy;
- 		$tag = sanitize_term( $tag, $taxonomy );
+ 		$tag = sanitize_term($tag, $taxonomy);
 
 		$this->level = $level;
 
-		echo '<tr id="tag-' . $tag->term_id . '">';
-		$this->single_row_columns( $tag );
+		echo '<tr id="tag-'.$tag->term_id.'">';
+		$this->single_row_columns($tag);
 		echo '</tr>';
 	}
 
@@ -323,12 +323,12 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_cb( $tag ) {
-		$default_term = get_option( 'default_' . $this->screen->taxonomy );
+	public function column_cb($tag) {
+		$default_term = get_option('default_'.$this->screen->taxonomy);
 
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
-			return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
-				. '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
+		if (current_user_can(get_taxonomy($this->screen->taxonomy)->cap->delete_terms) && $tag->term_id != $default_term)
+			return '<label class="screen-reader-text" for="cb-select-'.$tag->term_id.'">'.sprintf(__('Select %s'), $tag->name).'</label>'
+				. '<input type="checkbox" name="delete_tags[]" value="'.$tag->term_id.'" id="cb-select-'.$tag->term_id.'" />';
 
 		return '&nbsp;';
 	}
@@ -337,10 +337,10 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_name( $tag ) {
+	public function column_name($tag) {
 		$taxonomy = $this->screen->taxonomy;
 
-		$pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
+		$pad = str_repeat('&#8212; ', max(0, $this->level));
 
 		/**
 		 * Filter display of the term name in the terms list table.
@@ -355,19 +355,19 @@ 
 		 * @param string $pad_tag_name The term name, padded if not top-level.
 		 * @param object $tag          Term object.
 		 */
-		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+		$name = apply_filters('term_name', $pad.' '.$tag->name, $tag);
 
-		$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-		$edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
+		$qe_data = get_term($tag->term_id, $taxonomy, OBJECT, 'edit');
+		$edit_link = esc_url(get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type));
 
-		$out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+		$out = '<strong><a class="row-title" href="'.$edit_link.'" title="'.esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $name)).'">'.$name.'</a></strong><br />';
 
-		$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-		$out .= '<div class="name">' . $qe_data->name . '</div>';
+		$out .= '<div class="hidden" id="inline_'.$qe_data->term_id.'">';
+		$out .= '<div class="name">'.$qe_data->name.'</div>';
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
-		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+		$out .= '<div class="slug">'.apply_filters('editable_slug', $qe_data->slug).'</div>';
+		$out .= '<div class="parent">'.$qe_data->parent.'</div></div>';
 
 		return $out;
 	}
@@ -395,26 +395,26 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for terms.
 	 */
-	protected function handle_row_actions( $tag, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($tag, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		$taxonomy = $this->screen->taxonomy;
-		$tax = get_taxonomy( $taxonomy );
-		$default_term = get_option( 'default_' . $taxonomy );
+		$tax = get_taxonomy($taxonomy);
+		$default_term = get_option('default_'.$taxonomy);
 
-		$edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
+		$edit_link = esc_url(get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type));
 
 		$actions = array();
-		if ( current_user_can( $tax->cap->edit_terms ) ) {
-			$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-			$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+		if (current_user_can($tax->cap->edit_terms)) {
+			$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
+			$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">'.__('Quick&nbsp;Edit').'</a>';
 		}
-		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-			$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
-		if ( $tax->public )
-			$actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';
+		if (current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term)
+			$actions['delete'] = "<a class='delete-tag' href='".wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_'.$tag->term_id)."'>".__('Delete')."</a>";
+		if ($tax->public)
+			$actions['view'] = '<a href="'.get_term_link($tag).'">'.__('View').'</a>';
 
 		/**
 		 * Filter the action links displayed for each term in the Tags list table.
@@ -426,7 +426,7 @@ 
 		 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param object $tag     Term object.
 		 */
-		$actions = apply_filters( 'tag_row_actions', $actions, $tag );
+		$actions = apply_filters('tag_row_actions', $actions, $tag);
 
 		/**
 		 * Filter the action links displayed for each term in the terms list table.
@@ -439,16 +439,16 @@ 
 		 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param object $tag     Term object.
 		 */
-		$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
+		$actions = apply_filters("{$taxonomy}_row_actions", $actions, $tag);
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_description( $tag ) {
+	public function column_description($tag) {
 		return $tag->description;
 	}
 
@@ -456,46 +456,46 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_slug( $tag ) {
+	public function column_slug($tag) {
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		return apply_filters( 'editable_slug', $tag->slug );
+		return apply_filters('editable_slug', $tag->slug);
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_posts( $tag ) {
-		$count = number_format_i18n( $tag->count );
+	public function column_posts($tag) {
+		$count = number_format_i18n($tag->count);
 
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui )
+		$ptype_object = get_post_type_object($this->screen->post_type);
+		if ( ! $ptype_object->show_ui)
 			return $count;
 
-		if ( $tax->query_var ) {
-			$args = array( $tax->query_var => $tag->slug );
+		if ($tax->query_var) {
+			$args = array($tax->query_var => $tag->slug);
 		} else {
-			$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
+			$args = array('taxonomy' => $tax->name, 'term' => $tag->slug);
 		}
 
-		if ( 'post' != $this->screen->post_type )
+		if ('post' != $this->screen->post_type)
 			$args['post_type'] = $this->screen->post_type;
 
-		if ( 'attachment' == $this->screen->post_type )
-			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ('attachment' == $this->screen->post_type)
+			return "<a href='".esc_url(add_query_arg($args, 'upload.php'))."'>$count</a>";
 
-		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
+		return "<a href='".esc_url(add_query_arg($args, 'edit.php'))."'>$count</a>";
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_links( $tag ) {
-		$count = number_format_i18n( $tag->count );
-		if ( $count )
+	public function column_links($tag) {
+		$count = number_format_i18n($tag->count);
+		if ($count)
 			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
 		return $count;
 	}
@@ -505,7 +505,7 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function column_default( $tag, $column_name ) {
+	public function column_default($tag, $column_name) {
 		/**
 		 * Filter the displayed columns in the terms list table.
 		 *
@@ -518,7 +518,7 @@ 
 		 * @param string $column_name Name of the column.
 		 * @param int    $term_id     Term ID.
 		 */
-		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id );
+		return apply_filters("manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id);
 	}
 
 	/**
@@ -527,9 +527,9 @@ 
 	 * @since 3.1.0
 	 */
 	public function inline_edit() {
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) )
+		if ( ! current_user_can($tax->cap->edit_terms))
 			return;
 ?>
 
@@ -537,43 +537,43 @@ 
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 			<fieldset><div class="inline-edit-col">
-				<h4><?php _e( 'Quick Edit' ); ?></h4>
+				<h4><?php _e('Quick Edit'); ?></h4>
 
 				<label>
-					<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
+					<span class="title"><?php _ex('Name', 'term name'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
 				</label>
-	<?php if ( !global_terms_enabled() ) { ?>
+	<?php if ( ! global_terms_enabled()) { ?>
 				<label>
-					<span class="title"><?php _e( 'Slug' ); ?></span>
+					<span class="title"><?php _e('Slug'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
 				</label>
 	<?php } ?>
 			</div></fieldset>
 	<?php
 
-		$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
+		$core_columns = array('cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true);
 
-		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;
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
+			do_action('quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy);
 		}
 
 	?>
 
 		<p class="inline-edit-save submit">
-			<a href="#inline-edit" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></a>
+			<a href="#inline-edit" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
 			<a href="#inline-edit" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></a>
 			<span class="spinner"></span>
 			<span class="error" style="display:none;"></span>
-			<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-			<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
-			<input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
+			<?php wp_nonce_field('taxinlineeditnonce', '_inline_edit', false); ?>
+			<input type="hidden" name="taxonomy" value="<?php echo esc_attr($this->screen->taxonomy); ?>" />
+			<input type="hidden" name="post_type" value="<?php echo esc_attr($this->screen->post_type); ?>" />
 			<br class="clear" />
 		</p>
 		</td></tr>

Braces +58 added lines, -38 removed lines

@@ -41,17 +41,20 @@ 
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) )
-			$taxonomy = 'post_tag';
+		if ( empty( $taxonomy ) ) {
+					$taxonomy = 'post_tag';
+		}
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			wp_die( __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					wp_die( __( 'Invalid taxonomy' ) );
+		}
 
 		$tax = get_taxonomy( $taxonomy );
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
-			$post_type = 'post';
+		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) ) {
+					$post_type = 'post';
+		}
 
 	}
 
@@ -107,11 +110,13 @@ 
 			'number' => $tags_per_page,
 		);
 
-		if ( !empty( $_REQUEST['orderby'] ) )
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		if ( !empty( $_REQUEST['orderby'] ) ) {
+					$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		}
 
-		if ( !empty( $_REQUEST['order'] ) )
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		if ( !empty( $_REQUEST['order'] ) ) {
+					$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		}
 
 		$this->callback_args = $args;
 
@@ -153,8 +158,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
-			return 'bulk-delete';
+		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) ) {
+					return 'bulk-delete';
+		}
 
 		return parent::current_action();
 	}
@@ -261,11 +267,13 @@ 
 
 		foreach ( $terms as $key => $term ) {
 
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
-			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
-				continue;
+			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) ) {
+							continue;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
@@ -275,8 +283,10 @@ 
 					$my_parent = get_term( $p, $taxonomy );
 					$my_parents[] = $my_parent;
 					$p = $my_parent->parent;
-					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+					if ( in_array( $p, $parent_ids ) ) {
+						// Prevent parent loops.
 						break;
+					}
 					$parent_ids[] = $p;
 				}
 				unset( $parent_ids );
@@ -298,8 +308,9 @@ 
 
 			unset( $terms[$key] );
 
-			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) ) {
+							$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			}
 		}
 	}
 
@@ -326,9 +337,10 @@ 
 	public function column_cb( $tag ) {
 		$default_term = get_option( 'default_' . $this->screen->taxonomy );
 
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
-			return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
+		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term ) {
+					return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
 				. '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
+		}
 
 		return '&nbsp;';
 	}
@@ -411,10 +423,12 @@ 
 			$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
 			$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
 		}
-		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-			$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
-		if ( $tax->public )
-			$actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';
+		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) {
+					$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
+		}
+		if ( $tax->public ) {
+					$actions['view'] = '<a href="' . get_term_link( $tag ) . '">' . __( 'View' ) . '</a>';
+		}
 
 		/**
 		 * Filter the action links displayed for each term in the Tags list table.
@@ -471,8 +485,9 @@ 
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
 		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui )
-			return $count;
+		if ( ! $ptype_object->show_ui ) {
+					return $count;
+		}
 
 		if ( $tax->query_var ) {
 			$args = array( $tax->query_var => $tag->slug );
@@ -480,11 +495,13 @@ 
 			$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
 		}
 
-		if ( 'post' != $this->screen->post_type )
-			$args['post_type'] = $this->screen->post_type;
+		if ( 'post' != $this->screen->post_type ) {
+					$args['post_type'] = $this->screen->post_type;
+		}
 
-		if ( 'attachment' == $this->screen->post_type )
-			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ( 'attachment' == $this->screen->post_type ) {
+					return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		}
 
 		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
 	}
@@ -495,8 +512,9 @@ 
 	 */
 	public function column_links( $tag ) {
 		$count = number_format_i18n( $tag->count );
-		if ( $count )
-			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+		if ( $count ) {
+					$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+		}
 		return $count;
 	}
 
@@ -529,9 +547,10 @@ 
 	public function inline_edit() {
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) )
-			return;
-?>
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+					return;
+		}
+		?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
@@ -557,8 +576,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;
+			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
 			do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );

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

Spacing +129 added lines, -129 removed lines

@@ -38,15 +38,15 @@ 
 	protected function get_installed_plugin_slugs() {
 		$slugs = array();
 
-		$plugin_info = get_site_transient( 'update_plugins' );
-		if ( isset( $plugin_info->no_update ) ) {
-			foreach ( $plugin_info->no_update as $plugin ) {
+		$plugin_info = get_site_transient('update_plugins');
+		if (isset($plugin_info->no_update)) {
+			foreach ($plugin_info->no_update as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
 
-		if ( isset( $plugin_info->response ) ) {
-			foreach ( $plugin_info->response as $plugin ) {
+		if (isset($plugin_info->response)) {
+			foreach ($plugin_info->response as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
@@ -64,11 +64,11 @@ 
 	 * @global string $wp_version
 	 */
 	public function prepare_items() {
-		include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+		include(ABSPATH.'wp-admin/includes/plugin-install.php');
 
 		global $tabs, $tab, $paged, $type, $term;
 
-		wp_reset_vars( array( 'tab' ) );
+		wp_reset_vars(array('tab'));
 
 		$paged = $this->get_pagenum();
 
@@ -77,22 +77,22 @@ 
 		// These are the tabs which are shown on the page
 		$tabs = array();
 
-		if ( 'search' == $tab )
-			$tabs['search']	= __( 'Search Results' );
-		$tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
-		$tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
-		$tabs['recommended']   = _x( 'Recommended', 'Plugin Installer' );
-		$tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
-		if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
-			$tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
+		if ('search' == $tab)
+			$tabs['search'] = __('Search Results');
+		$tabs['featured']  = _x('Featured', 'Plugin Installer');
+		$tabs['popular']   = _x('Popular', 'Plugin Installer');
+		$tabs['recommended'] = _x('Recommended', 'Plugin Installer');
+		$tabs['favorites'] = _x('Favorites', 'Plugin Installer');
+		if ($tab === 'beta' || false !== strpos($GLOBALS['wp_version'], '-')) {
+			$tabs['beta'] = _x('Beta Testing', 'Plugin Installer');
 		}
-		if ( current_user_can( 'upload_plugins' ) ) {
+		if (current_user_can('upload_plugins')) {
 			// No longer a real tab. Here for filter compatibility.
 			// Gets skipped in get_views().
-			$tabs['upload'] = __( 'Upload Plugin' );
+			$tabs['upload'] = __('Upload Plugin');
 		}
 
-		$nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
+		$nonmenu_tabs = array('plugin-information'); // Valid actions to perform which do not have a Menu item.
 
 		/**
 		 * Filter the tabs shown on the Plugin Install screen.
@@ -102,7 +102,7 @@ 
 		 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
 		 *                    'recommended', 'favorites', and 'upload'.
 		 */
-		$tabs = apply_filters( 'install_plugins_tabs', $tabs );
+		$tabs = apply_filters('install_plugins_tabs', $tabs);
 
 		/**
 		 * Filter tabs not associated with a menu item on the Plugin Install screen.
@@ -111,11 +111,11 @@ 
 		 *
 		 * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
 		 */
-		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
+		$nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if (empty($tab) || ( ! isset($tabs[$tab]) && ! in_array($tab, (array) $nonmenu_tabs)))
+			$tab = key($tabs);
 
 		$args = array(
 			'page' => $paged,
@@ -130,14 +130,14 @@ 
 			'installed_plugins' => $this->get_installed_plugin_slugs(),
 		);
 
-		switch ( $tab ) {
+		switch ($tab) {
 			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+				$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+				$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'tag':
-						$args['tag'] = sanitize_title_with_dashes( $term );
+						$args['tag'] = sanitize_title_with_dashes($term);
 						break;
 					case 'term':
 						$args['search'] = $term;
@@ -161,14 +161,14 @@ 
 				break;
 
 			case 'favorites':
-				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
+				$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+				update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
+				if ($user)
 					$args['user'] = $user;
 				else
 					$args = false;
 
-				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
+				add_action('install_plugins_favorites', 'install_plugins_favorites_form', 9, 0);
 				break;
 
 			default:
@@ -186,30 +186,30 @@ 
 		 *
 		 * @param array|bool $args Plugin Install API arguments.
 		 */
-		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
+		$args = apply_filters("install_plugins_table_api_args_$tab", $args);
 
-		if ( !$args )
+		if ( ! $args)
 			return;
 
-		$api = plugins_api( 'query_plugins', $args );
+		$api = plugins_api('query_plugins', $args);
 
-		if ( is_wp_error( $api ) ) {
+		if (is_wp_error($api)) {
 			$this->error = $api;
 			return;
 		}
 
 		$this->items = $api->plugins;
 
-		if ( $this->orderby ) {
-			uasort( $this->items, array( $this, 'order_callback' ) );
+		if ($this->orderby) {
+			uasort($this->items, array($this, 'order_callback'));
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $api->info['results'],
 			'per_page' => $args['per_page'],
-		) );
+		));
 
-		if ( isset( $api->info['groups'] ) ) {
+		if (isset($api->info['groups'])) {
 			$this->groups = $api->info['groups'];
 		}
 	}
@@ -218,12 +218,12 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $this->error ) ) {
-			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+		if (isset($this->error)) {
+			$message = $this->error->get_error_message().'<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">'.__('Try again').'</a></p>';
 		} else {
-			$message = __( 'No plugins match your request.' );
+			$message = __('No plugins match your request.');
 		}
-		echo '<div class="no-plugin-results">' . $message . '</div>';
+		echo '<div class="no-plugin-results">'.$message.'</div>';
 	}
 
 	/**
@@ -237,13 +237,13 @@ 
 		global $tabs, $tab;
 
 		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action == $tab ) ? ' current' : '';
-			$href = self_admin_url('plugin-install.php?tab=' . $action);
+		foreach ((array) $tabs as $action => $text) {
+			$class = ($action == $tab) ? ' current' : '';
+			$href = self_admin_url('plugin-install.php?tab='.$action);
 			$display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
 		}
 		// No longer a real tab.
-		unset( $display_tabs['plugin-install-upload'] );
+		unset($display_tabs['plugin-install-upload']);
 
 		return $display_tabs;
 	}
@@ -255,22 +255,22 @@ 
 		$views = $this->get_views();
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
 ?>
 <div class="wp-filter">
 	<ul class="filter-links">
 		<?php
-		if ( ! empty( $views ) ) {
-			foreach ( $views as $class => $view ) {
-				$views[ $class ] = "\t<li class='$class'>$view";
+		if ( ! empty($views)) {
+			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";
 		}
 		?>
 	</ul>
 
-	<?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
+	<?php install_search_form(isset($views['plugin-install-search'])); ?>
 </div>
 <?php
 	}
@@ -283,21 +283,21 @@ 
 
 		$data_attr = '';
 
-		if ( $singular ) {
+		if ($singular) {
 			$data_attr = " data-wp-lists='list:$singular'";
 		}
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
 ?>
-<div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<div class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 
 	<div id="the-list"<?php echo $data_attr; ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
 	</div>
 </div>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -305,12 +305,12 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( $GLOBALS['tab'] === 'featured' ) {
+	protected function display_tablenav($which) {
+		if ($GLOBALS['tab'] === 'featured') {
 			return;
 		}
 
-		if ( 'top' ==  $which ) {
+		if ('top' == $which) {
 			wp_referer_field();
 		?>
 			<div class="tablenav top">
@@ -321,14 +321,14 @@ 
 					 *
 					 * @since 2.7.0
 					 */
-					do_action( 'install_plugins_table_header' ); ?>
+					do_action('install_plugins_table_header'); ?>
 				</div>
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php } else { ?>
 			<div class="tablenav bottom">
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php
@@ -339,7 +339,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -354,23 +354,23 @@ 
 	 * @param object $plugin_b
 	 * @return int
 	 */
-	private function order_callback( $plugin_a, $plugin_b ) {
+	private function order_callback($plugin_a, $plugin_b) {
 		$orderby = $this->orderby;
-		if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+		if ( ! isset($plugin_a->$orderby, $plugin_b->$orderby)) {
 			return 0;
 		}
 
 		$a = $plugin_a->$orderby;
 		$b = $plugin_b->$orderby;
 
-		if ( $a == $b ) {
+		if ($a == $b) {
 			return 0;
 		}
 
-		if ( 'DESC' == $this->order ) {
-			return ( $a < $b ) ? 1 : -1;
+		if ('DESC' == $this->order) {
+			return ($a < $b) ? 1 : -1;
 		} else {
-			return ( $a < $b ) ? -1 : 1;
+			return ($a < $b) ? -1 : 1;
 		}
 	}
 
@@ -379,98 +379,98 @@ 
 	 */
 	public function display_rows() {
 		$plugins_allowedtags = array(
-			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
-			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
-			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+			'a' => array('href' => array(), 'title' => array(), 'target' => array()),
+			'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
+			'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
 			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
 		);
 
 		$plugins_group_titles = array(
-			'Performance' => _x( 'Performance', 'Plugin installer group title' ),
-			'Social'      => _x( 'Social',      'Plugin installer group title' ),
-			'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+			'Performance' => _x('Performance', 'Plugin installer group title'),
+			'Social'      => _x('Social', 'Plugin installer group title'),
+			'Tools'       => _x('Tools', 'Plugin installer group title'),
 		);
 
 		$group = null;
 
-		foreach ( (array) $this->items as $plugin ) {
-			if ( is_object( $plugin ) ) {
+		foreach ((array) $this->items as $plugin) {
+			if (is_object($plugin)) {
 				$plugin = (array) $plugin;
 			}
 
 			// Display the group heading if there is one
-			if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
-				if ( isset( $this->groups[ $plugin['group'] ] ) ) {
-					$group_name = $this->groups[ $plugin['group'] ];
-					if ( isset( $plugins_group_titles[ $group_name ] ) ) {
-						$group_name = $plugins_group_titles[ $group_name ];
+			if (isset($plugin['group']) && $plugin['group'] != $group) {
+				if (isset($this->groups[$plugin['group']])) {
+					$group_name = $this->groups[$plugin['group']];
+					if (isset($plugins_group_titles[$group_name])) {
+						$group_name = $plugins_group_titles[$group_name];
 					}
 				} else {
 					$group_name = $plugin['group'];
 				}
 
 				// Starting a new group, close off the divs of the last one
-				if ( ! empty( $group ) ) {
+				if ( ! empty($group)) {
 					echo '</div></div>';
 				}
 
-				echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+				echo '<div class="plugin-group"><h3>'.esc_html($group_name).'</h3>';
 				// needs an extra wrapping div for nth-child selectors to work
 				echo '<div class="plugin-items">';
 
 				$group = $plugin['group'];
 			}
-			$title = wp_kses( $plugin['name'], $plugins_allowedtags );
+			$title = wp_kses($plugin['name'], $plugins_allowedtags);
 
 			// Remove any HTML from the description.
-			$description = strip_tags( $plugin['short_description'] );
-			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
+			$description = strip_tags($plugin['short_description']);
+			$version = wp_kses($plugin['version'], $plugins_allowedtags);
 
-			$name = strip_tags( $title . ' ' . $version );
+			$name = strip_tags($title.' '.$version);
 
-			$author = wp_kses( $plugin['author'], $plugins_allowedtags );
-			if ( ! empty( $author ) ) {
-				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+			$author = wp_kses($plugin['author'], $plugins_allowedtags);
+			if ( ! empty($author)) {
+				$author = ' <cite>'.sprintf(__('By %s'), $author).'</cite>';
 			}
 
 			$action_links = array();
 
-			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
-				$status = install_plugin_install_status( $plugin );
+			if (current_user_can('install_plugins') || current_user_can('update_plugins')) {
+				$status = install_plugin_install_status($plugin);
 
-				switch ( $status['status'] ) {
+				switch ($status['status']) {
 					case 'install':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version. */
-							$action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+							$action_links[] = '<a class="install-now button" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Install %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Install Now').'</a>';
 						}
 
 						break;
 					case 'update_available':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version */
-							$action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+							$action_links[] = '<a class="update-now button" data-plugin="'.esc_attr($status['file']).'" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Update %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Update Now').'</a>';
 						}
 
 						break;
 					case 'latest_installed':
 					case 'newer_installed':
-						$action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+						$action_links[] = '<span class="button button-disabled" title="'.esc_attr__('This plugin is already installed and is up to date').' ">'._x('Installed', 'plugin').'</span>';
 						break;
 				}
 			}
 
-			$details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-								'&amp;TB_iframe=true&amp;width=600&amp;height=550' );
+			$details_link = self_admin_url('plugin-install.php?tab=plugin-information&amp;plugin='.$plugin['slug'].
+								'&amp;TB_iframe=true&amp;width=600&amp;height=550');
 
 			/* translators: 1: Plugin name and version. */
-			$action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+			$action_links[] = '<a href="'.esc_url($details_link).'" class="thickbox" aria-label="'.esc_attr(sprintf(__('More information about %s'), $name)).'" data-title="'.esc_attr($name).'">'.__('More Details').'</a>';
 
-			if ( !empty( $plugin['icons']['svg'] ) ) {
+			if ( ! empty($plugin['icons']['svg'])) {
 				$plugin_icon_url = $plugin['icons']['svg'];
-			} elseif ( !empty( $plugin['icons']['2x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['2x'])) {
 				$plugin_icon_url = $plugin['icons']['2x'];
-			} elseif ( !empty( $plugin['icons']['1x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['1x'])) {
 				$plugin_icon_url = $plugin['icons']['1x'];
 			} else {
 				$plugin_icon_url = $plugin['icons']['default'];
@@ -484,21 +484,21 @@ 
 			 * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now.
 			 * @param array $plugin       The plugin currently being listed.
 			 */
-			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+			$action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
 
-			$date_format = __( 'M j, Y @ H:i' );
-			$last_updated_timestamp = strtotime( $plugin['last_updated'] );
+			$date_format = __('M j, Y @ H:i');
+			$last_updated_timestamp = strtotime($plugin['last_updated']);
 		?>
-		<div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
+		<div class="plugin-card plugin-card-<?php echo sanitize_html_class($plugin['slug']); ?>">
 			<div class="plugin-card-top">
-				<a href="<?php echo esc_url( $details_link ); ?>" class="thickbox plugin-icon"><img src="<?php echo esc_attr( $plugin_icon_url ) ?>" /></a>
+				<a href="<?php echo esc_url($details_link); ?>" class="thickbox plugin-icon"><img src="<?php echo esc_attr($plugin_icon_url) ?>" /></a>
 				<div class="name column-name">
-					<h4><a href="<?php echo esc_url( $details_link ); ?>" class="thickbox"><?php echo $title; ?></a></h4>
+					<h4><a href="<?php echo esc_url($details_link); ?>" class="thickbox"><?php echo $title; ?></a></h4>
 				</div>
 				<div class="action-links">
 					<?php
-						if ( $action_links ) {
-							echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+						if ($action_links) {
+							echo '<ul class="plugin-action-buttons"><li>'.implode('</li><li>', $action_links).'</li></ul>';
 						}
 					?>
 				</div>
@@ -509,32 +509,32 @@ 
 			</div>
 			<div class="plugin-card-bottom">
 				<div class="vers column-rating">
-					<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
-					<span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+					<?php wp_star_rating(array('rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'])); ?>
+					<span class="num-ratings">(<?php echo number_format_i18n($plugin['num_ratings']); ?>)</span>
 				</div>
 				<div class="column-updated">
-					<strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
-						<?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+					<strong><?php _e('Last Updated:'); ?></strong> <span title="<?php echo esc_attr(date_i18n($date_format, $last_updated_timestamp)); ?>">
+						<?php printf(__('%s ago'), human_time_diff($last_updated_timestamp)); ?>
 					</span>
 				</div>
 				<div class="column-downloaded">
 					<?php
-					if ( $plugin['active_installs'] >= 1000000 ) {
-						$active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+					if ($plugin['active_installs'] >= 1000000) {
+						$active_installs_text = _x('1+ Million', 'Active plugin installs');
 					} else {
-						$active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+						$active_installs_text = number_format_i18n($plugin['active_installs']).'+';
 					}
-					printf( __( '%s Active Installs' ), $active_installs_text );
+					printf(__('%s Active Installs'), $active_installs_text);
 					?>
 				</div>
 				<div class="column-compatibility">
 					<?php
-					if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
-						echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
-					} elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
-						echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+					if ( ! empty($plugin['tested']) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($plugin['tested'])), $plugin['tested'], '>')) {
+						echo '<span class="compatibility-untested">'.__('Untested with your version of WordPress').'</span>';
+					} elseif ( ! empty($plugin['requires']) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($plugin['requires'])), $plugin['requires'], '<')) {
+						echo '<span class="compatibility-incompatible">'.__('<strong>Incompatible</strong> with your version of WordPress').'</span>';
 					} else {
-						echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+						echo '<span class="compatibility-compatible">'.__('<strong>Compatible</strong> with your version of WordPress').'</span>';
 					}
 					?>
 				</div>
@@ -544,7 +544,7 @@ 
 		}
 
 		// Close off the group divs of the last one
-		if ( ! empty( $group ) ) {
+		if ( ! empty($group)) {
 			echo '</div></div>';
 		}
 	}

Braces +14 added lines, -10 removed lines

@@ -77,8 +77,9 @@ 
 		// These are the tabs which are shown on the page
 		$tabs = array();
 
-		if ( 'search' == $tab )
-			$tabs['search']	= __( 'Search Results' );
+		if ( 'search' == $tab ) {
+					$tabs['search']	= __( 'Search Results' );
+		}
 		$tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
 		$tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
 		$tabs['recommended']   = _x( 'Recommended', 'Plugin Installer' );
@@ -114,8 +115,9 @@ 
 		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) ) {
+					$tab = key( $tabs );
+		}
 
 		$args = array(
 			'page' => $paged,
@@ -163,10 +165,11 @@ 
 			case 'favorites':
 				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
 				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
-					$args['user'] = $user;
-				else
-					$args = false;
+				if ( $user ) {
+									$args['user'] = $user;
+				} else {
+									$args = false;
+				}
 
 				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
 				break;
@@ -188,8 +191,9 @@ 
 		 */
 		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
 
-		if ( !$args )
-			return;
+		if ( !$args ) {
+					return;
+		}
 
 		$api = plugins_api( 'query_plugins', $args );
 

src/wp-admin/includes/admin.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Includes all of the WordPress Administration API files.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Includes all of the WordPress Administration API files.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 if ( ! defined('WP_ADMIN') ) {
 	/*

Spacing +26 added lines, -26 removed lines

@@ -6,76 +6,76 @@
  * @subpackage Administration
  */
 
-if ( ! defined('WP_ADMIN') ) {
+if ( ! defined('WP_ADMIN')) {
 	/*
 	 * This file is being included from a file other than wp-admin/admin.php, so
 	 * some setup was skipped. Make sure the admin message catalog is loaded since
 	 * load_default_textdomain() will not have done so in this context.
 	 */
-	load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+	load_textdomain('default', WP_LANG_DIR.'/admin-'.get_locale().'.mo');
 }
 
 /** WordPress Administration Hooks */
-require_once(ABSPATH . 'wp-admin/includes/admin-filters.php');
+require_once(ABSPATH.'wp-admin/includes/admin-filters.php');
 
 /** WordPress Bookmark Administration API */
-require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
+require_once(ABSPATH.'wp-admin/includes/bookmark.php');
 
 /** WordPress Comment Administration API */
-require_once(ABSPATH . 'wp-admin/includes/comment.php');
+require_once(ABSPATH.'wp-admin/includes/comment.php');
 
 /** WordPress Administration File API */
-require_once(ABSPATH . 'wp-admin/includes/file.php');
+require_once(ABSPATH.'wp-admin/includes/file.php');
 
 /** WordPress Image Administration API */
-require_once(ABSPATH . 'wp-admin/includes/image.php');
+require_once(ABSPATH.'wp-admin/includes/image.php');
 
 /** WordPress Media Administration API */
-require_once(ABSPATH . 'wp-admin/includes/media.php');
+require_once(ABSPATH.'wp-admin/includes/media.php');
 
 /** WordPress Import Administration API */
-require_once(ABSPATH . 'wp-admin/includes/import.php');
+require_once(ABSPATH.'wp-admin/includes/import.php');
 
 /** WordPress Misc Administration API */
-require_once(ABSPATH . 'wp-admin/includes/misc.php');
+require_once(ABSPATH.'wp-admin/includes/misc.php');
 
 /** WordPress Plugin Administration API */
-require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+require_once(ABSPATH.'wp-admin/includes/plugin.php');
 
 /** WordPress Post Administration API */
-require_once(ABSPATH . 'wp-admin/includes/post.php');
+require_once(ABSPATH.'wp-admin/includes/post.php');
 
 /** WordPress Administration Screen API */
-require_once(ABSPATH . 'wp-admin/includes/screen.php');
+require_once(ABSPATH.'wp-admin/includes/screen.php');
 
 /** WordPress Taxonomy Administration API */
-require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
+require_once(ABSPATH.'wp-admin/includes/taxonomy.php');
 
 /** WordPress Template Administration API */
-require_once(ABSPATH . 'wp-admin/includes/template.php');
+require_once(ABSPATH.'wp-admin/includes/template.php');
 
 /** WordPress List Table Administration API and base class */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
-require_once(ABSPATH . 'wp-admin/includes/list-table.php');
+require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
+require_once(ABSPATH.'wp-admin/includes/list-table.php');
 
 /** WordPress Theme Administration API */
-require_once(ABSPATH . 'wp-admin/includes/theme.php');
+require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 /** WordPress User Administration API */
-require_once(ABSPATH . 'wp-admin/includes/user.php');
+require_once(ABSPATH.'wp-admin/includes/user.php');
 
 /** WordPress Site Icon API */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
+require_once(ABSPATH.'wp-admin/includes/class-wp-site-icon.php');
 
 /** WordPress Update Administration API */
-require_once(ABSPATH . 'wp-admin/includes/update.php');
+require_once(ABSPATH.'wp-admin/includes/update.php');
 
 /** WordPress Deprecated Administration API */
-require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
+require_once(ABSPATH.'wp-admin/includes/deprecated.php');
 
 /** WordPress Multisite support API */
-if ( is_multisite() ) {
-	require_once(ABSPATH . 'wp-admin/includes/ms-admin-filters.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');
+if (is_multisite()) {
+	require_once(ABSPATH.'wp-admin/includes/ms-admin-filters.php');
+	require_once(ABSPATH.'wp-admin/includes/ms.php');
+	require_once(ABSPATH.'wp-admin/includes/ms-deprecated.php');
 }

src/wp-admin/includes/taxonomy.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Taxonomy Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Taxonomy Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 //
 // Category

Spacing +48 added lines, -48 removed lines

@@ -21,9 +21,9 @@ 
  * @param int        $parent   Optional. ID of parent term.
  * @return mixed
  */
-function category_exists( $cat_name, $parent = null ) {
+function category_exists($cat_name, $parent = null) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
+	if (is_array($id))
 		$id = $id['term_id'];
 	return $id;
 }
@@ -36,9 +36,9 @@ 
  * @param int $id
  * @return object
  */
-function get_category_to_edit( $id ) {
-	$category = get_term( $id, 'category', OBJECT, 'edit' );
-	_make_cat_compat( $category );
+function get_category_to_edit($id) {
+	$category = get_term($id, 'category', OBJECT, 'edit');
+	_make_cat_compat($category);
 	return $category;
 }
 
@@ -51,11 +51,11 @@ 
  * @param int        $parent
  * @return int|WP_Error
  */
-function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
+function wp_create_category($cat_name, $parent = 0) {
+	if ($id = category_exists($cat_name, $parent))
 		return $id;
 
-	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
+	return wp_insert_category(array('cat_name' => $cat_name, 'category_parent' => $parent));
 }
 
 /**
@@ -67,17 +67,17 @@ 
  * @param int   $post_id    Optional. The post ID. Default empty.
  * @return List of categories to create for the given post.
  */
-function wp_create_categories( $categories, $post_id = '' ) {
-	$cat_ids = array ();
-	foreach ( $categories as $category ) {
-		if ( $id = category_exists( $category ) ) {
+function wp_create_categories($categories, $post_id = '') {
+	$cat_ids = array();
+	foreach ($categories as $category) {
+		if ($id = category_exists($category)) {
 			$cat_ids[] = $id;
-		} elseif ( $id = wp_create_category( $category ) ) {
+		} elseif ($id = wp_create_category($category)) {
 			$cat_ids[] = $id;
 		}
 	}
 
-	if ( $post_id )
+	if ($post_id)
 		wp_set_post_categories($post_id, $cat_ids);
 
 	return $cat_ids;
@@ -105,47 +105,47 @@ 
  * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure,
  *                    depending on param $wp_error.
  */
-function wp_insert_category( $catarr, $wp_error = false ) {
-	$cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
-	$catarr = wp_parse_args( $catarr, $cat_defaults );
+function wp_insert_category($catarr, $wp_error = false) {
+	$cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
+	$catarr = wp_parse_args($catarr, $cat_defaults);
 
-	if ( trim( $catarr['cat_name'] ) == '' ) {
-		if ( ! $wp_error ) {
+	if (trim($catarr['cat_name']) == '') {
+		if ( ! $wp_error) {
 			return 0;
 		} else {
-			return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+			return new WP_Error('cat_name', __('You did not enter a category name.'));
 		}
 	}
 
 	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
 
 	// Are we updating or creating?
-	$update = ! empty ( $catarr['cat_ID'] );
+	$update = ! empty ($catarr['cat_ID']);
 
 	$name = $catarr['cat_name'];
 	$description = $catarr['category_description'];
 	$slug = $catarr['category_nicename'];
 	$parent = (int) $catarr['category_parent'];
-	if ( $parent < 0 ) {
+	if ($parent < 0) {
 		$parent = 0;
 	}
 
-	if ( empty( $parent )
-		|| ! term_exists( $parent, $catarr['taxonomy'] )
-		|| ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
+	if (empty($parent)
+		|| ! term_exists($parent, $catarr['taxonomy'])
+		|| ($catarr['cat_ID'] && term_is_ancestor_of($catarr['cat_ID'], $parent, $catarr['taxonomy']))) {
 		$parent = 0;
 	}
 
 	$args = compact('name', 'slug', 'parent', 'description');
 
-	if ( $update ) {
-		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+	if ($update) {
+		$catarr['cat_ID'] = wp_update_term($catarr['cat_ID'], $catarr['taxonomy'], $args);
 	} else {
-		$catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+		$catarr['cat_ID'] = wp_insert_term($catarr['cat_name'], $catarr['taxonomy'], $args);
 	}
 
-	if ( is_wp_error( $catarr['cat_ID'] ) ) {
-		if ( $wp_error ) {
+	if (is_wp_error($catarr['cat_ID'])) {
+		if ($wp_error) {
 			return $catarr['cat_ID'];
 		} else {
 			return 0;
@@ -168,12 +168,12 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
+	if (isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']))
 		return false;
 
 	// First, get all of the original fields
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
-	_make_cat_compat( $category );
+	$category = get_term($cat_ID, 'category', ARRAY_A);
+	_make_cat_compat($category);
 
 	// Escape data pulled from DB.
 	$category = wp_slash($category);
@@ -209,7 +209,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_tag($tag_name) {
-	return wp_create_term( $tag_name, 'post_tag');
+	return wp_create_term($tag_name, 'post_tag');
 }
 
 /**
@@ -221,8 +221,8 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy);
+function get_tags_to_edit($post_id, $taxonomy = 'post_tag') {
+	return get_terms_to_edit($post_id, $taxonomy);
 }
 
 /**
@@ -234,29 +234,29 @@ 
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return string|bool|WP_Error
  */
-function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
+function get_terms_to_edit($post_id, $taxonomy = 'post_tag') {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	$terms = get_object_term_cache( $post_id, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post_id, $taxonomy );
-		wp_cache_add( $post_id, $terms, $taxonomy . '_relationships' );
+	$terms = get_object_term_cache($post_id, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post_id, $taxonomy);
+		wp_cache_add($post_id, $terms, $taxonomy.'_relationships');
 	}
 
-	if ( ! $terms ) {
+	if ( ! $terms) {
 		return false;
 	}
-	if ( is_wp_error( $terms ) ) {
+	if (is_wp_error($terms)) {
 		return $terms;
 	}
 	$term_names = array();
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 		$term_names[] = $term->name;
 	}
 
-	$terms_to_edit = esc_attr( join( ',', $term_names ) );
+	$terms_to_edit = esc_attr(join(',', $term_names));
 
 	/**
 	 * Filter the comma-separated list of terms available to edit.
@@ -268,7 +268,7 @@ 
 	 * @param array  $terms_to_edit An array of terms.
 	 * @param string $taxonomy     The taxonomy for which to retrieve terms. Default 'post_tag'.
 	 */
-	$terms_to_edit = apply_filters( 'terms_to_edit', $terms_to_edit, $taxonomy );
+	$terms_to_edit = apply_filters('terms_to_edit', $terms_to_edit, $taxonomy);
 
 	return $terms_to_edit;
 }
@@ -283,7 +283,7 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
+	if ($id = term_exists($tag_name, $taxonomy))
 		return $id;
 
 	return wp_insert_term($tag_name, $taxonomy);

Braces +18 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
  */
 function category_exists( $cat_name, $parent = null ) {
 	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
-		$id = $id['term_id'];
+	if ( is_array($id) ) {
+			$id = $id['term_id'];
+	}
 	return $id;
 }
 
@@ -52,8 +53,9 @@ 
  * @return int|WP_Error
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
-		return $id;
+	if ( $id = category_exists($cat_name, $parent) ) {
+			return $id;
+	}
 
 	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
 }
@@ -77,8 +79,9 @@ 
 		}
 	}
 
-	if ( $post_id )
-		wp_set_post_categories($post_id, $cat_ids);
+	if ( $post_id ) {
+			wp_set_post_categories($post_id, $cat_ids);
+	}
 
 	return $cat_ids;
 }
@@ -168,8 +171,9 @@ 
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
-		return false;
+	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) ) {
+			return false;
+	}
 
 	// First, get all of the original fields
 	$category = get_term( $cat_ID, 'category', ARRAY_A );
@@ -236,8 +240,9 @@ 
  */
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	$terms = get_object_term_cache( $post_id, $taxonomy );
 	if ( false === $terms ) {
@@ -283,8 +288,9 @@ 
  * @return array|WP_Error
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
-		return $id;
+	if ( $id = term_exists($tag_name, $taxonomy) ) {
+			return $id;
+	}
 
 	return wp_insert_term($tag_name, $taxonomy);
 }

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

Indentation +7 added lines, -7 removed lines

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

Spacing +61 added lines, -61 removed lines

@@ -19,11 +19,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'plural' => 'bookmarks',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -31,7 +31,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_links' );
+		return current_user_can('manage_links');
 	}
 
 	/**
@@ -44,27 +44,27 @@ 
 	public function prepare_items() {
 		global $cat_id, $s, $orderby, $order;
 
-		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'cat_id', 'link_id', 'orderby', 'order', 's'));
 
-		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+		$args = array('hide_invisible' => 0, 'hide_empty' => 0);
 
-		if ( 'all' != $cat_id )
+		if ('all' != $cat_id)
 			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
+		if ( ! empty($s))
 			$args['search'] = $s;
-		if ( !empty( $orderby ) )
+		if ( ! empty($orderby))
 			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
+		if ( ! empty($order))
 			$args['order'] = $order;
 
-		$this->items = get_bookmarks( $args );
+		$this->items = get_bookmarks($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No links found.' );
+		_e('No links found.');
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -83,10 +83,10 @@ 
 	 * @global int $cat_id
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $cat_id;
 
-		if ( 'top' != $which )
+		if ('top' != $which)
 			return;
 ?>
 		<div class="alignleft actions">
@@ -95,16 +95,16 @@ 
 				'selected' => $cat_id,
 				'name' => 'cat_id',
 				'taxonomy' => 'link_category',
-				'show_option_all' => __( 'All categories' ),
+				'show_option_all' => __('All categories'),
 				'hide_empty' => true,
 				'hierarchical' => 1,
 				'show_count' => 0,
 				'orderby' => 'name',
 			);
 
-			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			echo '<label class="screen-reader-text" for="cat_id">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 ?>
 		</div>
 <?php
@@ -117,12 +117,12 @@ 
 	public function get_columns() {
 		return array(
 			'cb'         => '<input type="checkbox" />',
-			'name'       => _x( 'Name', 'link name' ),
-			'url'        => __( 'URL' ),
-			'categories' => __( 'Categories' ),
-			'rel'        => __( 'Relationship' ),
-			'visible'    => __( 'Visible' ),
-			'rating'     => __( 'Rating' )
+			'name'       => _x('Name', 'link name'),
+			'url'        => __('URL'),
+			'categories' => __('Categories'),
+			'rel'        => __('Relationship'),
+			'visible'    => __('Visible'),
+			'rating'     => __('Rating')
 		);
 	}
 
@@ -159,10 +159,10 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_cb( $link ) {
+	public function column_cb($link) {
 		?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf(__('Select %s'), $link->link_name); ?></label>
+		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr($link->link_id); ?>" />
 		<?php
 	}
 
@@ -174,11 +174,11 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_name( $link ) {
-		$edit_link = get_edit_bookmark_link( $link );
+	public function column_name($link) {
+		$edit_link = get_edit_bookmark_link($link);
 		?>
 		<strong><a class="row-title" href="<?php echo $edit_link ?>" title="<?php
-			echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) );
+			echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $link->link_name));
 		?>"><?php echo $link->link_name ?></a></strong><br />
 		<?php
 	}
@@ -191,9 +191,9 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_url( $link ) {
-		$short_url = url_shorten( $link->link_url );
-		echo "<a href='$link->link_url' title='". esc_attr( sprintf( __( 'Visit %s' ), $link->link_name ) )."'>$short_url</a>";
+	public function column_url($link) {
+		$short_url = url_shorten($link->link_url);
+		echo "<a href='$link->link_url' title='".esc_attr(sprintf(__('Visit %s'), $link->link_name))."'>$short_url</a>";
 	}
 
 	/**
@@ -206,22 +206,22 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_categories( $link ) {
+	public function column_categories($link) {
 		global $cat_id;
 
 		$cat_names = array();
-		foreach ( $link->link_category as $category ) {
-			$cat = get_term( $category, 'link_category', OBJECT, 'display' );
-			if ( is_wp_error( $cat ) ) {
+		foreach ($link->link_category as $category) {
+			$cat = get_term($category, 'link_category', OBJECT, 'display');
+			if (is_wp_error($cat)) {
 				echo $cat->get_error_message();
 			}
 			$cat_name = $cat->name;
-			if ( $cat_id != $category ) {
+			if ($cat_id != $category) {
 				$cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
 			}
 			$cat_names[] = $cat_name;
 		}
-		echo implode( ', ', $cat_names );
+		echo implode(', ', $cat_names);
 	}
 
 	/**
@@ -232,8 +232,8 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rel( $link ) {
-		echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+	public function column_rel($link) {
+		echo empty($link->link_rel) ? '<br />' : $link->link_rel;
 	}
 
 	/**
@@ -244,11 +244,11 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_visible( $link ) {
-		if ( 'Y' === $link->link_visible ) {
-			_e( 'Yes' );
+	public function column_visible($link) {
+		if ('Y' === $link->link_visible) {
+			_e('Yes');
 		} else {
-			_e( 'No' );
+			_e('No');
 		}
 	}
 
@@ -260,7 +260,7 @@ 
 	 *
 	 * @param object $link The current link object.
 	 */
-	public function column_rating( $link ) {
+	public function column_rating($link) {
 		echo $link->link_rating;
 	}
 
@@ -273,7 +273,7 @@ 
 	 * @param object $link        Link object.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $link, $column_name ) {
+	public function column_default($link, $column_name) {
 		/**
 		 * Fires for each registered custom link column.
 		 *
@@ -282,17 +282,17 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $link_id     Link ID.
 		 */
-		do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+		do_action('manage_link_custom_column', $column_name, $link->link_id);
 	}
 
 	public function display_rows() {
-		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
-			$link->link_category = wp_get_link_cats( $link->link_id );
+		foreach ($this->items as $link) {
+			$link = sanitize_bookmark($link);
+			$link->link_name = esc_attr($link->link_name);
+			$link->link_category = wp_get_link_cats($link->link_id);
 ?>
 		<tr id="link-<?php echo $link->link_id; ?>">
-			<?php $this->single_row_columns( $link ) ?>
+			<?php $this->single_row_columns($link) ?>
 		</tr>
 <?php
 		}
@@ -309,16 +309,16 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row action output for links.
 	 */
-	protected function handle_row_actions( $link, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($link, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$edit_link = get_edit_bookmark_link( $link );
+		$edit_link = get_edit_bookmark_link($link);
 
 		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
-		return $this->row_actions( $actions );
+		$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
+		$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id)."' onclick=\"if ( confirm( '".esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name))."' ) ) { return true;}return false;\">".__('Delete')."</a>";
+		return $this->row_actions($actions);
 	}
 }

Braces +16 added lines, -11 removed lines

@@ -48,14 +48,18 @@ 
 
 		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-		if ( 'all' != $cat_id )
-			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
-			$args['search'] = $s;
-		if ( !empty( $orderby ) )
-			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
-			$args['order'] = $order;
+		if ( 'all' != $cat_id ) {
+					$args['category'] = $cat_id;
+		}
+		if ( !empty( $s ) ) {
+					$args['search'] = $s;
+		}
+		if ( !empty( $orderby ) ) {
+					$args['orderby'] = $orderby;
+		}
+		if ( !empty( $order ) ) {
+					$args['order'] = $order;
+		}
 
 		$this->items = get_bookmarks( $args );
 	}
@@ -86,9 +90,10 @@ 
 	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
-		if ( 'top' != $which )
-			return;
-?>
+		if ( 'top' != $which ) {
+					return;
+		}
+		?>
 		<div class="alignleft actions">
 <?php
 			$dropdown_options = array(

src/wp-admin/includes/widgets.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Widgets Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Widgets Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Display list of the available widgets.

Spacing +46 added lines, -46 removed lines

@@ -18,34 +18,34 @@ 
 	global $wp_registered_widgets, $wp_registered_widget_controls;
 
 	$sort = $wp_registered_widgets;
-	usort( $sort, '_sort_name_callback' );
+	usort($sort, '_sort_name_callback');
 	$done = array();
 
-	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
+	foreach ($sort as $widget) {
+		if (in_array($widget['callback'], $done, true)) // We already showed this multi-widget
 			continue;
 
-		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
+		$sidebar = is_active_widget($widget['callback'], $widget['id'], false, false);
 		$done[] = $widget['callback'];
 
-		if ( ! isset( $widget['params'][0] ) )
+		if ( ! isset($widget['params'][0]))
 			$widget['params'][0] = array();
 
-		$args = array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' );
+		$args = array('widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template');
 
-		if ( isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number']) ) {
+		if (isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number'])) {
 			$id_base = $wp_registered_widget_controls[$widget['id']]['id_base'];
 			$args['_temp_id'] = "$id_base-__i__";
 			$args['_multi_num'] = next_widget_id_number($id_base);
 			$args['_add'] = 'multi';
 		} else {
 			$args['_add'] = 'single';
-			if ( $sidebar )
+			if ($sidebar)
 				$args['_hide'] = '1';
 		}
 
-		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
-		call_user_func_array( 'wp_widget_control', $args );
+		$args = wp_list_widget_controls_dynamic_sidebar(array(0 => $args, 1 => $widget['params'][0]));
+		call_user_func_array('wp_widget_control', $args);
 	}
 }
 
@@ -57,8 +57,8 @@ 
  *
  * @return int
  */
-function _sort_name_callback( $a, $b ) {
-	return strnatcasecmp( $a['name'], $b['name'] );
+function _sort_name_callback($a, $b) {
+	return strnatcasecmp($a['name'], $b['name']);
 }
 
 /**
@@ -70,31 +70,31 @@ 
  * @param string $sidebar id slug of the sidebar
  * @param string optional $sidebar_name Include the HTML for the sidebar name
  */
-function wp_list_widget_controls( $sidebar, $sidebar_name = '' ) {
-	add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
+function wp_list_widget_controls($sidebar, $sidebar_name = '') {
+	add_filter('dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar');
 
-	$description = wp_sidebar_description( $sidebar );
+	$description = wp_sidebar_description($sidebar);
 
-	echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
+	echo '<div id="'.esc_attr($sidebar).'" class="widgets-sortables">';
 
-	if ( $sidebar_name ) {
+	if ($sidebar_name) {
 		?>
 		<div class="sidebar-name">
 			<div class="sidebar-name-arrow"><br /></div>
-			<h3><?php echo esc_html( $sidebar_name ); ?> <span class="spinner"></span></h3>
+			<h3><?php echo esc_html($sidebar_name); ?> <span class="spinner"></span></h3>
 		</div>
 		<?php
 	}
 
 	echo '<div class="sidebar-description">';
 
-	if ( ! empty( $description ) ) {
-		echo '<p class="description">' . $description . '</p>';
+	if ( ! empty($description)) {
+		echo '<p class="description">'.$description.'</p>';
 	}
 
 	echo '</div>';
 
-	dynamic_sidebar( $sidebar );
+	dynamic_sidebar($sidebar);
 
 	echo '</div>';
 }
@@ -111,7 +111,7 @@ 
  * @param array $params
  * @return array
  */
-function wp_list_widget_controls_dynamic_sidebar( $params ) {
+function wp_list_widget_controls_dynamic_sidebar($params) {
 	global $wp_registered_widgets;
 	static $i = 0;
 	$i++;
@@ -124,7 +124,7 @@ 
 	$params[0]['after_widget'] = "</div>";
 	$params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated
 	$params[0]['after_title'] = "%END_OF_TITLE%"; // deprecated
-	if ( is_callable( $wp_registered_widgets[$widget_id]['callback'] ) ) {
+	if (is_callable($wp_registered_widgets[$widget_id]['callback'])) {
 		$wp_registered_widgets[$widget_id]['_callback'] = $wp_registered_widgets[$widget_id]['callback'];
 		$wp_registered_widgets[$widget_id]['callback'] = 'wp_widget_control';
 	}
@@ -139,12 +139,12 @@ 
  * @param string $id_base
  * @return int
  */
-function next_widget_id_number( $id_base ) {
+function next_widget_id_number($id_base) {
 	global $wp_registered_widgets;
 	$number = 1;
 
-	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
+	foreach ($wp_registered_widgets as $widget_id => $widget) {
+		if (preg_match('/'.$id_base.'-([0-9]+)$/', $widget_id, $matches))
 			$number = max($number, $matches[1]);
 	}
 	$number++;
@@ -166,12 +166,12 @@ 
  * @param array $sidebar_args
  * @return array
  */
-function wp_widget_control( $sidebar_args ) {
+function wp_widget_control($sidebar_args) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets;
 
 	$widget_id = $sidebar_args['widget_id'];
 	$sidebar_id = isset($sidebar_args['id']) ? $sidebar_args['id'] : false;
-	$key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[$sidebar_id] ) : '-1'; // position of widget in sidebar
+	$key = $sidebar_id ? array_search($widget_id, $sidebars_widgets[$sidebar_id]) : '-1'; // position of widget in sidebar
 	$control = isset($wp_registered_widget_controls[$widget_id]) ? $wp_registered_widget_controls[$widget_id] : array();
 	$widget = $wp_registered_widgets[$widget_id];
 
@@ -181,10 +181,10 @@ 
 	$multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
 	$add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
 
-	$query_arg = array( 'editwidget' => $widget['id'] );
-	if ( $add_new ) {
+	$query_arg = array('editwidget' => $widget['id']);
+	if ($add_new) {
 		$query_arg['addnew'] = 1;
-		if ( $multi_number ) {
+		if ($multi_number) {
 			$query_arg['num'] = $multi_number;
 			$query_arg['base'] = $id_base;
 		}
@@ -197,27 +197,27 @@ 
 	 * We aren't showing a widget control, we're outputting a template
 	 * for a multi-widget control.
 	 */
-	if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
+	if (isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number) {
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
-		if ( isset($control['id_base']) )
-			$id_format = $control['id_base'] . '-__i__';
+		if (isset($control['id_base']))
+			$id_format = $control['id_base'].'-__i__';
 	}
 
 	$wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
 	unset($wp_registered_widgets[$widget_id]['_callback']);
 
-	$widget_title = esc_html( strip_tags( $sidebar_args['widget_name'] ) );
+	$widget_title = esc_html(strip_tags($sidebar_args['widget_name']));
 	$has_form = 'noform';
 
 	echo $sidebar_args['before_widget']; ?>
 	<div class="widget-top">
 	<div class="widget-title-action">
 		<a class="widget-action hide-if-no-js" href="#available-widgets"></a>
-		<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
-			<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
-			<span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
+		<a class="widget-control-edit hide-if-js" href="<?php echo esc_url(add_query_arg($query_arg)); ?>">
+			<span class="edit"><?php _ex('Edit', 'widget'); ?></span>
+			<span class="add"><?php _ex('Add', 'widget'); ?></span>
 			<span class="screen-reader-text"><?php echo $widget_title; ?></span>
 		</a>
 	</div>
@@ -228,15 +228,15 @@ 
 	<form method="post">
 	<div class="widget-content">
 <?php
-	if ( isset($control['callback']) )
-		$has_form = call_user_func_array( $control['callback'], $control['params'] );
+	if (isset($control['callback']))
+		$has_form = call_user_func_array($control['callback'], $control['params']);
 	else
-		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo "\t\t<p>".__('There are no options for this widget.')."</p>\n"; ?>
 	</div>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset($control['width'])) echo esc_attr($control['width']); ?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset($control['height'])) echo esc_attr($control['height']); ?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
@@ -246,8 +246,8 @@ 
 		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
-		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
-			<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
+		<div class="alignright<?php if ('noform' === $has_form) echo ' widget-control-noform'; ?>">
+			<?php submit_button(__('Save'), 'button-primary widget-control-save right', 'savewidget', false, array('id' => 'widget-'.esc_attr($id_format).'-savewidget')); ?>
 			<span class="spinner"></span>
 		</div>
 		<br class="clear" />
@@ -256,7 +256,7 @@ 
 	</div>
 
 	<div class="widget-description">
-<?php echo ( $widget_description = wp_widget_description($widget_id) ) ? "$widget_description\n" : "$widget_title\n"; ?>
+<?php echo ($widget_description = wp_widget_description($widget_id)) ? "$widget_description\n" : "$widget_title\n"; ?>
 	</div>
 <?php
 	echo $sidebar_args['after_widget'];

Braces +33 added lines, -16 removed lines

@@ -22,14 +22,17 @@ 
 	$done = array();
 
 	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
+		if ( in_array( $widget['callback'], $done, true ) ) {
+			// We already showed this multi-widget
 			continue;
+		}
 
 		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
 		$done[] = $widget['callback'];
 
-		if ( ! isset( $widget['params'][0] ) )
-			$widget['params'][0] = array();
+		if ( ! isset( $widget['params'][0] ) ) {
+					$widget['params'][0] = array();
+		}
 
 		$args = array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' );
 
@@ -40,8 +43,9 @@ 
 			$args['_add'] = 'multi';
 		} else {
 			$args['_add'] = 'single';
-			if ( $sidebar )
-				$args['_hide'] = '1';
+			if ( $sidebar ) {
+							$args['_hide'] = '1';
+			}
 		}
 
 		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
@@ -144,8 +148,9 @@ 
 	$number = 1;
 
 	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
-			$number = max($number, $matches[1]);
+		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) ) {
+					$number = max($number, $matches[1]);
+		}
 	}
 	$number++;
 
@@ -201,8 +206,9 @@ 
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
-		if ( isset($control['id_base']) )
-			$id_format = $control['id_base'] . '-__i__';
+		if ( isset($control['id_base']) ) {
+					$id_format = $control['id_base'] . '-__i__';
+		}
 	}
 
 	$wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
@@ -228,15 +234,23 @@ 
 	<form method="post">
 	<div class="widget-content">
 <?php
-	if ( isset($control['callback']) )
-		$has_form = call_user_func_array( $control['callback'], $control['params'] );
-	else
-		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n"; ?>
+	if ( isset($control['callback']) ) {
+			$has_form = call_user_func_array( $control['callback'], $control['params'] );
+	} else {
+			echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
+	}
+	?>
 	</div>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) {
+	echo esc_attr($control['width']);
+}
+?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) {
+	echo esc_attr($control['height']);
+}
+?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
@@ -246,7 +260,10 @@ 
 		<a class="widget-control-remove" href="#remove"><?php _e('Delete'); ?></a> |
 		<a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
 		</div>
-		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
+		<div class="alignright<?php if ( 'noform' === $has_form ) {
+	echo ' widget-control-noform';
+}
+?>">
 			<?php submit_button( __( 'Save' ), 'button-primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
 			<span class="spinner"></span>
 		</div>

src/wp-admin/includes/plugin-install.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Plugin Install Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Plugin Install Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Retrieve plugin installer pages from WordPress Plugins API.

Spacing +178 added lines, -178 removed lines

@@ -28,15 +28,15 @@ 
  */
 function plugins_api($action, $args = null) {
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( ! isset( $args->per_page ) ) {
+	if ( ! isset($args->per_page)) {
 		$args->per_page = 24;
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if ( ! isset($args->locale)) {
 		$args->locale = get_locale();
 	}
 
@@ -50,7 +50,7 @@ 
 	 * @param object $args   Plugin API arguments.
 	 * @param string $action The type of information being requested from the Plugin Install API.
 	 */
-	$args = apply_filters( 'plugins_api_args', $args, $action );
+	$args = apply_filters('plugins_api_args', $args, $action);
 
 	/**
 	 * Allows a plugin to override the WordPress.org Plugin Install API entirely.
@@ -63,35 +63,35 @@ 
 	 * @param string      $action The type of information being requested from the Plugin Install API.
 	 * @param object      $args   Plugin API arguments.
 	 */
-	$res = apply_filters( 'plugins_api', false, $action, $args );
+	$res = apply_filters('plugins_api', false, $action, $args);
 
-	if ( false === $res ) {
+	if (false === $res) {
 		$url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ($ssl = wp_http_supports(array('ssl')))
+			$url = set_url_scheme($url, 'https');
 
 		$http_args = array(
 			'timeout' => 15,
 			'body' => array(
 				'action' => $action,
-				'request' => serialize( $args )
+				'request' => serialize($args)
 			)
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request = wp_remote_post($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-			$request = wp_remote_post( $http_url, $http_args );
+		if ($ssl && is_wp_error($request)) {
+			trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+			$request = wp_remote_post($http_url, $http_args);
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+		if (is_wp_error($request)) {
+			$res = new WP_Error('plugins_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), $request->get_error_message());
 		} else {
-			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			$res = maybe_unserialize(wp_remote_retrieve_body($request));
+			if ( ! is_object($res) && ! is_array($res))
+				$res = new WP_Error('plugins_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), wp_remote_retrieve_body($request));
 		}
-	} elseif ( !is_wp_error($res) ) {
+	} elseif ( ! is_wp_error($res)) {
 		$res->external = true;
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @param string          $action The type of information being requested from the Plugin Install API.
 	 * @param object          $args   Plugin API arguments.
 	 */
-	return apply_filters( 'plugins_api_result', $res, $action, $args );
+	return apply_filters('plugins_api_result', $res, $action, $args);
 }
 
 /**
@@ -115,17 +115,17 @@ 
  * @param array $args
  * @return array
  */
-function install_popular_tags( $args = array() ) {
+function install_popular_tags($args = array()) {
 	$key = md5(serialize($args));
-	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) )
+	if (false !== ($tags = get_site_transient('poptags_'.$key)))
 		return $tags;
 
 	$tags = plugins_api('hot_tags', $args);
 
-	if ( is_wp_error($tags) )
+	if (is_wp_error($tags))
 		return $tags;
 
-	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
+	set_site_transient('poptags_'.$key, $tags, 3 * HOUR_IN_SECONDS);
 
 	return $tags;
 }
@@ -135,34 +135,34 @@ 
  */
 function install_dashboard() {
 	?>
-	<p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?></p>
+	<p><?php printf(__('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format via <a href="%2$s">this page</a>.'), 'https://wordpress.org/plugins/', self_admin_url('plugin-install.php?tab=upload')); ?></p>
 
 	<?php display_plugins_table(); ?>
 
-	<h3><?php _e( 'Popular tags' ) ?></h3>
-	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ) ?></p>
+	<h3><?php _e('Popular tags') ?></h3>
+	<p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:') ?></p>
 	<?php
 
 	$api_tags = install_popular_tags();
 
 	echo '<p class="popular-tags">';
-	if ( is_wp_error($api_tags) ) {
+	if (is_wp_error($api_tags)) {
 		echo $api_tags->get_error_message();
 	} else {
 		//Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
 		$tags = array();
-		foreach ( (array) $api_tags as $tag ) {
-			$url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
+		foreach ((array) $api_tags as $tag) {
+			$url = self_admin_url('plugin-install.php?tab=search&type=tag&s='.urlencode($tag['name']));
 			$data = array(
-				'link' => esc_url( $url ),
+				'link' => esc_url($url),
 				'name' => $tag['name'],
 				'slug' => $tag['slug'],
-				'id' => sanitize_title_with_dashes( $tag['name'] ),
+				'id' => sanitize_title_with_dashes($tag['name']),
 				'count' => $tag['count']
 			);
-			$tags[ $tag['name'] ] = (object) $data;
+			$tags[$tag['name']] = (object) $data;
 		}
-		echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) );
+		echo wp_generate_tag_cloud($tags, array('single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins')));
 	}
 	echo '</p><br class="clear" />';
 }
@@ -174,20 +174,20 @@ 
  *
  * @param bool $type_selector
  */
-function install_search_form( $type_selector = true ) {
-	$type = isset($_REQUEST['type']) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset($_REQUEST['s']) ? wp_unslash( $_REQUEST['s'] ) : '';
+function install_search_form($type_selector = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 	$input_attrs = '';
 	$button_type = 'button screen-reader-text';
 
 	// assume no $type_selector means it's a simplified search form
-	if ( ! $type_selector ) {
-		$input_attrs = 'class="wp-filter-search" placeholder="' . esc_attr__( 'Search Plugins' ) . '" ';
+	if ( ! $type_selector) {
+		$input_attrs = 'class="wp-filter-search" placeholder="'.esc_attr__('Search Plugins').'" ';
 	}
 
 	?><form class="search-form search-plugins" method="get">
 		<input type="hidden" name="tab" value="search" />
-		<?php if ( $type_selector ) : ?>
+		<?php if ($type_selector) : ?>
 		<select name="type" id="typeselector">
 			<option value="term"<?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
 			<option value="author"<?php selected('author', $type) ?>><?php _e('Author'); ?></option>
@@ -197,7 +197,7 @@ 
 		<label><span class="screen-reader-text"><?php _e('Search Plugins'); ?></span>
 			<input type="search" name="s" value="<?php echo esc_attr($term) ?>" <?php echo $input_attrs; ?>/>
 		</label>
-		<?php submit_button( __( 'Search Plugins' ), $button_type, false, false, array( 'id' => 'search-submit' ) ); ?>
+		<?php submit_button(__('Search Plugins'), $button_type, false, false, array('id' => 'search-submit')); ?>
 	</form><?php
 }
 
@@ -210,10 +210,10 @@ 
 <div class="upload-plugin">
 	<p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
 	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
-		<?php wp_nonce_field( 'plugin-upload'); ?>
+		<?php wp_nonce_field('plugin-upload'); ?>
 		<label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
 		<input type="file" id="pluginzip" name="pluginzip" />
-		<?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
+		<?php submit_button(__('Install Now'), 'button', 'install-plugin-submit', false); ?>
 	</form>
 </div>
 <?php
@@ -225,15 +225,15 @@ 
  *
  */
 function install_plugins_favorites_form() {
-	$user = ! empty( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+	$user = ! empty($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
 	?>
-	<p class="install-help"><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
+	<p class="install-help"><?php _e('If you have marked plugins as favorites on WordPress.org, you can browse them here.'); ?></p>
 	<form method="get">
 		<input type="hidden" name="tab" value="favorites" />
 		<p>
-			<label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
-			<input type="search" id="user" name="user" value="<?php echo esc_attr( $user ); ?>" />
-			<input type="submit" class="button" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+			<label for="user"><?php _e('Your WordPress.org username:'); ?></label>
+			<input type="search" id="user" name="user" value="<?php echo esc_attr($user); ?>" />
+			<input type="submit" class="button" value="<?php esc_attr_e('Get Favorites'); ?>" />
 		</p>
 	</form>
 	<?php
@@ -249,14 +249,14 @@ 
 function display_plugins_table() {
 	global $wp_list_table;
 
-	switch ( current_filter() ) {
+	switch (current_filter()) {
 		case 'install_plugins_favorites' :
-			if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
+			if (empty($_GET['user']) && ! get_user_option('wporg_favorites')) {
 				return;
 			}
 			break;
 		case 'install_plugins_recommended' :
-			echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
+			echo '<p>'.__('These suggestions are based on the plugins you and other users have installed.').'</p>';
 			break;
 	}
 
@@ -278,7 +278,7 @@ 
  */
 function install_plugin_install_status($api, $loop = false) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array($api) )
+	if (is_array($api))
 		$api = (object) $api;
 
 	// Default to a "new" plugin
@@ -291,37 +291,37 @@ 
 	 * and has an update awaiting it.
 	 */
 	$update_plugins = get_site_transient('update_plugins');
-	if ( isset( $update_plugins->response ) ) {
-		foreach ( (array)$update_plugins->response as $file => $plugin ) {
-			if ( $plugin->slug === $api->slug ) {
+	if (isset($update_plugins->response)) {
+		foreach ((array) $update_plugins->response as $file => $plugin) {
+			if ($plugin->slug === $api->slug) {
 				$status = 'update_available';
 				$update_file = $file;
 				$version = $plugin->new_version;
-				if ( current_user_can('update_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				if (current_user_can('update_plugins'))
+					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin='.$update_file), 'upgrade-plugin_'.$update_file);
 				break;
 			}
 		}
 	}
 
-	if ( 'install' == $status ) {
-		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
-			$installed_plugin = get_plugins('/' . $api->slug);
-			if ( empty($installed_plugin) ) {
-				if ( current_user_can('install_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+	if ('install' == $status) {
+		if (is_dir(WP_PLUGIN_DIR.'/'.$api->slug)) {
+			$installed_plugin = get_plugins('/'.$api->slug);
+			if (empty($installed_plugin)) {
+				if (current_user_can('install_plugins'))
+					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$api->slug), 'install-plugin_'.$api->slug);
 			} else {
-				$key = array_keys( $installed_plugin );
-				$key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
-				$update_file = $api->slug . '/' . $key;
-				if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
+				$key = array_keys($installed_plugin);
+				$key = reset($key); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+				$update_file = $api->slug.'/'.$key;
+				if (version_compare($api->version, $installed_plugin[$key]['Version'], '=')) {
 					$status = 'latest_installed';
-				} elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
+				} elseif (version_compare($api->version, $installed_plugin[$key]['Version'], '<')) {
 					$status = 'newer_installed';
-					$version = $installed_plugin[ $key ]['Version'];
+					$version = $installed_plugin[$key]['Version'];
 				} else {
 					//If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
-					if ( ! $loop ) {
+					if ( ! $loop) {
 						delete_site_transient('update_plugins');
 						wp_update_plugins();
 						return install_plugin_install_status($api, true);
@@ -330,15 +330,15 @@ 
 			}
 		} else {
 			// "install" & no directory with that slug
-			if ( current_user_can('install_plugins') )
-				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			if (current_user_can('install_plugins'))
+				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin='.$api->slug), 'install-plugin_'.$api->slug);
 		}
 	}
-	if ( isset($_GET['from']) )
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	if (isset($_GET['from']))
+		$url .= '&amp;from='.urlencode(wp_unslash($_GET['from']));
 
 	$file = $update_file;
-	return compact( 'status', 'url', 'version', 'file' );
+	return compact('status', 'url', 'version', 'file');
 }
 
 /**
@@ -352,12 +352,12 @@ 
 function install_plugin_information() {
 	global $tab;
 
-	if ( empty( $_REQUEST['plugin'] ) ) {
+	if (empty($_REQUEST['plugin'])) {
 		return;
 	}
 
-	$api = plugins_api( 'plugin_information', array(
-		'slug' => wp_unslash( $_REQUEST['plugin'] ),
+	$api = plugins_api('plugin_information', array(
+		'slug' => wp_unslash($_REQUEST['plugin']),
 		'is_ssl' => is_ssl(),
 		'fields' => array(
 			'banners' => true,
@@ -365,67 +365,67 @@ 
 			'downloaded' => false,
 			'active_installs' => true
 		)
-	) );
+	));
 
-	if ( is_wp_error( $api ) ) {
-		wp_die( $api );
+	if (is_wp_error($api)) {
+		wp_die($api);
 	}
 
 	$plugins_allowedtags = array(
-		'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
-		'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ),
+		'a' => array('href' => array(), 'title' => array(), 'target' => array()),
+		'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
 		'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-		'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ),
+		'div' => array('class' => array()), 'span' => array('class' => array()),
 		'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
 		'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-		'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() )
+		'img' => array('src' => array(), 'class' => array(), 'alt' => array())
 	);
 
 	$plugins_section_titles = array(
-		'description'  => _x( 'Description',  'Plugin installer section title' ),
-		'installation' => _x( 'Installation', 'Plugin installer section title' ),
-		'faq'          => _x( 'FAQ',          'Plugin installer section title' ),
-		'screenshots'  => _x( 'Screenshots',  'Plugin installer section title' ),
-		'changelog'    => _x( 'Changelog',    'Plugin installer section title' ),
-		'reviews'      => _x( 'Reviews',      'Plugin installer section title' ),
-		'other_notes'  => _x( 'Other Notes',  'Plugin installer section title' )
+		'description'  => _x('Description', 'Plugin installer section title'),
+		'installation' => _x('Installation', 'Plugin installer section title'),
+		'faq'          => _x('FAQ', 'Plugin installer section title'),
+		'screenshots'  => _x('Screenshots', 'Plugin installer section title'),
+		'changelog'    => _x('Changelog', 'Plugin installer section title'),
+		'reviews'      => _x('Reviews', 'Plugin installer section title'),
+		'other_notes'  => _x('Other Notes', 'Plugin installer section title')
 	);
 
 	// Sanitize HTML
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		$api->sections[$section_name] = wp_kses( $content, $plugins_allowedtags );
+	foreach ((array) $api->sections as $section_name => $content) {
+		$api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
 	}
 
-	foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) {
-		if ( isset( $api->$key ) ) {
-			$api->$key = wp_kses( $api->$key, $plugins_allowedtags );
+	foreach (array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key) {
+		if (isset($api->$key)) {
+			$api->$key = wp_kses($api->$key, $plugins_allowedtags);
 		}
 	}
 
-	$_tab = esc_attr( $tab );
+	$_tab = esc_attr($tab);
 
-	$section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English.
-	if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
-		$section_titles = array_keys( (array) $api->sections );
-		$section = reset( $section_titles );
+	$section = isset($_REQUEST['section']) ? wp_unslash($_REQUEST['section']) : 'description'; // Default to the Description tab, Do not translate, API returns English.
+	if (empty($section) || ! isset($api->sections[$section])) {
+		$section_titles = array_keys((array) $api->sections);
+		$section = reset($section_titles);
 	}
 
-	iframe_header( __( 'Plugin Install' ) );
+	iframe_header(__('Plugin Install'));
 
 	$_with_banner = '';
 
-	if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) {
+	if ( ! empty($api->banners) && ( ! empty($api->banners['low']) || ! empty($api->banners['high']))) {
 		$_with_banner = 'with-banner';
-		$low  = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
-		$high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
+		$low  = empty($api->banners['low']) ? $api->banners['high'] : $api->banners['low'];
+		$high = empty($api->banners['high']) ? $api->banners['low'] : $api->banners['high'];
 		?>
 		<style type="text/css">
 			#plugin-information-title.with-banner {
-				background-image: url( <?php echo esc_url( $low ); ?> );
+				background-image: url( <?php echo esc_url($low); ?> );
 			}
 			@media only screen and ( -webkit-min-device-pixel-ratio: 1.5 ) {
 				#plugin-information-title.with-banner {
-					background-image: url( <?php echo esc_url( $high ); ?> );
+					background-image: url( <?php echo esc_url($high); ?> );
 				}
 			}
 		</style>
@@ -436,96 +436,96 @@ 
 	echo "<div id='{$_tab}-title' class='{$_with_banner}'><div class='vignette'></div><h2>{$api->name}</h2></div>";
 	echo "<div id='{$_tab}-tabs' class='{$_with_banner}'>\n";
 
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) {
+	foreach ((array) $api->sections as $section_name => $content) {
+		if ('reviews' === $section_name && (empty($api->ratings) || 0 === array_sum((array) $api->ratings))) {
 			continue;
 		}
 
-		if ( isset( $plugins_section_titles[ $section_name ] ) ) {
-			$title = $plugins_section_titles[ $section_name ];
+		if (isset($plugins_section_titles[$section_name])) {
+			$title = $plugins_section_titles[$section_name];
 		} else {
-			$title = ucwords( str_replace( '_', ' ', $section_name ) );
+			$title = ucwords(str_replace('_', ' ', $section_name));
 		}
 
-		$class = ( $section_name === $section ) ? ' class="current"' : '';
-		$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
-		$href = esc_url( $href );
-		$san_section = esc_attr( $section_name );
+		$class = ($section_name === $section) ? ' class="current"' : '';
+		$href = add_query_arg(array('tab' => $tab, 'section' => $section_name));
+		$href = esc_url($href);
+		$san_section = esc_attr($section_name);
 		echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
 	}
 
 	echo "</div>\n";
 
-	$date_format = __( 'M j, Y @ H:i' );
-	$last_updated_timestamp = strtotime( $api->last_updated );
+	$date_format = __('M j, Y @ H:i');
+	$last_updated_timestamp = strtotime($api->last_updated);
 	?>
 	<div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
 	<div class="fyi">
 		<ul>
-		<?php if ( ! empty( $api->version ) ) { ?>
-			<li><strong><?php _e( 'Version:' ); ?></strong> <?php echo $api->version; ?></li>
-		<?php } if ( ! empty( $api->author ) ) { ?>
-			<li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
-		<?php } if ( ! empty( $api->last_updated ) ) { ?>
-			<li><strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
-				<?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+		<?php if ( ! empty($api->version)) { ?>
+			<li><strong><?php _e('Version:'); ?></strong> <?php echo $api->version; ?></li>
+		<?php } if ( ! empty($api->author)) { ?>
+			<li><strong><?php _e('Author:'); ?></strong> <?php echo links_add_target($api->author, '_blank'); ?></li>
+		<?php } if ( ! empty($api->last_updated)) { ?>
+			<li><strong><?php _e('Last Updated:'); ?></strong> <span title="<?php echo esc_attr(date_i18n($date_format, $last_updated_timestamp)); ?>">
+				<?php printf(__('%s ago'), human_time_diff($last_updated_timestamp)); ?>
 			</span></li>
-		<?php } if ( ! empty( $api->requires ) ) { ?>
-			<li><strong><?php _e( 'Requires WordPress Version:' ); ?></strong> <?php printf( __( '%s or higher' ), $api->requires ); ?></li>
-		<?php } if ( ! empty( $api->tested ) ) { ?>
-			<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
-		<?php } if ( ! empty( $api->active_installs ) ) { ?>
-			<li><strong><?php _e( 'Active Installs:' ); ?></strong> <?php
-				if ( $api->active_installs >= 1000000 ) {
-					_ex( '1+ Million', 'Active plugin installs' );
+		<?php } if ( ! empty($api->requires)) { ?>
+			<li><strong><?php _e('Requires WordPress Version:'); ?></strong> <?php printf(__('%s or higher'), $api->requires); ?></li>
+		<?php } if ( ! empty($api->tested)) { ?>
+			<li><strong><?php _e('Compatible up to:'); ?></strong> <?php echo $api->tested; ?></li>
+		<?php } if ( ! empty($api->active_installs)) { ?>
+			<li><strong><?php _e('Active Installs:'); ?></strong> <?php
+				if ($api->active_installs >= 1000000) {
+					_ex('1+ Million', 'Active plugin installs');
 				} else {
-					echo number_format_i18n( $api->active_installs ) . '+';
+					echo number_format_i18n($api->active_installs).'+';
 				}
 			?></li>
-		<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
-			<li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
-		<?php } if ( ! empty( $api->homepage ) ) { ?>
-			<li><a target="_blank" href="<?php echo esc_url( $api->homepage ); ?>"><?php _e( 'Plugin Homepage &#187;' ); ?></a></li>
-		<?php } if ( ! empty( $api->donate_link ) && empty( $api->contributors ) ) { ?>
-			<li><a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a></li>
+		<?php } if ( ! empty($api->slug) && empty($api->external)) { ?>
+			<li><a target="_blank" href="https://wordpress.org/plugins/<?php echo $api->slug; ?>/"><?php _e('WordPress.org Plugin Page &#187;'); ?></a></li>
+		<?php } if ( ! empty($api->homepage)) { ?>
+			<li><a target="_blank" href="<?php echo esc_url($api->homepage); ?>"><?php _e('Plugin Homepage &#187;'); ?></a></li>
+		<?php } if ( ! empty($api->donate_link) && empty($api->contributors)) { ?>
+			<li><a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a></li>
 		<?php } ?>
 		</ul>
-		<?php if ( ! empty( $api->rating ) ) { ?>
-		<h3><?php _e( 'Average Rating' ); ?></h3>
-		<?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>
-		<small><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></small>
+		<?php if ( ! empty($api->rating)) { ?>
+		<h3><?php _e('Average Rating'); ?></h3>
+		<?php wp_star_rating(array('rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings)); ?>
+		<small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
 		<?php }
 
-		if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
-			foreach( $api->ratings as $key => $ratecount ) {
+		if ( ! empty($api->ratings) && array_sum((array) $api->ratings) > 0) {
+			foreach ($api->ratings as $key => $ratecount) {
 				// Avoid div-by-zero.
-				$_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
+				$_rating = $api->num_ratings ? ($ratecount / $api->num_ratings) : 0;
 				?>
 				<div class="counter-container">
 					<span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
 						target="_blank"
-						title="<?php echo esc_attr( sprintf( _n( 'Click to see reviews that provided a rating of %d star', 'Click to see reviews that provided a rating of %d stars', $key ), $key ) ); ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
+						title="<?php echo esc_attr(sprintf(_n('Click to see reviews that provided a rating of %d star', 'Click to see reviews that provided a rating of %d stars', $key), $key)); ?>"><?php printf(_n('%d star', '%d stars', $key), $key); ?></a></span>
 					<span class="counter-back">
 						<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
 					</span>
-					<span class="counter-count"><?php echo number_format_i18n( $ratecount ); ?></span>
+					<span class="counter-count"><?php echo number_format_i18n($ratecount); ?></span>
 				</div>
 				<?php
 			}
 		}
-		if ( ! empty( $api->contributors ) ) { ?>
-			<h3><?php _e( 'Contributors' ); ?></h3>
+		if ( ! empty($api->contributors)) { ?>
+			<h3><?php _e('Contributors'); ?></h3>
 			<ul class="contributors">
 				<?php
-				foreach ( (array) $api->contributors as $contrib_username => $contrib_profile ) {
-					if ( empty( $contrib_username ) && empty( $contrib_profile ) ) {
+				foreach ((array) $api->contributors as $contrib_username => $contrib_profile) {
+					if (empty($contrib_username) && empty($contrib_profile)) {
 						continue;
 					}
-					if ( empty( $contrib_username ) ) {
-						$contrib_username = preg_replace( '/^.+\/(.+)\/?$/', '\1', $contrib_profile );
+					if (empty($contrib_username)) {
+						$contrib_username = preg_replace('/^.+\/(.+)\/?$/', '\1', $contrib_profile);
 					}
-					$contrib_username = sanitize_user( $contrib_username );
-					if ( empty( $contrib_profile ) ) {
+					$contrib_username = sanitize_user($contrib_username);
+					if (empty($contrib_profile)) {
 						echo "<li><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' />{$contrib_username}</li>";
 					} else {
 						echo "<li><a href='{$contrib_profile}' target='_blank'><img src='https://wordpress.org/grav-redirect.php?user={$contrib_username}&amp;s=36' width='18' height='18' />{$contrib_username}</a></li>";
@@ -533,26 +533,26 @@ 
 				}
 				?>
 			</ul>
-			<?php if ( ! empty( $api->donate_link ) ) { ?>
-				<a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a>
+			<?php if ( ! empty($api->donate_link)) { ?>
+				<a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a>
 			<?php } ?>
 		<?php } ?>
 	</div>
 	<div id="section-holder" class="wrap">
 	<?php
-		if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
-			echo '<div class="notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
-		} elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
-			echo '<div class="notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+		if ( ! empty($api->tested) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>')) {
+			echo '<div class="notice notice-warning"><p>'.__('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.').'</p></div>';
+		} elseif ( ! empty($api->requires) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<')) {
+			echo '<div class="notice notice-warning"><p>'.__('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.').'</p></div>';
 		}
 
-		foreach ( (array) $api->sections as $section_name => $content ) {
-			$content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' );
-			$content = links_add_target( $content, '_blank' );
+		foreach ((array) $api->sections as $section_name => $content) {
+			$content = links_add_base_url($content, 'https://wordpress.org/plugins/'.$api->slug.'/');
+			$content = links_add_target($content, '_blank');
 
-			$san_section = esc_attr( $section_name );
+			$san_section = esc_attr($section_name);
 
-			$display = ( $section_name === $section ) ? 'block' : 'none';
+			$display = ($section_name === $section) ? 'block' : 'none';
 
 			echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
 			echo $content;
@@ -562,24 +562,24 @@ 
 	echo "</div>\n";
 	echo "</div>\n"; // #plugin-information-scrollable
 	echo "<div id='$tab-footer'>\n";
-	if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) {
-		$status = install_plugin_install_status( $api );
-		switch ( $status['status'] ) {
+	if ( ! empty($api->download_link) && (current_user_can('install_plugins') || current_user_can('update_plugins'))) {
+		$status = install_plugin_install_status($api);
+		switch ($status['status']) {
 			case 'install':
-				if ( $status['url'] ) {
-					echo '<a class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Now' ) . '</a>';
+				if ($status['url']) {
+					echo '<a class="button button-primary right" href="'.$status['url'].'" target="_parent">'.__('Install Now').'</a>';
 				}
 				break;
 			case 'update_available':
-				if ( $status['url'] ) {
-					echo '<a data-slug="' . esc_attr( $api->slug ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+				if ($status['url']) {
+					echo '<a data-slug="'.esc_attr($api->slug).'" id="plugin_update_from_iframe" class="button button-primary right" href="'.$status['url'].'" target="_parent">'.__('Install Update Now').'</a>';
 				}
 				break;
 			case 'newer_installed':
-				echo '<a class="button button-primary right disabled">' . sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ) . '</a>';
+				echo '<a class="button button-primary right disabled">'.sprintf(__('Newer Version (%s) Installed'), $status['version']).'</a>';
 				break;
 			case 'latest_installed':
-				echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
+				echo '<a class="button button-primary right disabled">'.__('Latest Version Installed').'</a>';
 				break;
 		}
 	}

Braces +27 added lines, -18 removed lines

@@ -67,8 +67,9 @@ 
 
 	if ( false === $res ) {
 		$url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+					$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'timeout' => 15,
@@ -88,8 +89,9 @@ 
 			$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+							$res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			}
 		}
 	} elseif ( !is_wp_error($res) ) {
 		$res->external = true;
@@ -117,13 +119,15 @@ 
  */
 function install_popular_tags( $args = array() ) {
 	$key = md5(serialize($args));
-	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) )
-		return $tags;
+	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) ) {
+			return $tags;
+	}
 
 	$tags = plugins_api('hot_tags', $args);
 
-	if ( is_wp_error($tags) )
-		return $tags;
+	if ( is_wp_error($tags) ) {
+			return $tags;
+	}
 
 	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
 
@@ -278,8 +282,9 @@ 
  */
 function install_plugin_install_status($api, $loop = false) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array($api) )
-		$api = (object) $api;
+	if ( is_array($api) ) {
+			$api = (object) $api;
+	}
 
 	// Default to a "new" plugin
 	$status = 'install';
@@ -297,8 +302,9 @@ 
 				$status = 'update_available';
 				$update_file = $file;
 				$version = $plugin->new_version;
-				if ( current_user_can('update_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				if ( current_user_can('update_plugins') ) {
+									$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				}
 				break;
 			}
 		}
@@ -308,8 +314,9 @@ 
 		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
 			$installed_plugin = get_plugins('/' . $api->slug);
 			if ( empty($installed_plugin) ) {
-				if ( current_user_can('install_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+				if ( current_user_can('install_plugins') ) {
+									$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+				}
 			} else {
 				$key = array_keys( $installed_plugin );
 				$key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
@@ -330,12 +337,14 @@ 
 			}
 		} else {
 			// "install" & no directory with that slug
-			if ( current_user_can('install_plugins') )
-				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			if ( current_user_can('install_plugins') ) {
+							$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			}
 		}
 	}
-	if ( isset($_GET['from']) )
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	if ( isset($_GET['from']) ) {
+			$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	}
 
 	$file = $update_file;
 	return compact( 'status', 'url', 'version', 'file' );

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

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Theme Installer List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+			 * Theme Installer List Table class.
+			 *
+			 * @package WordPress
+			 * @subpackage List_Table
+			 * @since 3.1.0
+			 * @access private
+			 */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
 	public $features = array();

Spacing +100 added lines, -100 removed lines

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

Braces +28 added lines, -20 removed lines

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