ntwb / wordpress

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

Spacing +144 added lines, -144 removed lines

@@ -36,29 +36,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';
 
 	}
@@ -68,16 +68,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) {
 			/**
 			 * Filters the number of terms displayed per page for the Tags list table.
 			 *
@@ -85,7 +85,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);
 
 			/**
 			 * Filters the number of terms displayed per page for the Tags list table.
@@ -95,8 +95,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) {
 			/**
 			 * Filters the number of terms displayed per page for the Categories list table.
 			 *
@@ -104,10 +104,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,
@@ -115,18 +115,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,
-		) );
+		));
 	}
 
 	/**
@@ -142,7 +142,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;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -161,7 +161,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();
@@ -174,15 +174,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;
@@ -208,47 +208,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);
 			}
 		}
 	}
@@ -263,51 +263,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);
 		}
 	}
 
@@ -316,14 +316,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>';
 	}
 
@@ -331,12 +331,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;';
 	}
@@ -345,10 +345,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));
 
 		/**
 		 * Filters display of the term name in the terms list table.
@@ -363,32 +363,32 @@ 
 		 * @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' );
+		$qe_data = get_term($tag->term_id, $taxonomy, OBJECT, 'edit');
 
-		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+		$uri = (defined('DOING_AJAX') && DOING_AJAX) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+			urlencode(wp_unslash($uri)),
+			get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type)
 		);
 
 		$out = sprintf(
 			'<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong><br />',
-			esc_url( $edit_link ),
+			esc_url($edit_link),
 			/* translators: %s: taxonomy term name */
-			esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $tag->name ) ),
+			esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $tag->name)),
 			$name
 		);
 
-		$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, $qe_data ) . '</div>';
-		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+		$out .= '<div class="slug">'.apply_filters('editable_slug', $qe_data->slug, $qe_data).'</div>';
+		$out .= '<div class="parent">'.$qe_data->parent.'</div></div>';
 
 		return $out;
 	}
@@ -416,55 +416,55 @@ 
 	 * @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);
 
-		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+		$uri = (defined('DOING_AJAX') && DOING_AJAX) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+			urlencode(wp_unslash($uri)),
+			get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type)
 		);
 
 		$actions = array();
-		if ( current_user_can( $tax->cap->edit_terms ) ) {
+		if (current_user_can($tax->cap->edit_terms)) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
+				esc_url($edit_link),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $tag->name)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline aria-button-if-js" aria-label="%s">%s</a>',
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $tag->name ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $tag->name)),
+				__('Quick&nbsp;Edit')
 			);
 		}
-		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) {
+		if (current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term) {
 			$actions['delete'] = sprintf(
 				'<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
-				wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+				wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_'.$tag->term_id),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Delete &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Delete' )
+				esc_attr(sprintf(__('Delete &#8220;%s&#8221;'), $tag->name)),
+				__('Delete')
 			);
 		}
-		if ( $tax->public ) {
+		if ($tax->public) {
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_term_link( $tag ),
+				get_term_link($tag),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221; archive' ), $tag->name ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221; archive'), $tag->name)),
+				__('View')
 			);
 		}
 
@@ -478,7 +478,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);
 
 		/**
 		 * Filters the action links displayed for each term in the terms list table.
@@ -491,16 +491,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;
 	}
 
@@ -508,46 +508,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, $tag );
+		return apply_filters('editable_slug', $tag->slug, $tag);
 	}
 
 	/**
 	 * @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;
 	}
@@ -557,7 +557,7 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function column_default( $tag, $column_name ) {
+	public function column_default($tag, $column_name) {
 		/**
 		 * Filters the displayed columns in the terms list table.
 		 *
@@ -570,7 +570,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);
 	}
 
 	/**
@@ -579,9 +579,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;
 ?>
 
@@ -589,43 +589,43 @@ 
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 			<fieldset>
-				<legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>
+				<legend class="inline-edit-legend"><?php _e('Quick Edit'); ?></legend>
 				<div class="inline-edit-col">
 				<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">
-			<button type="button" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></button>
+			<button type="button" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></button>
 			<button type="button" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
 			<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 +52 added lines, -34 removed lines

@@ -49,17 +49,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';
+		}
 
 	}
 
@@ -115,11 +118,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;
 
@@ -161,8 +166,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();
 	}
@@ -269,11 +275,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'] ) ) {
@@ -283,8 +291,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 );
@@ -306,8 +316,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 );
+			}
 		}
 	}
 
@@ -334,9 +345,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;';
 	}
@@ -523,8 +535,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 );
@@ -532,11 +545,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>";
 	}
@@ -547,8 +562,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;
 	}
 
@@ -581,9 +597,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">
@@ -609,8 +626,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/nav-menu.php

Spacing +285 added lines, -285 removed lines

@@ -8,10 +8,10 @@ 
  */
 
 /** Walker_Nav_Menu_Edit class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-edit.php');
 
 /** Walker_Nav_Menu_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-checklist.php');
 
 /**
  * Prints the appropriate response to a menu quick search.
@@ -20,41 +20,41 @@ 
  *
  * @param array $request The unsanitized request values.
  */
