ntwb / wordpress

src/wp-includes/template-loader.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * Loads the correct template based on the visitor's url
- * @package WordPress
- */
+	 * Loads the correct template based on the visitor's url
+	 * @package WordPress
+	 */
 if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
 	/**
 	 * Fires before determining which template to load.

Spacing +31 added lines, -31 removed lines

@@ -3,13 +3,13 @@ 
  * Loads the correct template based on the visitor's url
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if (defined('WP_USE_THEMES') && WP_USE_THEMES)
 	/**
 	 * Fires before determining which template to load.
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'template_redirect' );
+	do_action('template_redirect');
 
 /**
  * Filter whether to allow 'HEAD' requests to generate content.
@@ -21,46 +21,46 @@ 
  *
  * @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
  */
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ('HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters('exit_on_http_head', true))
 	exit();
 
 // Process feeds and trackbacks even if not using themes.
-if ( is_robots() ) :
+if (is_robots()) :
 	/**
 	 * Fired when the template loader determines a robots.txt request.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'do_robots' );
+	do_action('do_robots');
 	return;
-elseif ( is_feed() ) :
+elseif (is_feed()) :
 	do_feed();
 	return;
-elseif ( is_trackback() ) :
-	include( ABSPATH . 'wp-trackback.php' );
+elseif (is_trackback()) :
+	include(ABSPATH.'wp-trackback.php');
 	return;
 endif;
 
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
+if (defined('WP_USE_THEMES') && WP_USE_THEMES) :
 	$template = false;
-	if     ( is_embed()          && $template = get_embed_template()          ) :
-	elseif ( is_404()            && $template = get_404_template()            ) :
-	elseif ( is_search()         && $template = get_search_template()         ) :
-	elseif ( is_front_page()     && $template = get_front_page_template()     ) :
-	elseif ( is_home()           && $template = get_home_template()           ) :
-	elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-	elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
-	elseif ( is_attachment()     && $template = get_attachment_template()     ) :
+	if (is_embed() && $template = get_embed_template()) :
+	elseif (is_404() && $template = get_404_template()) :
+	elseif (is_search() && $template = get_search_template()) :
+	elseif (is_front_page() && $template = get_front_page_template()) :
+	elseif (is_home() && $template = get_home_template()) :
+	elseif (is_post_type_archive() && $template = get_post_type_archive_template()) :
+	elseif (is_tax() && $template = get_taxonomy_template()) :
+	elseif (is_attachment() && $template = get_attachment_template()) :
 		remove_filter('the_content', 'prepend_attachment');
-	elseif ( is_single()         && $template = get_single_template()         ) :
-	elseif ( is_page()           && $template = get_page_template()           ) :
-	elseif ( is_singular()       && $template = get_singular_template()       ) :
-	elseif ( is_category()       && $template = get_category_template()       ) :
-	elseif ( is_tag()            && $template = get_tag_template()            ) :
-	elseif ( is_author()         && $template = get_author_template()         ) :
-	elseif ( is_date()           && $template = get_date_template()           ) :
-	elseif ( is_archive()        && $template = get_archive_template()        ) :
-	elseif ( is_paged()          && $template = get_paged_template()          ) :
+	elseif (is_single() && $template = get_single_template()) :
+	elseif (is_page() && $template = get_page_template()) :
+	elseif (is_singular() && $template = get_singular_template()) :
+	elseif (is_category() && $template = get_category_template()) :
+	elseif (is_tag() && $template = get_tag_template()) :
+	elseif (is_author() && $template = get_author_template()) :
+	elseif (is_date() && $template = get_date_template()) :
+	elseif (is_archive() && $template = get_archive_template()) :
+	elseif (is_paged() && $template = get_paged_template()) :
 	else :
 		$template = get_index_template();
 	endif;
@@ -71,12 +71,12 @@ 
 	 *
 	 * @param string $template The path of the template to include.
 	 */
-	if ( $template = apply_filters( 'template_include', $template ) ) {
-		include( $template );
-	} elseif ( current_user_can( 'switch_themes' ) ) {
+	if ($template = apply_filters('template_include', $template)) {
+		include($template);
+	} elseif (current_user_can('switch_themes')) {
 		$theme = wp_get_theme();
-		if ( $theme->errors() ) {
-			wp_die( $theme->errors() );
+		if ($theme->errors()) {
+			wp_die($theme->errors());
 		}
 	}
 	return;

Braces +7 added lines, -3 removed lines

@@ -3,13 +3,14 @@ 
  * Loads the correct template based on the visitor's url
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) {
 	/**
 	 * Fires before determining which template to load.
 	 *
 	 * @since 1.5.0
 	 */
 	do_action( 'template_redirect' );
+}
 
 /**
  * Filter whether to allow 'HEAD' requests to generate content.
@@ -21,8 +22,9 @@ 
  *
  * @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
  */
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) ) {
 	exit();
+}
 
 // Process feeds and trackbacks even if not using themes.
 if ( is_robots() ) :
@@ -61,8 +63,10 @@ 
 	elseif ( is_date()           && $template = get_date_template()           ) :
 	elseif ( is_archive()        && $template = get_archive_template()        ) :
 	elseif ( is_paged()          && $template = get_paged_template()          ) :
-	else :
+	else {
+		:
 		$template = get_index_template();
+	}
 	endif;
 	/**
 	 * Filter the path of the current template before including it.

src/wp-includes/author-template.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Author Template functions for use in themes.
- *
- * These functions must be used within the WordPress Loop.
- *
- * @link https://codex.wordpress.org/Author_Templates
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * Author Template functions for use in themes.
+	 *
+	 * These functions must be used within the WordPress Loop.
+	 *
+	 * @link https://codex.wordpress.org/Author_Templates
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Retrieve the author of the current post.

Spacing +73 added lines, -73 removed lines

@@ -23,8 +23,8 @@ 
 function get_the_author($deprecated = '') {
 	global $authordata;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.1' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.1');
 
 	/**
 	 * Filter the display name of the current post's author.
@@ -55,21 +55,21 @@ 
  * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
  * @return string|null The author's display name, from get_the_author().
  */
