ntwb / wordpress

src/wp-admin/profile.php

Spacing +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
 define('IS_PROFILE_PAGE', true);
 
 /** Load User Editing Page */
-require_once( dirname( __FILE__ ) . '/user-edit.php' );
+require_once(dirname(__FILE__).'/user-edit.php');

src/wp-admin/install-helper.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
 /** Load WordPress Bootstrap */
 require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( ! function_exists('maybe_create_table') ) :
+if ( ! function_exists('maybe_create_table')) :
 /**
  * Create database table, if it doesn't already exist.
  *
@@ -51,7 +51,7 @@ 
  */
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+	foreach ($wpdb->get_col("SHOW TABLES", 0) as $table) {
 		if ($table == $table_name) {
 			return true;
 		}
@@ -60,7 +60,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+	foreach ($wpdb->get_col("SHOW TABLES", 0) as $table) {
 		if ($table == $table_name) {
 			return true;
 		}
@@ -69,7 +69,7 @@ 
 }
 endif;
 
-if ( ! function_exists('maybe_add_column') ) :
+if ( ! function_exists('maybe_add_column')) :
 /**
  * Add column to database table, if column doesn't already exist in table.
  *
@@ -84,7 +84,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 
 		if ($column == $column_name) {
 			return true;
@@ -95,7 +95,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -118,14 +118,14 @@ 
  */
 function maybe_drop_column($table_name, $column_name, $drop_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 
 			// Found it, so try to drop it.
 			$wpdb->query($drop_ddl);
 
 			// We cannot directly tell that whether this succeeded!
-			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+			foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 				if ($column == $column_name) {
 					return false;
 				}
@@ -170,7 +170,7 @@ 
 	$diffs = 0;
 	$results = $wpdb->get_results("DESC $table_name");
 
-	foreach ($results as $row ) {
+	foreach ($results as $row) {
 
 		if ($row->Field == $col_name) {
 
@@ -181,7 +181,7 @@ 
 			if (($is_null != null) && ($row->Null != $is_null)) {
 				++$diffs;
 			}
-			if (($key != null) && ($row->Key  != $key)) {
+			if (($key != null) && ($row->Key != $key)) {
 				++$diffs;
 			}
 			if (($default != null) && ($row->Default != $default)) {

src/wp-admin/ms-users.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('users.php') );
+wp_redirect(network_admin_url('users.php'));
 exit;

src/wp-includes/post-thumbnail-template.php

Braces +12 added lines, -8 removed lines

@@ -66,16 +66,19 @@ 
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
 function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
-		$wp_query = $GLOBALS['wp_query'];
+	if ( ! $wp_query ) {
+			$wp_query = $GLOBALS['wp_query'];
+	}
 
-	if ( $wp_query->thumbnails_cached )
-		return;
+	if ( $wp_query->thumbnails_cached ) {
+			return;
+	}
 
 	$thumb_ids = array();
 	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
-			$thumb_ids[] = $id;
+		if ( $id = get_post_thumbnail_id( $post->ID ) ) {
+					$thumb_ids[] = $id;
+		}
 	}
 
 	if ( ! empty ( $thumb_ids ) ) {
@@ -130,8 +133,9 @@ 
 		 * @param string $size              The post thumbnail size.
 		 */
 		do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
-			update_post_thumbnail_cache();
+		if ( in_the_loop() ) {
+					update_post_thumbnail_cache();
+		}
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
  *
  * @see get_the_post_thumbnail()
  *
- * @param string|array $size Optional. Image size to use. Accepts any valid image size, or
+ * @param string $size Optional. Image size to use. Accepts any valid image size, or
  *                           an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.

Spacing +41 added lines, -41 removed lines

@@ -18,8 +18,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return bool Whether the post has an image attached.
  */
-function has_post_thumbnail( $post = null ) {
-	return (bool) get_post_thumbnail_id( $post );
+function has_post_thumbnail($post = null) {
+	return (bool) get_post_thumbnail_id($post);
 }
 
 /**
@@ -31,12 +31,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return string|int Post thumbnail ID or empty string.
  */
-function get_post_thumbnail_id( $post = null ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_post_thumbnail_id($post = null) {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	return get_post_meta( $post->ID, '_thumbnail_id', true );
+	return get_post_meta($post->ID, '_thumbnail_id', true);
 }
 
 /**
@@ -58,8 +58,8 @@ 
  *                           Default 'post-thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  */
-function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
-	echo get_the_post_thumbnail( null, $size, $attr );
+function the_post_thumbnail($size = 'post-thumbnail', $attr = '') {
+	echo get_the_post_thumbnail(null, $size, $attr);
 }
 
 /**
@@ -71,21 +71,21 @@ 
  *
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
-function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
+function update_post_thumbnail_cache($wp_query = null) {
+	if ( ! $wp_query)
 		$wp_query = $GLOBALS['wp_query'];
 
-	if ( $wp_query->thumbnails_cached )
+	if ($wp_query->thumbnails_cached)
 		return;
 
 	$thumb_ids = array();
-	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
+	foreach ($wp_query->posts as $post) {
+		if ($id = get_post_thumbnail_id($post->ID))
 			$thumb_ids[] = $id;
 	}
 
-	if ( ! empty ( $thumb_ids ) ) {
-		_prime_post_caches( $thumb_ids, false, true );
+	if ( ! empty ($thumb_ids)) {
+		_prime_post_caches($thumb_ids, false, true);
 	}
 
 	$wp_query->thumbnails_cached = true;
@@ -111,12 +111,12 @@ 
  * @param string|array $attr Optional. Query string or array of attributes. Default empty.
  * @return string The post thumbnail image tag.
  */
-function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_the_post_thumbnail($post = null, $size = 'post-thumbnail', $attr = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return '';
 	}
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
+	$post_thumbnail_id = get_post_thumbnail_id($post);
 
 	/**
 	 * Filters the post thumbnail size.
@@ -126,9 +126,9 @@ 
 	 * @param string|array $size The post thumbnail size. Image size or array of width and height
 	 *                           values (in that order). Default 'post-thumbnail'.
 	 */
-	$size = apply_filters( 'post_thumbnail_size', $size );
+	$size = apply_filters('post_thumbnail_size', $size);
 
-	if ( $post_thumbnail_id ) {
+	if ($post_thumbnail_id) {
 
 		/**
 		 * Fires before fetching the post thumbnail HTML.
@@ -142,10 +142,10 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
+		do_action('begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
+		if (in_the_loop())
 			update_post_thumbnail_cache();
-		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
+		$html = wp_get_attachment_image($post_thumbnail_id, $size, false, $attr);
 
 		/**
 		 * Fires after fetching the post thumbnail HTML.
@@ -157,7 +157,7 @@ 
 		 * @param string|array $size              The post thumbnail size. Image size or array of width
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
-		do_action( 'end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
+		do_action('end_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size);
 
 	} else {
 		$html = '';
@@ -174,7 +174,7 @@ 
 	 *                                        values (in that order). Default 'post-thumbnail'.
 	 * @param string       $attr              Query string of attributes.
 	 */
-	return apply_filters( 'post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr );
+	return apply_filters('post_thumbnail_html', $html, $post->ID, $post_thumbnail_id, $size, $attr);
 }
 
 /**
@@ -187,12 +187,12 @@ 
  *                           array of height and width dimensions. Default 'post-thumbnail'.
  * @return string|false Post thumbnail URL or false if no URL is available.
  */
-function get_the_post_thumbnail_url( $post = null, $size = 'post-thumbnail' ) {
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
-	if ( ! $post_thumbnail_id ) {
+function get_the_post_thumbnail_url($post = null, $size = 'post-thumbnail') {
+	$post_thumbnail_id = get_post_thumbnail_id($post);
+	if ( ! $post_thumbnail_id) {
 		return false;
 	}
-	return wp_get_attachment_image_url( $post_thumbnail_id, $size );
+	return wp_get_attachment_image_url($post_thumbnail_id, $size);
 }
 
 /**
@@ -204,10 +204,10 @@ 
  *                           or an array of width and height values in pixels (in that order).
  *                           Default 'post-thumbnail'.
  */
-function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
-	$url = get_the_post_thumbnail_url( null, $size );
-	if ( $url ) {
-		echo esc_url( $url );
+function the_post_thumbnail_url($size = 'post-thumbnail') {
+	$url = get_the_post_thumbnail_url(null, $size);
+	if ($url) {
+		echo esc_url($url);
 	}
 }
 
@@ -219,15 +219,15 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return string Post thumbnail caption.
  */
-function get_the_post_thumbnail_caption( $post = null ) {
-	$post_thumbnail_id = get_post_thumbnail_id( $post );
-	if ( ! $post_thumbnail_id ) {
+function get_the_post_thumbnail_caption($post = null) {
+	$post_thumbnail_id = get_post_thumbnail_id($post);
+	if ( ! $post_thumbnail_id) {
 		return '';
 	}
 
-	$caption = wp_get_attachment_caption( $post_thumbnail_id );
+	$caption = wp_get_attachment_caption($post_thumbnail_id);
 
-	if ( ! $caption ) {
+	if ( ! $caption) {
 		$caption = '';
 	}
 
@@ -241,7 +241,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  */
-function the_post_thumbnail_caption( $post = null ) {
+function the_post_thumbnail_caption($post = null) {
 	/**
 	 * Filters the displayed post thumbnail caption.
 	 *
@@ -249,5 +249,5 @@ 
 	 *
 	 * @param string $caption Caption for the given attachment.
 	 */
-	echo apply_filters( 'the_post_thumbnail_caption', get_the_post_thumbnail_caption( $post ) );
+	echo apply_filters('the_post_thumbnail_caption', get_the_post_thumbnail_caption($post));
 }

src/wp-includes/vars.php

Braces +22 added lines, -16 removed lines

@@ -22,12 +22,13 @@ 
 // On which page are we ?
 if ( is_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
-		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
-		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	else
-		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	if ( is_network_admin() ) {
+			preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} elseif ( is_user_admin() ) {
+			preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	} else {
+			preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	}
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
@@ -36,15 +37,18 @@ 
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
-			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+		if ( '.php' !== substr($pagenow, -4, 4) ) {
+					$pagenow .= '.php';
+		}
+		// for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
-		$pagenow = strtolower($self_matches[1]);
-	else
-		$pagenow = 'index.php';
-}
+	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) ) {
+			$pagenow = strtolower($self_matches[1]);
+	} else {
+			$pagenow = 'index.php';
+	}
+	}
 unset($self_matches);
 
 // Simple browser detection
@@ -63,8 +67,9 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) ) {
+							header( 'X-UA-Compatible: chrome=1' );
+			}
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
@@ -84,8 +89,9 @@ 
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false ) {
 	$is_iphone = true;
+}
 
 $is_IE = ( $is_macIE || $is_winIE );
 

Spacing +26 added lines, -26 removed lines

@@ -20,27 +20,27 @@ 
 	$is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
-if ( is_admin() ) {
+if (is_admin()) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
+	if (is_network_admin())
 		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	else
 		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
 	$pagenow = $self_matches[1];
 	$pagenow = trim($pagenow, '/');
 	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
-	if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
+	if ('' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow) {
 		$pagenow = 'index.php';
 	} else {
 		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
 		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
+		if ('.php' !== substr($pagenow, -4, 4))
 			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
+	if (preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches))
 		$pagenow = strtolower($self_matches[1]);
 	else
 		$pagenow = 'index.php';
@@ -50,13 +50,13 @@ 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false;
 
-if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
-	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+if (isset($_SERVER['HTTP_USER_AGENT'])) {
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
 		$is_lynx = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false) {
 		$is_edge = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
-		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false) {
+		if (stripos($_SERVER['HTTP_USER_AGENT'], 'chromeframe') !== false) {
 			$is_admin = is_admin();
 			/**
 			 * Filter whether Google Chrome Frame should be used, if available.
@@ -65,31 +65,31 @@ 
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
-				header( 'X-UA-Compatible: chrome=1' );
+			if ($is_chrome = apply_filters('use_google_chrome_frame', $is_admin))
+				header('X-UA-Compatible: chrome=1');
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif (stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) {
 		$is_safari = true;
-	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+	} elseif ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
 		$is_winIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
 		$is_gecko = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
 		$is_opera = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
 		$is_NS4 = true;
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ($is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false)
 	$is_iphone = true;
 
-$is_IE = ( $is_macIE || $is_winIE );
+$is_IE = ($is_macIE || $is_winIE);
 
 // Server detection
 
@@ -109,13 +109,13 @@ 
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */
-$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = ! $is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
  * Whether the server software is IIS 7.X or greater
  * @global bool $is_iis7
  */
-$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+$is_iis7 = $is_IIS && intval(substr($_SERVER['SERVER_SOFTWARE'], strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/') + 14)) >= 7;
 
 /**
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
@@ -123,15 +123,15 @@ 
  * @return bool
  */
 function wp_is_mobile() {
-	if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		$is_mobile = false;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
+	} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
 		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;

src/wp-includes/js/tinymce/wp-tinymce.php

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
+	if (function_exists('realpath'))
 		$path = realpath($path);
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file($path))
 		return false;
 
 	return @file_get_contents($path);
@@ -23,17 +23,17 @@ 
 
 header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
+header('Expires: '.gmdate("D, d M Y H:i:s", time() + $expires_offset).' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if (isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ($file = get_file($basepath.'/wp-tinymce.js.gz'))) {
 
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
 	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
-	echo get_file( $basepath . '/tinymce.min.js' );
-	echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
+	echo get_file($basepath.'/tinymce.min.js');
+	echo get_file($basepath.'/plugins/compat3x/plugin.min.js');
 }
 exit;

Braces +6 added lines, -4 removed lines

@@ -10,11 +10,13 @@
 
 function get_file($path) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists('realpath') ) {
+			$path = realpath($path);
+	}
 
-	if ( ! $path || ! @is_file($path) )
-		return false;
+	if ( ! $path || ! @is_file($path) ) {
+			return false;
+	}
 
 	return @file_get_contents($path);
 }

src/wp-includes/class-wp-error.php

Braces +38 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
 	 * @param mixed $data Optional. Error data.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
-			return;
+		if ( empty($code) ) {
+					return;
+		}
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -71,8 +73,9 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
-			return array();
+		if ( empty($this->errors) ) {
+					return array();
+		}
 
 		return array_keys($this->errors);
 	}
@@ -88,8 +91,9 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
-			return '';
+		if ( empty($codes) ) {
+					return '';
+		}
 
 		return $codes[0];
 	}
@@ -106,16 +110,18 @@ 
 		// Return all messages if no code specified.
 		if ( empty($code) ) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
-				$all_messages = array_merge($all_messages, $messages);
+			foreach ( (array) $this->errors as $code => $messages ) {
+							$all_messages = array_merge($all_messages, $messages);
+			}
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
-			return $this->errors[$code];
-		else
-			return array();
+		if ( isset($this->errors[$code]) ) {
+					return $this->errors[$code];
+		} else {
+					return array();
+		}
 	}
 
 	/**
@@ -130,11 +136,13 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
-			return '';
+		if ( empty($messages) ) {
+					return '';
+		}
 		return $messages[0];
 	}
 
@@ -147,11 +155,13 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
-		if ( isset($this->error_data[$code]) )
-			return $this->error_data[$code];
+		if ( isset($this->error_data[$code]) ) {
+					return $this->error_data[$code];
+		}
 	}
 
 	/**
@@ -166,8 +176,9 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty($data) ) {
+					$this->error_data[$code] = $data;
+		}
 	}
 
 	/**
@@ -181,8 +192,9 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
-			$code = $this->get_error_code();
+		if ( empty($code) ) {
+					$code = $this->get_error_code();
+		}
 
 		$this->error_data[$code] = $data;
 	}

Spacing +17 added lines, -17 removed lines

@@ -52,13 +52,13 @@ 
 	 * @param string $message Error message
 	 * @param mixed $data Optional. Error data.
 	 */
-	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
+	public function __construct($code = '', $message = '', $data = '') {
+		if (empty($code))
 			return;
 
 		$this->errors[$code][] = $message;
 
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
+		if (empty($this->errors))
 			return array();
 
 		return array_keys($this->errors);
@@ -88,7 +88,7 @@ 
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
+		if (empty($codes))
 			return '';
 
 		return $codes[0];
@@ -104,15 +104,15 @@ 
 	 */
 	public function get_error_messages($code = '') {
 		// Return all messages if no code specified.
-		if ( empty($code) ) {
+		if (empty($code)) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
+			foreach ((array) $this->errors as $code => $messages)
 				$all_messages = array_merge($all_messages, $messages);
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
+		if (isset($this->errors[$code]))
 			return $this->errors[$code];
 		else
 			return array();
@@ -130,10 +130,10 @@ 
 	 * @return string
 	 */
 	public function get_error_message($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
+		if (empty($messages))
 			return '';
 		return $messages[0];
 	}
@@ -147,10 +147,10 @@ 
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data($code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
-		if ( isset($this->error_data[$code]) )
+		if (isset($this->error_data[$code]))
 			return $this->error_data[$code];
 	}
 
@@ -166,7 +166,7 @@ 
 	 */
 	public function add($code, $message, $data = '') {
 		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
+		if ( ! empty($data))
 			$this->error_data[$code] = $data;
 	}
 
@@ -181,7 +181,7 @@ 
 	 * @param string|int $code Error code.
 	 */
 	public function add_data($data, $code = '') {
-		if ( empty($code) )
+		if (empty($code))
 			$code = $this->get_error_code();
 
 		$this->error_data[$code] = $data;
@@ -197,8 +197,8 @@ 
 	 *
 	 * @param string|int $code Error code.
 	 */
-	public function remove( $code ) {
-		unset( $this->errors[ $code ] );
-		unset( $this->error_data[ $code ] );
+	public function remove($code) {
+		unset($this->errors[$code]);
+		unset($this->error_data[$code]);
 	}
 }

src/wp-includes/class-wp-admin-bar.php

Braces +94 added lines, -64 removed lines

@@ -60,8 +60,9 @@ 
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
-			$header_callback = '_admin_bar_bump_cb';
+		if ( empty($header_callback) ) {
+					$header_callback = '_admin_bar_bump_cb';
+		}
 
 		add_action('wp_head', $header_callback);
 
@@ -107,16 +108,19 @@ 
 	 */
 	public function add_node( $args ) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) ) {
+					$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		}
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if ( is_object( $args ) ) {
+					$args = get_object_vars( $args );
+		}
 
 		// Ensure we have a valid title.
 		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
-				return;
+			if ( empty( $args['title'] ) ) {
+							return;
+			}
 
 			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
 			// Deprecated: Generate an ID from the title.
@@ -133,12 +137,14 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ( $maybe_defaults = $this->get_node( $args['id'] ) ) {
+					$defaults = get_object_vars( $maybe_defaults );
+		}
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) {
+					$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		}
 
 		$args = wp_parse_args( $args, $defaults );
 
@@ -170,8 +176,9 @@ 
 	 * @return object Node.
 	 */
 	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
-			return clone $node;
+		if ( $node = $this->_get_node( $id ) ) {
+					return clone $node;
+		}
 	}
 
 	/**
@@ -179,22 +186,26 @@ 
 	 * @return object|void
 	 */
 	final protected function _get_node( $id ) {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
-		if ( empty( $id ) )
-			$id = 'root';
+		if ( empty( $id ) ) {
+					$id = 'root';
+		}
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if ( isset( $this->nodes[ $id ] ) ) {
+					return $this->nodes[ $id ];
+		}
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
-			return;
+		if ( ! $nodes = $this->_get_nodes() ) {
+					return;
+		}
 
 		foreach ( $nodes as &$node ) {
 			$node = clone $node;
@@ -206,8 +217,9 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		return $this->nodes;
 	}
@@ -253,16 +265,18 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ( $root ) {
+					$this->_render( $root );
+		}
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
-			return;
+		if ( $this->bound ) {
+					return;
+		}
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
@@ -279,13 +293,15 @@ 
 			unset( $node->group );
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
-				$node->parent = 'root';
+			if ( ! $node->parent ) {
+							$node->parent = 'root';
+			}
 		}
 
 		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
-				continue;
+			if ( 'root' == $node->id ) {
+							continue;
+			}
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
 			if ( ! $parent = $this->_get_node( $node->parent ) ) {
@@ -296,10 +312,11 @@ 
 			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
 			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
-					$node->meta['class'] = $group_class;
-				else
-					$node->meta['class'] .= ' ' . $group_class;
+				if ( empty( $node->meta['class'] ) ) {
+									$node->meta['class'] = $group_class;
+				} else {
+									$node->meta['class'] .= ' ' . $group_class;
+				}
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
@@ -357,10 +374,11 @@ 
 						$container->parent = $grandparent->id;
 
 						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
-							$grandparent->children[] = $container;
-						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+						if ( $index === false ) {
+													$grandparent->children[] = $container;
+						} else {
+													array_splice( $grandparent->children, $index, 1, array( $container ) );
+						}
 					}
 
 					$parent->parent = $container->id;
@@ -393,12 +411,13 @@ 
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
 		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
-				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
-				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
-				$class .= ' ie9';
+			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
+							$class .= ' ie7';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
+							$class .= ' ie8';
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
+							$class .= ' ie9';
+			}
 		} elseif ( wp_is_mobile() ) {
 			$class .= ' mobile';
 		}
@@ -425,8 +444,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'container' || empty( $node->children ) ) {
+					return;
+		}
 
 		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
 			foreach ( $node->children as $group ) {
@@ -443,13 +463,15 @@ 
 			$this->_render_container( $node );
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
-			return;
+		if ( $node->type != 'group' || empty( $node->children ) ) {
+					return;
+		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
-		else
-			$class = '';
+		if ( ! empty( $node->meta['class'] ) ) {
+					$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		} else {
+					$class = '';
+		}
 
 		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
 			foreach ( $node->children as $item ) {
@@ -462,8 +484,9 @@ 
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
-			return;
+		if ( $node->type != 'item' ) {
+					return;
+		}
 
 		$is_parent = ! empty( $node->children );
 		$has_link  = ! empty( $node->href );
@@ -478,11 +501,13 @@ 
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
-			$menuclass .= $node->meta['class'];
+		if ( ! empty( $node->meta['class'] ) ) {
+					$menuclass .= $node->meta['class'];
+		}
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ( $menuclass ) {
+					$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		}
 
 		?>
 
@@ -502,8 +527,10 @@ 
 					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
 				endif;
 				?>><?php
-			else:
+			else {
+				:
 				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+			}
 				if ( ! empty( $node->meta['title'] ) ) :
 					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
 				endif;
@@ -514,9 +541,11 @@ 
 
 			if ( $has_link ) :
 				?></a><?php
-			else:
+			else {
+				:
 				?></div><?php
 			endif;
+			}
 
 			if ( $is_parent ) :
 				?><div class="ab-sub-wrapper"><?php
@@ -526,8 +555,9 @@ 
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
-				echo $node->meta['html'];
+			if ( ! empty( $node->meta['html'] ) ) {
+							echo $node->meta['html'];
+			}
 
 			?>
 		</li><?php

Spacing +178 added lines, -178 removed lines

@@ -21,13 +21,13 @@ 
 	 * @param string $name
 	 * @return string|array|void
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
+	public function __get($name) {
+		switch ($name) {
 			case 'proto' :
 				return is_ssl() ? 'https://' : 'http://';
 
 			case 'menu' :
-				_deprecated_argument( 'WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+				_deprecated_argument('WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.');
 				return array(); // Sorry, folks.
 		}
 	}
@@ -38,61 +38,61 @@ 
 	public function initialize() {
 		$this->user = new stdClass;
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			/* Populate settings we need for the menu based on the current user. */
-			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
-			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+			$this->user->blogs = get_blogs_of_user(get_current_user_id());
+			if (is_multisite()) {
+				$this->user->active_blog = get_active_blog_for_user(get_current_user_id());
+				$this->user->domain = empty($this->user->active_blog) ? user_admin_url() : trailingslashit(get_home_url($this->user->active_blog->blog_id));
 				$this->user->account_domain = $this->user->domain;
 			} else {
 				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->domain = trailingslashit(home_url());
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
 
-		add_action( 'wp_head', 'wp_admin_bar_header' );
+		add_action('wp_head', 'wp_admin_bar_header');
 
-		add_action( 'admin_head', 'wp_admin_bar_header' );
+		add_action('admin_head', 'wp_admin_bar_header');
 
-		if ( current_theme_supports( 'admin-bar' ) ) {
+		if (current_theme_supports('admin-bar')) {
 			/**
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args = get_theme_support('admin-bar');
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if (empty($header_callback))
 			$header_callback = '_admin_bar_bump_cb';
 
 		add_action('wp_head', $header_callback);
 
-		wp_enqueue_script( 'admin-bar' );
-		wp_enqueue_style( 'admin-bar' );
+		wp_enqueue_script('admin-bar');
+		wp_enqueue_style('admin-bar');
 
 		/**
 		 * Fires after WP_Admin_Bar is initialized.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'admin_bar_init' );
+		do_action('admin_bar_init');
 	}
 
 	/**
 	 * @param array $node
 	 */
-	public function add_menu( $node ) {
-		$this->add_node( $node );
+	public function add_menu($node) {
+		$this->add_node($node);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	public function remove_menu( $id ) {
-		$this->remove_node( $id );
+	public function remove_menu($id) {
+		$this->remove_node($id);
 	}
 
 	/**
@@ -114,22 +114,22 @@ 
 	 *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
 	 * }
 	 */
-	public function add_node( $args ) {
+	public function add_node($args) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if (func_num_args() >= 3 && is_string(func_get_arg(0)))
+			$args = array_merge(array('parent' => func_get_arg(0)), func_get_arg(2));
 
-		if ( is_object( $args ) )
-			$args = get_object_vars( $args );
+		if (is_object($args))
+			$args = get_object_vars($args);
 
 		// Ensure we have a valid title.
-		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+		if (empty($args['id'])) {
+			if (empty($args['title']))
 				return;
 
-			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3.0' );
+			_doing_it_wrong(__METHOD__, __('The menu ID should not be empty.'), '3.3.0');
 			// Deprecated: Generate an ID from the title.
-			$args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+			$args['id'] = esc_attr(sanitize_title(trim($args['title'])));
 		}
 
 		$defaults = array(
@@ -142,34 +142,34 @@ 
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
-			$defaults = get_object_vars( $maybe_defaults );
+		if ($maybe_defaults = $this->get_node($args['id']))
+			$defaults = get_object_vars($maybe_defaults);
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
-			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		if ( ! empty($defaults['meta']) && ! empty($args['meta']))
+			$args['meta'] = wp_parse_args($args['meta'], $defaults['meta']);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$back_compat_parents = array(
-			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-account-with-avatar' => array('my-account', '3.3'),
+			'my-blogs'               => array('my-sites', '3.3'),
 		);
 
-		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
-			list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
-			_deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+		if (isset($back_compat_parents[$args['parent']])) {
+			list($new_parent, $version) = $back_compat_parents[$args['parent']];
+			_deprecated_argument(__METHOD__, $version, sprintf('Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent']));
 			$args['parent'] = $new_parent;
 		}
 
-		$this->_set_node( $args );
+		$this->_set_node($args);
 	}
 
 	/**
 	 * @param array $args
 	 */
-	final protected function _set_node( $args ) {
-		$this->nodes[ $args['id'] ] = (object) $args;
+	final protected function _set_node($args) {
+		$this->nodes[$args['id']] = (object) $args;
 	}
 
 	/**
@@ -178,8 +178,8 @@ 
 	 * @param string $id
 	 * @return object Node.
 	 */
-	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+	final public function get_node($id) {
+		if ($node = $this->_get_node($id))
 			return clone $node;
 	}
 
@@ -187,25 +187,25 @@ 
 	 * @param string $id
 	 * @return object|void
 	 */
-	final protected function _get_node( $id ) {
-		if ( $this->bound )
+	final protected function _get_node($id) {
+		if ($this->bound)
 			return;
 
-		if ( empty( $id ) )
+		if (empty($id))
 			$id = 'root';
 
-		if ( isset( $this->nodes[ $id ] ) )
-			return $this->nodes[ $id ];
+		if (isset($this->nodes[$id]))
+			return $this->nodes[$id];
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes())
 			return;
 
-		foreach ( $nodes as &$node ) {
+		foreach ($nodes as &$node) {
 			$node = clone $node;
 		}
 		return $nodes;
@@ -215,7 +215,7 @@ 
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		return $this->nodes;
@@ -235,10 +235,10 @@ 
 	 *                         'class', 'onclick', 'target', and 'title'.
 	 * }
 	 */
-	final public function add_group( $args ) {
+	final public function add_group($args) {
 		$args['group'] = true;
 
-		$this->add_node( $args );
+		$this->add_node($args);
 	}
 
 	/**
@@ -246,15 +246,15 @@ 
 	 *
 	 * @param string $id The ID of the item.
 	 */
-	public function remove_node( $id ) {
-		$this->_unset_node( $id );
+	public function remove_node($id) {
+		$this->_unset_node($id);
 	}
 
 	/**
 	 * @param string $id
 	 */
-	final protected function _unset_node( $id ) {
-		unset( $this->nodes[ $id ] );
+	final protected function _unset_node($id) {
+		unset($this->nodes[$id]);
 	}
 
 	/**
@@ -262,66 +262,66 @@ 
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
-			$this->_render( $root );
+		if ($root)
+			$this->_render($root);
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ($this->bound)
 			return;
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
-		$this->remove_node( 'root' );
-		$this->add_node( array(
+		$this->remove_node('root');
+		$this->add_node(array(
 			'id'    => 'root',
 			'group' => false,
-		) );
+		));
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
-		foreach ( $this->_get_nodes() as $node ) {
+		foreach ($this->_get_nodes() as $node) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
-			unset( $node->group );
+			$node->type = ($node->group) ? 'group' : 'item';
+			unset($node->group);
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent)
 				$node->parent = 'root';
 		}
 
-		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+		foreach ($this->_get_nodes() as $node) {
+			if ('root' == $node->id)
 				continue;
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
-			if ( ! $parent = $this->_get_node( $node->parent ) ) {
+			if ( ! $parent = $this->_get_node($node->parent)) {
 				continue;
 			}
 
 			// Generate the group class (we distinguish between top level and other level groups).
-			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
+			$group_class = ($node->parent == 'root') ? 'ab-top-menu' : 'ab-submenu';
 
-			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+			if ($node->type == 'group') {
+				if (empty($node->meta['class']))
 					$node->meta['class'] = $group_class;
 				else
-					$node->meta['class'] .= ' ' . $group_class;
+					$node->meta['class'] .= ' '.$group_class;
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
-			if ( $parent->type == 'item' && $node->type == 'item' ) {
-				$default_id = $parent->id . '-default';
-				$default    = $this->_get_node( $default_id );
+			if ($parent->type == 'item' && $node->type == 'item') {
+				$default_id = $parent->id.'-default';
+				$default    = $this->_get_node($default_id);
 
 				// The default group is added here to allow groups that are
 				// added before standard menu items to render first.
-				if ( ! $default ) {
+				if ( ! $default) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'        => $default_id,
 						'parent'    => $parent->id,
 						'type'      => 'group',
@@ -331,45 +331,45 @@ 
 						),
 						'title'     => false,
 						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					));
+					$default = $this->_get_node($default_id);
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
 			// Groups in groups aren't allowed. Add a special 'container' node.
 			// The container will invisibly wrap both groups.
-			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
-				$container_id = $parent->id . '-container';
-				$container    = $this->_get_node( $container_id );
+			} elseif ($parent->type == 'group' && $node->type == 'group') {
+				$container_id = $parent->id.'-container';
+				$container    = $this->_get_node($container_id);
 
 				// We need to create a container for this group, life is sad.
-				if ( ! $container ) {
+				if ( ! $container) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
+					$this->_set_node(array(
 						'id'       => $container_id,
 						'type'     => 'container',
-						'children' => array( $parent ),
+						'children' => array($parent),
 						'parent'   => false,
 						'title'    => false,
 						'href'     => false,
 						'meta'     => array(),
-					) );
+					));
 
-					$container = $this->_get_node( $container_id );
+					$container = $this->_get_node($container_id);
 
 					// Link the container node if a grandparent node exists.
-					$grandparent = $this->_get_node( $parent->parent );
+					$grandparent = $this->_get_node($parent->parent);
 
-					if ( $grandparent ) {
+					if ($grandparent) {
 						$container->parent = $grandparent->id;
 
-						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						$index = array_search($parent, $grandparent->children, true);
+						if ($index === false)
 							$grandparent->children[] = $container;
 						else
-							array_splice( $grandparent->children, $index, 1, array( $container ) );
+							array_splice($grandparent->children, $index, 1, array($container));
 					}
 
 					$parent->parent = $container->id;
@@ -385,7 +385,7 @@ 
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root = $this->_get_node('root');
 		$this->bound = true;
 		return $root;
 	}
@@ -395,35 +395,35 @@ 
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
-	final protected function _render( $root ) {
+	final protected function _render($root) {
 		global $is_IE;
 
 		// Add browser classes.
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
-		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+		if ($is_IE) {
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7'))
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8'))
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 9'))
 				$class .= ' ie9';
-		} elseif ( wp_is_mobile() ) {
+		} elseif (wp_is_mobile()) {
 			$class .= ' mobile';
 		}
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<?php if ( ! is_admin() ) { ?>
-				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+			<?php if ( ! is_admin()) { ?>
+				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
 			<?php } ?>
-			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
-					$this->_render_group( $group );
+			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Toolbar'); ?>" tabindex="0">
+				<?php foreach ($root->children as $group) {
+					$this->_render_group($group);
 				} ?>
 			</div>
-			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<?php if (is_user_logged_in()) : ?>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url(wp_logout_url()); ?>"><?php _e('Log Out'); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -433,13 +433,13 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+	final protected function _render_container($node) {
+		if ($node->type != 'container' || empty($node->children))
 			return;
 
-		?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
-			foreach ( $node->children as $group ) {
-				$this->_render_group( $group );
+		?><div id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>" class="ab-group-container"><?php
+			foreach ($node->children as $group) {
+				$this->_render_group($group);
 			}
 		?></div><?php
 	}
@@ -447,22 +447,22 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_group( $node ) {
-		if ( $node->type == 'container' ) {
-			$this->_render_container( $node );
+	final protected function _render_group($node) {
+		if ($node->type == 'container') {
+			$this->_render_container($node);
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ($node->type != 'group' || empty($node->children))
 			return;
 
-		if ( ! empty( $node->meta['class'] ) )
-			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+		if ( ! empty($node->meta['class']))
+			$class = ' class="'.esc_attr(trim($node->meta['class'])).'"';
 		else
 			$class = '';
 
-		?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
-			foreach ( $node->children as $item ) {
-				$this->_render_item( $item );
+		?><ul id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $class; ?>><?php
+			foreach ($node->children as $item) {
+				$this->_render_item($item);
 			}
 		?></ul><?php
 	}
@@ -470,85 +470,85 @@ 
 	/**
 	 * @param object $node
 	 */
-	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+	final protected function _render_item($node) {
+		if ($node->type != 'item')
 			return;
 
-		$is_parent = ! empty( $node->children );
-		$has_link  = ! empty( $node->href );
+		$is_parent = ! empty($node->children);
+		$has_link  = ! empty($node->href);
 
 		// Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
-		$tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
-		$aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+		$tabindex = (isset($node->meta['tabindex']) && is_numeric($node->meta['tabindex'])) ? (int) $node->meta['tabindex'] : '';
+		$aria_attributes = ('' !== $tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 		$menuclass = '';
 
-		if ( $is_parent ) {
+		if ($is_parent) {
 			$menuclass = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty($node->meta['class']))
 			$menuclass .= $node->meta['class'];
 
-		if ( $menuclass )
-			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		if ($menuclass)
+			$menuclass = ' class="'.esc_attr(trim($menuclass)).'"';
 
 		?>
 
-		<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
-			if ( $has_link ):
-				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
-					if ( ! empty( $node->meta['onclick'] ) ) :
-						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+		<li id="<?php echo esc_attr('wp-admin-bar-'.$node->id); ?>"<?php echo $menuclass; ?>><?php
+			if ($has_link):
+				?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url($node->href) ?>"<?php
+					if ( ! empty($node->meta['onclick'])) :
+						?> onclick="<?php echo esc_js($node->meta['onclick']); ?>"<?php
 					endif;
-				if ( ! empty( $node->meta['target'] ) ) :
-					?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+				if ( ! empty($node->meta['target'])) :
+					?> target="<?php echo esc_attr($node->meta['target']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['rel'] ) ) :
-					?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+				if ( ! empty($node->meta['rel'])) :
+					?> rel="<?php echo esc_attr($node->meta['rel']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			else:
 				?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
-				if ( ! empty( $node->meta['title'] ) ) :
-					?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+				if ( ! empty($node->meta['title'])) :
+					?> title="<?php echo esc_attr($node->meta['title']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['lang'] ) ) :
-					?> lang="<?php echo esc_attr( $node->meta['lang'] ); ?>"<?php
+				if ( ! empty($node->meta['lang'])) :
+					?> lang="<?php echo esc_attr($node->meta['lang']); ?>"<?php
 				endif;
-				if ( ! empty( $node->meta['dir'] ) ) :
-					?> dir="<?php echo esc_attr( $node->meta['dir'] ); ?>"<?php
+				if ( ! empty($node->meta['dir'])) :
+					?> dir="<?php echo esc_attr($node->meta['dir']); ?>"<?php
 				endif;
 				?>><?php
 			endif;
 
 			echo $node->title;
 
-			if ( $has_link ) :
+			if ($has_link) :
 				?></a><?php
 			else:
 				?></div><?php
 			endif;
 
-			if ( $is_parent ) :
+			if ($is_parent) :
 				?><div class="ab-sub-wrapper"><?php
-					foreach ( $node->children as $group ) {
-						$this->_render_group( $group );
+					foreach ($node->children as $group) {
+						$this->_render_group($group);
 					}
 				?></div><?php
 			endif;
 
-			if ( ! empty( $node->meta['html'] ) )
+			if ( ! empty($node->meta['html']))
 				echo $node->meta['html'];
 
 			?>
@@ -559,9 +559,9 @@ 
 	 * @param string $id    Unused.
 	 * @param object $node
 	 */
-	public function recursive_render( $id, $node ) {
-		_deprecated_function( __METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
-		$this->_render_item( $node );
+	public function recursive_render($id, $node) {
+		_deprecated_function(__METHOD__, '3.3.0', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()');
+		$this->_render_item($node);
 	}
 
 	/**
@@ -569,32 +569,32 @@ 
 	 */
 	public function add_menus() {
 		// User related, aligned right.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_menu', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_search_menu', 4);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_account_item', 7);
 
 		// Site related.
-		add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
-		add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
+		add_action('admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0);
+		add_action('admin_bar_menu', 'wp_admin_bar_wp_menu', 10);
+		add_action('admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20);
+		add_action('admin_bar_menu', 'wp_admin_bar_site_menu', 30);
+		add_action('admin_bar_menu', 'wp_admin_bar_customize_menu', 40);
+		add_action('admin_bar_menu', 'wp_admin_bar_updates_menu', 50);
 
 		// Content related.
-		if ( ! is_network_admin() && ! is_user_admin() ) {
-			add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-			add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+		if ( ! is_network_admin() && ! is_user_admin()) {
+			add_action('admin_bar_menu', 'wp_admin_bar_comments_menu', 60);
+			add_action('admin_bar_menu', 'wp_admin_bar_new_content_menu', 70);
 		}
-		add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		add_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 
-		add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
+		add_action('admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200);
 
 		/**
 		 * Fires after menus are added to the menu bar.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'add_admin_bar_menus' );
+		do_action('add_admin_bar_menus');
 	}
 }

src/wp-includes/bookmark.php

Switch Indentation +18 added lines, -18 removed lines

@@ -354,24 +354,24 @@
  */
 function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
 	switch ( $field ) {
-	case 'link_id' : // ints
-	case 'link_rating' :
-		$value = (int) $value;
-		break;
-	case 'link_category' : // array( ints )
-		$value = array_map('absint', (array) $value);
-		// We return here so that the categories aren't filtered.
-		// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
-		return $value;
-
-	case 'link_visible' : // bool stored as Y|N
-		$value = preg_replace('/[^YNyn]/', '', $value);
-		break;
-	case 'link_target' : // "enum"
-		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
-		break;
+		case 'link_id' : // ints
+		case 'link_rating' :
+			$value = (int) $value;
+			break;
+		case 'link_category' : // array( ints )
+			$value = array_map('absint', (array) $value);
+			// We return here so that the categories aren't filtered.
+			// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+			return $value;
+
+		case 'link_visible' : // bool stored as Y|N
+			$value = preg_replace('/[^YNyn]/', '', $value);
+			break;
+		case 'link_target' : // "enum"
+			$targets = array('_top', '_blank');
+			if ( ! in_array($value, $targets) )
+				$value = '';
+			break;
 	}
 
 	if ( 'raw' == $context )

Braces +29 added lines, -20 removed lines

@@ -22,10 +22,11 @@ 
 	global $wpdb;
 
 	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
-			$_bookmark = & $GLOBALS['link'];
-		else
-			$_bookmark = null;
+		if ( isset($GLOBALS['link']) ) {
+					$_bookmark = & $GLOBALS['link'];
+		} else {
+					$_bookmark = null;
+		}
 	} elseif ( is_object($bookmark) ) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
@@ -41,8 +42,9 @@ 
 		}
 	}
 
-	if ( ! $_bookmark )
-		return $_bookmark;
+	if ( ! $_bookmark ) {
+			return $_bookmark;
+	}
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
@@ -71,14 +73,17 @@ 
 	$bookmark = (int) $bookmark;
 	$bookmark = get_bookmark( $bookmark );
 
-	if ( is_wp_error($bookmark) )
-		return $bookmark;
+	if ( is_wp_error($bookmark) ) {
+			return $bookmark;
+	}
 
-	if ( !is_object($bookmark) )
-		return '';
+	if ( !is_object($bookmark) ) {
+			return '';
+	}
 
-	if ( !isset($bookmark->$field) )
-		return '';
+	if ( !isset($bookmark->$field) ) {
+			return '';
+	}
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
 }
@@ -317,11 +322,13 @@ 
 
 	foreach ( $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
-				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			if ( isset($bookmark->$field) ) {
+							$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			}
 		} else {
-			if ( isset($bookmark[$field]) )
-				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			if ( isset($bookmark[$field]) ) {
+							$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			}
 		}
 	}
 
@@ -369,13 +376,15 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
+		if ( ! in_array($value, $targets) ) {
+					$value = '';
+		}
 		break;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	if ( 'edit' == $context ) {
 		/** This filter is documented in wp-includes/post.php */

Spacing +105 added lines, -105 removed lines

@@ -22,36 +22,36 @@ 
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
 
-	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
+	if (empty($bookmark)) {
+		if (isset($GLOBALS['link']))
 			$_bookmark = & $GLOBALS['link'];
 		else
 			$_bookmark = null;
-	} elseif ( is_object($bookmark) ) {
+	} elseif (is_object($bookmark)) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
 	} else {
-		if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
+		if (isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark)) {
 			$_bookmark = & $GLOBALS['link'];
-		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
+		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark')) {
 			$_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-			if ( $_bookmark ) {
-				$_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
-				wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+			if ($_bookmark) {
+				$_bookmark->link_category = array_unique(wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')));
+				wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
 			}
 		}
 	}
 
-	if ( ! $_bookmark )
+	if ( ! $_bookmark)
 		return $_bookmark;
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_bookmark;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return get_object_vars($_bookmark);
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		return array_values(get_object_vars($_bookmark));
 	} else {
 		return $_bookmark;
@@ -68,17 +68,17 @@ 
  * @param string $context Optional. The context of how the field will be used.
  * @return string|WP_Error
  */
-function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
+function get_bookmark_field($field, $bookmark, $context = 'display') {
 	$bookmark = (int) $bookmark;
-	$bookmark = get_bookmark( $bookmark );
+	$bookmark = get_bookmark($bookmark);
 
-	if ( is_wp_error($bookmark) )
+	if (is_wp_error($bookmark))
 		return $bookmark;
 
-	if ( !is_object($bookmark) )
+	if ( ! is_object($bookmark))
 		return '';
 
-	if ( !isset($bookmark->$field) )
+	if ( ! isset($bookmark->$field))
 		return '';
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
@@ -115,7 +115,7 @@ 
  * }
  * @return array List of bookmark row objects.
  */
-function get_bookmarks( $args = '' ) {
+function get_bookmarks($args = '') {
 	global $wpdb;
 
 	$defaults = array(
@@ -126,13 +126,13 @@ 
 		'exclude' => '', 'search' => ''
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$key = md5( serialize( $r ) );
+	$key = md5(serialize($r));
 	$cache = false;
-	if ( 'rand' !== $r['orderby'] && $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
-		if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
-			$bookmarks = $cache[ $key ];
+	if ('rand' !== $r['orderby'] && $cache = wp_cache_get('get_bookmarks', 'bookmark')) {
+		if (is_array($cache) && isset($cache[$key])) {
+			$bookmarks = $cache[$key];
 			/**
 			 * Filters the returned list of bookmarks.
 			 *
@@ -148,98 +148,98 @@ 
 			 * @param array $bookmarks List of the cached bookmarks.
 			 * @param array $r         An array of bookmark query arguments.
 			 */
-			return apply_filters( 'get_bookmarks', $bookmarks, $r );
+			return apply_filters('get_bookmarks', $bookmarks, $r);
 		}
 	}
 
-	if ( ! is_array( $cache ) ) {
+	if ( ! is_array($cache)) {
 		$cache = array();
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
-		$r['exclude'] = '';  //ignore exclude, category, and category_name params if using include
+	if ( ! empty($r['include'])) {
+		$r['exclude'] = ''; //ignore exclude, category, and category_name params if using include
 		$r['category'] = '';
 		$r['category_name'] = '';
-		$inclinks = preg_split( '/[\s,]+/', $r['include'] );
-		if ( count( $inclinks ) ) {
-			foreach ( $inclinks as $inclink ) {
-				if ( empty( $inclusions ) ) {
-					$inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+		$inclinks = preg_split('/[\s,]+/', $r['include']);
+		if (count($inclinks)) {
+			foreach ($inclinks as $inclink) {
+				if (empty($inclusions)) {
+					$inclusions = ' AND ( link_id = '.intval($inclink).' ';
 				} else {
-					$inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+					$inclusions .= ' OR link_id = '.intval($inclink).' ';
 				}
 			}
 		}
 	}
-	if (! empty( $inclusions ) ) {
+	if ( ! empty($inclusions)) {
 		$inclusions .= ')';
 	}
 
 	$exclusions = '';
-	if ( ! empty( $r['exclude'] ) ) {
-		$exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
-		if ( count( $exlinks ) ) {
-			foreach ( $exlinks as $exlink ) {
-				if ( empty( $exclusions ) ) {
-					$exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+	if ( ! empty($r['exclude'])) {
+		$exlinks = preg_split('/[\s,]+/', $r['exclude']);
+		if (count($exlinks)) {
+			foreach ($exlinks as $exlink) {
+				if (empty($exclusions)) {
+					$exclusions = ' AND ( link_id <> '.intval($exlink).' ';
 				} else {
-					$exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+					$exclusions .= ' AND link_id <> '.intval($exlink).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $exclusions ) ) {
+	if ( ! empty($exclusions)) {
 		$exclusions .= ')';
 	}
 
-	if ( ! empty( $r['category_name'] ) ) {
-		if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) {
+	if ( ! empty($r['category_name'])) {
+		if ($r['category'] = get_term_by('name', $r['category_name'], 'link_category')) {
 			$r['category'] = $r['category']->term_id;
 		} else {
-			$cache[ $key ] = array();
-			wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+			$cache[$key] = array();
+			wp_cache_set('get_bookmarks', $cache, 'bookmark');
 			/** This filter is documented in wp-includes/bookmark.php */
-			return apply_filters( 'get_bookmarks', array(), $r );
+			return apply_filters('get_bookmarks', array(), $r);
 		}
 	}
 
 	$search = '';
-	if ( ! empty( $r['search'] ) ) {
-		$like = '%' . $wpdb->esc_like( $r['search'] ) . '%';
-		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like );
+	if ( ! empty($r['search'])) {
+		$like = '%'.$wpdb->esc_like($r['search']).'%';
+		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like);
 	}
 
 	$category_query = '';
 	$join = '';
-	if ( ! empty( $r['category'] ) ) {
-		$incategories = preg_split( '/[\s,]+/', $r['category'] );
-		if ( count($incategories) ) {
-			foreach ( $incategories as $incat ) {
-				if ( empty( $category_query ) ) {
-					$category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+	if ( ! empty($r['category'])) {
+		$incategories = preg_split('/[\s,]+/', $r['category']);
+		if (count($incategories)) {
+			foreach ($incategories as $incat) {
+				if (empty($category_query)) {
+					$category_query = ' AND ( tt.term_id = '.intval($incat).' ';
 				} else {
-					$category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+					$category_query .= ' OR tt.term_id = '.intval($incat).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $category_query ) ) {
+	if ( ! empty($category_query)) {
 		$category_query .= ") AND taxonomy = 'link_category'";
 		$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
 	}
 
-	if ( $r['show_updated'] ) {
+	if ($r['show_updated']) {
 		$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
 	} else {
 		$recently_updated_test = '';
 	}
 
-	$get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+	$get_updated = ($r['show_updated']) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
 
-	$orderby = strtolower( $r['orderby'] );
+	$orderby = strtolower($r['orderby']);
 	$length = '';
-	switch ( $orderby ) {
+	switch ($orderby) {
 		case 'length':
 			$length = ", CHAR_LENGTH(link_name) AS length";
 			break;
@@ -251,49 +251,49 @@ 
 			break;
 		default:
 			$orderparams = array();
-			$keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' );
-			foreach ( explode( ',', $orderby ) as $ordparam ) {
-				$ordparam = trim( $ordparam );
+			$keys = array('link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description');
+			foreach (explode(',', $orderby) as $ordparam) {
+				$ordparam = trim($ordparam);
 
-				if ( in_array( 'link_' . $ordparam, $keys ) ) {
-					$orderparams[] = 'link_' . $ordparam;
-				} elseif ( in_array( $ordparam, $keys ) ) {
+				if (in_array('link_'.$ordparam, $keys)) {
+					$orderparams[] = 'link_'.$ordparam;
+				} elseif (in_array($ordparam, $keys)) {
 					$orderparams[] = $ordparam;
 				}
 			}
-			$orderby = implode( ',', $orderparams );
+			$orderby = implode(',', $orderparams);
 	}
 
-	if ( empty( $orderby ) ) {
+	if (empty($orderby)) {
 		$orderby = 'link_name';
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
+	$order = strtoupper($r['order']);
+	if ('' !== $order && ! in_array($order, array('ASC', 'DESC'))) {
 		$order = 'ASC';
 	}
 
 	$visible = '';
-	if ( $r['hide_invisible'] ) {
+	if ($r['hide_invisible']) {
 		$visible = "AND link_visible = 'Y'";
 	}
 
 	$query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
 	$query .= " $exclusions $inclusions $search";
 	$query .= " ORDER BY $orderby $order";
-	if ( $r['limit'] != -1 ) {
-		$query .= ' LIMIT ' . $r['limit'];
+	if ($r['limit'] != -1) {
+		$query .= ' LIMIT '.$r['limit'];
 	}
 
-	$results = $wpdb->get_results( $query );
+	$results = $wpdb->get_results($query);
 
-	if ( 'rand()' !== $orderby ) {
-		$cache[ $key ] = $results;
-		wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+	if ('rand()' !== $orderby) {
+		$cache[$key] = $results;
+		wp_cache_set('get_bookmarks', $cache, 'bookmark');
 	}
 
 	/** This filter is documented in wp-includes/bookmark.php */
-	return apply_filters( 'get_bookmarks', $results, $r );
+	return apply_filters('get_bookmarks', $results, $r);
 }
 
 /**
@@ -309,9 +309,9 @@ 
 function sanitize_bookmark($bookmark, $context = 'display') {
 	$fields = array('link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
 		'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
-		'link_rel', 'link_notes', 'link_rss', );
+		'link_rel', 'link_notes', 'link_rss',);
 
-	if ( is_object($bookmark) ) {
+	if (is_object($bookmark)) {
 		$do_object = true;
 		$link_id = $bookmark->link_id;
 	} else {
@@ -319,12 +319,12 @@ 
 		$link_id = $bookmark['link_id'];
 	}
 
-	foreach ( $fields as $field ) {
-		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
+	foreach ($fields as $field) {
+		if ($do_object) {
+			if (isset($bookmark->$field))
 				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
 		} else {
-			if ( isset($bookmark[$field]) )
+			if (isset($bookmark[$field]))
 				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
 		}
 	}
@@ -356,8 +356,8 @@ 
  *                            'js', 'db', or 'display'
  * @return mixed The filtered value.
  */
-function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
-	switch ( $field ) {
+function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
+	switch ($field) {
 	case 'link_id' : // ints
 	case 'link_rating' :
 		$value = (int) $value;
@@ -373,34 +373,34 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
+		if ( ! in_array($value, $targets))
 			$value = '';
 		break;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "edit_{$field}", $value, $bookmark_id );
+		$value = apply_filters("edit_{$field}", $value, $bookmark_id);
 
-		if ( 'link_notes' == $field ) {
-			$value = esc_html( $value ); // textarea_escaped
+		if ('link_notes' == $field) {
+			$value = esc_html($value); // textarea_escaped
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
+	} elseif ('db' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "pre_{$field}", $value );
+		$value = apply_filters("pre_{$field}", $value);
 	} else {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "{$field}", $value, $bookmark_id, $context );
+		$value = apply_filters("{$field}", $value, $bookmark_id, $context);
 
-		if ( 'attribute' == $context ) {
-			$value = esc_attr( $value );
-		} elseif ( 'js' == $context ) {
-			$value = esc_js( $value );
+		if ('attribute' == $context) {
+			$value = esc_attr($value);
+		} elseif ('js' == $context) {
+			$value = esc_js($value);
 		}
 	}
 
@@ -414,8 +414,8 @@ 
  *
  * @param int $bookmark_id Bookmark ID.
  */
-function clean_bookmark_cache( $bookmark_id ) {
-	wp_cache_delete( $bookmark_id, 'bookmark' );
-	wp_cache_delete( 'get_bookmarks', 'bookmark' );
-	clean_object_term_cache( $bookmark_id, 'link');
+function clean_bookmark_cache($bookmark_id) {
+	wp_cache_delete($bookmark_id, 'bookmark');
+	wp_cache_delete('get_bookmarks', 'bookmark');
+	clean_object_term_cache($bookmark_id, 'link');
 }