-function _wp_ajax_menu_quick_search( $request = array() ) {
+function _wp_ajax_menu_quick_search($request = array()) {
 	$args = array();
-	$type = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query = isset( $request['q'] ) ? $request['q'] : '';
-	$response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
+	$type = isset($request['type']) ? $request['type'] : '';
+	$object_type = isset($request['object_type']) ? $request['object_type'] : '';
+	$query = isset($request['q']) ? $request['q'] : '';
+	$response_format = isset($request['response-format']) && in_array($request['response-format'], array('json', 'markup')) ? $request['response-format'] : 'json';
 
-	if ( 'markup' == $response_format ) {
+	if ('markup' == $response_format) {
 		$args['walker'] = new Walker_Nav_Menu_Checklist;
 	}
 
-	if ( 'get-post-item' == $type ) {
-		if ( post_type_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+	if ('get-post-item' == $type) {
+		if (post_type_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($object_id))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
-							'post_title' => get_the_title( $object_id ),
-							'post_type' => get_post_type( $object_id ),
+							'post_title' => get_the_title($object_id),
+							'post_type' => get_post_type($object_id),
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( taxonomy_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+		} elseif (taxonomy_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
-					$post_obj = get_term( $object_id, $object_type );
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_term($object_id, $object_type))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
+					$post_obj = get_term($object_id, $object_type);
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
@@ -68,46 +68,46 @@ 
 
 		}
 
-	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
-		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
-			$search_results_query = new WP_Query( array(
+	} elseif (preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches)) {
+		if ('posttype' == $matches[1] && get_post_type_object($matches[2])) {
+			$search_results_query = new WP_Query(array(
 				'no_found_rows'          => true,
 				'update_post_meta_cache' => false,
 				'update_post_term_cache' => false,
 				'posts_per_page'         => 10,
 				'post_type'              => $matches[2],
 				's'                      => $query,
-			) );
-			if ( ! $search_results_query->have_posts() ) {
+			));
+			if ( ! $search_results_query->have_posts()) {
 				return;
 			}
-			while ( $search_results_query->have_posts() ) {
+			while ($search_results_query->have_posts()) {
 				$post = $search_results_query->next_post();
-				if ( 'markup' == $response_format ) {
+				if ('markup' == $response_format) {
 					$var_by_ref = $post->ID;
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($var_by_ref))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $post->ID,
-							'post_title' => get_the_title( $post->ID ),
+							'post_title' => get_the_title($post->ID),
 							'post_type' => $matches[2],
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( 'taxonomy' == $matches[1] ) {
-			$terms = get_terms( $matches[2], array(
+		} elseif ('taxonomy' == $matches[1]) {
+			$terms = get_terms($matches[2], array(
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
+			if (empty($terms) || is_wp_error($terms))
 				return;
-			foreach ( (array) $terms as $term ) {
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+			foreach ((array) $terms as $term) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array($term)), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $term->term_id,
@@ -130,17 +130,17 @@ 
 function wp_nav_menu_setup() {
 	// Register meta boxes
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box('add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default');
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns)
-	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+	add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 	// If first time editing, disable advanced items by default.
-	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+	if (false === get_user_option('managenav-menuscolumnshidden')) {
 		$user = wp_get_current_user();
 		update_user_option($user->ID, 'managenav-menuscolumnshidden',
-			array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
+			array(0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute',),
 			true);
 	}
 }
@@ -155,17 +155,17 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
+	if (get_user_option('metaboxhidden_nav-menus') !== false || ! is_array($wp_meta_boxes))
 		return;
 
-	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category');
 	$hidden_meta_boxes = array();
 
-	foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-		foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-				if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-					unset( $box['id'] );
+	foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+		foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+			foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+				if (in_array($box['id'], $initial_meta_boxes)) {
+					unset($box['id']);
 				} else {
 					$hidden_meta_boxes[] = $box['id'];
 				}
@@ -174,7 +174,7 @@ 
 	}
 
 	$user = wp_get_current_user();
-	update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+	update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 }
 
 /**
@@ -183,12 +183,12 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $post_types )
+	if ( ! $post_types)
 		return;
 
-	foreach ( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		/**
 		 * Filters whether a menu items meta box will be added for the current
 		 * object type.
@@ -201,12 +201,12 @@ 
 		 * @param object $meta_box_object The current object to add a menu items
 		 *                                meta box for.
 		 */
-		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
-		if ( $post_type ) {
+		$post_type = apply_filters('nav_menu_meta_box_object', $post_type);
+		if ($post_type) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
-			$priority = ( 'page' == $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			$priority = ('page' == $post_type->name ? 'core' : 'default');
+			add_meta_box("add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -217,17 +217,17 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+	$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
 
-	if ( !$taxonomies )
+	if ( ! $taxonomies)
 		return;
 
-	foreach ( $taxonomies as $tax ) {
+	foreach ($taxonomies as $tax) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
-		if ( $tax ) {
+		$tax = apply_filters('nav_menu_meta_box_object', $tax);
+		if ($tax) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box("add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax);
 		}
 	}
 }
@@ -242,13 +242,13 @@ 
  * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
  * @return string Disabled attribute if at least one menu exists, false if not
  */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+function wp_nav_menu_disabled_check($nav_menu_selected_id) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
+	if ($one_theme_location_no_menus)
 		return false;
 
-	return disabled( $nav_menu_selected_id, 0 );
+	return disabled($nav_menu_selected_id, 0);
 }
 
 /**
@@ -268,18 +268,18 @@ 
 	<div class="customlinkdiv" id="customlinkdiv">
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+			<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+			<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -306,15 +306,15 @@ 
  *     @type WP_Post_Type $args     Extra meta box arguments (the post type object for this meta box).
  * }
  */
-function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
+function wp_nav_menu_item_post_type_meta_box($object, $box) {
 	global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 	$post_type_name = $box['args']->name;
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$post_type_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'offset' => $offset,
@@ -327,23 +327,23 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $box['args']->_default_query ) )
-		$args = array_merge($args, (array) $box['args']->_default_query );
+	if (isset($box['args']->_default_query))
+		$args = array_merge($args, (array) $box['args']->_default_query);
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
-	$posts = $get_posts->query( $args );
-	if ( ! $get_posts->post_count ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	$posts = $get_posts->query($args);
+	if ( ! $get_posts->post_count) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
 	$num_pages = $get_posts->max_num_pages;
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$post_type_name . '-tab' => 'all',
+				$post_type_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'post_type',
 				'item-object' => $post_type_name,
@@ -357,18 +357,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	if (is_post_type_hierarchical($post_type_name)) {
+		$db_fields = array('parent' => 'post_parent', 'id' => 'ID');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-recent';
-	if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
-		$current_tab = $_REQUEST[$post_type_name . '-tab'];
+	if (isset($_REQUEST[$post_type_name.'-tab']) && in_array($_REQUEST[$post_type_name.'-tab'], array('all', 'search'))) {
+		$current_tab = $_REQUEST[$post_type_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-posttype-'.$post_type_name])) {
 		$current_tab = 'search';
 	}
 
@@ -384,30 +384,30 @@ 
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
-					<?php _e( 'Most Recent' ); ?>
+			<li <?php echo ('most-recent' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-most-recent" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+					<?php _e('Most Recent'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="<?php echo esc_attr($post_type_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search'); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-search" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
 		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
-			echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
-				$most_recent = $get_posts->query( $recent_args );
+				$recent_args = array_merge($args, array('orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15));
+				$most_recent = $get_posts->query($recent_args);
 				$args['walker'] = $walker;
 
 				/**
@@ -422,50 +422,50 @@ 
 				 * @param array $args        An array of WP_Query arguments.
 				 * @param array $box         Arguments passed to wp_nav_menu_item_post_type_meta_box().
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box );
+				$most_recent = apply_filters("nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box);
 
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
-			if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
-				$search_results = get_posts( array( 's' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) );
+			if (isset($_REQUEST['quick-search-posttype-'.$post_type_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-posttype-'.$post_type_name]);
+				$search_results = get_posts(array('s' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC',));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-posttype-'.$post_type_name)); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -478,15 +478,15 @@ 
 				 * If we're dealing with pages, let's put a checkbox for the front
 				 * page at the top of the list.
 				 */
-				if ( 'page' == $post_type_name ) {
-					$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
-					if ( ! empty( $front_page ) ) {
-						$front_page_obj = get_post( $front_page );
+				if ('page' == $post_type_name) {
+					$front_page = 'page' == get_option('show_on_front') ? (int) get_option('page_on_front') : 0;
+					if ( ! empty($front_page)) {
+						$front_page_obj = get_post($front_page);
 						$front_page_obj->front_or_home = true;
-						array_unshift( $posts, $front_page_obj );
+						array_unshift($posts, $front_page_obj);
 					} else {
-						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-						array_unshift( $posts, (object) array(
+						$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+						array_unshift($posts, (object) array(
 							'front_or_home' => true,
 							'ID' => 0,
 							'object_id' => $_nav_menu_placeholder,
@@ -497,15 +497,15 @@ 
 							'post_type' => 'nav_menu_item',
 							'type' => 'custom',
 							'url' => home_url('/'),
-						) );
+						));
 					}
 				}
 
-				$post_type = get_post_type_object( $post_type_name );
-				$archive_link = get_post_type_archive_link( $post_type_name );
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-					array_unshift( $posts, (object) array(
+				$post_type = get_post_type_object($post_type_name);
+				$archive_link = get_post_type_archive_link($post_type_name);
+				if ($post_type->has_archive) {
+					$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+					array_unshift($posts, (object) array(
 						'ID' => 0,
 						'object_id' => $_nav_menu_placeholder,
 						'object'     => $post_type_name,
@@ -514,8 +514,8 @@ 
 						'post_title' => $post_type->labels->archives,
 						'post_type' => 'nav_menu_item',
 						'type' => 'post_type_archive',
-						'url' => get_post_type_archive_link( $post_type_name ),
-					) );
+						'url' => get_post_type_archive_link($post_type_name),
+					));
 				}
 
 				/**
@@ -534,11 +534,11 @@ 
 				 * @param array        $args      An array of WP_Query arguments.
 				 * @param WP_Post_Type $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
+				$posts = apply_filters("nav_menu_items_{$post_type_name}", $posts, $args, $post_type);
 
-				$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
+				$checkbox_items = walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args);
 
-				if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
+				if ('all' == $current_tab && ! empty($_REQUEST['selectall'])) {
 					$checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
 
 				}
@@ -546,7 +546,7 @@ 
 				echo $checkbox_items;
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -556,18 +556,18 @@ 
 		<p class="button-controls wp-clearfix">
 			<span class="list-controls">
 				<a href="<?php
-					echo esc_url( add_query_arg(
+					echo esc_url(add_query_arg(
 						array(
-							$post_type_name . '-tab' => 'all',
+							$post_type_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
-						remove_query_arg( $removed_args )
+						remove_query_arg($removed_args)
 					));
 				?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr('submit-posttype-'.$post_type_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -593,14 +593,14 @@ 
  *     @type object $args     Extra meta box arguments (the taxonomy object for this meta box).
  * }
  */
-function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
+function wp_nav_menu_item_taxonomy_meta_box($object, $box) {
 	global $nav_menu_selected_id;
 	$taxonomy_name = $box['args']->name;
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$taxonomy_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'child_of' => 0,
@@ -615,19 +615,19 @@ 
 		'pad_counts' => false,
 	);
 
-	$terms = get_terms( $taxonomy_name, $args );
+	$terms = get_terms($taxonomy_name, $args);
 
-	if ( ! $terms || is_wp_error($terms) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	if ( ! $terms || is_wp_error($terms)) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
-	$num_pages = ceil( wp_count_terms( $taxonomy_name , array_merge( $args, array('number' => '', 'offset' => '') ) ) / $per_page );
+	$num_pages = ceil(wp_count_terms($taxonomy_name, array_merge($args, array('number' => '', 'offset' => ''))) / $per_page);
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$taxonomy_name . '-tab' => 'all',
+				$taxonomy_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'taxonomy',
 				'item-object' => $taxonomy_name,
@@ -641,18 +641,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+	if (is_taxonomy_hierarchical($taxonomy_name)) {
+		$db_fields = array('parent' => 'parent', 'id' => 'term_id');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-used';
-	if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
-		$current_tab = $_REQUEST[$taxonomy_name . '-tab'];
+	if (isset($_REQUEST[$taxonomy_name.'-tab']) && in_array($_REQUEST[$taxonomy_name.'-tab'], array('all', 'most-used', 'search'))) {
+		$current_tab = $_REQUEST[$taxonomy_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
 		$current_tab = 'search';
 	}
 
@@ -668,39 +668,39 @@ 
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-					<?php _e( 'Most Used' ); ?>
+			<li <?php echo ('most-used' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-pop" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+					<?php _e('Most Used'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr($taxonomy_name); ?>" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
-			echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms = get_terms( $taxonomy_name, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+				$popular_terms = get_terms($taxonomy_name, array('orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -708,10 +708,10 @@ 
 			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args);
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -719,33 +719,33 @@ 
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
-			if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-				$search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+			if (isset($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-taxonomy-'.$taxonomy_name]);
+				$search_results = get_terms($taxonomy_name, array('name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-taxonomy-'.$taxonomy_name)); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
@@ -756,7 +756,7 @@ 
 				<a href="<?php
 					echo esc_url(add_query_arg(
 						array(
-							$taxonomy_name . '-tab' => 'all',
+							$taxonomy_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
 						remove_query_arg($removed_args)
@@ -765,7 +765,7 @@ 
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr('submit-taxonomy-'.$taxonomy_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -783,25 +783,25 @@ 
  * @param array $menu_data The unsanitized posted menu item data.
  * @return array The database IDs of the items saved
  */
-function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
+function wp_save_nav_menu_items($menu_id = 0, $menu_data = array()) {
 	$menu_id = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if (0 == $menu_id || is_nav_menu($menu_id)) {
 
 		// Loop through all the menu items' POST values.
-		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+		foreach ((array) $menu_data as $_possible_db_id => $_item_object_data) {
 			if (
 				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
+				empty($_item_object_data['menu-item-object-id']) &&
 				(
 					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
+					! isset($_item_object_data['menu-item-type']) ||
 					// Or URL is the default.
-					in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
-					! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
+					in_array($_item_object_data['menu-item-url'], array('http://', '')) ||
+					! ('custom' == $_item_object_data['menu-item-type'] && ! isset($_item_object_data['menu-item-db-id'])) || // or it's not a custom menu item (but not the custom home page)
 					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
+					! empty($_item_object_data['menu-item-db-id'])
 				)
 			) {
 				// Then this potential menu item is not getting added to this menu.
@@ -810,8 +810,8 @@ 
 
 			// If this possible menu item doesn't actually have a menu database ID yet.
 			if (
-				empty( $_item_object_data['menu-item-db-id'] ) ||
-				( 0 > $_possible_db_id ) ||
+				empty($_item_object_data['menu-item-db-id']) ||
+				(0 > $_possible_db_id) ||
 				$_possible_db_id != $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
@@ -820,22 +820,22 @@ 
 			}
 
 			$args = array(
-				'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
-				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-db-id' => (isset($_item_object_data['menu-item-db-id']) ? $_item_object_data['menu-item-db-id'] : ''),
+				'menu-item-object-id' => (isset($_item_object_data['menu-item-object-id']) ? $_item_object_data['menu-item-object-id'] : ''),
+				'menu-item-object' => (isset($_item_object_data['menu-item-object']) ? $_item_object_data['menu-item-object'] : ''),
+				'menu-item-parent-id' => (isset($_item_object_data['menu-item-parent-id']) ? $_item_object_data['menu-item-parent-id'] : ''),
+				'menu-item-position' => (isset($_item_object_data['menu-item-position']) ? $_item_object_data['menu-item-position'] : ''),
+				'menu-item-type' => (isset($_item_object_data['menu-item-type']) ? $_item_object_data['menu-item-type'] : ''),
+				'menu-item-title' => (isset($_item_object_data['menu-item-title']) ? $_item_object_data['menu-item-title'] : ''),
+				'menu-item-url' => (isset($_item_object_data['menu-item-url']) ? $_item_object_data['menu-item-url'] : ''),
+				'menu-item-description' => (isset($_item_object_data['menu-item-description']) ? $_item_object_data['menu-item-description'] : ''),
+				'menu-item-attr-title' => (isset($_item_object_data['menu-item-attr-title']) ? $_item_object_data['menu-item-attr-title'] : ''),
+				'menu-item-target' => (isset($_item_object_data['menu-item-target']) ? $_item_object_data['menu-item-target'] : ''),
+				'menu-item-classes' => (isset($_item_object_data['menu-item-classes']) ? $_item_object_data['menu-item-classes'] : ''),
+				'menu-item-xfn' => (isset($_item_object_data['menu-item-xfn']) ? $_item_object_data['menu-item-xfn'] : ''),
 			);
 
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+			$items_saved[] = wp_update_nav_menu_item($menu_id, $_actual_db_id, $args);
 
 		}
 	}
@@ -852,23 +852,23 @@ 
  * @param object $object The post type or taxonomy meta-object.
  * @return object The post type of taxonomy object.
  */
-function _wp_nav_menu_meta_box_object( $object = null ) {
-	if ( isset( $object->name ) ) {
+function _wp_nav_menu_meta_box_object($object = null) {
+	if (isset($object->name)) {
 
-		if ( 'page' == $object->name ) {
+		if ('page' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
 		// Posts should show only published items.
-		} elseif ( 'post' == $object->name ) {
+		} elseif ('post' == $object->name) {
 			$object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
 		// Categories should be in reverse chronological order.
-		} elseif ( 'category' == $object->name ) {
+		} elseif ('category' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'id',
 				'order' => 'DESC',
@@ -893,19 +893,19 @@ 
  * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error $output The menu formatted to edit or error object on failure.
  */
-function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
-	$menu = wp_get_nav_menu_object( $menu_id );
+function wp_get_nav_menu_to_edit($menu_id = 0) {
+	$menu = wp_get_nav_menu_object($menu_id);
 
 	// If the menu exists, get its items.
-	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
+	if (is_nav_menu($menu)) {
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('post_status' => 'any'));
 		$result = '<div id="menu-instructions" class="post-body-plain';
-		$result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result .= ( ! empty($menu_items)) ? ' menu-instructions-inactive">' : '">';
+		$result .= '<p>'.__('Add menu items from the column on the left.').'</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if (empty($menu_items))
+			return $result.' <ul class="menu" id="menu-to-edit"> </ul>';
 
 		/**
 		 * Filters the Walker class used when adding nav menu items.
@@ -915,40 +915,40 @@ 
 		 * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
 		 * @param int    $menu_id ID of the menu being rendered.
 		 */
-		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+		$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id);
 
-		if ( class_exists( $walker_class_name ) ) {
+		if (class_exists($walker_class_name)) {
 			$walker = new $walker_class_name;
 		} else {
-			return new WP_Error( 'menu_walker_not_exist',
+			return new WP_Error('menu_walker_not_exist',
 				/* translators: %s: walker class name */
-				sprintf( __( 'The Walker class named %s does not exist.' ),
-					'<strong>' . $walker_class_name . '</strong>'
+				sprintf(__('The Walker class named %s does not exist.'),
+					'<strong>'.$walker_class_name.'</strong>'
 				)
 			);
 		}
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
-		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
+		foreach ((array) $menu_items as $menu_item) {
+			if (isset($menu_item->post_status) && 'draft' == $menu_item->post_status)
 				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
+			if ( ! empty($menu_item->_invalid))
 				$some_invalid_menu_items = true;
 		}
 
-		if ( $some_pending_menu_items ) {
-			$result .= '<div class="notice notice-info notice-alt inline"><p>' . __( 'Click Save Menu to make pending menu items public.' ) . '</p></div>';
+		if ($some_pending_menu_items) {
+			$result .= '<div class="notice notice-info notice-alt inline"><p>'.__('Click Save Menu to make pending menu items public.').'</p></div>';
 		}
 
-		if ( $some_invalid_menu_items ) {
-			$result .= '<div class="notice notice-error notice-alt inline"><p>' . __( 'There are some invalid menu items. Please check or delete them.' ) . '</p></div>';
+		if ($some_invalid_menu_items) {
+			$result .= '<div class="notice notice-error notice-alt inline"><p>'.__('There are some invalid menu items. Please check or delete them.').'</p></div>';
 		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
+		$result .= walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker));
 		$result .= ' </ul> ';
 		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
+	} elseif (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -963,13 +963,13 @@ 
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'          => __( 'Show advanced menu properties' ),
+		'_title'          => __('Show advanced menu properties'),
 		'cb'              => '<input type="checkbox" />',
-		'link-target'     => __( 'Link Target' ),
-		'title-attribute' => __( 'Title Attribute' ),
-		'css-classes'     => __( 'CSS Classes' ),
-		'xfn'             => __( 'Link Relationship (XFN)' ),
-		'description'     => __( 'Description' ),
+		'link-target'     => __('Link Target'),
+		'title-attribute' => __('Title Attribute'),
+		'css-classes'     => __('CSS Classes'),
+		'xfn'             => __('Link Relationship (XFN)'),
+		'description'     => __('Description'),
 	);
 }
 
@@ -983,13 +983,13 @@ 
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp));
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_items_to_delete as $menu_item_id)
+		wp_delete_post($menu_item_id, true);
 }
 
 /**
@@ -1001,12 +1001,12 @@ 
  * @param string $nav_menu_selected_title Title of the currently-selected menu
  * @return array $messages The menu updated message
  */
-function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
-	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
+function wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title) {
+	$unsorted_menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish'));
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
+	foreach ($unsorted_menu_items as $_item)
 		$menu_items[$_item->db_id] = $_item;
 
 	$post_fields = array(
@@ -1016,66 +1016,66 @@ 
 		'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
 	);
 
-	wp_defer_term_counting( true );
+	wp_defer_term_counting(true);
 	// Loop through all the menu items' POST variables
-	if ( ! empty( $_POST['menu-item-db-id'] ) ) {
-		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+	if ( ! empty($_POST['menu-item-db-id'])) {
+		foreach ((array) $_POST['menu-item-db-id'] as $_key => $k) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+			if ( ! isset($_POST['menu-item-title'][$_key]) || '' == $_POST['menu-item-title'][$_key])
 				continue;
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ($post_fields as $field)
+				$args[$field] = isset($_POST[$field][$_key]) ? $_POST[$field][$_key] : '';
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item($nav_menu_selected_id, ($_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key), $args);
 
-			if ( is_wp_error( $menu_item_db_id ) ) {
-				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+			if (is_wp_error($menu_item_db_id)) {
+				$messages[] = '<div id="message" class="error"><p>'.$menu_item_db_id->get_error_message().'</p></div>';
 			} else {
-				unset( $menu_items[ $menu_item_db_id ] );
+				unset($menu_items[$menu_item_db_id]);
 			}
 		}
 	}
 
 	// Remove menu items from the menu that weren't in $_POST
-	if ( ! empty( $menu_items ) ) {
-		foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-			if ( is_nav_menu_item( $menu_item_id ) ) {
-				wp_delete_post( $menu_item_id );
+	if ( ! empty($menu_items)) {
+		foreach (array_keys($menu_items) as $menu_item_id) {
+			if (is_nav_menu_item($menu_item_id)) {
+				wp_delete_post($menu_item_id);
 			}
 		}
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
+	$auto_add = ! empty($_POST['auto-add-pages']);
+	$nav_menu_option = (array) get_option('nav_menu_options');
+	if ( ! isset($nav_menu_option['auto_add']))
 		$nav_menu_option['auto_add'] = array();
-	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+	if ($auto_add) {
+		if ( ! in_array($nav_menu_selected_id, $nav_menu_option['auto_add']))
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if (false !== ($key = array_search($nav_menu_selected_id, $nav_menu_option['auto_add'])))
+			unset($nav_menu_option['auto_add'][$key]);
 	}
 	// Remove nonexistent/deleted menus
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
-	update_option( 'nav_menu_options', $nav_menu_option );
+	$nav_menu_option['auto_add'] = array_intersect($nav_menu_option['auto_add'], wp_get_nav_menus(array('fields' => 'ids')));
+	update_option('nav_menu_options', $nav_menu_option);
 
-	wp_defer_term_counting( false );
+	wp_defer_term_counting(false);
 
 	/** This action is documented in wp-includes/nav-menu.php */
-	do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+	do_action('wp_update_nav_menu', $nav_menu_selected_id);
 
-	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.
 		/* translators: %s: nav menu title */
-		sprintf( __( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
-		) . '</p></div>';
+		sprintf(__('%s has been updated.'),
+			'<strong>'.$nav_menu_selected_title.'</strong>'
+		).'</p></div>';
 
-	unset( $menu_items, $unsorted_menu_items );
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }
@@ -1089,36 +1089,36 @@ 
  * @access private
  */
 function _wp_expand_nav_menu_post_data() {
-	if ( ! isset( $_POST['nav-menu-data'] ) ) {
+	if ( ! isset($_POST['nav-menu-data'])) {
 		return;
 	}
 
-	$data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
+	$data = json_decode(stripslashes($_POST['nav-menu-data']));
 
-	if ( ! is_null( $data ) && $data ) {
-		foreach ( $data as $post_input_data ) {
+	if ( ! is_null($data) && $data) {
+		foreach ($data as $post_input_data) {
 			// For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
 			// derive the array path keys via regex and set the value in $_POST.
-			preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
+			preg_match('#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches);
 
-			$array_bits = array( $matches[1] );
+			$array_bits = array($matches[1]);
 
-			if ( isset( $matches[3] ) ) {
-				$array_bits = array_merge( $array_bits, explode( '][', $matches[3] ) );
+			if (isset($matches[3])) {
+				$array_bits = array_merge($array_bits, explode('][', $matches[3]));
 			}
 
 			$new_post_data = array();
 
 			// Build the new array value from leaf to trunk.
-			for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
-				if ( $i == count( $array_bits ) - 1 ) {
-					$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
+			for ($i = count($array_bits) - 1; $i >= 0; $i--) {
+				if ($i == count($array_bits) - 1) {
+					$new_post_data[$array_bits[$i]] = wp_slash($post_input_data->value);
 				} else {
-					$new_post_data = array( $array_bits[ $i ] => $new_post_data );
+					$new_post_data = array($array_bits[$i] => $new_post_data);
 				}
 			}
 
-			$_POST = array_replace_recursive( $_POST, $new_post_data );
+			$_POST = array_replace_recursive($_POST, $new_post_data);
 		}
 	}
 }

Braces +73 added lines, -39 removed lines

@@ -102,8 +102,9 @@ 
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
-				return;
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+							return;
+			}
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
 					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
@@ -155,8 +156,9 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
-		return;
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) {
+			return;
+	}
 
 	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -185,8 +187,9 @@ 
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
-		return;
+	if ( ! $post_types ) {
+			return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -219,8 +222,9 @@ 
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
-		return;
+	if ( !$taxonomies ) {
+			return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -245,8 +249,9 @@ 
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
-		return false;
+	if ( $one_theme_location_no_menus ) {
+			return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -327,8 +332,9 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $box['args']->_default_query ) )
-		$args = array_merge($args, (array) $box['args']->_default_query );
+	if ( isset( $box['args']->_default_query ) ) {
+			$args = array_merge($args, (array) $box['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
@@ -385,17 +391,26 @@ 
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#<?php echo $post_type_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 					<?php _e( 'Search'); ?>
 				</a>
 			</li>
@@ -669,17 +684,26 @@ 
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
 					<?php _e( 'Most Used' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
@@ -904,8 +928,9 @@ 
 		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if ( empty($menu_items) ) {
+					return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filters the Walker class used when adding nav menu items.
@@ -930,10 +955,12 @@ 
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
-				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
-				$some_invalid_menu_items = true;
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+							$some_pending_menu_items = true;
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
+							$some_invalid_menu_items = true;
+			}
 		}
 
 		if ( $some_pending_menu_items ) {
@@ -988,9 +1015,10 @@ 
 	// Delete orphaned draft menu items.
 	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
-}
+	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
+			wp_delete_post( $menu_item_id, true );
+	}
+	}
 
 /**
  * Saves nav menu items
@@ -1006,8 +1034,9 @@ 
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+			$menu_items[$_item->db_id] = $_item;
+	}
 
 	$post_fields = array(
 		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
@@ -1022,12 +1051,14 @@ 
 		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
-				continue;
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+							continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+							$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			}
 
 			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
@@ -1051,14 +1082,17 @@ 
 	// Store 'auto-add' pages.
 	$auto_add = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
-		$nav_menu_option['auto_add'] = array();
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+			$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
-			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+					$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+					unset( $nav_menu_option['auto_add'][$key] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

src/wp-admin/includes/dashboard.php

Spacing +372 added lines, -372 removed lines

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

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

Spacing +11 added lines, -11 removed lines

@@ -8,34 +8,34 @@
  */
 
 /** WP_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-wp-upgrader-skin.php';
 
 /** Plugin_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-plugin-upgrader-skin.php';
 
 /** Theme_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-theme-upgrader-skin.php';
 
 /** Bulk_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-bulk-upgrader-skin.php';
 
 /** Bulk_Plugin_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-bulk-plugin-upgrader-skin.php';
 
 /** Bulk_Theme_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-bulk-theme-upgrader-skin.php';
 
 /** Plugin_Installer_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-plugin-installer-skin.php';
 
 /** Theme_Installer_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-theme-installer-skin.php';
 
 /** Language_Pack_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-language-pack-upgrader-skin.php';
 
 /** Automatic_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-automatic-upgrader-skin.php';
 
 /** WP_Ajax_Upgrader_Skin class */
-require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php';
+require_once ABSPATH.'wp-admin/includes/class-wp-ajax-upgrader-skin.php';

src/wp-admin/includes/menu.php

Spacing +56 added lines, -56 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -16,8 +16,8 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_network_admin_menu' );
-} elseif ( is_user_admin() ) {
+	do_action('_network_admin_menu');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -27,7 +27,7 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_user_admin_menu' );
+	do_action('_user_admin_menu');
 } else {
 
 	/**
@@ -38,18 +38,18 @@ 
 	 * @private
 	 * @since 2.2.0
 	 */
-	do_action( '_admin_menu' );
+	do_action('_admin_menu');
 }
 
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
-	if ( false !== $pos = strpos($menu_page[2], '?') ) {
+	if (false !== $pos = strpos($menu_page[2], '?')) {
 		// Handle post_type=post|page|foo pages.
 		$hook_name = substr($menu_page[2], 0, $pos);
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
+		if (isset($hook_args['post_type']))
 			$hook_name = $hook_args['post_type'];
 		else
 			$hook_name = basename($hook_name, '.php');
@@ -59,9 +59,9 @@ 
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
+	if (isset($compat[$hook_name]))
 		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
+	elseif ( ! $hook_name)
 		continue;
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
@@ -73,14 +73,14 @@ 
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
 	foreach ($sub as $index => $data) {
-		if ( ! current_user_can($data[1]) ) {
+		if ( ! current_user_can($data[1])) {
 			unset($submenu[$parent][$index]);
 			$_wp_submenu_nopriv[$parent][$data[2]] = true;
 		}
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
+	if (empty($submenu[$parent]))
 		unset($submenu[$parent]);
 }
 unset($sub, $parent);
@@ -90,18 +90,18 @@ 
  * Menus for which the original parent is not accessible due to lack of privileges
  * will have the next submenu in line be assigned as the new menu parent.
  */
-foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
+foreach ($menu as $id => $data) {
+	if (empty($submenu[$data[2]]))
 		continue;
 	$subs = $submenu[$data[2]];
-	$first_sub = reset( $subs );
+	$first_sub = reset($subs);
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
+	if ($new_parent != $old_parent) {
 		$_wp_real_parent_file[$old_parent] = $new_parent;
 		$menu[$id][2] = $new_parent;
 
@@ -111,13 +111,13 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
+		if (isset($_wp_submenu_nopriv[$old_parent]))
 			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -126,8 +126,8 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'network_admin_menu', '' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_menu', '');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -136,7 +136,7 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'user_admin_menu', '' );
+	do_action('user_admin_menu', '');
 } else {
 
 	/**
@@ -146,32 +146,32 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'admin_menu', '' );
+	do_action('admin_menu', '');
 }
 
 /*
  * Remove menus that have no accessible submenus and require privileges
  * that the user does not have. Run re-parent loop again.
  */
-foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
+foreach ($menu as $id => $data) {
+	if ( ! current_user_can($data[1]))
 		$_wp_menu_nopriv[$data[2]] = true;
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
+	if ( ! empty($submenu[$data[2]]) && 1 == count($submenu[$data[2]])) {
 		$subs = $submenu[$data[2]];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		$first_sub = reset($subs);
+		if ($data[2] == $first_sub[2])
+			unset($submenu[$data[2]]);
 	}
 
 	// If submenu is empty...
-	if ( empty($submenu[$data[2]]) ) {
+	if (empty($submenu[$data[2]])) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+		if (isset($_wp_menu_nopriv[$data[2]])) {
 			unset($menu[$id]);
 		}
 	}
@@ -185,7 +185,7 @@ 
  * @return string
  */
 function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+	$class = empty($class) ? $add : $class .= ' '.$add;
 	return $class;
 }
 
@@ -198,29 +198,29 @@ 
 	$first = $lastorder = false;
 	$i = 0;
 	$mc = count($menu);
-	foreach ( $menu as $order => $top ) {
+	foreach ($menu as $order => $top) {
 		$i++;
 
-		if ( 0 == $order ) { // dashboard is always shown/single
+		if (0 == $order) { // dashboard is always shown/single
 			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
 			$lastorder = 0;
 			continue;
 		}
 
-		if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
+		if (0 === strpos($top[2], 'separator') && false !== $lastorder) { // if separator
 			$first = true;
 			$c = $menu[$lastorder][4];
 			$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
 			continue;
 		}
 
-		if ( $first ) {
+		if ($first) {
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-first', $c);
 			$first = false;
 		}
 
-		if ( $mc == $i ) { // last item
+		if ($mc == $i) { // last item
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-last', $c);
 		}
@@ -235,7 +235,7 @@ 
 	 *
 	 * @param array $menu Associative array of administration menu items.
 	 */
-	return apply_filters( 'add_menu_classes', $menu );
+	return apply_filters('add_menu_classes', $menu);
 }
 
 uksort($menu, "strnatcasecmp"); // make it all pretty
@@ -249,9 +249,9 @@ 
  *
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
-if ( apply_filters( 'custom_menu_order', false ) ) {
+if (apply_filters('custom_menu_order', false)) {
 	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
+	foreach ($menu as $menu_item) {
 		$menu_order[] = $menu_item[2];
 	}
 	unset($menu_item);
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order = apply_filters( 'menu_order', $menu_order );
+	$menu_order = apply_filters('menu_order', $menu_order);
 	$menu_order = array_flip($menu_order);
 	$default_menu_order = array_flip($default_menu_order);
 
@@ -286,12 +286,12 @@ 
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+		if (isset($menu_order[$a]) && ! isset($menu_order[$b])) {
 			return -1;
-		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+		} elseif ( ! isset($menu_order[$a]) && isset($menu_order[$b])) {
 			return 1;
-		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
+		} elseif (isset($menu_order[$a]) && isset($menu_order[$b])) {
+			if ($menu_order[$a] == $menu_order[$b])
 				return 0;
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
@@ -305,41 +305,41 @@ 
 
 // Prevent adjacent separators
 $prev_menu_was_separator = false;
-foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+foreach ($menu as $id => $data) {
+	if (false === stristr($data[4], 'wp-menu-separator')) {
 
 		// This item is not a separator, so falsey the toggler and do nothing
 		$prev_menu_was_separator = false;
 	} else {
 
 		// The previous item was a separator, so unset this one
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
+		if (true === $prev_menu_was_separator) {
+			unset($menu[$id]);
 		}
 
 		// This item is a separator, so truthy the toggler and move on
 		$prev_menu_was_separator = true;
 	}
 }
-unset( $id, $data, $prev_menu_was_separator );
+unset($id, $data, $prev_menu_was_separator);
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_keys( $menu );
-$last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
-	unset( $menu[ $last_menu_key ] );
-unset( $last_menu_key );
+$last_menu_key = array_keys($menu);
+$last_menu_key = array_pop($last_menu_key);
+if ( ! empty($menu) && 'wp-menu-separator' == $menu[$last_menu_key][4])
+	unset($menu[$last_menu_key]);
+unset($last_menu_key);
 
-if ( !user_can_access_admin_page() ) {
+if ( ! user_can_access_admin_page()) {
 
 	/**
 	 * Fires when access to an admin page is denied.
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'admin_page_access_denied' );
+	do_action('admin_page_access_denied');
 
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
 $menu = add_menu_classes($menu);

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

Spacing +201 added lines, -201 removed lines

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

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

Spacing +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
  * @deprecated 3.0.0
  */
 function wpmu_menu() {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	// Deprecated. See #11763.
 }
 
@@ -27,10 +27,10 @@ 
  * @see is_upload_space_available()
  */
 function wpmu_checkAvailableSpace() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'is_upload_space_available()' );
+	_deprecated_function(__FUNCTION__, '3.0.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.'));
 }
 
 /**
@@ -38,8 +38,8 @@ 
  *
  * @deprecated 3.0.0
  */
-function mu_options( $options ) {
-	_deprecated_function(__FUNCTION__, '3.0.0' );
+function mu_options($options) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 	return $options;
 }
 
@@ -50,7 +50,7 @@ 
  * @see activate_plugin()
  */
 function activate_sitewide_plugin() {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()' );
+	_deprecated_function(__FUNCTION__, '3.0.0', 'activate_plugin()');
 	return false;
 }
 
@@ -60,8 +60,8 @@ 
  * @deprecated 3.0.0 Use deactivate_sitewide_plugin()
  * @see deactivate_sitewide_plugin()
  */
-function deactivate_sitewide_plugin( $plugin = false ) {
-	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
+function deactivate_sitewide_plugin($plugin = false) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()');
 }
 
 /**
@@ -70,9 +70,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.0', 'is_network_only_plugin()' );
-	return is_network_only_plugin( $file );
+function is_wpmu_sitewide_plugin($file) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'is_network_only_plugin()');
+	return is_network_only_plugin($file);
 }
 
 /**
@@ -82,8 +82,8 @@ 
  * @see WP_Theme::get_allowed_on_network()
  */
 function get_site_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()' );
-	return array_map( 'intval', WP_Theme::get_allowed_on_network() );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'WP_Theme::get_allowed_on_network()');
+	return array_map('intval', WP_Theme::get_allowed_on_network());
 }
 
 /**
@@ -92,9 +92,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.0', '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.0', 'WP_Theme::get_allowed_on_site()');
+	return array_map('intval', WP_Theme::get_allowed_on_site($blog_id));
 }
 
 /**

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

Spacing +234 added lines, -234 removed lines

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

src/wp-admin/includes/bookmark.php

Spacing +80 added lines, -80 removed lines

@@ -25,28 +25,28 @@ 
  * @param int $link_id Optional. ID of the link to edit. Default 0.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function edit_link( $link_id = 0 ) {
-	if ( ! current_user_can( 'manage_links' ) ) {
+function edit_link($link_id = 0) {
+	if ( ! current_user_can('manage_links')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit the links for this site.').'</p>',
 			403
 		);
 	}
 
-	$_POST['link_url'] = esc_html( $_POST['link_url'] );
+	$_POST['link_url'] = esc_html($_POST['link_url']);
 	$_POST['link_url'] = esc_url($_POST['link_url']);
-	$_POST['link_name'] = esc_html( $_POST['link_name'] );
-	$_POST['link_image'] = esc_html( $_POST['link_image'] );
+	$_POST['link_name'] = esc_html($_POST['link_name']);
+	$_POST['link_image'] = esc_html($_POST['link_image']);
 	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+	if ( ! isset($_POST['link_visible']) || 'N' != $_POST['link_visible'])
 		$_POST['link_visible'] = 'Y';
 
-	if ( !empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$_POST['link_id'] = $link_id;
-		return wp_update_link( $_POST );
+		return wp_update_link($_POST);
 	} else {
-		return wp_insert_link( $_POST );
+		return wp_insert_link($_POST);
 	}
 }
 
@@ -59,13 +59,13 @@ 
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
+	if (isset($_GET['linkurl']))
+		$link->link_url = esc_url(wp_unslash($_GET['linkurl']));
 	else
 		$link->link_url = '';
 
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
+	if (isset($_GET['name']))
+		$link->link_name = esc_attr(wp_unslash($_GET['name']));
 	else
 		$link->link_name = '';
 
@@ -84,7 +84,7 @@ 
  * @param int $link_id ID of the link to delete
  * @return true Always true.
  */
-function wp_delete_link( $link_id ) {
+function wp_delete_link($link_id) {
 	global $wpdb;
 	/**
 	 * Fires before a link is deleted.
@@ -93,11 +93,11 @@ 
 	 *
 	 * @param int $link_id ID of the link to delete.
 	 */
-	do_action( 'delete_link', $link_id );
+	do_action('delete_link', $link_id);
 
-	wp_delete_object_term_relationships( $link_id, 'link_category' );
+	wp_delete_object_term_relationships($link_id, 'link_category');
 
-	$wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
+	$wpdb->delete($wpdb->links, array('link_id' => $link_id));
 
 	/**
 	 * Fires after a link has been deleted.
@@ -106,9 +106,9 @@ 
 	 *
 	 * @param int $link_id ID of the deleted link.
 	 */
-	do_action( 'deleted_link', $link_id );
+	do_action('deleted_link', $link_id);
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return true;
 }
@@ -121,9 +121,9 @@ 
  * @param int $link_id Link ID to look up
  * @return array The requested link's categories
  */
-function wp_get_link_cats( $link_id = 0 ) {
-	$cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
-	return array_unique( $cats );
+function wp_get_link_cats($link_id = 0) {
+	$cats = wp_get_object_terms($link_id, 'link_category', array('fields' => 'ids'));
+	return array_unique($cats);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @param int|stdClass $link Link ID or object to retrieve.
  * @return object Link object for editing.
  */
-function get_link_to_edit( $link ) {
-	return get_bookmark( $link, OBJECT, 'edit' );
+function get_link_to_edit($link) {
+	return get_bookmark($link, OBJECT, 'edit');
 }
 
 /**
@@ -149,63 +149,63 @@ 
  * @param bool  $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function wp_insert_link( $linkdata, $wp_error = false ) {
+function wp_insert_link($linkdata, $wp_error = false) {
 	global $wpdb;
 
-	$defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+	$defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0);
 
-	$args = wp_parse_args( $linkdata, $defaults );
-	$r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
+	$args = wp_parse_args($linkdata, $defaults);
+	$r = wp_unslash(sanitize_bookmark($args, 'db'));
 
 	$link_id   = $r['link_id'];
 	$link_name = $r['link_name'];
 	$link_url  = $r['link_url'];
 
 	$update = false;
-	if ( ! empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$update = true;
 	}
 
-	if ( trim( $link_name ) == '' ) {
-		if ( trim( $link_url ) != '' ) {
+	if (trim($link_name) == '') {
+		if (trim($link_url) != '') {
 			$link_name = $link_url;
 		} else {
 			return 0;
 		}
 	}
 
-	if ( trim( $link_url ) == '' ) {
+	if (trim($link_url) == '') {
 		return 0;
 	}
 
-	$link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-	$link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-	$link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-	$link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-	$link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-	$link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-	$link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-	$link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-	$link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-	$link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+	$link_rating      = ( ! empty($r['link_rating'])) ? $r['link_rating'] : 0;
+	$link_image       = ( ! empty($r['link_image'])) ? $r['link_image'] : '';
+	$link_target      = ( ! empty($r['link_target'])) ? $r['link_target'] : '';
+	$link_visible     = ( ! empty($r['link_visible'])) ? $r['link_visible'] : 'Y';
+	$link_owner       = ( ! empty($r['link_owner'])) ? $r['link_owner'] : get_current_user_id();
+	$link_notes       = ( ! empty($r['link_notes'])) ? $r['link_notes'] : '';
+	$link_description = ( ! empty($r['link_description'])) ? $r['link_description'] : '';
+	$link_rss         = ( ! empty($r['link_rss'])) ? $r['link_rss'] : '';
+	$link_rel         = ( ! empty($r['link_rel'])) ? $r['link_rel'] : '';
+	$link_category    = ( ! empty($r['link_category'])) ? $r['link_category'] : array();
 
 	// Make sure we set a valid category.
-	if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
-		$link_category = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_category) || 0 == count($link_category)) {
+		$link_category = array(get_option('default_link_category'));
 	}
 
-	if ( $update ) {
-		if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+	if ($update) {
+		if (false === $wpdb->update($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss'), compact('link_id'))) {
+			if ($wp_error) {
+				return new WP_Error('db_update_error', __('Could not update link in the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
 		}
 	} else {
-		if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+		if (false === $wpdb->insert($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss'))) {
+			if ($wp_error) {
+				return new WP_Error('db_insert_error', __('Could not insert link into the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
@@ -213,9 +213,9 @@ 
 		$link_id = (int) $wpdb->insert_id;
 	}
 
-	wp_set_link_cats( $link_id, $link_category );
+	wp_set_link_cats($link_id, $link_category);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires after a link was updated in the database.
 		 *
@@ -223,7 +223,7 @@ 
 		 *
 		 * @param int $link_id ID of the link that was updated.
 		 */
-		do_action( 'edit_link', $link_id );
+		do_action('edit_link', $link_id);
 	} else {
 		/**
 		 * Fires after a link was added to the database.
@@ -232,9 +232,9 @@ 
 		 *
 		 * @param int $link_id ID of the link that was added.
 		 */
-		do_action( 'add_link', $link_id );
+		do_action('add_link', $link_id);
 	}
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return $link_id;
 }
@@ -247,17 +247,17 @@ 
  * @param int   $link_id         ID of the link to update.
  * @param array $link_categories Array of link categories to add the link to.
  */
-function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
+function wp_set_link_cats($link_id = 0, $link_categories = array()) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-		$link_categories = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_categories) || 0 == count($link_categories))
+		$link_categories = array(get_option('default_link_category'));
 
-	$link_categories = array_map( 'intval', $link_categories );
-	$link_categories = array_unique( $link_categories );
+	$link_categories = array_map('intval', $link_categories);
+	$link_categories = array_unique($link_categories);
 
-	wp_set_object_terms( $link_id, $link_categories, 'link_category' );
+	wp_set_object_terms($link_id, $link_categories, 'link_category');
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 }
 
 /**
@@ -268,26 +268,26 @@ 
  * @param array $linkdata Link data to update.
  * @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
  */
-function wp_update_link( $linkdata ) {
+function wp_update_link($linkdata) {
 	$link_id = (int) $linkdata['link_id'];
 
-	$link = get_bookmark( $link_id, ARRAY_A );
+	$link = get_bookmark($link_id, ARRAY_A);
 
 	// Escape data pulled from DB.
-	$link = wp_slash( $link );
+	$link = wp_slash($link);
 
 	// Passed link category list overwrites existing category list if not empty.
-	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-			 && 0 != count( $linkdata['link_category'] ) )
+	if (isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+			 && 0 != count($linkdata['link_category']))
 		$link_cats = $linkdata['link_category'];
 	else
 		$link_cats = $link['link_category'];
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$linkdata = array_merge( $link, $linkdata );
+	$linkdata = array_merge($link, $linkdata);
 	$linkdata['link_category'] = $link_cats;
 
-	return wp_insert_link( $linkdata );
+	return wp_insert_link($linkdata);
 }
 
 /**
@@ -300,17 +300,17 @@ 
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
+	if ('link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow)
 		return;
 
-	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
-	$really_can_manage_links = current_user_can( 'manage_links' );
-	remove_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
+	add_filter('pre_option_link_manager_enabled', '__return_true', 100);
+	$really_can_manage_links = current_user_can('manage_links');
+	remove_filter('pre_option_link_manager_enabled', '__return_true', 100);
 
-	if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
-		$link = network_admin_url( 'plugin-install.php?tab=search&amp;s=Link+Manager' );
-		wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
+	if ($really_can_manage_links && current_user_can('install_plugins')) {
+		$link = network_admin_url('plugin-install.php?tab=search&amp;s=Link+Manager');
+		wp_die(sprintf(__('If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.'), $link));
 	}
 
-	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
 }