-function the_author( $deprecated = '', $deprecated_echo = true ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.1' );
+function the_author($deprecated = '', $deprecated_echo = true) {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.1');
 	}
 
-	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '1.5',
+	if (true !== $deprecated_echo) {
+		_deprecated_argument(__FUNCTION__, '1.5',
 			/* translators: %s: get_the_author() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(__('Use %s instead if you do not want the value echoed.'),
 				'<code>get_the_author()</code>'
 			)
 		);
 	}
 
-	if ( $deprecated_echo ) {
+	if ($deprecated_echo) {
 		echo get_the_author();
 	}
 
@@ -84,7 +84,7 @@ 
  * @return string|void The author's display name.
  */
 function get_the_modified_author() {
-	if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) {
+	if ($last_id = get_post_meta(get_post()->ID, '_edit_last', true)) {
 		$last_user = get_userdata($last_id);
 
 		/**
@@ -121,20 +121,20 @@ 
  * @param int $user_id Optional. User ID.
  * @return string The author's field from the current author's DB object.
  */
-function get_the_author_meta( $field = '', $user_id = false ) {
+function get_the_author_meta($field = '', $user_id = false) {
 	$original_user_id = $user_id;
 
-	if ( ! $user_id ) {
+	if ( ! $user_id) {
 		global $authordata;
-		$user_id = isset( $authordata->ID ) ? $authordata->ID : 0;
+		$user_id = isset($authordata->ID) ? $authordata->ID : 0;
 	} else {
-		$authordata = get_userdata( $user_id );
+		$authordata = get_userdata($user_id);
 	}
 
-	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
-		$field = 'user_' . $field;
+	if (in_array($field, array('login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status')))
+		$field = 'user_'.$field;
 
-	$value = isset( $authordata->$field ) ? $authordata->$field : '';
+	$value = isset($authordata->$field) ? $authordata->$field : '';
 
 	/**
 	 * Filter the value of the requested user metadata.
@@ -148,7 +148,7 @@ 
 	 * @param int      $user_id          The user ID for the value.
 	 * @param int|bool $original_user_id The original user ID, as passed to the function.
 	 */
-	return apply_filters( 'get_the_author_' . $field, $value, $user_id, $original_user_id );
+	return apply_filters('get_the_author_'.$field, $value, $user_id, $original_user_id);
 }
 
 /**
@@ -161,8 +161,8 @@ 
  * @param string $field selects the field of the users record.
  * @param int $user_id Optional. User ID.
  */
-function the_author_meta( $field = '', $user_id = false ) {
-	$author_meta = get_the_author_meta( $field, $user_id );
+function the_author_meta($field = '', $user_id = false) {
+	$author_meta = get_the_author_meta($field, $user_id);
 
 	/**
 	 * The value of the requested user metadata.
@@ -174,7 +174,7 @@ 
 	 * @param string $author_meta The value of the metadata.
 	 * @param int    $user_id     The user ID.
 	 */
-	echo apply_filters( 'the_author_' . $field, $author_meta, $user_id );
+	echo apply_filters('the_author_'.$field, $author_meta, $user_id);
 }
 
 /**
@@ -187,8 +187,8 @@ 
  *                     else the result of get_the_author().
  */
 function get_the_author_link() {
-	if ( get_the_author_meta('url') ) {
-		return '<a href="' . esc_url( get_the_author_meta('url') ) . '" title="' . esc_attr( sprintf(__("Visit %s&#8217;s website"), get_the_author()) ) . '" rel="author external">' . get_the_author() . '</a>';
+	if (get_the_author_meta('url')) {
+		return '<a href="'.esc_url(get_the_author_meta('url')).'" title="'.esc_attr(sprintf(__("Visit %s&#8217;s website"), get_the_author())).'" rel="author external">'.get_the_author().'</a>';
 	} else {
 		return get_the_author();
 	}
@@ -217,10 +217,10 @@ 
  */
 function get_the_author_posts() {
 	$post = get_post();
-	if ( ! $post ) {
+	if ( ! $post) {
 		return 0;
 	}
-	return count_user_posts( $post->post_author, $post->post_type );
+	return count_user_posts($post->post_author, $post->post_type);
 }
 
 /**
@@ -246,14 +246,14 @@ 
  */
 function get_the_author_posts_link() {
 	global $authordata;
-	if ( ! is_object( $authordata ) ) {
+	if ( ! is_object($authordata)) {
 		return;
 	}
 
 	$link = sprintf(
 		'<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
-		esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ),
-		esc_attr( sprintf( __( 'Posts by %s' ), get_the_author() ) ),
+		esc_url(get_author_posts_url($authordata->ID, $authordata->user_nicename)),
+		esc_attr(sprintf(__('Posts by %s'), get_the_author())),
 		get_the_author()
 	);
 
@@ -264,7 +264,7 @@ 
 	 *
 	 * @param string $link HTML link.
 	 */
-	return apply_filters( 'the_author_posts_link', $link );
+	return apply_filters('the_author_posts_link', $link);
 }
 
 /**
@@ -275,9 +275,9 @@ 
  *
  * @param string $deprecated Unused.
  */
-function the_author_posts_link( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.1' );
+function the_author_posts_link($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.1');
 	}
 	echo get_the_author_posts_link();
 }
@@ -293,22 +293,22 @@ 
  * @param string $author_nicename Optional. The author's nicename (slug). Default empty.
  * @return string The URL to the author's page.
  */
-function get_author_posts_url( $author_id, $author_nicename = '' ) {
+function get_author_posts_url($author_id, $author_nicename = '') {
 	global $wp_rewrite;
 	$auth_ID = (int) $author_id;
 	$link = $wp_rewrite->get_author_permastruct();
 
-	if ( empty($link) ) {
-		$file = home_url( '/' );
-		$link = $file . '?author=' . $auth_ID;
+	if (empty($link)) {
+		$file = home_url('/');
+		$link = $file.'?author='.$auth_ID;
 	} else {
-		if ( '' == $author_nicename ) {
+		if ('' == $author_nicename) {
 			$user = get_userdata($author_id);
-			if ( !empty($user->user_nicename) )
+			if ( ! empty($user->user_nicename))
 				$author_nicename = $user->user_nicename;
 		}
 		$link = str_replace('%author%', $author_nicename, $link);
-		$link = home_url( user_trailingslashit( $link ) );
+		$link = home_url(user_trailingslashit($link));
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * @param int    $author_id       The author's id.
 	 * @param string $author_nicename The author's nice name.
 	 */
-	$link = apply_filters( 'author_link', $link, $author_id, $author_nicename );
+	$link = apply_filters('author_link', $link, $author_id, $author_nicename);
 
 	return $link;
 }
@@ -360,7 +360,7 @@ 
  * }
  * @return string|void The output, if echo is set to false.
  */
-function wp_list_authors( $args = '' ) {
+function wp_list_authors($args = '') {
 	global $wpdb;
 
 	$defaults = array(
@@ -371,89 +371,89 @@ 
 		'style' => 'list', 'html' => true, 'exclude' => '', 'include' => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$return = '';
 
-	$query_args = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
+	$query_args = wp_array_slice_assoc($args, array('orderby', 'order', 'number', 'exclude', 'include'));
 	$query_args['fields'] = 'ids';
-	$authors = get_users( $query_args );
+	$authors = get_users($query_args);
 
 	$author_count = array();
-	foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author" ) as $row ) {
+	foreach ((array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE ".get_private_posts_cap_sql('post')." GROUP BY post_author") as $row) {
 		$author_count[$row->post_author] = $row->count;
 	}
-	foreach ( $authors as $author_id ) {
-		$author = get_userdata( $author_id );
+	foreach ($authors as $author_id) {
+		$author = get_userdata($author_id);
 
-		if ( $args['exclude_admin'] && 'admin' == $author->display_name ) {
+		if ($args['exclude_admin'] && 'admin' == $author->display_name) {
 			continue;
 		}
 
-		$posts = isset( $author_count[$author->ID] ) ? $author_count[$author->ID] : 0;
+		$posts = isset($author_count[$author->ID]) ? $author_count[$author->ID] : 0;
 
-		if ( ! $posts && $args['hide_empty'] ) {
+		if ( ! $posts && $args['hide_empty']) {
 			continue;
 		}
 
-		if ( $args['show_fullname'] && $author->first_name && $author->last_name ) {
+		if ($args['show_fullname'] && $author->first_name && $author->last_name) {
 			$name = "$author->first_name $author->last_name";
 		} else {
 			$name = $author->display_name;
 		}
 
-		if ( ! $args['html'] ) {
-			$return .= $name . ', ';
+		if ( ! $args['html']) {
+			$return .= $name.', ';
 
 			continue; // No need to go further to process HTML.
 		}
 
-		if ( 'list' == $args['style'] ) {
+		if ('list' == $args['style']) {
 			$return .= '<li>';
 		}
 
-		$link = '<a href="' . get_author_posts_url( $author->ID, $author->user_nicename ) . '" title="' . esc_attr( sprintf(__("Posts by %s"), $author->display_name) ) . '">' . $name . '</a>';
+		$link = '<a href="'.get_author_posts_url($author->ID, $author->user_nicename).'" title="'.esc_attr(sprintf(__("Posts by %s"), $author->display_name)).'">'.$name.'</a>';
 
-		if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) {
+		if ( ! empty($args['feed_image']) || ! empty($args['feed'])) {
 			$link .= ' ';
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= '(';
 			}
 
-			$link .= '<a href="' . get_author_feed_link( $author->ID, $args['feed_type'] ) . '"';
+			$link .= '<a href="'.get_author_feed_link($author->ID, $args['feed_type']).'"';
 
 			$alt = '';
-			if ( ! empty( $args['feed'] ) ) {
-				$alt = ' alt="' . esc_attr( $args['feed'] ) . '"';
+			if ( ! empty($args['feed'])) {
+				$alt = ' alt="'.esc_attr($args['feed']).'"';
 				$name = $args['feed'];
 			}
 
 			$link .= '>';
 
-			if ( ! empty( $args['feed_image'] ) ) {
-				$link .= '<img src="' . esc_url( $args['feed_image'] ) . '" style="border: none;"' . $alt . ' />';
+			if ( ! empty($args['feed_image'])) {
+				$link .= '<img src="'.esc_url($args['feed_image']).'" style="border: none;"'.$alt.' />';
 			} else {
 				$link .= $name;
 			}
 
 			$link .= '</a>';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= ')';
 			}
 		}
 
-		if ( $args['optioncount'] ) {
-			$link .= ' ('. $posts . ')';
+		if ($args['optioncount']) {
+			$link .= ' ('.$posts.')';
 		}
 
 		$return .= $link;
-		$return .= ( 'list' == $args['style'] ) ? '</li>' : ', ';
+		$return .= ('list' == $args['style']) ? '</li>' : ', ';
 	}
 
-	$return = rtrim( $return, ', ' );
+	$return = rtrim($return, ', ');
 
-	if ( ! $args['echo'] ) {
+	if ( ! $args['echo']) {
 		return $return;
 	}
 	echo $return;
@@ -473,10 +473,10 @@ 
 function is_multi_author() {
 	global $wpdb;
 
-	if ( false === ( $is_multi_author = get_transient( 'is_multi_author' ) ) ) {
+	if (false === ($is_multi_author = get_transient('is_multi_author'))) {
 		$rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
-		$is_multi_author = 1 < count( $rows ) ? 1 : 0;
-		set_transient( 'is_multi_author', $is_multi_author );
+		$is_multi_author = 1 < count($rows) ? 1 : 0;
+		set_transient('is_multi_author', $is_multi_author);
 	}
 
 	/**
@@ -486,7 +486,7 @@ 
 	 *
 	 * @param bool $is_multi_author Whether $is_multi_author should evaluate as true.
 	 */
-	return apply_filters( 'is_multi_author', (bool) $is_multi_author );
+	return apply_filters('is_multi_author', (bool) $is_multi_author);
 }
 
 /**
@@ -495,5 +495,5 @@ 
  * @private
  */
 function __clear_multi_author_cache() {
-	delete_transient( 'is_multi_author' );
+	delete_transient('is_multi_author');
 }

Braces +9 added lines, -6 removed lines

@@ -23,8 +23,9 @@ 
 function get_the_author($deprecated = '') {
 	global $authordata;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.1' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.1' );
+	}
 
 	/**
 	 * Filter the display name of the current post's author.
@@ -131,8 +132,9 @@ 
 		$authordata = get_userdata( $user_id );
 	}
 
-	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
-		$field = 'user_' . $field;
+	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) ) {
+			$field = 'user_' . $field;
+	}
 
 	$value = isset( $authordata->$field ) ? $authordata->$field : '';
 
@@ -304,8 +306,9 @@ 
 	} else {
 		if ( '' == $author_nicename ) {
 			$user = get_userdata($author_id);
-			if ( !empty($user->user_nicename) )
-				$author_nicename = $user->user_nicename;
+			if ( !empty($user->user_nicename) ) {
+							$author_nicename = $user->user_nicename;
+			}
 		}
 		$link = str_replace('%author%', $author_nicename, $link);
 		$link = home_url( user_trailingslashit( $link ) );

src/wp-includes/rewrite.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Rewrite API
- *
- * @package WordPress
- * @subpackage Rewrite
- */
+	 * WordPress Rewrite API
+	 *
+	 * @package WordPress
+	 * @subpackage Rewrite
+	 */
 
 /**
  * Add a straight rewrite rule.

Spacing +97 added lines, -97 removed lines

@@ -109,14 +109,14 @@ 
  *
  * @since 3.7.0
  */
-define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS );
+define('EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS);
 
 /**
  * Endpoint Mask for everything.
  *
  * @since 2.1.0
  */
-define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES );
+define('EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES);
 
 /**
  * Adds a rewrite rule that transforms a URL structure to a set of query vars.
@@ -134,10 +134,10 @@ 
  * @param string       $after Optional. Priority of the new rule. Accepts 'top'
  *                            or 'bottom'. Default 'bottom'.
  */
-function add_rewrite_rule( $regex, $query, $after = 'bottom' ) {
+function add_rewrite_rule($regex, $query, $after = 'bottom') {
 	global $wp_rewrite;
 
-	$wp_rewrite->add_rule( $regex, $query, $after );
+	$wp_rewrite->add_rule($regex, $query, $after);
 }
 
 /**
@@ -156,20 +156,20 @@ 
  * @param string $regex Regular expression to substitute the tag for in rewrite rules.
  * @param string $query Optional. String to append to the rewritten query. Must end in '='. Default empty.
  */
-function add_rewrite_tag( $tag, $regex, $query = '' ) {
+function add_rewrite_tag($tag, $regex, $query = '') {
 	// validate the tag's name
-	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' )
+	if (strlen($tag) < 3 || $tag[0] != '%' || $tag[strlen($tag) - 1] != '%')
 		return;
 
 	global $wp_rewrite, $wp;
 
-	if ( empty( $query ) ) {
-		$qv = trim( $tag, '%' );
-		$wp->add_query_var( $qv );
-		$query = $qv . '=';
+	if (empty($query)) {
+		$qv = trim($tag, '%');
+		$wp->add_query_var($qv);
+		$query = $qv.'=';
 	}
 
-	$wp_rewrite->add_rewrite_tag( $tag, $regex, $query );
+	$wp_rewrite->add_rewrite_tag($tag, $regex, $query);
 }
 
 /**
@@ -181,9 +181,9 @@ 
  *
  * @param string $tag Name of the rewrite tag.
  */
-function remove_rewrite_tag( $tag ) {
+function remove_rewrite_tag($tag) {
 	global $wp_rewrite;
-	$wp_rewrite->remove_rewrite_tag( $tag );
+	$wp_rewrite->remove_rewrite_tag($tag);
 }
 
 /**
@@ -199,16 +199,16 @@ 
  * @param array  $args   Optional. Arguments for building the rules from the permalink structure,
  *                       see WP_Rewrite::add_permastruct() for full details. Default empty array.
  */
-function add_permastruct( $name, $struct, $args = array() ) {
+function add_permastruct($name, $struct, $args = array()) {
 	global $wp_rewrite;
 
 	// backwards compatibility for the old parameters: $with_front and $ep_mask
-	if ( ! is_array( $args ) )
-		$args = array( 'with_front' => $args );
-	if ( func_num_args() == 4 )
-		$args['ep_mask'] = func_get_arg( 3 );
+	if ( ! is_array($args))
+		$args = array('with_front' => $args);
+	if (func_num_args() == 4)
+		$args['ep_mask'] = func_get_arg(3);
 
-	$wp_rewrite->add_permastruct( $name, $struct, $args );
+	$wp_rewrite->add_permastruct($name, $struct, $args);
 }
 
 /**
@@ -224,10 +224,10 @@ 
  *
  * @param string $name Name for permalink structure.
  */
-function remove_permastruct( $name ) {
+function remove_permastruct($name) {
 	global $wp_rewrite;
 
-	$wp_rewrite->remove_permastruct( $name );
+	$wp_rewrite->remove_permastruct($name);
 }
 
 /**
@@ -241,19 +241,19 @@ 
  * @param callable $function Callback to run on feed display.
  * @return string Feed action name.
  */
-function add_feed( $feedname, $function ) {
+function add_feed($feedname, $function) {
 	global $wp_rewrite;
 
-	if ( ! in_array( $feedname, $wp_rewrite->feeds ) ) {
+	if ( ! in_array($feedname, $wp_rewrite->feeds)) {
 		$wp_rewrite->feeds[] = $feedname;
 	}
 
-	$hook = 'do_feed_' . $feedname;
+	$hook = 'do_feed_'.$feedname;
 
 	// Remove default function hook
-	remove_action( $hook, $hook );
+	remove_action($hook, $hook);
 
-	add_action( $hook, $function, 10, 2 );
+	add_action($hook, $function, 10, 2);
 
 	return $hook;
 }
@@ -268,9 +268,9 @@ 
  * @param bool $hard Whether to update .htaccess (hard flush) or just update
  * 	                 rewrite_rules transient (soft flush). Default is true (hard).
  */
-function flush_rewrite_rules( $hard = true ) {
+function flush_rewrite_rules($hard = true) {
 	global $wp_rewrite;
-	$wp_rewrite->flush_rules( $hard );
+	$wp_rewrite->flush_rules($hard);
 }
 
 /**
@@ -305,9 +305,9 @@ 
  * @param string|bool $query_var Name of the corresponding query variable. Pass `false` to skip registering a query_var
  *                               for this endpoint. Defaults to the value of `$name`.
  */
-function add_rewrite_endpoint( $name, $places, $query_var = true ) {
+function add_rewrite_endpoint($name, $places, $query_var = true) {
 	global $wp_rewrite;
-	$wp_rewrite->add_endpoint( $name, $places, $query_var );
+	$wp_rewrite->add_endpoint($name, $places, $query_var);
 }
 
 /**
@@ -321,10 +321,10 @@ 
  * @param string $base The taxonomy base that we're going to filter
  * @return string
  */
-function _wp_filter_taxonomy_base( $base ) {
-	if ( !empty( $base ) ) {
-		$base = preg_replace( '|^/index\.php/|', '', $base );
-		$base = trim( $base, '/' );
+function _wp_filter_taxonomy_base($base) {
+	if ( ! empty($base)) {
+		$base = preg_replace('|^/index\.php/|', '', $base);
+		$base = trim($base, '/');
 	}
 	return $base;
 }
@@ -351,16 +351,16 @@ 
  *                          WP::parse_request(). Default empty array.
  * @return array Returns the original array of query vars, with date/post conflicts resolved.
  */
-function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) {
-	if ( ! isset( $query_vars['year'] ) && ! isset( $query_vars['monthnum'] ) && ! isset( $query_vars['day'] ) ) {
+function wp_resolve_numeric_slug_conflicts($query_vars = array()) {
+	if ( ! isset($query_vars['year']) && ! isset($query_vars['monthnum']) && ! isset($query_vars['day'])) {
 		return $query_vars;
 	}
 
 	// Identify the 'postname' position in the permastruct array.
-	$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-	$postname_index = array_search( '%postname%', $permastructs );
+	$permastructs   = array_values(array_filter(explode('/', get_option('permalink_structure'))));
+	$postname_index = array_search('%postname%', $permastructs);
 
-	if ( false === $postname_index ) {
+	if (false === $postname_index) {
 		return $query_vars;
 	}
 
@@ -371,35 +371,35 @@ 
 	 * for month-slug clashes when `is_month` *or* `is_day`.
 	 */
 	$compare = '';
-	if ( 0 === $postname_index && ( isset( $query_vars['year'] ) || isset( $query_vars['monthnum'] ) ) ) {
+	if (0 === $postname_index && (isset($query_vars['year']) || isset($query_vars['monthnum']))) {
 		$compare = 'year';
-	} elseif ( '%year%' === $permastructs[ $postname_index - 1 ] && ( isset( $query_vars['monthnum'] ) || isset( $query_vars['day'] ) ) ) {
+	} elseif ('%year%' === $permastructs[$postname_index - 1] && (isset($query_vars['monthnum']) || isset($query_vars['day']))) {
 		$compare = 'monthnum';
-	} elseif ( '%monthnum%' === $permastructs[ $postname_index - 1 ] && isset( $query_vars['day'] ) ) {
+	} elseif ('%monthnum%' === $permastructs[$postname_index - 1] && isset($query_vars['day'])) {
 		$compare = 'day';
 	}
 
-	if ( ! $compare ) {
+	if ( ! $compare) {
 		return $query_vars;
 	}
 
 	// This is the potentially clashing slug.
-	$value = $query_vars[ $compare ];
+	$value = $query_vars[$compare];
 
-	$post = get_page_by_path( $value, OBJECT, 'post' );
-	if ( ! ( $post instanceof WP_Post ) ) {
+	$post = get_page_by_path($value, OBJECT, 'post');
+	if ( ! ($post instanceof WP_Post)) {
 		return $query_vars;
 	}
 
 	// If the date of the post doesn't match the date specified in the URL, resolve to the date archive.
-	if ( preg_match( '/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches ) && isset( $query_vars['year'] ) && ( 'monthnum' === $compare || 'day' === $compare ) ) {
+	if (preg_match('/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches) && isset($query_vars['year']) && ('monthnum' === $compare || 'day' === $compare)) {
 		// $matches[1] is the year the post was published.
-		if ( intval( $query_vars['year'] ) !== intval( $matches[1] ) ) {
+		if (intval($query_vars['year']) !== intval($matches[1])) {
 			return $query_vars;
 		}
 
 		// $matches[2] is the month the post was published.
-		if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && intval( $query_vars['monthnum'] ) !== intval( $matches[2] ) ) {
+		if ('day' === $compare && isset($query_vars['monthnum']) && intval($query_vars['monthnum']) !== intval($matches[2])) {
 			return $query_vars;
 		}
 	}
@@ -409,35 +409,35 @@ 
 	 * intended as the page number. Verify that it's a valid page before resolving to it.
 	 */
 	$maybe_page = '';
-	if ( 'year' === $compare && isset( $query_vars['monthnum'] ) ) {
+	if ('year' === $compare && isset($query_vars['monthnum'])) {
 		$maybe_page = $query_vars['monthnum'];
-	} elseif ( 'monthnum' === $compare && isset( $query_vars['day'] ) ) {
+	} elseif ('monthnum' === $compare && isset($query_vars['day'])) {
 		$maybe_page = $query_vars['day'];
 	}
 	// Bug found in #11694 - 'page' was returning '/4'
-	$maybe_page = (int) trim( $maybe_page, '/' );
+	$maybe_page = (int) trim($maybe_page, '/');
 
-	$post_page_count = substr_count( $post->post_content, '<!--nextpage-->' ) + 1;
+	$post_page_count = substr_count($post->post_content, '<!--nextpage-->') + 1;
 
 	// If the post doesn't have multiple pages, but a 'page' candidate is found, resolve to the date archive.
-	if ( 1 === $post_page_count && $maybe_page ) {
+	if (1 === $post_page_count && $maybe_page) {
 		return $query_vars;
 	}
 
 	// If the post has multiple pages and the 'page' number isn't valid, resolve to the date archive.
-	if ( $post_page_count > 1 && $maybe_page > $post_page_count ) {
+	if ($post_page_count > 1 && $maybe_page > $post_page_count) {
 		return $query_vars;
 	}
 
 	// If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage.
-	if ( '' !== $maybe_page ) {
-		$query_vars['page'] = intval( $maybe_page );
+	if ('' !== $maybe_page) {
+		$query_vars['page'] = intval($maybe_page);
 	}
 
 	// Next, unset autodetected date-related query vars.
-	unset( $query_vars['year'] );
-	unset( $query_vars['monthnum'] );
-	unset( $query_vars['day'] );
+	unset($query_vars['year']);
+	unset($query_vars['monthnum']);
+	unset($query_vars['day']);
 
 	// Then, set the identified post.
 	$query_vars['name'] = $post->post_name;
@@ -459,7 +459,7 @@ 
  * @param string $url Permalink to check.
  * @return int Post ID, or 0 on failure.
  */
-function url_to_postid( $url ) {
+function url_to_postid($url) {
 	global $wp_rewrite;
 
 	/**
@@ -469,12 +469,12 @@ 
 	 *
 	 * @param string $url The URL to derive the post ID from.
 	 */
-	$url = apply_filters( 'url_to_postid', $url );
+	$url = apply_filters('url_to_postid', $url);
 
 	// First, check to see if there is a 'p=N' or 'page_id=N' to match against
-	if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )	{
+	if (preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values)) {
 		$id = absint($values[2]);
-		if ( $id )
+		if ($id)
 			return $id;
 	}
 
@@ -487,21 +487,21 @@ 
 	$url = $url_split[0];
 
 	// Set the correct URL scheme.
-	$scheme = parse_url( home_url(), PHP_URL_SCHEME );
-	$url = set_url_scheme( $url, $scheme );
+	$scheme = parse_url(home_url(), PHP_URL_SCHEME);
+	$url = set_url_scheme($url, $scheme);
 
 	// Add 'www.' if it is absent and should be there
-	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )
+	if (false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.'))
 		$url = str_replace('://', '://www.', $url);
 
 	// Strip 'www.' if it is present and shouldn't be
-	if ( false === strpos(home_url(), '://www.') )
+	if (false === strpos(home_url(), '://www.'))
 		$url = str_replace('://www.', '://', $url);
 
-	if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
-		$page_on_front = get_option( 'page_on_front' );
+	if (trim($url, '/') === home_url() && 'page' == get_option('show_on_front')) {
+		$page_on_front = get_option('page_on_front');
 
-		if ( $page_on_front && get_post( $page_on_front ) instanceof WP_Post ) {
+		if ($page_on_front && get_post($page_on_front) instanceof WP_Post) {
 			return (int) $page_on_front;
 		}
 	}
@@ -510,21 +510,21 @@ 
 	$rewrite = $wp_rewrite->wp_rewrite_rules();
 
 	// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
-	if ( empty($rewrite) )
+	if (empty($rewrite))
 		return 0;
 
 	// Strip 'index.php/' if we're not using path info permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	if ( ! $wp_rewrite->using_index_permalinks())
+		$url = str_replace($wp_rewrite->index.'/', '', $url);
 
-	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+	if (false !== strpos(trailingslashit($url), home_url('/'))) {
 		// Chop off http://domain.com/[path]
 		$url = str_replace(home_url(), '', $url);
 	} else {
 		// Chop off /path/to/blog
-		$home_path = parse_url( home_url( '/' ) );
-		$home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
-		$url = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
+		$home_path = parse_url(home_url('/'));
+		$home_path = isset($home_path['path']) ? $home_path['path'] : '';
+		$url = preg_replace(sprintf('#^%s#', preg_quote($home_path)), '', trailingslashit($url));
 	}
 
 	// Trim leading and lagging slashes
@@ -533,32 +533,32 @@ 
 	$request = $url;
 	$post_type_query_vars = array();
 
-	foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
-		if ( ! empty( $t->query_var ) )
-			$post_type_query_vars[ $t->query_var ] = $post_type;
+	foreach (get_post_types(array(), 'objects') as $post_type => $t) {
+		if ( ! empty($t->query_var))
+			$post_type_query_vars[$t->query_var] = $post_type;
 	}
 
 	// Look for matches.
 	$request_match = $request;
-	foreach ( (array)$rewrite as $match => $query) {
+	foreach ((array) $rewrite as $match => $query) {
 
 		// If the requesting file is the anchor of the match, prepend it
 		// to the path info.
-		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
-			$request_match = $url . '/' . $request;
+		if ( ! empty($url) && ($url != $request) && (strpos($match, $url) === 0))
+			$request_match = $url.'/'.$request;
 
-		if ( preg_match("#^$match#", $request_match, $matches) ) {
+		if (preg_match("#^$match#", $request_match, $matches)) {
 
-			if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+			if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 				// This is a verbose page match, let's check to be sure about it.
-				$page = get_page_by_path( $matches[ $varmatch[1] ] );
-				if ( ! $page ) {
+				$page = get_page_by_path($matches[$varmatch[1]]);
+				if ( ! $page) {
 					continue;
 				}
 
-				$post_status_obj = get_post_status_object( $page->post_status );
+				$post_status_obj = get_post_status_object($page->post_status);
 				if ( ! $post_status_obj->public && ! $post_status_obj->protected
-					&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+					&& ! $post_status_obj->private && $post_status_obj->exclude_from_search) {
 					continue;
 				}
 			}
@@ -572,12 +572,12 @@ 
 
 			// Filter out non-public query vars
 			global $wp;
-			parse_str( $query, $query_vars );
+			parse_str($query, $query_vars);
 			$query = array();
-			foreach ( (array) $query_vars as $key => $value ) {
-				if ( in_array( $key, $wp->public_query_vars ) ){
+			foreach ((array) $query_vars as $key => $value) {
+				if (in_array($key, $wp->public_query_vars)) {
 					$query[$key] = $value;
-					if ( isset( $post_type_query_vars[$key] ) ) {
+					if (isset($post_type_query_vars[$key])) {
 						$query['post_type'] = $post_type_query_vars[$key];
 						$query['name'] = $value;
 					}
@@ -585,11 +585,11 @@ 
 			}
 
 			// Resolve conflicts between posts with numeric slugs and date archive queries.
-			$query = wp_resolve_numeric_slug_conflicts( $query );
+			$query = wp_resolve_numeric_slug_conflicts($query);
 
 			// Do the query
-			$query = new WP_Query( $query );
-			if ( ! empty( $query->posts ) && $query->is_singular )
+			$query = new WP_Query($query);
+			if ( ! empty($query->posts) && $query->is_singular)
 				return $query->post->ID;
 			else
 				return 0;

Braces +35 added lines, -24 removed lines

@@ -158,8 +158,9 @@ 
  */
 function add_rewrite_tag( $tag, $regex, $query = '' ) {
 	// validate the tag's name
-	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' )
-		return;
+	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' ) {
+			return;
+	}
 
 	global $wp_rewrite, $wp;
 
@@ -203,10 +204,12 @@ 
 	global $wp_rewrite;
 
 	// backwards compatibility for the old parameters: $with_front and $ep_mask
-	if ( ! is_array( $args ) )
-		$args = array( 'with_front' => $args );
-	if ( func_num_args() == 4 )
-		$args['ep_mask'] = func_get_arg( 3 );
+	if ( ! is_array( $args ) ) {
+			$args = array( 'with_front' => $args );
+	}
+	if ( func_num_args() == 4 ) {
+			$args['ep_mask'] = func_get_arg( 3 );
+	}
 
 	$wp_rewrite->add_permastruct( $name, $struct, $args );
 }
@@ -474,8 +477,9 @@ 
 	// First, check to see if there is a 'p=N' or 'page_id=N' to match against
 	if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )	{
 		$id = absint($values[2]);
-		if ( $id )
-			return $id;
+		if ( $id ) {
+					return $id;
+		}
 	}
 
 	// Get rid of the #anchor
@@ -491,12 +495,14 @@ 
 	$url = set_url_scheme( $url, $scheme );
 
 	// Add 'www.' if it is absent and should be there
-	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )
-		$url = str_replace('://', '://www.', $url);
+	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') ) {
+			$url = str_replace('://', '://www.', $url);
+	}
 
 	// Strip 'www.' if it is present and shouldn't be
-	if ( false === strpos(home_url(), '://www.') )
-		$url = str_replace('://www.', '://', $url);
+	if ( false === strpos(home_url(), '://www.') ) {
+			$url = str_replace('://www.', '://', $url);
+	}
 
 	if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
 		$page_on_front = get_option( 'page_on_front' );
@@ -510,12 +516,14 @@ 
 	$rewrite = $wp_rewrite->wp_rewrite_rules();
 
 	// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
-	if ( empty($rewrite) )
-		return 0;
+	if ( empty($rewrite) ) {
+			return 0;
+	}
 
 	// Strip 'index.php/' if we're not using path info permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
-		$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	if ( !$wp_rewrite->using_index_permalinks() ) {
+			$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	}
 
 	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
 		// Chop off http://domain.com/[path]
@@ -534,8 +542,9 @@ 
 	$post_type_query_vars = array();
 
 	foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
-		if ( ! empty( $t->query_var ) )
-			$post_type_query_vars[ $t->query_var ] = $post_type;
+		if ( ! empty( $t->query_var ) ) {
+					$post_type_query_vars[ $t->query_var ] = $post_type;
+		}
 	}
 
 	// Look for matches.
@@ -544,8 +553,9 @@ 
 
 		// If the requesting file is the anchor of the match, prepend it
 		// to the path info.
-		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
-			$request_match = $url . '/' . $request;
+		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) ) {
+					$request_match = $url . '/' . $request;
+		}
 
 		if ( preg_match("#^$match#", $request_match, $matches) ) {
 
@@ -589,10 +599,11 @@ 
 
 			// Do the query
 			$query = new WP_Query( $query );
-			if ( ! empty( $query->posts ) && $query->is_singular )
-				return $query->post->ID;
-			else
-				return 0;
+			if ( ! empty( $query->posts ) && $query->is_singular ) {
+							return $query->post->ID;
+			} else {
+							return 0;
+			}
 		}
 	}
 	return 0;

src/wp-includes/session.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Abstract class for managing user session tokens.
- *
- * @since 4.0.0
- */
+	 * Abstract class for managing user session tokens.
+	 *
+	 * @since 4.0.0
+	 */
 abstract class WP_Session_Tokens {
 
 	/**

Spacing +63 added lines, -63 removed lines

@@ -22,7 +22,7 @@ 
 	 *
 	 * @param int $user_id User whose session to manage.
 	 */
-	protected function __construct( $user_id ) {
+	protected function __construct($user_id) {
 		$this->user_id = $user_id;
 	}
 
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param int $user_id User whose session to manage.
 	 */
-	final public static function get_instance( $user_id ) {
+	final public static function get_instance($user_id) {
 		/**
 		 * Filter the session token manager used.
 		 *
@@ -47,8 +47,8 @@ 
 		 * @param string $session Name of class to use as the manager.
 		 *                        Default 'WP_User_Meta_Session_Tokens'.
 		 */
-		$manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' );
-		return new $manager( $user_id );
+		$manager = apply_filters('session_token_manager', 'WP_User_Meta_Session_Tokens');
+		return new $manager($user_id);
 	}
 
 	/**
@@ -60,12 +60,12 @@ 
 	 * @param string $token Session token to hash.
 	 * @return string A hash of the session token (a verifier).
 	 */
-	final private function hash_token( $token ) {
+	final private function hash_token($token) {
 		// If ext/hash is not present, use sha1() instead.
-		if ( function_exists( 'hash' ) ) {
-			return hash( 'sha256', $token );
+		if (function_exists('hash')) {
+			return hash('sha256', $token);
 		} else {
-			return sha1( $token );
+			return sha1($token);
 		}
 	}
 
@@ -78,9 +78,9 @@ 
 	 * @param string $token Session token
 	 * @return array User session
 	 */
-	final public function get( $token ) {
-		$verifier = $this->hash_token( $token );
-		return $this->get_session( $verifier );
+	final public function get($token) {
+		$verifier = $this->hash_token($token);
+		return $this->get_session($verifier);
 	}
 
 	/**
@@ -94,9 +94,9 @@ 
 	 * @param string $token Token to verify.
 	 * @return bool Whether the token is valid for the user.
 	 */
-	final public function verify( $token ) {
-		$verifier = $this->hash_token( $token );
-		return (bool) $this->get_session( $verifier );
+	final public function verify($token) {
+		$verifier = $this->hash_token($token);
+		return (bool) $this->get_session($verifier);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 * @param int $expiration Session expiration timestamp.
 	 * @return string Session token.
 	 */
-	final public function create( $expiration ) {
+	final public function create($expiration) {
 		/**
 		 * Filter the information attached to the newly created session.
 		 *
@@ -128,25 +128,25 @@ 
 		 * @param array $session Array of extra data.
 		 * @param int   $user_id User ID.
 		 */
-		$session = apply_filters( 'attach_session_information', array(), $this->user_id );
+		$session = apply_filters('attach_session_information', array(), $this->user_id);
 		$session['expiration'] = $expiration;
 
 		// IP address.
-		if ( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
+		if ( ! empty($_SERVER['REMOTE_ADDR'])) {
 			$session['ip'] = $_SERVER['REMOTE_ADDR'];
 		}
 
 		// User-agent.
-		if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-			$session['ua'] = wp_unslash( $_SERVER['HTTP_USER_AGENT'] );
+		if ( ! empty($_SERVER['HTTP_USER_AGENT'])) {
+			$session['ua'] = wp_unslash($_SERVER['HTTP_USER_AGENT']);
 		}
 
 		// Timestamp
 		$session['login'] = time();
 
-		$token = wp_generate_password( 43, false, false );
+		$token = wp_generate_password(43, false, false);
 
-		$this->update( $token, $session );
+		$this->update($token, $session);
 
 		return $token;
 	}
@@ -160,9 +160,9 @@ 
 	 * @param string $token Session token to update.
 	 * @param array  $session Session information.
 	 */
-	final public function update( $token, $session ) {
-		$verifier = $this->hash_token( $token );
-		$this->update_session( $verifier, $session );
+	final public function update($token, $session) {
+		$verifier = $this->hash_token($token);
+		$this->update_session($verifier, $session);
 	}
 
 	/**
@@ -173,9 +173,9 @@ 
 	 *
 	 * @param string $token Session token to destroy.
 	 */
-	final public function destroy( $token ) {
-		$verifier = $this->hash_token( $token );
-		$this->update_session( $verifier, null );
+	final public function destroy($token) {
+		$verifier = $this->hash_token($token);
+		$this->update_session($verifier, null);
 	}
 
 	/**
@@ -187,11 +187,11 @@ 
 	 *
 	 * @param string $token_to_keep Session token to keep.
 	 */
-	final public function destroy_others( $token_to_keep ) {
-		$verifier = $this->hash_token( $token_to_keep );
-		$session = $this->get_session( $verifier );
-		if ( $session ) {
-			$this->destroy_other_sessions( $verifier );
+	final public function destroy_others($token_to_keep) {
+		$verifier = $this->hash_token($token_to_keep);
+		$session = $this->get_session($verifier);
+		if ($session) {
+			$this->destroy_other_sessions($verifier);
 		} else {
 			$this->destroy_all_sessions();
 		}
@@ -207,7 +207,7 @@ 
 	 * @param array $session Session to check.
 	 * @return bool Whether session is valid.
 	 */
-	final protected function is_still_valid( $session ) {
+	final protected function is_still_valid($session) {
 		return $session['expiration'] >= time();
 	}
 
@@ -229,8 +229,8 @@ 
 	 * @static
 	 */
 	final public static function destroy_all_for_all_users() {
-		$manager = apply_filters( 'session_token_manager', 'WP_User_Meta_Session_Tokens' );
-		call_user_func( array( $manager, 'drop_sessions' ) );
+		$manager = apply_filters('session_token_manager', 'WP_User_Meta_Session_Tokens');
+		call_user_func(array($manager, 'drop_sessions'));
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	 * @return array Sessions of a user.
 	 */
 	final public function get_all() {
-		return array_values( $this->get_sessions() );
+		return array_values($this->get_sessions());
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @param string $verifier Verifier of the session to retrieve.
 	 * @return array|null The session, or null if it does not exist.
 	 */
-	abstract protected function get_session( $verifier );
+	abstract protected function get_session($verifier);
 
 	/**
 	 * This method should update a session by its verifier.
@@ -276,7 +276,7 @@ 
 	 *
 	 * @param string $verifier Verifier of the session to update.
 	 */
-	abstract protected function update_session( $verifier, $session = null );
+	abstract protected function update_session($verifier, $session = null);
 
 	/**
 	 * This method should destroy all session tokens for this user,
@@ -287,7 +287,7 @@ 
 	 *
 	 * @param string $verifier Verifier of the session to keep.
 	 */
-	abstract protected function destroy_other_sessions( $verifier );
+	abstract protected function destroy_other_sessions($verifier);
 
 	/**
 	 * This method should destroy all sessions for a user.
@@ -323,14 +323,14 @@ 
 	 * @return array Sessions of a user.
 	 */
 	protected function get_sessions() {
-		$sessions = get_user_meta( $this->user_id, 'session_tokens', true );
+		$sessions = get_user_meta($this->user_id, 'session_tokens', true);
 
-		if ( ! is_array( $sessions ) ) {
+		if ( ! is_array($sessions)) {
 			return array();
 		}
 
-		$sessions = array_map( array( $this, 'prepare_session' ), $sessions );
-		return array_filter( $sessions, array( $this, 'is_still_valid' ) );
+		$sessions = array_map(array($this, 'prepare_session'), $sessions);
+		return array_filter($sessions, array($this, 'is_still_valid'));
 	}
 
 	/**
@@ -339,9 +339,9 @@ 
 	 * @param mixed $session Session or expiration.
 	 * @return array Session.
 	 */
-	protected function prepare_session( $session ) {
-		if ( is_int( $session ) ) {
-			return array( 'expiration' => $session );
+	protected function prepare_session($session) {
+		if (is_int($session)) {
+			return array('expiration' => $session);
 		}
 
 		return $session;
@@ -356,11 +356,11 @@ 
 	 * @param string $verifier Verifier of the session to retrieve.
 	 * @return array|null The session, or null if it does not exist
 	 */
-	protected function get_session( $verifier ) {
+	protected function get_session($verifier) {
 		$sessions = $this->get_sessions();
 
-		if ( isset( $sessions[ $verifier ] ) ) {
-			return $sessions[ $verifier ];
+		if (isset($sessions[$verifier])) {
+			return $sessions[$verifier];
 		}
 
 		return null;
@@ -375,16 +375,16 @@ 
 	 * @param string $verifier Verifier of the session to update.
 	 * @param array  $session  Optional. Session. Omitting this argument destroys the session.
 	 */
-	protected function update_session( $verifier, $session = null ) {
+	protected function update_session($verifier, $session = null) {
 		$sessions = $this->get_sessions();
 
-		if ( $session ) {
-			$sessions[ $verifier ] = $session;
+		if ($session) {
+			$sessions[$verifier] = $session;
 		} else {
-			unset( $sessions[ $verifier ] );
+			unset($sessions[$verifier]);
 		}
 
-		$this->update_sessions( $sessions );
+		$this->update_sessions($sessions);
 	}
 
 	/**
@@ -395,11 +395,11 @@ 
 	 *
 	 * @param array $sessions Sessions.
 	 */
-	protected function update_sessions( $sessions ) {
-		if ( $sessions ) {
-			update_user_meta( $this->user_id, 'session_tokens', $sessions );
+	protected function update_sessions($sessions) {
+		if ($sessions) {
+			update_user_meta($this->user_id, 'session_tokens', $sessions);
 		} else {
-			delete_user_meta( $this->user_id, 'session_tokens' );
+			delete_user_meta($this->user_id, 'session_tokens');
 		}
 	}
 
@@ -411,9 +411,9 @@ 
 	 *
 	 * @param string $verifier Verifier of the session to keep.
 	 */
-	protected function destroy_other_sessions( $verifier ) {
-		$session = $this->get_session( $verifier );
-		$this->update_sessions( array( $verifier => $session ) );
+	protected function destroy_other_sessions($verifier) {
+		$session = $this->get_session($verifier);
+		$this->update_sessions(array($verifier => $session));
 	}
 
 	/**
@@ -423,7 +423,7 @@ 
 	 * @access protected
 	 */
 	protected function destroy_all_sessions() {
-		$this->update_sessions( array() );
+		$this->update_sessions(array());
 	}
 
 	/**
@@ -434,6 +434,6 @@ 
 	 * @static
 	 */
 	public static function drop_sessions() {
-		delete_metadata( 'user', 0, 'session_tokens', false, true );
+		delete_metadata('user', 0, 'session_tokens', false, true);
 	}
 }

src/wp-includes/feed-rss.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * RSS 0.92 Feed Template for displaying RSS 0.92 Posts feed.
- *
- * @package WordPress
- */
+	 * RSS 0.92 Feed Template for displaying RSS 0.92 Posts feed.
+	 *
+	 * @package WordPress
+	 */
 
 header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rss').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
@@ -16,7 +16,7 @@ 
 	<description><?php bloginfo_rss('description') ?></description>
 	<lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
 	<docs>http://backend.userland.com/rss092</docs>
-	<language><?php bloginfo_rss( 'language' ); ?></language>
+	<language><?php bloginfo_rss('language'); ?></language>
 
 	<?php
 	/**
@@ -24,7 +24,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rss_head' );
+	do_action('rss_head');
 	?>
 
 <?php while (have_posts()) : the_post(); ?>
@@ -38,7 +38,7 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		do_action( 'rss_item' );
+		do_action('rss_item');
 		?>
 	</item>
 <?php endwhile; ?>

src/wp-includes/admin-bar.php

Braces +83 added lines, -56 removed lines

@@ -21,8 +21,9 @@ 
 function _wp_admin_bar_init() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() )
-		return false;
+	if ( ! is_admin_bar_showing() ) {
+			return false;
+	}
 
 	/* Load the admin bar class code ready for instantiation */
 	require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
@@ -37,10 +38,11 @@ 
 	 * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
 	 */
 	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-	if ( class_exists( $admin_bar_class ) )
-		$wp_admin_bar = new $admin_bar_class;
-	else
-		return false;
+	if ( class_exists( $admin_bar_class ) ) {
+			$wp_admin_bar = new $admin_bar_class;
+	} else {
+			return false;
+	}
 
 	$wp_admin_bar->initialize();
 	$wp_admin_bar->add_menus();
@@ -64,8 +66,9 @@ 
 function wp_admin_bar_render() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
-		return;
+	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) {
+			return;
+	}
 
 	/**
 	 * Load all necessary admin bar items.
@@ -181,8 +184,9 @@ 
 	$current_user = wp_get_current_user();
 	$profile_url  = get_edit_profile_url( $user_id );
 
-	if ( ! $user_id )
-		return;
+	if ( ! $user_id ) {
+			return;
+	}
 
 	$avatar = get_avatar( $user_id, 26 );
 	$howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
@@ -211,8 +215,9 @@ 
 	$current_user = wp_get_current_user();
 	$profile_url  = get_edit_profile_url( $user_id );
 
-	if ( ! $user_id )
-		return;
+	if ( ! $user_id ) {
+			return;
+	}
 
 	$wp_admin_bar->add_group( array(
 		'parent' => 'my-account',
@@ -222,8 +227,9 @@ 
 	$user_info  = get_avatar( $user_id, 64 );
 	$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
-	if ( $current_user->display_name !== $current_user->user_login )
-		$user_info .= "<span class='username'>{$current_user->user_login}</span>";
+	if ( $current_user->display_name !== $current_user->user_login ) {
+			$user_info .= "<span class='username'>{$current_user->user_login}</span>";
+	}
 
 	$wp_admin_bar->add_menu( array(
 		'parent' => 'user-actions',
@@ -257,12 +263,14 @@ 
  */
 function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	// Don't show for logged out users.
-	if ( ! is_user_logged_in() )
-		return;
+	if ( ! is_user_logged_in() ) {
+			return;
+	}
 
 	// Show only when the user is a member of this site, or they're a super admin.
-	if ( ! is_user_member_of_blog() && ! is_super_admin() )
-		return;
+	if ( ! is_user_member_of_blog() && ! is_super_admin() ) {
+			return;
+	}
 
 	$blogname = get_bloginfo('name');
 
@@ -354,12 +362,14 @@ 
  */
 function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	// Don't show for logged out users or single site mode.
-	if ( ! is_user_logged_in() || ! is_multisite() )
-		return;
+	if ( ! is_user_logged_in() || ! is_multisite() ) {
+			return;
+	}
 
 	// Show only when the user has at least one site, or they're a super admin.
-	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
-		return;
+	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() ) {
+			return;
+	}
 
 	if ( $wp_admin_bar->user->active_blog ) {
 		$my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' );
@@ -494,8 +504,9 @@ 
 	$short = wp_get_shortlink( 0, 'query' );
 	$id = 'get-shortlink';
 
-	if ( empty( $short ) )
-		return;
+	if ( empty( $short ) ) {
+			return;
+	}
 
 	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
 
@@ -562,8 +573,9 @@ 
 	} else {
 		$current_object = $wp_the_query->get_queried_object();
 
-		if ( empty( $current_object ) )
-			return;
+		if ( empty( $current_object ) ) {
+					return;
+		}
 
 		if ( ! empty( $current_object->post_type )
 			&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
@@ -603,37 +615,45 @@ 
 
 	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
 
-	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
-		$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) ) {
+			$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	}
 
-	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
-		$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) ) {
+			$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	}
 
-	if ( current_user_can( 'manage_links' ) )
-		$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	if ( current_user_can( 'manage_links' ) ) {
+			$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	}
 
-	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
-		$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) ) {
+			$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	}
 
 	unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
 
 	// Add any additional custom post types.
 	foreach ( $cpts as $cpt ) {
-		if ( ! current_user_can( $cpt->cap->create_posts ) )
-			continue;
+		if ( ! current_user_can( $cpt->cap->create_posts ) ) {
+					continue;
+		}
 
 		$key = 'post-new.php?post_type=' . $cpt->name;
 		$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
 	}
 	// Avoid clash with parent node and a 'content' post type.
-	if ( isset( $actions['post-new.php?post_type=content'] ) )
-		$actions['post-new.php?post_type=content'][1] = 'add-new-content';
+	if ( isset( $actions['post-new.php?post_type=content'] ) ) {
+			$actions['post-new.php?post_type=content'][1] = 'add-new-content';
+	}
 
-	if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
-		$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
+	if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) ) {
+			$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
+	}
 
-	if ( ! $actions )
-		return;
+	if ( ! $actions ) {
+			return;
+	}
 
 	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
 
@@ -663,8 +683,9 @@ 
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_comments_menu( $wp_admin_bar ) {
-	if ( !current_user_can('edit_posts') )
-		return;
+	if ( !current_user_can('edit_posts') ) {
+			return;
+	}
 
 	$awaiting_mod = wp_count_comments();
 	$awaiting_mod = $awaiting_mod->moderated;
@@ -713,8 +734,9 @@ 
 		) );
 	}
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
+			$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	}
 
 	if ( current_theme_supports( 'custom-background' ) ) {
 		$wp_admin_bar->add_menu( array(
@@ -753,8 +775,9 @@ 
 
 	$update_data = wp_get_update_data();
 
-	if ( !$update_data['counts']['total'] )
-		return;
+	if ( !$update_data['counts']['total'] ) {
+			return;
+	}
 
 	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
 	$title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
@@ -777,8 +800,9 @@ 
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_search_menu( $wp_admin_bar ) {
-	if ( is_admin() )
-		return;
+	if ( is_admin() ) {
+			return;
+	}
 
 	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
@@ -878,12 +902,14 @@ 
 	global $show_admin_bar, $pagenow;
 
 	// For all these types of requests, we never want an admin bar.
-	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
-		return false;
+	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') ) {
+			return false;
+	}
 
 	// Integrated into the admin.
-	if ( is_admin() )
-		return true;
+	if ( is_admin() ) {
+			return true;
+	}
 
 	if ( ! isset( $show_admin_bar ) ) {
 		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
@@ -921,8 +947,9 @@ 
  */
 function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
 	$pref = get_user_option( "show_admin_bar_{$context}", $user );
-	if ( false === $pref )
-		return true;
+	if ( false === $pref ) {
+			return true;
+	}
 
 	return 'true' === $pref;
 }

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Toolbar API: Top-level Toolbar functionality
- *
- * @package WordPress
- * @subpackage Toolbar
- * @since 3.1.0
- */
+	 * Toolbar API: Top-level Toolbar functionality
+	 *
+	 * @package WordPress
+	 * @subpackage Toolbar
+	 * @since 3.1.0
+	 */
 
 /**
  * Instantiate the admin bar object and set it up as a global for access elsewhere.

Spacing +299 added lines, -299 removed lines

@@ -23,11 +23,11 @@ 
 function _wp_admin_bar_init() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() )
+	if ( ! is_admin_bar_showing())
 		return false;
 
 	/* Load the admin bar class code ready for instantiation */
-	require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
+	require_once(ABSPATH.WPINC.'/class-wp-admin-bar.php');
 
 	/* Instantiate the admin bar */
 
@@ -38,8 +38,8 @@ 
 	 *
 	 * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
 	 */
-	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-	if ( class_exists( $admin_bar_class ) )
+	$admin_bar_class = apply_filters('wp_admin_bar_class', 'WP_Admin_Bar');
+	if (class_exists($admin_bar_class))
 		$wp_admin_bar = new $admin_bar_class;
 	else
 		return false;
@@ -66,7 +66,7 @@ 
 function wp_admin_bar_render() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
+	if ( ! is_admin_bar_showing() || ! is_object($wp_admin_bar))
 		return;
 
 	/**
@@ -78,14 +78,14 @@ 
 	 *
 	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
 	 */
-	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+	do_action_ref_array('admin_bar_menu', array(&$wp_admin_bar));
 
 	/**
 	 * Fires before the admin bar is rendered.
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'wp_before_admin_bar_render' );
+	do_action('wp_before_admin_bar_render');
 
 	$wp_admin_bar->render();
 
@@ -94,7 +94,7 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'wp_after_admin_bar_render' );
+	do_action('wp_after_admin_bar_render');
 }
 
 /**
@@ -104,54 +104,54 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_wp_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_menu( array(
+function wp_admin_bar_wp_menu($wp_admin_bar) {
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'wp-logo',
-		'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
-		'href'  => self_admin_url( 'about.php' ),
-	) );
+		'title' => '<span class="ab-icon"></span><span class="screen-reader-text">'.__('About WordPress').'</span>',
+		'href'  => self_admin_url('about.php'),
+	));
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Add "About WordPress" link
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'wp-logo',
 			'id'     => 'about',
 			'title'  => __('About WordPress'),
-			'href'   => self_admin_url( 'about.php' ),
-		) );
+			'href'   => self_admin_url('about.php'),
+		));
 	}
 
 	// Add WordPress.org link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'wporg',
 		'title'     => __('WordPress.org'),
 		'href'      => __('https://wordpress.org/'),
-	) );
+	));
 
 	// Add codex link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'documentation',
 		'title'     => __('Documentation'),
 		'href'      => __('https://codex.wordpress.org/'),
-	) );
+	));
 
 	// Add forums link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'support-forums',
 		'title'     => __('Support Forums'),
 		'href'      => __('https://wordpress.org/support/'),
-	) );
+	));
 
 	// Add feedback link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'feedback',
 		'title'     => __('Feedback'),
 		'href'      => __('https://wordpress.org/support/forum/requests-and-feedback'),
-	) );
+	));
 }
 
 /**
@@ -161,13 +161,13 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
-	if ( is_admin() ) {
-		$wp_admin_bar->add_menu( array(
+function wp_admin_bar_sidebar_toggle($wp_admin_bar) {
+	if (is_admin()) {
+		$wp_admin_bar->add_menu(array(
 			'id'    => 'menu-toggle',
-			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">'.__('Menu').'</span>',
 			'href'  => '#',
-		) );
+		));
 	}
 }
 
@@ -178,34 +178,34 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_account_item( $wp_admin_bar ) {
+function wp_admin_bar_my_account_item($wp_admin_bar) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	if ( current_user_can( 'read' ) ) {
-		$profile_url = get_edit_profile_url( $user_id );
-	} elseif ( is_multisite() ) {
-		$profile_url = get_dashboard_url( $user_id, 'profile.php' );
+	if (current_user_can('read')) {
+		$profile_url = get_edit_profile_url($user_id);
+	} elseif (is_multisite()) {
+		$profile_url = get_dashboard_url($user_id, 'profile.php');
 	} else {
 		$profile_url = false;
 	}
 
-	$avatar = get_avatar( $user_id, 26 );
-	$howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
-	$class  = empty( $avatar ) ? '' : 'with-avatar';
+	$avatar = get_avatar($user_id, 26);
+	$howdy  = sprintf(__('Howdy, %1$s'), $current_user->display_name);
+	$class  = empty($avatar) ? '' : 'with-avatar';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'        => 'my-account',
 		'parent'    => 'top-secondary',
-		'title'     => $howdy . $avatar,
+		'title'     => $howdy.$avatar,
 		'href'      => $profile_url,
 		'meta'      => array(
 			'class'     => $class,
 		),
-	) );
+	));
 }
 
 /**
@@ -215,33 +215,33 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
+function wp_admin_bar_my_account_menu($wp_admin_bar) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	if ( current_user_can( 'read' ) ) {
-		$profile_url = get_edit_profile_url( $user_id );
-	} elseif ( is_multisite() ) {
-		$profile_url = get_dashboard_url( $user_id, 'profile.php' );
+	if (current_user_can('read')) {
+		$profile_url = get_edit_profile_url($user_id);
+	} elseif (is_multisite()) {
+		$profile_url = get_dashboard_url($user_id, 'profile.php');
 	} else {
 		$profile_url = false;
 	}
 
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'my-account',
 		'id'     => 'user-actions',
-	) );
+	));
 
-	$user_info  = get_avatar( $user_id, 64 );
+	$user_info  = get_avatar($user_id, 64);
 	$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
-	if ( $current_user->display_name !== $current_user->user_login )
+	if ($current_user->display_name !== $current_user->user_login)
 		$user_info .= "<span class='username'>{$current_user->user_login}</span>";
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'user-actions',
 		'id'     => 'user-info',
 		'title'  => $user_info,
@@ -249,23 +249,23 @@ 
 		'meta'   => array(
 			'tabindex' => -1,
 		),
-	) );
+	));
 
-	if ( false !== $profile_url ) {
-		$wp_admin_bar->add_menu( array(
+	if (false !== $profile_url) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'user-actions',
 			'id'     => 'edit-profile',
-			'title'  => __( 'Edit My Profile' ),
+			'title'  => __('Edit My Profile'),
 			'href'   => $profile_url,
-		) );
+		));
 	}
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'user-actions',
 		'id'     => 'logout',
-		'title'  => __( 'Log Out' ),
+		'title'  => __('Log Out'),
 		'href'   => wp_logout_url(),
-	) );
+	));
 }
 
 /**
@@ -275,66 +275,66 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_site_menu( $wp_admin_bar ) {
+function wp_admin_bar_site_menu($wp_admin_bar) {
 	// Don't show for logged out users.
-	if ( ! is_user_logged_in() )
+	if ( ! is_user_logged_in())
 		return;
 
 	// Show only when the user is a member of this site, or they're a super admin.
-	if ( ! is_user_member_of_blog() && ! is_super_admin() )
+	if ( ! is_user_member_of_blog() && ! is_super_admin())
 		return;
 
 	$blogname = get_bloginfo('name');
 
-	if ( ! $blogname ) {
-		$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+	if ( ! $blogname) {
+		$blogname = preg_replace('#^(https?://)?(www.)?#', '', get_home_url());
 	}
 
-	if ( is_network_admin() ) {
-		$blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
-	} elseif ( is_user_admin() ) {
-		$blogname = sprintf( __('User Dashboard: %s'), esc_html( get_current_site()->site_name ) );
+	if (is_network_admin()) {
+		$blogname = sprintf(__('Network Admin: %s'), esc_html(get_current_site()->site_name));
+	} elseif (is_user_admin()) {
+		$blogname = sprintf(__('User Dashboard: %s'), esc_html(get_current_site()->site_name));
 	}
 
-	$title = wp_html_excerpt( $blogname, 40, '&hellip;' );
+	$title = wp_html_excerpt($blogname, 40, '&hellip;');
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'site-name',
 		'title' => $title,
-		'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
-	) );
+		'href'  => (is_admin() || ! current_user_can('read')) ? home_url('/') : admin_url(),
+	));
 
 	// Create submenu items.
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		// Add an option to visit the site.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'site-name',
 			'id'     => 'view-site',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+			'title'  => __('Visit Site'),
+			'href'   => home_url('/'),
+		));
 
-		if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (is_blog_admin() && is_multisite() && current_user_can('manage_sites')) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => 'site-name',
 				'id'     => 'edit-site',
-				'title'  => __( 'Edit Site' ),
-				'href'   => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
-			) );
+				'title'  => __('Edit Site'),
+				'href'   => network_admin_url('site-info.php?id='.get_current_blog_id()),
+			));
 		}
 
-	} else if ( current_user_can( 'read' ) ) {
+	} else if (current_user_can('read')) {
 		// We're on the front end, link to the Dashboard.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'site-name',
 			'id'     => 'dashboard',
-			'title'  => __( 'Dashboard' ),
+			'title'  => __('Dashboard'),
 			'href'   => admin_url(),
-		) );
+		));
 
 		// Add the appearance submenu items.
-		wp_admin_bar_appearance_menu( $wp_admin_bar );
+		wp_admin_bar_appearance_menu($wp_admin_bar);
 	}
 }
 
@@ -345,24 +345,24 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
  */
-function wp_admin_bar_customize_menu( $wp_admin_bar ) {
+function wp_admin_bar_customize_menu($wp_admin_bar) {
 	// Don't show for users who can't access the customizer or when in the admin.
-	if ( ! current_user_can( 'customize' ) || is_admin() ) {
+	if ( ! current_user_can('customize') || is_admin()) {
 		return;
 	}
 
-	$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-	$customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+	$current_url = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+	$customize_url = add_query_arg('url', urlencode($current_url), wp_customize_url());
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'     => 'customize',
-		'title'  => __( 'Customize' ),
+		'title'  => __('Customize'),
 		'href'   => $customize_url,
 		'meta'   => array(
 			'class' => 'hide-if-no-customize',
 		),
-	) );
-	add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+	));
+	add_action('wp_before_admin_bar_render', 'wp_customize_support_script');
 }
 
 /**
@@ -372,138 +372,138 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
+function wp_admin_bar_my_sites_menu($wp_admin_bar) {
 	// Don't show for logged out users or single site mode.
-	if ( ! is_user_logged_in() || ! is_multisite() )
+	if ( ! is_user_logged_in() || ! is_multisite())
 		return;
 
 	// Show only when the user has at least one site, or they're a super admin.
-	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
+	if (count($wp_admin_bar->user->blogs) < 1 && ! is_super_admin())
 		return;
 
-	if ( $wp_admin_bar->user->active_blog ) {
-		$my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' );
+	if ($wp_admin_bar->user->active_blog) {
+		$my_sites_url = get_admin_url($wp_admin_bar->user->active_blog->blog_id, 'my-sites.php');
 	} else {
-		$my_sites_url = admin_url( 'my-sites.php' );
+		$my_sites_url = admin_url('my-sites.php');
 	}
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'my-sites',
-		'title' => __( 'My Sites' ),
+		'title' => __('My Sites'),
 		'href'  => $my_sites_url,
-	) );
+	));
 
-	if ( is_super_admin() ) {
-		$wp_admin_bar->add_group( array(
+	if (is_super_admin()) {
+		$wp_admin_bar->add_group(array(
 			'parent' => 'my-sites',
 			'id'     => 'my-sites-super-admin',
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'my-sites-super-admin',
 			'id'     => 'network-admin',
 			'title'  => __('Network Admin'),
 			'href'   => network_admin_url(),
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-d',
-			'title'  => __( 'Dashboard' ),
+			'title'  => __('Dashboard'),
 			'href'   => network_admin_url(),
-		) );
-		$wp_admin_bar->add_menu( array(
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-s',
-			'title'  => __( 'Sites' ),
-			'href'   => network_admin_url( 'sites.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Sites'),
+			'href'   => network_admin_url('sites.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-u',
-			'title'  => __( 'Users' ),
-			'href'   => network_admin_url( 'users.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Users'),
+			'href'   => network_admin_url('users.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-t',
-			'title'  => __( 'Themes' ),
-			'href'   => network_admin_url( 'themes.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Themes'),
+			'href'   => network_admin_url('themes.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-p',
-			'title'  => __( 'Plugins' ),
-			'href'   => network_admin_url( 'plugins.php' ),
-		) );
-		$wp_admin_bar->add_menu( array(
+			'title'  => __('Plugins'),
+			'href'   => network_admin_url('plugins.php'),
+		));
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-o',
-			'title'  => __( 'Settings' ),
-			'href'   => network_admin_url( 'settings.php' ),
-		) );
+			'title'  => __('Settings'),
+			'href'   => network_admin_url('settings.php'),
+		));
 	}
 
 	// Add site links
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'my-sites',
 		'id'     => 'my-sites-list',
 		'meta'   => array(
 			'class' => is_super_admin() ? 'ab-sub-secondary' : '',
 		),
-	) );
+	));
 
-	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-		switch_to_blog( $blog->userblog_id );
+	foreach ((array) $wp_admin_bar->user->blogs as $blog) {
+		switch_to_blog($blog->userblog_id);
 
 		$blavatar = '<div class="blavatar"></div>';
 
 		$blogname = $blog->blogname;
 
-		if ( ! $blogname ) {
-			$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+		if ( ! $blogname) {
+			$blogname = preg_replace('#^(https?://)?(www.)?#', '', get_home_url());
 		}
 
-		$menu_id  = 'blog-' . $blog->userblog_id;
+		$menu_id = 'blog-'.$blog->userblog_id;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent'    => 'my-sites-list',
 			'id'        => $menu_id,
-			'title'     => $blavatar . $blogname,
+			'title'     => $blavatar.$blogname,
 			'href'      => admin_url(),
-		) );
+		));
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => $menu_id,
-			'id'     => $menu_id . '-d',
-			'title'  => __( 'Dashboard' ),
+			'id'     => $menu_id.'-d',
+			'title'  => __('Dashboard'),
 			'href'   => admin_url(),
-		) );
+		));
 
-		if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (current_user_can(get_post_type_object('post')->cap->create_posts)) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => $menu_id,
-				'id'     => $menu_id . '-n',
-				'title'  => __( 'New Post' ),
-				'href'   => admin_url( 'post-new.php' ),
-			) );
+				'id'     => $menu_id.'-n',
+				'title'  => __('New Post'),
+				'href'   => admin_url('post-new.php'),
+			));
 		}
 
-		if ( current_user_can( 'edit_posts' ) ) {
-			$wp_admin_bar->add_menu( array(
+		if (current_user_can('edit_posts')) {
+			$wp_admin_bar->add_menu(array(
 				'parent' => $menu_id,
-				'id'     => $menu_id . '-c',
-				'title'  => __( 'Manage Comments' ),
-				'href'   => admin_url( 'edit-comments.php' ),
-			) );
+				'id'     => $menu_id.'-c',
+				'title'  => __('Manage Comments'),
+				'href'   => admin_url('edit-comments.php'),
+			));
 		}
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent' => $menu_id,
-			'id'     => $menu_id . '-v',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+			'id'     => $menu_id.'-v',
+			'title'  => __('Visit Site'),
+			'href'   => home_url('/'),
+		));
 
 		restore_current_blog();
 	}
@@ -516,21 +516,21 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
-	$short = wp_get_shortlink( 0, 'query' );
+function wp_admin_bar_shortlink_menu($wp_admin_bar) {
+	$short = wp_get_shortlink(0, 'query');
 	$id = 'get-shortlink';
 
-	if ( empty( $short ) )
+	if (empty($short))
 		return;
 
-	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
+	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="'.esc_attr($short).'" />';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id' => $id,
-		'title' => __( 'Shortlink' ),
+		'title' => __('Shortlink'),
 		'href' => $short,
-		'meta' => array( 'html' => $html ),
-	) );
+		'meta' => array('html' => $html),
+	));
 }
 
 /**
@@ -543,73 +543,73 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_edit_menu( $wp_admin_bar ) {
+function wp_admin_bar_edit_menu($wp_admin_bar) {
 	global $tag, $wp_the_query;
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		$current_screen = get_current_screen();
 		$post = get_post();
 
-		if ( 'post' == $current_screen->base
+		if ('post' == $current_screen->base
 			&& 'add' != $current_screen->action
-			&& ( $post_type_object = get_post_type_object( $post->post_type ) )
-			&& current_user_can( 'read_post', $post->ID )
-			&& ( $post_type_object->public )
-			&& ( $post_type_object->show_in_admin_bar ) )
+			&& ($post_type_object = get_post_type_object($post->post_type))
+			&& current_user_can('read_post', $post->ID)
+			&& ($post_type_object->public)
+			&& ($post_type_object->show_in_admin_bar))
 		{
-			if ( 'draft' == $post->post_status ) {
-				$preview_link = get_preview_post_link( $post );
-				$wp_admin_bar->add_menu( array(
+			if ('draft' == $post->post_status) {
+				$preview_link = get_preview_post_link($post);
+				$wp_admin_bar->add_menu(array(
 					'id' => 'preview',
 					'title' => $post_type_object->labels->view_item,
-					'href' => esc_url( $preview_link ),
-					'meta' => array( 'target' => 'wp-preview-' . $post->ID ),
-				) );
+					'href' => esc_url($preview_link),
+					'meta' => array('target' => 'wp-preview-'.$post->ID),
+				));
 			} else {
-				$wp_admin_bar->add_menu( array(
+				$wp_admin_bar->add_menu(array(
 					'id' => 'view',
 					'title' => $post_type_object->labels->view_item,
-					'href' => get_permalink( $post->ID )
-				) );
+					'href' => get_permalink($post->ID)
+				));
 			}
-		} elseif ( 'term' == $current_screen->base
-			&& isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
-			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
-			&& $tax->public )
+		} elseif ('term' == $current_screen->base
+			&& isset($tag) && is_object($tag) && ! is_wp_error($tag)
+			&& ($tax = get_taxonomy($tag->taxonomy))
+			&& $tax->public)
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'view',
 				'title' => $tax->labels->view_item,
-				'href' => get_term_link( $tag )
-			) );
+				'href' => get_term_link($tag)
+			));
 		}
 	} else {
 		$current_object = $wp_the_query->get_queried_object();
 
-		if ( empty( $current_object ) )
+		if (empty($current_object))
 			return;
 
-		if ( ! empty( $current_object->post_type )
-			&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
-			&& current_user_can( 'edit_post', $current_object->ID )
+		if ( ! empty($current_object->post_type)
+			&& ($post_type_object = get_post_type_object($current_object->post_type))
+			&& current_user_can('edit_post', $current_object->ID)
 			&& $post_type_object->show_in_admin_bar
-			&& $edit_post_link = get_edit_post_link( $current_object->ID ) )
+			&& $edit_post_link = get_edit_post_link($current_object->ID))
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit',
 				'title' => $post_type_object->labels->edit_item,
 				'href' => $edit_post_link
-			) );
-		} elseif ( ! empty( $current_object->taxonomy )
-			&& ( $tax = get_taxonomy( $current_object->taxonomy ) )
-			&& current_user_can( $tax->cap->edit_terms )
-			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
+			));
+		} elseif ( ! empty($current_object->taxonomy)
+			&& ($tax = get_taxonomy($current_object->taxonomy))
+			&& current_user_can($tax->cap->edit_terms)
+			&& $edit_term_link = get_edit_term_link($current_object->term_id, $current_object->taxonomy))
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit',
 				'title' => $tax->labels->edit_item,
 				'href' => $edit_term_link
-			) );
+			));
 		}
 	}
 }
@@ -621,60 +621,60 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
+function wp_admin_bar_new_content_menu($wp_admin_bar) {
 	$actions = array();
 
-	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
+	$cpts = (array) get_post_types(array('show_in_admin_bar' => true), 'objects');
 
-	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
-		$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	if (isset($cpts['post']) && current_user_can($cpts['post']->cap->create_posts))
+		$actions['post-new.php'] = array($cpts['post']->labels->name_admin_bar, 'new-post');
 
-	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
-		$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	if (isset($cpts['attachment']) && current_user_can('upload_files'))
+		$actions['media-new.php'] = array($cpts['attachment']->labels->name_admin_bar, 'new-media');
 
-	if ( current_user_can( 'manage_links' ) )
-		$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	if (current_user_can('manage_links'))
+		$actions['link-add.php'] = array(_x('Link', 'add new from admin bar'), 'new-link');
 
-	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
-		$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	if (isset($cpts['page']) && current_user_can($cpts['page']->cap->create_posts))
+		$actions['post-new.php?post_type=page'] = array($cpts['page']->labels->name_admin_bar, 'new-page');
 
-	unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
+	unset($cpts['post'], $cpts['page'], $cpts['attachment']);
 
 	// Add any additional custom post types.
-	foreach ( $cpts as $cpt ) {
-		if ( ! current_user_can( $cpt->cap->create_posts ) )
+	foreach ($cpts as $cpt) {
+		if ( ! current_user_can($cpt->cap->create_posts))
 			continue;
 
-		$key = 'post-new.php?post_type=' . $cpt->name;
-		$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
+		$key = 'post-new.php?post_type='.$cpt->name;
+		$actions[$key] = array($cpt->labels->name_admin_bar, 'new-'.$cpt->name);
 	}
 	// Avoid clash with parent node and a 'content' post type.
-	if ( isset( $actions['post-new.php?post_type=content'] ) )
+	if (isset($actions['post-new.php?post_type=content']))
 		$actions['post-new.php?post_type=content'][1] = 'add-new-content';
 
-	if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
-		$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
+	if (current_user_can('create_users') || current_user_can('promote_users'))
+		$actions['user-new.php'] = array(_x('User', 'add new from admin bar'), 'new-user');
 
-	if ( ! $actions )
+	if ( ! $actions)
 		return;
 
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
+	$title = '<span class="ab-icon"></span><span class="ab-label">'._x('New', 'admin bar menu group label').'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'new-content',
 		'title' => $title,
-		'href'  => admin_url( current( array_keys( $actions ) ) ),
-	) );
+		'href'  => admin_url(current(array_keys($actions))),
+	));
 
-	foreach ( $actions as $link => $action ) {
-		list( $title, $id ) = $action;
+	foreach ($actions as $link => $action) {
+		list($title, $id) = $action;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'parent'    => 'new-content',
 			'id'        => $id,
 			'title'     => $title,
-			'href'      => admin_url( $link )
-		) );
+			'href'      => admin_url($link)
+		));
 	}
 }
 
@@ -685,23 +685,23 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_comments_menu( $wp_admin_bar ) {
-	if ( !current_user_can('edit_posts') )
+function wp_admin_bar_comments_menu($wp_admin_bar) {
+	if ( ! current_user_can('edit_posts'))
 		return;
 
 	$awaiting_mod = wp_count_comments();
 	$awaiting_mod = $awaiting_mod->moderated;
-	$awaiting_text = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
+	$awaiting_text = sprintf(_n('%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod), number_format_i18n($awaiting_mod));
 
 	$icon  = '<span class="ab-icon"></span>';
-	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
-	$title .= '<span class="screen-reader-text">' . $awaiting_text . '</span>';
+	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-'.$awaiting_mod.'" aria-hidden="true">'.number_format_i18n($awaiting_mod).'</span>';
+	$title .= '<span class="screen-reader-text">'.$awaiting_text.'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'comments',
-		'title' => $icon . $title,
+		'title' => $icon.$title,
 		'href'  => admin_url('edit-comments.php'),
-	) );
+	));
 }
 
 /**
@@ -711,56 +711,56 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
+function wp_admin_bar_appearance_menu($wp_admin_bar) {
+	$wp_admin_bar->add_group(array('parent' => 'site-name', 'id' => 'appearance'));
 
-	if ( current_user_can( 'switch_themes' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_user_can('switch_themes')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'themes',
-			'title'  => __( 'Themes' ),
-			'href'   => admin_url( 'themes.php' ),
-		) );
+			'title'  => __('Themes'),
+			'href'   => admin_url('themes.php'),
+		));
 	}
 
-	if ( ! current_user_can( 'edit_theme_options' ) ) {
+	if ( ! current_user_can('edit_theme_options')) {
 		return;
 	}
 
-	if ( current_theme_supports( 'widgets' )  ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('widgets')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'widgets',
-			'title'  => __( 'Widgets' ),
-			'href'   => admin_url( 'widgets.php' ),
-		) );
+			'title'  => __('Widgets'),
+			'href'   => admin_url('widgets.php'),
+		));
 	}
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	if (current_theme_supports('menus') || current_theme_supports('widgets'))
+		$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php')));
 
-	if ( current_theme_supports( 'custom-background' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('custom-background')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'background',
-			'title'  => __( 'Background' ),
-			'href'   => admin_url( 'themes.php?page=custom-background' ),
+			'title'  => __('Background'),
+			'href'   => admin_url('themes.php?page=custom-background'),
 			'meta'   => array(
 				'class' => 'hide-if-customize',
 			),
-		) );
+		));
 	}
 
-	if ( current_theme_supports( 'custom-header' ) ) {
-		$wp_admin_bar->add_menu( array(
+	if (current_theme_supports('custom-header')) {
+		$wp_admin_bar->add_menu(array(
 			'parent' => 'appearance',
 			'id'     => 'header',
-			'title'  => __( 'Header' ),
-			'href'   => admin_url( 'themes.php?page=custom-header' ),
+			'title'  => __('Header'),
+			'href'   => admin_url('themes.php?page=custom-header'),
 			'meta'   => array(
 				'class' => 'hide-if-customize',
 			),
-		) );
+		));
 	}
 
 }
@@ -772,24 +772,24 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_updates_menu( $wp_admin_bar ) {
+function wp_admin_bar_updates_menu($wp_admin_bar) {
 
 	$update_data = wp_get_update_data();
 
-	if ( !$update_data['counts']['total'] )
+	if ( ! $update_data['counts']['total'])
 		return;
 
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
-	$title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
+	$title = '<span class="ab-icon"></span><span class="ab-label">'.number_format_i18n($update_data['counts']['total']).'</span>';
+	$title .= '<span class="screen-reader-text">'.$update_data['title'].'</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'    => 'updates',
 		'title' => $title,
-		'href'  => network_admin_url( 'update-core.php' ),
+		'href'  => network_admin_url('update-core.php'),
 		'meta'  => array(
 			'title' => $update_data['title'],
 		),
-	) );
+	));
 }
 
 /**
@@ -799,17 +799,17 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_search_menu( $wp_admin_bar ) {
-	if ( is_admin() )
+function wp_admin_bar_search_menu($wp_admin_bar) {
+	if (is_admin())
 		return;
 
-	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
+	$form  = '<form action="'.esc_url(home_url('/')).'" method="get" id="adminbarsearch">';
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
-	$form .= '<label for="adminbar-search" class="screen-reader-text">' . __( 'Search' ) . '</label>';
-	$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
+	$form .= '<label for="adminbar-search" class="screen-reader-text">'.__('Search').'</label>';
+	$form .= '<input type="submit" class="adminbar-button" value="'.__('Search').'"/>';
 	$form .= '</form>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'parent' => 'top-secondary',
 		'id'     => 'search',
 		'title'  => $form,
@@ -817,7 +817,7 @@ 
 			'class'    => 'admin-bar-search',
 			'tabindex' => -1,
 		)
-	) );
+	));
 }
 
 /**
@@ -827,21 +827,21 @@ 
  *
  * @param WP_Admin_Bar $wp_admin_bar
  */
-function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array(
+function wp_admin_bar_add_secondary_groups($wp_admin_bar) {
+	$wp_admin_bar->add_group(array(
 		'id'     => 'top-secondary',
 		'meta'   => array(
 			'class' => 'ab-top-secondary',
 		),
-	) );
+	));
 
-	$wp_admin_bar->add_group( array(
+	$wp_admin_bar->add_group(array(
 		'parent' => 'wp-logo',
 		'id'     => 'wp-logo-external',
 		'meta'   => array(
 			'class' => 'ab-sub-secondary',
 		),
-	) );
+	));
 }
 
 /**
@@ -882,7 +882,7 @@ 
  *
  * @param bool $show Whether to allow the admin bar to show.
  */
-function show_admin_bar( $show ) {
+function show_admin_bar($show) {
 	global $show_admin_bar;
 	$show_admin_bar = (bool) $show;
 }
@@ -901,19 +901,19 @@ 
 	global $show_admin_bar, $pagenow;
 
 	// For all these types of requests, we never want an admin bar.
-	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+	if (defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST'))
 		return false;
 
-	if ( is_embed() ) {
+	if (is_embed()) {
 		return false;
 	}
 
 	// Integrated into the admin.
-	if ( is_admin() )
+	if (is_admin())
 		return true;
 
-	if ( ! isset( $show_admin_bar ) ) {
-		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
+	if ( ! isset($show_admin_bar)) {
+		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow) {
 			$show_admin_bar = false;
 		} else {
 			$show_admin_bar = _get_admin_bar_pref();
@@ -930,7 +930,7 @@ 
 	 *
 	 * @param bool $show_admin_bar Whether the admin bar should be shown. Default false.
 	 */
-	$show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
+	$show_admin_bar = apply_filters('show_admin_bar', $show_admin_bar);
 
 	return $show_admin_bar;
 }
@@ -946,9 +946,9 @@ 
  * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
  * @return bool Whether the admin bar should be showing for this user.
  */
-function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
-	$pref = get_user_option( "show_admin_bar_{$context}", $user );
-	if ( false === $pref )
+function _get_admin_bar_pref($context = 'front', $user = 0) {
+	$pref = get_user_option("show_admin_bar_{$context}", $user);
+	if (false === $pref)
 		return true;
 
 	return 'true' === $pref;

src/wp-includes/bookmark-template.php

Spacing +61 added lines, -61 removed lines

@@ -48,7 +48,7 @@ 
  * }
  * @return string Formatted output in HTML
  */
-function _walk_bookmarks( $bookmarks, $args = '' ) {
+function _walk_bookmarks($bookmarks, $args = '') {
 	$defaults = array(
 		'show_updated' => 0, 'show_description' => 0,
 		'show_images' => 1, 'show_name' => 0,
@@ -56,63 +56,63 @@ 
 		'show_rating' => 0, 'link_before' => '', 'link_after' => ''
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = ''; // Blank string to start with.
 
-	foreach ( (array) $bookmarks as $bookmark ) {
-		if ( ! isset( $bookmark->recently_updated ) ) {
+	foreach ((array) $bookmarks as $bookmark) {
+		if ( ! isset($bookmark->recently_updated)) {
 			$bookmark->recently_updated = false;
 		}
 		$output .= $r['before'];
-		if ( $r['show_updated'] && $bookmark->recently_updated ) {
+		if ($r['show_updated'] && $bookmark->recently_updated) {
 			$output .= '<em>';
 		}
 		$the_link = '#';
-		if ( ! empty( $bookmark->link_url ) ) {
-			$the_link = esc_url( $bookmark->link_url );
+		if ( ! empty($bookmark->link_url)) {
+			$the_link = esc_url($bookmark->link_url);
 		}
-		$desc = esc_attr( sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ) );
-		$name = esc_attr( sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ) );
+		$desc = esc_attr(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display'));
+		$name = esc_attr(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display'));
  		$title = $desc;
 
-		if ( $r['show_updated'] ) {
-			if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
+		if ($r['show_updated']) {
+			if ('00' != substr($bookmark->link_updated_f, 0, 2)) {
 				$title .= ' (';
 				$title .= sprintf(
 					__('Last updated: %s'),
 					date(
-						get_option( 'links_updated_date_format' ),
-						$bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS )
+						get_option('links_updated_date_format'),
+						$bookmark->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)
 					)
 				);
 				$title .= ')';
 			}
 		}
-		$alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"';
+		$alt = ' alt="'.$name.($r['show_description'] ? ' '.$title : '').'"';
 
-		if ( '' != $title ) {
-			$title = ' title="' . $title . '"';
+		if ('' != $title) {
+			$title = ' title="'.$title.'"';
 		}
 		$rel = $bookmark->link_rel;
-		if ( '' != $rel ) {
-			$rel = ' rel="' . esc_attr($rel) . '"';
+		if ('' != $rel) {
+			$rel = ' rel="'.esc_attr($rel).'"';
 		}
 		$target = $bookmark->link_target;
-		if ( '' != $target ) {
-			$target = ' target="' . $target . '"';
+		if ('' != $target) {
+			$target = ' target="'.$target.'"';
 		}
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
 		$output .= $r['link_before'];
 
-		if ( $bookmark->link_image != null && $r['show_images'] ) {
-			if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
+		if ($bookmark->link_image != null && $r['show_images']) {
+			if (strpos($bookmark->link_image, 'http') === 0) {
 				$output .= "<img src=\"$bookmark->link_image\" $alt $title />";
 			} else { // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$bookmark->link_image\" $alt $title />";
 			}
-			if ( $r['show_name'] ) {
+			if ($r['show_name']) {
 				$output .= " $name";
 			}
 		} else {
@@ -123,23 +123,23 @@ 
 
 		$output .= '</a>';
 
-		if ( $r['show_updated'] && $bookmark->recently_updated ) {
+		if ($r['show_updated'] && $bookmark->recently_updated) {
 			$output .= '</em>';
 		}
 
-		if ( $r['show_description'] && '' != $desc ) {
-			$output .= $r['between'] . $desc;
+		if ($r['show_description'] && '' != $desc) {
+			$output .= $r['between'].$desc;
 		}
 
-		if ( $r['show_rating'] ) {
-			$output .= $r['between'] . sanitize_bookmark_field(
+		if ($r['show_rating']) {
+			$output .= $r['between'].sanitize_bookmark_field(
 				'link_rating',
 				$bookmark->link_rating,
 				$bookmark->link_id,
 				'display'
 			);
 		}
-		$output .= $r['after'] . "\n";
+		$output .= $r['after']."\n";
 	} // end while
 
 	return $output;
@@ -197,7 +197,7 @@ 
  * }
  * @return string|void Will only return if echo option is set to not echo. Default is not return anything.
  */
-function wp_list_bookmarks( $args = '' ) {
+function wp_list_bookmarks($args = '') {
 	$defaults = array(
 		'orderby' => 'name', 'order' => 'ASC',
 		'limit' => -1, 'category' => '', 'exclude_category' => '',
@@ -210,41 +210,41 @@ 
 		'category_after' => '</li>'
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = '';
 
-	if ( ! is_array( $r['class'] ) ) {
-		$r['class'] = explode( ' ', $r['class'] );
+	if ( ! is_array($r['class'])) {
+		$r['class'] = explode(' ', $r['class']);
 	}
- 	$r['class'] = array_map( 'sanitize_html_class', $r['class'] );
- 	$r['class'] = trim( join( ' ', $r['class'] ) );
+ 	$r['class'] = array_map('sanitize_html_class', $r['class']);
+ 	$r['class'] = trim(join(' ', $r['class']));
 
-	if ( $r['categorize'] ) {
-		$cats = get_terms( 'link_category', array(
+	if ($r['categorize']) {
+		$cats = get_terms('link_category', array(
 			'name__like' => $r['category_name'],
 			'include' => $r['category'],
 			'exclude' => $r['exclude_category'],
 			'orderby' => $r['category_orderby'],
 			'order' => $r['category_order'],
 			'hierarchical' => 0
-		) );
-		if ( empty( $cats ) ) {
+		));
+		if (empty($cats)) {
 			$r['categorize'] = false;
 		}
 	}
 
-	if ( $r['categorize'] ) {
+	if ($r['categorize']) {
 		// Split the bookmarks into ul's for each category
-		foreach ( (array) $cats as $cat ) {
-			$params = array_merge( $r, array( 'category' => $cat->term_id ) );
-			$bookmarks = get_bookmarks( $params );
-			if ( empty( $bookmarks ) ) {
+		foreach ((array) $cats as $cat) {
+			$params = array_merge($r, array('category' => $cat->term_id));
+			$bookmarks = get_bookmarks($params);
+			if (empty($bookmarks)) {
 				continue;
 			}
 			$output .= str_replace(
-				array( '%id', '%class' ),
-				array( "linkcat-$cat->term_id", $r['class'] ),
+				array('%id', '%class'),
+				array("linkcat-$cat->term_id", $r['class']),
 				$r['category_before']
 			);
 			/**
@@ -254,36 +254,36 @@ 
 			 *
 			 * @param string $cat_name The category name of bookmarks.
 			 */
-			$catname = apply_filters( 'link_category', $cat->name );
+			$catname = apply_filters('link_category', $cat->name);
 
 			$output .= $r['title_before'];
 			$output .= $catname;
 			$output .= $r['title_after'];
 			$output .= "\n\t<ul class='xoxo blogroll'>\n";
-			$output .= _walk_bookmarks( $bookmarks, $r );
+			$output .= _walk_bookmarks($bookmarks, $r);
 			$output .= "\n\t</ul>\n";
-			$output .= $r['category_after'] . "\n";
+			$output .= $r['category_after']."\n";
 		}
 	} else {
 		//output one single list using title_li for the title
-		$bookmarks = get_bookmarks( $r );
+		$bookmarks = get_bookmarks($r);
 
-		if ( ! empty( $bookmarks ) ) {
-			if ( ! empty( $r['title_li'] ) ) {
+		if ( ! empty($bookmarks)) {
+			if ( ! empty($r['title_li'])) {
 				$output .= str_replace(
-					array( '%id', '%class' ),
-					array( "linkcat-" . $r['category'], $r['class'] ),
+					array('%id', '%class'),
+					array("linkcat-".$r['category'], $r['class']),
 					$r['category_before']
 				);
 				$output .= $r['title_before'];
 				$output .= $r['title_li'];
 				$output .= $r['title_after'];
 				$output .= "\n\t<ul class='xoxo blogroll'>\n";
-				$output .= _walk_bookmarks( $bookmarks, $r );
+				$output .= _walk_bookmarks($bookmarks, $r);
 				$output .= "\n\t</ul>\n";
-				$output .= $r['category_after'] . "\n";
+				$output .= $r['category_after']."\n";
 			} else {
-				$output .= _walk_bookmarks( $bookmarks, $r );
+				$output .= _walk_bookmarks($bookmarks, $r);
 			}
 		}
 	}
@@ -295,9 +295,9 @@ 
 	 *
 	 * @param string $html The HTML list of bookmarks.
 	 */
-	$html = apply_filters( 'wp_list_bookmarks', $output );
+	$html = apply_filters('wp_list_bookmarks', $output);
 
-	if ( ! $r['echo'] ) {
+	if ( ! $r['echo']) {
 		return $html;
 	}
 	echo $html;

src/wp-includes/pluggable-deprecated.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * Deprecated pluggable functions from past WordPress versions. You shouldn't use these
- * functions and look for the alternatives instead. The functions will be removed in a
- * later version.
- *
- * Deprecated warnings are also thrown if one of these functions is being defined by a plugin.
- *
- * @package WordPress
- * @subpackage Deprecated
- * @see pluggable.php
- */
+	 * Deprecated pluggable functions from past WordPress versions. You shouldn't use these
+	 * functions and look for the alternatives instead. The functions will be removed in a
+	 * later version.
+	 *
+	 * Deprecated warnings are also thrown if one of these functions is being defined by a plugin.
+	 *
+	 * @package WordPress
+	 * @subpackage Deprecated
+	 * @see pluggable.php
+	 */
 
 /*
  * Deprecated functions come here to die.

Braces +15 added lines, -10 removed lines

@@ -88,9 +88,10 @@ 
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_clearcookie') ) :
@@ -104,9 +105,10 @@ 
 function wp_clearcookie() {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
 	wp_clear_auth_cookie();
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
+}
 endif;
 
 if ( !function_exists('wp_get_cookie_login') ):
@@ -124,9 +126,10 @@ 
 function wp_get_cookie_login() {
 	_deprecated_function( __FUNCTION__, '2.5' );
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_get_cookie_login', '2.5' );
+}
 endif;
 
 if ( !function_exists('wp_login') ) :
@@ -157,14 +160,16 @@ 
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
-		return true;
+	if ( ! is_wp_error($user) ) {
+			return true;
+	}
 
 	$error = $user->get_error_message();
 	return false;
-}
-else :
+} else {
+	:
 	_deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
+}
 endif;
 
 /**

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
  * @deprecated 4.5.0 Use wp_get_current_user()
  * @see wp_get_current_user()
  *
- * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
+ * @return WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
  */
 function get_currentuserinfo() {
 	_deprecated_function( __FUNCTION__, '4.5', 'wp_get_current_user()' );

Spacing +26 added lines, -26 removed lines

@@ -15,7 +15,7 @@ 
  * Deprecated functions come here to die.
  */
 
-if ( !function_exists('set_current_user') ) :
+if ( ! function_exists('set_current_user')) :
 /**
  * Changes the current user by ID or name.
  *
@@ -30,12 +30,12 @@ 
  * @return WP_User returns wp_set_current_user()
  */
 function set_current_user($id, $name = '') {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_set_current_user()' );
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_set_current_user()');
 	return wp_set_current_user($id, $name);
 }
 endif;
 
-if ( !function_exists('get_currentuserinfo') ) :
+if ( ! function_exists('get_currentuserinfo')) :
 /**
  * Populate global variables with information about the currently logged in user.
  *
@@ -46,13 +46,13 @@ 
  * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
  */
 function get_currentuserinfo() {
-	_deprecated_function( __FUNCTION__, '4.5', 'wp_get_current_user()' );
+	_deprecated_function(__FUNCTION__, '4.5', 'wp_get_current_user()');
 
 	return _wp_get_current_user();
 }
 endif;
 
-if ( !function_exists('get_userdatabylogin') ) :
+if ( ! function_exists('get_userdatabylogin')) :
 /**
  * Retrieve user info by login name.
  *
@@ -64,12 +64,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_userdatabylogin($user_login) {
-	_deprecated_function( __FUNCTION__, '3.3', "get_user_by('login')" );
+	_deprecated_function(__FUNCTION__, '3.3', "get_user_by('login')");
 	return get_user_by('login', $user_login);
 }
 endif;
 
-if ( !function_exists('get_user_by_email') ) :
+if ( ! function_exists('get_user_by_email')) :
 /**
  * Retrieve user info by email.
  *
@@ -81,12 +81,12 @@ 
  * @return bool|object False on failure, User DB row object
  */
 function get_user_by_email($email) {
-	_deprecated_function( __FUNCTION__, '3.3', "get_user_by('email')" );
+	_deprecated_function(__FUNCTION__, '3.3', "get_user_by('email')");
 	return get_user_by('email', $email);
 }
 endif;
 
-if ( !function_exists('wp_setcookie') ) :
+if ( ! function_exists('wp_setcookie')) :
 /**
  * Sets a cookie for a user who just logged in. This function is deprecated.
  *
@@ -102,15 +102,15 @@ 
  * @param bool $remember Optional. Remember that the user is logged in
  */
 function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_set_auth_cookie()');
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
 }
 else :
-	_deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
+	_deprecated_function('wp_setcookie', '2.5', 'wp_set_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_clearcookie') ) :
+if ( ! function_exists('wp_clearcookie')) :
 /**
  * Clears the authentication cookie, logging the user out. This function is deprecated.
  *
@@ -119,14 +119,14 @@ 
  * @see wp_clear_auth_cookie()
  */
 function wp_clearcookie() {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_clear_auth_cookie()');
 	wp_clear_auth_cookie();
 }
 else :
-	_deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
+	_deprecated_function('wp_clearcookie', '2.5', 'wp_clear_auth_cookie()');
 endif;
 
-if ( !function_exists('wp_get_cookie_login') ):
+if ( ! function_exists('wp_get_cookie_login')):
 /**
  * Gets the user cookie login. This function is deprecated.
  *
@@ -139,14 +139,14 @@ 
  * @return bool Always returns false
  */
 function wp_get_cookie_login() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function(__FUNCTION__, '2.5');
 	return false;
 }
 else :
-	_deprecated_function( 'wp_get_cookie_login', '2.5' );
+	_deprecated_function('wp_get_cookie_login', '2.5');
 endif;
 
-if ( !function_exists('wp_login') ) :
+if ( ! function_exists('wp_login')) :
 /**
  * Checks a users login information and logs them in if it checks out. This function is deprecated.
  *
@@ -169,19 +169,19 @@ 
  * @return bool False on login failure, true on successful check
  */
 function wp_login($username, $password, $deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_signon()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_signon()');
 	global $error;
 
 	$user = wp_authenticate($username, $password);
 
-	if ( ! is_wp_error($user) )
+	if ( ! is_wp_error($user))
 		return true;
 
 	$error = $user->get_error_message();
 	return false;
 }
 else :
-	_deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
+	_deprecated_function('wp_login', '2.5', 'wp_signon()');
 endif;
 
 /**
@@ -195,14 +195,14 @@ 
  *
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server', false ) ) {
+if ( ! class_exists('wp_atom_server', false)) {
 	class wp_atom_server {
-		public function __call( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' );
+		public function __call($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5', 'the Atom Publishing Protocol plugin');
 		}
 
-		public static function __callStatic( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' );
+		public static function __callStatic($name, $arguments) {
+			_deprecated_function(__CLASS__.'::'.$name, '3.5', 'the Atom Publishing Protocol plugin');
 		}
 	}
 }

src/wp-includes/class-wp-customize-control.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Customize Control classes
- *
- * @package WordPress
- * @subpackage Customize
- * @since 3.4.0
- */
+	 * WordPress Customize Control classes
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 3.4.0
+	 */
 
 /**
  * Customize Control class.

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	 * @since 4.1.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function active_callback() {
 		return true;

Spacing +89 added lines, -89 removed lines

@@ -182,34 +182,34 @@ 
 	 *                                                 'date' are supported implicitly. Default 'text'.
 	 * }
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
 		// Process settings.
-		if ( ! isset( $this->settings ) ) {
+		if ( ! isset($this->settings)) {
 			$this->settings = $id;
 		}
 
 		$settings = array();
-		if ( is_array( $this->settings ) ) {
-			foreach ( $this->settings as $key => $setting ) {
-				$settings[ $key ] = $this->manager->get_setting( $setting );
+		if (is_array($this->settings)) {
+			foreach ($this->settings as $key => $setting) {
+				$settings[$key] = $this->manager->get_setting($setting);
 			}
-		} else if ( is_string( $this->settings ) ) {
-			$this->setting = $this->manager->get_setting( $this->settings );
+		} else if (is_string($this->settings)) {
+			$this->setting = $this->manager->get_setting($this->settings);
 			$settings['default'] = $this->setting;
 		}
 		$this->settings = $settings;
@@ -232,7 +232,7 @@ 
 	 */
 	final public function active() {
 		$control = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filter response of WP_Customize_Control::active().
@@ -242,7 +242,7 @@ 
 		 * @param bool                 $active  Whether the Customizer control is active.
 		 * @param WP_Customize_Control $control WP_Customize_Control instance.
 		 */
-		$active = apply_filters( 'customize_control_active', $active, $control );
+		$active = apply_filters('customize_control_active', $active, $control);
 
 		return $active;
 	}
@@ -271,9 +271,9 @@ 
 	 * @param string $setting_key
 	 * @return mixed The requested setting's value, if the setting exists.
 	 */
-	final public function value( $setting_key = 'default' ) {
-		if ( isset( $this->settings[ $setting_key ] ) ) {
-			return $this->settings[ $setting_key ]->value();
+	final public function value($setting_key = 'default') {
+		if (isset($this->settings[$setting_key])) {
+			return $this->settings[$setting_key]->value();
 		}
 	}
 
@@ -284,8 +284,8 @@ 
 	 */
 	public function to_json() {
 		$this->json['settings'] = array();
-		foreach ( $this->settings as $key => $setting ) {
-			$this->json['settings'][ $key ] = $setting->id;
+		foreach ($this->settings as $key => $setting) {
+			$this->json['settings'][$key] = $setting->id;
 		}
 
 		$this->json['type'] = $this->type;
@@ -323,18 +323,18 @@ 
 	 * @return bool False if theme doesn't support the control or user doesn't have the required permissions, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+		if ( ! empty($this->capability) && ! current_user_can($this->capability)) {
 			return false;
 		}
 
-		foreach ( $this->settings as $setting ) {
-			if ( ! $setting || ! $setting->check_capabilities() ) {
+		foreach ($this->settings as $setting) {
+			if ( ! $setting || ! $setting->check_capabilities()) {
 				return false;
 			}
 		}
 
-		$section = $this->manager->get_section( $this->section );
-		if ( isset( $section ) && ! $section->check_capabilities() ) {
+		$section = $this->manager->get_section($this->section);
+		if (isset($section) && ! $section->check_capabilities()) {
 			return false;
 		}
 
@@ -351,7 +351,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -361,7 +361,7 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
+		if ( ! $this->check_capabilities())
 			return;
 
 		/**
@@ -371,7 +371,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this WP_Customize_Control instance.
 		 */
-		do_action( 'customize_render_control', $this );
+		do_action('customize_render_control', $this);
 
 		/**
 		 * Fires just before a specific Customizer control is rendered.
@@ -383,7 +383,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this {@see WP_Customize_Control} instance.
 		 */
-		do_action( 'customize_render_control_' . $this->id, $this );
+		do_action('customize_render_control_'.$this->id, $this);
 
 		$this->render();
 	}
@@ -394,10 +394,10 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render() {
-		$id    = 'customize-control-' . str_replace( array( '[', ']' ), array( '-', '' ), $this->id );
-		$class = 'customize-control customize-control-' . $this->type;
+		$id    = 'customize-control-'.str_replace(array('[', ']'), array('-', ''), $this->id);
+		$class = 'customize-control customize-control-'.$this->type;
 
-		?><li id="<?php echo esc_attr( $id ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		?><li id="<?php echo esc_attr($id); ?>" class="<?php echo esc_attr($class); ?>">
 			<?php $this->render_content(); ?>
 		</li><?php
 	}
@@ -410,11 +410,11 @@ 
 	 * @param string $setting_key
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
-	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
+	public function get_link($setting_key = 'default') {
+		if ( ! isset($this->settings[$setting_key]))
 			return '';
 
-		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
+		return 'data-customize-setting-link="'.esc_attr($this->settings[$setting_key]->id).'"';
 	}
 
 	/**
@@ -425,8 +425,8 @@ 
 	 *
 	 * @param string $setting_key
 	 */
-	public function link( $setting_key = 'default' ) {
-		echo $this->get_link( $setting_key );
+	public function link($setting_key = 'default') {
+		echo $this->get_link($setting_key);
 	}
 
 	/**
@@ -436,8 +436,8 @@ 
 	 * @access public
 	 */
 	public function input_attrs() {
-		foreach ( $this->input_attrs as $attr => $value ) {
-			echo $attr . '="' . esc_attr( $value ) . '" ';
+		foreach ($this->input_attrs as $attr => $value) {
+			echo $attr.'="'.esc_attr($value).'" ';
 		}
 	}
 
@@ -454,57 +454,57 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render_content() {
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'checkbox':
 				?>
 				<label>
-					<input type="checkbox" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); checked( $this->value() ); ?> />
-					<?php echo esc_html( $this->label ); ?>
-					<?php if ( ! empty( $this->description ) ) : ?>
+					<input type="checkbox" value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); checked($this->value()); ?> />
+					<?php echo esc_html($this->label); ?>
+					<?php if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 				</label>
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
-				$name = '_customize-radio-' . $this->id;
+				$name = '_customize-radio-'.$this->id;
 
-				if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
-					<span class="description customize-control-description"><?php echo $this->description ; ?></span>
+				if ( ! empty($this->description)) : ?>
+					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif;
 
-				foreach ( $this->choices as $value => $label ) :
+				foreach ($this->choices as $value => $label) :
 					?>
 					<label>
-						<input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-						<?php echo esc_html( $label ); ?><br/>
+						<input type="radio" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($name); ?>" <?php $this->link(); checked($this->value(), $value); ?> />
+						<?php echo esc_html($label); ?><br/>
 					</label>
 					<?php
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ($this->choices as $value => $label)
+							echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 						?>
 					</select>
 				</label>
@@ -513,38 +513,38 @@ 
 			case 'textarea':
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<textarea rows="5" <?php $this->link(); ?>><?php echo esc_textarea( $this->value() ); ?></textarea>
+					<textarea rows="5" <?php $this->link(); ?>><?php echo esc_textarea($this->value()); ?></textarea>
 				</label>
 				<?php
 				break;
 			case 'dropdown-pages':
 				?>
 				<label>
-				<?php if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				<?php if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
+				if ( ! empty($this->description)) : ?>
 					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif; ?>
 
 				<?php $dropdown = wp_dropdown_pages(
 					array(
-						'name'              => '_customize-dropdown-pages-' . $this->id,
+						'name'              => '_customize-dropdown-pages-'.$this->id,
 						'echo'              => 0,
-						'show_option_none'  => __( '&mdash; Select &mdash;' ),
+						'show_option_none'  => __('&mdash; Select &mdash;'),
 						'option_none_value' => '0',
 						'selected'          => $this->value(),
 					)
 				);
 
 				// Hackily add in the data link parameter.
-				$dropdown = str_replace( '<select', '<select ' . $this->get_link(), $dropdown );
+				$dropdown = str_replace('<select', '<select '.$this->get_link(), $dropdown);
 				echo $dropdown;
 				?>
 				</label>
@@ -553,13 +553,13 @@ 
 			default:
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<input type="<?php echo esc_attr( $this->type ); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
+					<input type="<?php echo esc_attr($this->type); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); ?> />
 				</label>
 				<?php
 				break;
@@ -600,52 +600,52 @@ 
 }
 
 /** WP_Customize_Color_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
 
 /** WP_Customize_Media_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
 
 /** WP_Customize_Upload_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
 
 /** WP_Customize_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
 
 /** WP_Customize_Background_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
 
 /** WP_Customize_Cropped_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
 
 /** WP_Customize_Site_Icon_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
 
 /** WP_Customize_Header_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
 
 /** WP_Customize_Theme_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
 
 /** WP_Widget_Area_Customize_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
 
 /** WP_Widget_Form_Customize_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
 
 /** WP_Customize_Nav_Menu_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
 
 /** WP_Customize_Nav_Menu_Item_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
 
 /** WP_Customize_Nav_Menu_Location_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
 
 /** WP_Customize_Nav_Menu_Name_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
 
 /** WP_Customize_Nav_Menu_Auto_Add_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
 
 /** WP_Customize_New_Menu_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');

Braces +15 added lines, -10 removed lines

@@ -361,8 +361,9 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
-			return;
+		if ( ! $this->check_capabilities() ) {
+					return;
+		}
 
 		/**
 		 * Fires just before the current Customizer control is rendered.
@@ -411,8 +412,9 @@ 
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
 	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
-			return '';
+		if ( ! isset( $this->settings[ $setting_key ] ) ) {
+					return '';
+		}
 
 		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
 	}
@@ -467,8 +469,9 @@ 
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				$name = '_customize-radio-' . $this->id;
 
@@ -489,8 +492,9 @@ 
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				?>
 				<label>
@@ -503,8 +507,9 @@ 
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ( $this->choices as $value => $label ) {
+													echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						}
 						?>
 					</select>
 				</label>