ntwb / wordpress

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 +70 added lines, -70 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,12 +55,12 @@ 
  * @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' );
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
+function the_author($deprecated = '', $deprecated_echo = true) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.1');
+	if ($deprecated_echo !== true)
+		_deprecated_argument(__FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.'));
+	if ($deprecated_echo)
 		echo get_the_author();
 	return get_the_author();
 }
@@ -73,7 +73,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);
 
 		/**
@@ -110,20 +110,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.
@@ -137,7 +137,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);
 }
 
 /**
@@ -150,8 +150,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.
@@ -163,7 +163,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);
 }
 
 /**
@@ -176,8 +176,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();
 	}
@@ -206,10 +206,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);
 }
 
 /**
@@ -237,18 +237,18 @@ 
  * @param string $deprecated Deprecated.
  */
 function the_author_posts_link($deprecated = '') {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.1' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.1');
 
 	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()
 	);
 
@@ -259,7 +259,7 @@ 
 	 *
 	 * @param string $link HTML link.
 	 */
-	echo apply_filters( 'the_author_posts_link', $link );
+	echo apply_filters('the_author_posts_link', $link);
 }
 
 /**
@@ -276,17 +276,17 @@ 
 	$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));
 	}
 
 	/**
@@ -298,7 +298,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;
 }
@@ -338,7 +338,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(
@@ -349,89 +349,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;
@@ -451,10 +451,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);
 	}
 
 	/**
@@ -464,7 +464,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);
 }
 
 /**
@@ -473,5 +473,5 @@ 
  * @private
  */
 function __clear_multi_author_cache() {
-	delete_transient( 'is_multi_author' );
+	delete_transient('is_multi_author');
 }

Braces +21 added lines, -14 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.
@@ -56,12 +57,15 @@ 
  * @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' );
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
-		echo get_the_author();
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.1' );
+	}
+	if ( $deprecated_echo !== true ) {
+			_deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
+	}
+	if ( $deprecated_echo ) {
+			echo get_the_author();
+	}
 	return get_the_author();
 }
 
@@ -120,8 +124,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 : '';
 
@@ -237,8 +242,9 @@ 
  * @param string $deprecated Deprecated.
  */
 function the_author_posts_link($deprecated = '') {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.1' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.1' );
+	}
 
 	global $authordata;
 	if ( ! is_object( $authordata ) ) {
@@ -282,8 +288,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 +296 added lines, -296 removed lines

@@ -38,20 +38,20 @@ 
  * @param string $regex Regular expression to substitute the tag for in rewrite rules.
  * @param string $query String to append to the rewritten query. Must end in '='. Optional.
  */
-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);
 }
 
 /**
@@ -66,16 +66,16 @@ 
  * @param array  $args   Optional configuration for building the rules from the permalink structure,
  *                       see {@link WP_Rewrite::add_permastruct()} for full details.
  */
-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);
 }
 
 /**
@@ -91,9 +91,9 @@ 
  */
 function add_feed($feedname, $function) {
 	global $wp_rewrite;
-	if ( ! in_array($feedname, $wp_rewrite->feeds) ) //override the file if it is
+	if ( ! in_array($feedname, $wp_rewrite->feeds)) //override the file if it is
 		$wp_rewrite->feeds[] = $feedname;
-	$hook = 'do_feed_' . $feedname;
+	$hook = 'do_feed_'.$feedname;
 	// Remove default function hook
 	remove_action($hook, $hook);
 	add_action($hook, $function, 10, 1);
@@ -110,9 +110,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);
 }
 
 /**
@@ -218,14 +218,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);
 
 /**
  * Add an endpoint, like /trackback/.
@@ -259,9 +259,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);
 }
 
 /**
@@ -275,10 +275,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;
 }
@@ -305,16 +305,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;
 	}
 
@@ -325,35 +325,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;
 		}
 	}
@@ -363,33 +363,33 @@ 
 	 * 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'];
 	}
 
-	$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;
@@ -411,7 +411,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;
 
 	/**
@@ -421,12 +421,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;
 	}
 
@@ -434,7 +434,7 @@ 
 	$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;
 
 	// Get rid of the #anchor
@@ -446,25 +446,25 @@ 
 	$url = $url_split[0];
 
 	// 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);
 
 	// 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
@@ -473,25 +473,25 @@ 
 	$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.
-				if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+				if ( ! get_page_by_path($matches[$varmatch[1]]))
 					continue;
 			}
 
@@ -504,12 +504,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;
 					}
@@ -517,11 +517,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;
@@ -882,7 +882,7 @@ 
 	 * @since 1.5.0
 	 * @var array
 	 */
-	public $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+	public $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
 	/**
 	 * Whether permalinks are being used.
@@ -909,11 +909,11 @@ 
 	 * @return bool
 	 */
 	public function using_index_permalinks() {
-		if ( empty( $this->permalink_structure ) ) {
+		if (empty($this->permalink_structure)) {
 			return false;
 		}
 		// If the index is not in the permalink, we're using mod_rewrite.
-		return preg_match( '#^/*' . $this->index . '#', $this->permalink_structure );
+		return preg_match('#^/*'.$this->index.'#', $this->permalink_structure);
 	}
 
 	/**
@@ -950,8 +950,8 @@ 
 		$match_prefix = '$';
 		$match_suffix = '';
 
-		if ( ! empty($this->matches) ) {
-			$match_prefix = '$' . $this->matches . '[';
+		if ( ! empty($this->matches)) {
+			$match_prefix = '$'.$this->matches.'[';
 			$match_suffix = ']';
 		}
 
@@ -976,11 +976,11 @@ 
 
 		//get pages in order of hierarchy, i.e. children after parents
 		$pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");
-		$posts = get_page_hierarchy( $pages );
+		$posts = get_page_hierarchy($pages);
 
 		// If we have no pages get out quick
-		if ( !$posts )
-			return array( array(), array() );
+		if ( ! $posts)
+			return array(array(), array());
 
 		//now reverse it, because we need parents after children for rewrite rules to work properly
 		$posts = array_reverse($posts, true);
@@ -988,12 +988,12 @@ 
 		$page_uris = array();
 		$page_attachment_uris = array();
 
-		foreach ( $posts as $id => $post ) {
+		foreach ($posts as $id => $post) {
 			// URL => page name
 			$uri = get_page_uri($id);
-			$attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ));
-			if ( !empty($attachments) ) {
-				foreach ( $attachments as $attachment ) {
+			$attachments = $wpdb->get_results($wpdb->prepare("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id));
+			if ( ! empty($attachments)) {
+				foreach ($attachments as $attachment) {
 					$attach_uri = get_page_uri($attachment->ID);
 					$page_attachment_uris[$attach_uri] = $attachment->ID;
 				}
@@ -1002,7 +1002,7 @@ 
 			$page_uris[$uri] = $id;
 		}
 
-		return array( $page_uris, $page_attachment_uris );
+		return array($page_uris, $page_attachment_uris);
 	}
 
 	/**
@@ -1015,9 +1015,9 @@ 
 	 */
 	public function page_rewrite_rules() {
 		// the extra .? at the beginning prevents clashes with other regular expressions in the rules array
-		$this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );
+		$this->add_rewrite_tag('%pagename%', '(.?.+?)', 'pagename=');
 
-		return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES, true, true, false, false );
+		return $this->generate_rewrite_rules($this->get_page_permastruct(), EP_PAGES, true, true, false, false);
 	}
 
 	/**
@@ -1041,10 +1041,10 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
+		if (isset($this->date_structure))
 			return $this->date_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->date_structure = '';
 			return false;
 		}
@@ -1055,14 +1055,14 @@ 
 		$this->date_structure = '';
 		$date_endian = '';
 
-		foreach ( $endians as $endian ) {
-			if ( false !== strpos($this->permalink_structure, $endian) ) {
-				$date_endian= $endian;
+		foreach ($endians as $endian) {
+			if (false !== strpos($this->permalink_structure, $endian)) {
+				$date_endian = $endian;
 				break;
 			}
 		}
 
-		if ( empty($date_endian) )
+		if (empty($date_endian))
 			$date_endian = '%year%/%monthnum%/%day%';
 
 		// Do not allow the date tags and %post_id% to overlap in the permalink
@@ -1070,15 +1070,15 @@ 
 		$front = $this->front;
 		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
 		$tok_index = 1;
-		foreach ( (array) $tokens[0] as $token) {
-			if ( '%post_id%' == $token && ($tok_index <= 3) ) {
-				$front = $front . 'date/';
+		foreach ((array) $tokens[0] as $token) {
+			if ('%post_id%' == $token && ($tok_index <= 3)) {
+				$front = $front.'date/';
 				break;
 			}
 			$tok_index++;
 		}
 
-		$this->date_structure = $front . $date_endian;
+		$this->date_structure = $front.$date_endian;
 
 		return $this->date_structure;
 	}
@@ -1097,7 +1097,7 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%monthnum%', '', $structure);
@@ -1121,7 +1121,7 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%day%', '', $structure);
@@ -1188,10 +1188,10 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return false;
 
-		if ( isset($this->extra_permastructs[$name]) )
+		if (isset($this->extra_permastructs[$name]))
 			return $this->extra_permastructs[$name]['struct'];
 
 		return false;
@@ -1210,15 +1210,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
+		if (isset($this->author_structure))
 			return $this->author_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->author_structure = '';
 			return false;
 		}
 
-		$this->author_structure = $this->front . $this->author_base . '/%author%';
+		$this->author_structure = $this->front.$this->author_base.'/%author%';
 
 		return $this->author_structure;
 	}
@@ -1236,15 +1236,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
+		if (isset($this->search_structure))
 			return $this->search_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->search_structure = '';
 			return false;
 		}
 
-		$this->search_structure = $this->root . $this->search_base . '/%search%';
+		$this->search_structure = $this->root.$this->search_base.'/%search%';
 
 		return $this->search_structure;
 	}
@@ -1262,7 +1262,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
+		if (isset($this->page_structure))
 			return $this->page_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -1270,7 +1270,7 @@ 
 			return false;
 		}
 
-		$this->page_structure = $this->root . '%pagename%';
+		$this->page_structure = $this->root.'%pagename%';
 
 		return $this->page_structure;
 	}
@@ -1288,15 +1288,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
+		if (isset($this->feed_structure))
 			return $this->feed_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->feed_structure = '';
 			return false;
 		}
 
-		$this->feed_structure = $this->root . $this->feed_base . '/%feed%';
+		$this->feed_structure = $this->root.$this->feed_base.'/%feed%';
 
 		return $this->feed_structure;
 	}
@@ -1314,7 +1314,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
+		if (isset($this->comment_feed_structure))
 			return $this->comment_feed_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -1322,7 +1322,7 @@ 
 			return false;
 		}
 
-		$this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+		$this->comment_feed_structure = $this->root.$this->comments_base.'/'.$this->feed_base.'/%feed%';
 
 		return $this->comment_feed_structure;
 	}
@@ -1343,11 +1343,11 @@ 
 	 * @param string $regex Regular expression to substitute the tag for in rewrite rules.
 	 * @param string $query String to append to the rewritten query. Must end in '='.
 	 */
-	public function add_rewrite_tag( $tag, $regex, $query ) {
-		$position = array_search( $tag, $this->rewritecode );
-		if ( false !== $position && null !== $position ) {
-			$this->rewritereplace[ $position ] = $regex;
-			$this->queryreplace[ $position ] = $query;
+	public function add_rewrite_tag($tag, $regex, $query) {
+		$position = array_search($tag, $this->rewritecode);
+		if (false !== $position && null !== $position) {
+			$this->rewritereplace[$position] = $regex;
+			$this->queryreplace[$position] = $query;
 		} else {
 			$this->rewritecode[] = $tag;
 			$this->rewritereplace[] = $regex;
@@ -1378,28 +1378,28 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		//build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
-		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
+		foreach ((array) $this->feeds as $feed_name)
+			$feedregex2 .= $feed_name.'|';
+		$feedregex2 = '('.trim($feedregex2, '|').')/?$';
 
 		//$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
 		//and <permalink>/atom are both possible
-		$feedregex = $this->feed_base . '/' . $feedregex2;
+		$feedregex = $this->feed_base.'/'.$feedregex2;
 
 		//build a regex to match the trackback and page/xx parts of URLs
 		$trackbackregex = 'trackback/?$';
-		$pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-		$commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
+		$pageregex = $this->pagination_base.'/?([0-9]{1,})/?$';
+		$commentregex = $this->comments_pagination_base.'-([0-9]{1,})/?$';
 
 		//build up an array of endpoint regexes to append => queries to append
-		if ( $endpoints ) {
-			$ep_query_append = array ();
-			foreach ( (array) $this->endpoints as $endpoint) {
+		if ($endpoints) {
+			$ep_query_append = array();
+			foreach ((array) $this->endpoints as $endpoint) {
 				//match everything after the endpoint name, but allow for nothing to appear there
-				$epmatch = $endpoint[1] . '(/(.*))?/?$';
+				$epmatch = $endpoint[1].'(/(.*))?/?$';
 				//this will be appended on to the rest of the query for each dir
-				$epquery = '&' . $endpoint[2] . '=';
-				$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
+				$epquery = '&'.$endpoint[2].'=';
+				$ep_query_append[$epmatch] = array($endpoint[0], $epquery);
 			}
 		}
 
@@ -1416,26 +1416,26 @@ 
 		//build a list from the rewritecode and queryreplace arrays, that will look something like
 		//tagname=$matches[i] where i is the current $i
 		$queries = array();
-		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
+		for ($i = 0; $i < $num_tokens; ++$i) {
+			if (0 < $i)
+				$queries[$i] = $queries[$i - 1].'&';
 			else
 				$queries[$i] = '';
 
-			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
+			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]).$this->preg_index($i + 1);
 			$queries[$i] .= $query_token;
 		}
 
 		//get the structure, minus any cruft (stuff that isn't tags) at the front
 		$structure = $permalink_structure;
-		if ( $front != '/' )
+		if ($front != '/')
 			$structure = str_replace($front, '', $structure);
 
 		//create a list of dirs to walk over, making rewrite rules for each level
 		//so for example, a $structure of /%year%/%monthnum%/%postname% would create
 		//rewrite rules for /%year%/, /%year%/%monthnum%/ and /%year%/%monthnum%/%postname%
 		$structure = trim($structure, '/');
-		$dirs = $walk_dirs ? explode('/', $structure) : array( $structure );
+		$dirs = $walk_dirs ? explode('/', $structure) : array($structure);
 		$num_dirs = count($dirs);
 
 		//strip slashes from the front of $front
@@ -1444,9 +1444,9 @@ 
 		//the main workhorse loop
 		$post_rewrite = array();
 		$struct = $front;
-		for ( $j = 0; $j < $num_dirs; ++$j ) {
+		for ($j = 0; $j < $num_dirs; ++$j) {
 			//get the struct for this dir, and trim slashes off the front
-			$struct .= $dirs[$j] . '/'; //accumulate. see comment near explode('/', $structure) above
+			$struct .= $dirs[$j].'/'; //accumulate. see comment near explode('/', $structure) above
 			$struct = ltrim($struct, '/');
 
 			//replace tags with regexes
@@ -1456,10 +1456,10 @@ 
 			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
 
 			//get the 'tagname=$matches[i]'
-			$query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
+			$query = ( ! empty($num_toks) && isset($queries[$num_toks - 1])) ? $queries[$num_toks - 1] : '';
 
 			//set up $ep_mask_specific which is used to match more specific URL types
-			switch ( $dirs[$j] ) {
+			switch ($dirs[$j]) {
 				case '%year%':
 					$ep_mask_specific = EP_YEAR;
 					break;
@@ -1474,57 +1474,57 @@ 
 			}
 
 			//create query for /page/xx
-			$pagematch = $match . $pageregex;
-			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+			$pagematch = $match.$pageregex;
+			$pagequery = $index.'?'.$query.'&paged='.$this->preg_index($num_toks + 1);
 
 			//create query for /comment-page-xx
-			$commentmatch = $match . $commentregex;
-			$commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
+			$commentmatch = $match.$commentregex;
+			$commentquery = $index.'?'.$query.'&cpage='.$this->preg_index($num_toks + 1);
 
-			if ( get_option('page_on_front') ) {
+			if (get_option('page_on_front')) {
 				//create query for Root /comment-page-xx
-				$rootcommentmatch = $match . $commentregex;
-				$rootcommentquery = $index . '?' . $query . '&page_id=' . get_option('page_on_front') . '&cpage=' . $this->preg_index($num_toks + 1);
+				$rootcommentmatch = $match.$commentregex;
+				$rootcommentquery = $index.'?'.$query.'&page_id='.get_option('page_on_front').'&cpage='.$this->preg_index($num_toks + 1);
 			}
 
 			//create query for /feed/(feed|atom|rss|rss2|rdf)
-			$feedmatch = $match . $feedregex;
-			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch = $match.$feedregex;
+			$feedquery = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			//create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex)
-			$feedmatch2 = $match . $feedregex2;
-			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch2 = $match.$feedregex2;
+			$feedquery2 = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			//if asked to, turn the feed queries into comment feed ones
-			if ( $forcomments ) {
+			if ($forcomments) {
 				$feedquery .= '&withcomments=1';
 				$feedquery2 .= '&withcomments=1';
 			}
 
 			//start creating the array of rewrites for this dir
 			$rewrite = array();
-			if ( $feed ) //...adding on /feed/ regexes => queries
+			if ($feed) //...adding on /feed/ regexes => queries
 				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
-			if ( $paged ) //...and /page/xx ones
+			if ($paged) //...and /page/xx ones
 				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 
 			//only on pages with comments add ../comment-page-xx/
-			if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
+			if (EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask) {
 				$rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
-			} elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
+			} elseif (EP_ROOT & $ep_mask && get_option('page_on_front')) {
 				$rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
 			}
 			//do endpoints
-			if ( $endpoints ) {
-				foreach ( (array) $ep_query_append as $regex => $ep) {
+			if ($endpoints) {
+				foreach ((array) $ep_query_append as $regex => $ep) {
 					//add the endpoints on if the mask fits
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific)
+						$rewrite[$match.$regex] = $index.'?'.$query.$ep[1].$this->preg_index($num_toks + 2);
 				}
 			}
 
 			//if we've got some tags in this dir
-			if ( $num_toks ) {
+			if ($num_toks) {
 				$post = false;
 				$page = false;
 
@@ -1532,64 +1532,64 @@ 
 				//individual post. Do this by checking it contains at least one of 1) post name,
 				//2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
 				//minute all present). Set these flags now as we need them for the endpoints.
-				if ( strpos($struct, '%postname%') !== false
+				if (strpos($struct, '%postname%') !== false
 						|| strpos($struct, '%post_id%') !== false
 						|| strpos($struct, '%pagename%') !== false
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
+					if (strpos($struct, '%pagename%') !== false)
 						$page = true;
 				}
 
-				if ( ! $post ) {
+				if ( ! $post) {
 					// For custom post types, we need to add on endpoints as well.
-					foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
-						if ( strpos($struct, "%$ptype%") !== false ) {
+					foreach (get_post_types(array('_builtin' => false)) as $ptype) {
+						if (strpos($struct, "%$ptype%") !== false) {
 							$post = true;
-							$page = is_post_type_hierarchical( $ptype ); // This is for page style attachment url's
+							$page = is_post_type_hierarchical($ptype); // This is for page style attachment url's
 							break;
 						}
 					}
 				}
 
 				//if we're creating rules for a permalink, do all the endpoints like attachments etc
-				if ( $post ) {
+				if ($post) {
 					//create query and regex for trackback
-					$trackbackmatch = $match . $trackbackregex;
-					$trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
+					$trackbackmatch = $match.$trackbackregex;
+					$trackbackquery = $trackbackindex.'?'.$query.'&tb=1';
 					//trim slashes from the end of the regex for this dir
 					$match = rtrim($match, '/');
 					//get rid of brackets
-					$submatchbase = str_replace( array('(', ')'), '', $match);
+					$submatchbase = str_replace(array('(', ')'), '', $match);
 
 					//add a rule for at attachments, which take the form of <permalink>/some-text
-					$sub1 = $submatchbase . '/([^/]+)/';
-					$sub1tb = $sub1 . $trackbackregex; //add trackback regex <permalink>/trackback/...
-					$sub1feed = $sub1 . $feedregex; //and <permalink>/feed/(atom|...)
-					$sub1feed2 = $sub1 . $feedregex2; //and <permalink>/(feed|atom...)
-					$sub1comment = $sub1 . $commentregex; //and <permalink>/comment-page-xx
+					$sub1 = $submatchbase.'/([^/]+)/';
+					$sub1tb = $sub1.$trackbackregex; //add trackback regex <permalink>/trackback/...
+					$sub1feed = $sub1.$feedregex; //and <permalink>/feed/(atom|...)
+					$sub1feed2 = $sub1.$feedregex2; //and <permalink>/(feed|atom...)
+					$sub1comment = $sub1.$commentregex; //and <permalink>/comment-page-xx
 
 					//add another rule to match attachments in the explicit form:
 					//<permalink>/attachment/some-text
-					$sub2 = $submatchbase . '/attachment/([^/]+)/';
-					$sub2tb = $sub2 . $trackbackregex; //and add trackbacks <permalink>/attachment/trackback
-					$sub2feed = $sub2 . $feedregex;    //feeds, <permalink>/attachment/feed/(atom|...)
-					$sub2feed2 = $sub2 . $feedregex2;  //and feeds again on to this <permalink>/attachment/(feed|atom...)
-					$sub2comment = $sub2 . $commentregex; //and <permalink>/comment-page-xx
+					$sub2 = $submatchbase.'/attachment/([^/]+)/';
+					$sub2tb = $sub2.$trackbackregex; //and add trackbacks <permalink>/attachment/trackback
+					$sub2feed = $sub2.$feedregex; //feeds, <permalink>/attachment/feed/(atom|...)
+					$sub2feed2 = $sub2.$feedregex2; //and feeds again on to this <permalink>/attachment/(feed|atom...)
+					$sub2comment = $sub2.$commentregex; //and <permalink>/comment-page-xx
 
 					//create queries for these extra tag-ons we've just dealt with
-					$subquery = $index . '?attachment=' . $this->preg_index(1);
-					$subtbquery = $subquery . '&tb=1';
-					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-					$subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
+					$subquery = $index.'?attachment='.$this->preg_index(1);
+					$subtbquery = $subquery.'&tb=1';
+					$subfeedquery = $subquery.'&feed='.$this->preg_index(2);
+					$subcommentquery = $subquery.'&cpage='.$this->preg_index(2);
 
 					//do endpoints for attachments
-					if ( !empty($endpoints) ) {
-						foreach ( (array) $ep_query_append as $regex => $ep ) {
-							if ( $ep[0] & EP_ATTACHMENT ) {
-								$rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
-								$rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
+					if ( ! empty($endpoints)) {
+						foreach ((array) $ep_query_append as $regex => $ep) {
+							if ($ep[0] & EP_ATTACHMENT) {
+								$rewrite[$sub1.$regex] = $subquery.$ep[1].$this->preg_index(3);
+								$rewrite[$sub2.$regex] = $subquery.$ep[1].$this->preg_index(3);
 							}
 						}
 					}
@@ -1601,12 +1601,12 @@ 
 					$sub2 .= '?$';
 
 					//post pagination, e.g. <permalink>/2/
-					$match = $match . '(/[0-9]+)?/?$';
-					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+					$match = $match.'(/[0-9]+)?/?$';
+					$query = $index.'?'.$query.'&page='.$this->preg_index($num_toks + 1);
 				} else { //not matching a permalink so this is a lot simpler
 					//close the match and finalise the query
 					$match .= '?$';
-					$query = $index . '?' . $query;
+					$query = $index.'?'.$query;
 				}
 
 				//create the final array for this dir by joining the $rewrite array (which currently
@@ -1615,12 +1615,12 @@ 
 				$rewrite = array_merge($rewrite, array($match => $query));
 
 				//if we're matching a permalink, add those extras (attachments etc) on
-				if ( $post ) {
+				if ($post) {
 					//add trackback
 					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
 
 					//add regexes/queries for attachments, attachment trackbacks and so on
-					if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
+					if ( ! $page) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
 						$rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery, $sub1comment => $subcommentquery));
 					$rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery), $rewrite);
 				}
@@ -1671,29 +1671,29 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return $rewrite;
 
 		// robots.txt -only if installed at the root
-		$home_path = parse_url( home_url() );
-		$robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
+		$home_path = parse_url(home_url());
+		$robots_rewrite = (empty($home_path['path']) || '/' == $home_path['path']) ? array('robots\.txt$' => $this->index.'?robots=1') : array();
 
 		// Old feed and service files
 		$deprecated_files = array(
-			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
-			'.*wp-app\.php(/.*)?$' => $this->index . '?error=403',
+			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index.'?feed=old',
+			'.*wp-app\.php(/.*)?$' => $this->index.'?error=403',
 		);
 
 		// Registration rules
 		$registration_pages = array();
-		if ( is_multisite() && is_main_site() ) {
-			$registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
-			$registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
+		if (is_multisite() && is_main_site()) {
+			$registration_pages['.*wp-signup.php$'] = $this->index.'?signup=true';
+			$registration_pages['.*wp-activate.php$'] = $this->index.'?activate=true';
 		}
-		$registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
+		$registration_pages['.*wp-register.php$'] = $this->index.'?register=true'; // Deprecated
 
 		// Post rewrite rules.
-		$post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK );
+		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
 
 		/**
 		 * Filter rewrite rules used for "post" archives.
@@ -1702,7 +1702,7 @@ 
 		 *
 		 * @param array $post_rewrite The rewrite rules for posts.
 		 */
-		$post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
+		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
 
 		// Date rewrite rules.
 		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
@@ -1716,10 +1716,10 @@ 
 		 *
 		 * @param array $date_rewrite The rewrite rules for date archives.
 		 */
-		$date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
+		$date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
 
 		// Root-level rewrite rules.
-		$root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
+		$root_rewrite = $this->generate_rewrite_rules($this->root.'/', EP_ROOT);
 
 		/**
 		 * Filter rewrite rules used for root-level archives.
@@ -1731,10 +1731,10 @@ 
 		 *
 		 * @param array $root_rewrite The root-level rewrite rules.
 		 */
-		$root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
+		$root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
 
 		// Comments rewrite rules.
-		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false);
+		$comments_rewrite = $this->generate_rewrite_rules($this->root.$this->comments_base, EP_COMMENTS, false, true, true, false);
 
 		/**
 		 * Filter rewrite rules used for comment feed archives.
@@ -1745,7 +1745,7 @@ 
 		 *
 		 * @param array $comments_rewrite The rewrite rules for the site-wide comments feeds.
 		 */
-		$comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite );
+		$comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
 
 		// Search rewrite rules.
 		$search_structure = $this->get_search_permastruct();
@@ -1761,7 +1761,7 @@ 
 		 *
 		 * @param array $search_rewrite The rewrite rules for search queries.
 		 */
-		$search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
+		$search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
 		// Author rewrite rules.
 		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
@@ -1776,7 +1776,7 @@ 
 		 *
 		 * @param array $author_rewrite The rewrite rules for author archives.
 		 */
-		$author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite );
+		$author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
 
 		// Pages rewrite rules.
 		$page_rewrite = $this->page_rewrite_rules();
@@ -1788,17 +1788,17 @@ 
 		 *
 		 * @param array $page_rewrite The rewrite rules for the "page" post type.
 		 */
-		$page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite );
+		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
 		// Extra permastructs.
-		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
-			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+		foreach ($this->extra_permastructs as $permastructname => $struct) {
+			if (is_array($struct)) {
+				if (count($struct) == 2)
+					$rules = $this->generate_rewrite_rules($struct[0], $struct[1]);
 				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+					$rules = $this->generate_rewrite_rules($struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints']);
 			} else {
-				$rules = $this->generate_rewrite_rules( $struct );
+				$rules = $this->generate_rewrite_rules($struct);
 			}
 
 			/**
@@ -1812,8 +1812,8 @@ 
 			 *
 			 * @param array $rules The rewrite rules generated for the current permastruct.
 			 */
-			$rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
-			if ( 'post_tag' == $permastructname ) {
+			$rules = apply_filters($permastructname.'_rewrite_rules', $rules);
+			if ('post_tag' == $permastructname) {
 
 				/**
 				 * Filter rewrite rules used specifically for Tags.
@@ -1823,17 +1823,17 @@ 
 				 *
 				 * @param array $rules The rewrite rules generated for tags.
 				 */
-				$rules = apply_filters( 'tag_rewrite_rules', $rules );
+				$rules = apply_filters('tag_rewrite_rules', $rules);
 			}
 
 			$this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		if ($this->use_verbose_page_rules)
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
 		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1842,7 +1842,7 @@ 
 		 *
 		 * @param WP_Rewrite $this Current WP_Rewrite instance, passed by reference.
 		 */
-		do_action_ref_array( 'generate_rewrite_rules', array( &$this ) );
+		do_action_ref_array('generate_rewrite_rules', array(&$this));
 
 		/**
 		 * Filter the full set of generated rewrite rules.
@@ -1851,7 +1851,7 @@ 
 		 *
 		 * @param array $this->rules The compiled array of rewrite rules.
 		 */
-		$this->rules = apply_filters( 'rewrite_rules_array', $this->rules );
+		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
 
 		return $this->rules;
 	}
@@ -1872,7 +1872,7 @@ 
 	 */
 	public function wp_rewrite_rules() {
 		$this->rules = get_option('rewrite_rules');
-		if ( empty($this->rules) ) {
+		if (empty($this->rules)) {
 			$this->matches = 'matches';
 			$this->rewrite_rules();
 			update_option('rewrite_rules', $this->rules);
@@ -1896,15 +1896,15 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
+		if ( ! $this->using_permalinks())
 			return '';
 
-		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
+		$site_root = parse_url(site_url());
+		if (isset($site_root['path']))
 			$site_root = trailingslashit($site_root['path']);
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
+		if (isset($home_root['path']))
 			$home_root = trailingslashit($home_root['path']);
 		else
 			$home_root = '/';
@@ -1915,7 +1915,7 @@ 
 		$rules .= "RewriteRule ^index\.php$ - [L]\n"; // Prevent -f checks on index.php.
 
 		//add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all)
-		foreach ( (array) $this->non_wp_rules as $match => $query) {
+		foreach ((array) $this->non_wp_rules as $match => $query) {
 			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 			$match = str_replace('.+?', '.+', $match);
 
@@ -1925,18 +1925,18 @@ 
 				//nada.
 			//}
 
-			$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+			$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 		}
 
-		if ( $this->use_verbose_rules ) {
+		if ($this->use_verbose_rules) {
 			$this->matches = '';
 			$rewrite = $this->rewrite_rules();
 			$num_rules = count($rewrite);
-			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
-				"RewriteCond %{REQUEST_FILENAME} -d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n".
+				"RewriteCond %{REQUEST_FILENAME} -d\n".
 				"RewriteRule ^.*$ - [S=$num_rules]\n";
 
-			foreach ( (array) $rewrite as $match => $query) {
+			foreach ((array) $rewrite as $match => $query) {
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace('.+?', '.+', $match);
 
@@ -1946,14 +1946,14 @@ 
 					//nada.
 				//}
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				if (strpos($query, $this->index) !== false)
+					$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+					$rules .= 'RewriteRule ^'.$match.' '.$site_root.$query." [QSA,L]\n";
 			}
 		} else {
-			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
-				"RewriteCond %{REQUEST_FILENAME} !-d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n".
+				"RewriteCond %{REQUEST_FILENAME} !-d\n".
 				"RewriteRule . {$home_root}{$this->index} [L]\n";
 		}
 
@@ -1967,7 +1967,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		$rules = apply_filters( 'mod_rewrite_rules', $rules );
+		$rules = apply_filters('mod_rewrite_rules', $rules);
 
 		/**
 		 * Filter the list of rewrite rules formatted for output to an .htaccess file.
@@ -1977,7 +1977,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		return apply_filters( 'rewrite_rules', $rules );
+		return apply_filters('rewrite_rules', $rules);
 	}
 
 	/**
@@ -1991,11 +1991,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
+	public function iis7_url_rewrite_rules($add_parent_tags = false) {
+		if ( ! $this->using_permalinks())
 			return '';
 		$rules = '';
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '<configuration>
 	<system.webServer>
 		<rewrite>
@@ -2012,7 +2012,7 @@ 
 				<action type="Rewrite" url="index.php" />
 			</rule>';
 
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '
 			</rules>
 		</rewrite>
@@ -2027,7 +2027,7 @@ 
 		 *
 		 * @param string $rules Rewrite rules formatted for IIS web.config.
 		 */
-		return apply_filters( 'iis7_url_rewrite_rules', $rules );
+		return apply_filters('iis7_url_rewrite_rules', $rules);
 	}
 
 	/**
@@ -2047,10 +2047,10 @@ 
 		//get everything up to the first ?
 		$index = (strpos($redirect, '?') === false ? strlen($redirect) : strpos($redirect, '?'));
 		$front = substr($redirect, 0, $index);
-		if ( $front != $this->index ) { //it doesn't redirect to WP's index.php
+		if ($front != $this->index) { //it doesn't redirect to WP's index.php
 			$this->add_external_rule($regex, $redirect);
 		} else {
-			if ( 'bottom' == $after)
+			if ('bottom' == $after)
 				$this->extra_rules = array_merge($this->extra_rules, array($regex => $redirect));
 			else
 				$this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $redirect));
@@ -2091,17 +2091,17 @@ 
 	 *                               skip registering a query_var for this endpoint. Defaults to the
 	 *                               value of `$name`.
 	 */
-	public function add_endpoint( $name, $places, $query_var = true ) {
+	public function add_endpoint($name, $places, $query_var = true) {
 		global $wp;
 
 		// For backward compatibility, if `null` has explicitly been passed as `$query_var`, assume `true`.
-		if ( true === $query_var || null === func_get_arg( 2 ) ) {
+		if (true === $query_var || null === func_get_arg(2)) {
 			$query_var = $name;
 		}
-		$this->endpoints[] = array( $places, $name, $query_var );
+		$this->endpoints[] = array($places, $name, $query_var);
 
-		if ( $query_var ) {
-			$wp->add_query_var( $query_var );
+		if ($query_var) {
+			$wp->add_query_var($query_var);
 		}
 	}
 
@@ -2133,12 +2133,12 @@ 
 	 *                          rules built for each in turn? Default is true.
 	 *     - endpoints (bool) - Should endpoints be applied to the generated rewrite rules? Default is true.
 	 */
-	public function add_permastruct( $name, $struct, $args = array() ) {
+	public function add_permastruct($name, $struct, $args = array()) {
 		// 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);
 
 		$defaults = array(
 			'with_front' => true,
@@ -2149,16 +2149,16 @@ 
 			'walk_dirs' => true,
 			'endpoints' => true,
 		);
-		$args = array_intersect_key( $args, $defaults );
-		$args = wp_parse_args( $args, $defaults );
+		$args = array_intersect_key($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
+		if ($args['with_front'])
+			$struct = $this->front.$struct;
 		else
-			$struct = $this->root . $struct;
+			$struct = $this->root.$struct;
 		$args['struct'] = $struct;
 
-		$this->extra_permastructs[ $name ] = $args;
+		$this->extra_permastructs[$name] = $args;
 	}
 
 	/**
@@ -2175,19 +2175,19 @@ 
 	 *
 	 * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
 	 */
-	public function flush_rules( $hard = true ) {
+	public function flush_rules($hard = true) {
 		static $do_hard_later = null;
 
 		// Prevent this action from running before everyone has registered their rewrites
-		if ( ! did_action( 'wp_loaded' ) ) {
-			add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
-			$do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
+		if ( ! did_action('wp_loaded')) {
+			add_action('wp_loaded', array($this, 'flush_rules'));
+			$do_hard_later = (isset($do_hard_later)) ? $do_hard_later || $hard : $hard;
 			return;
 		}
 
-		if ( isset( $do_hard_later ) ) {
+		if (isset($do_hard_later)) {
 			$hard = $do_hard_later;
-			unset( $do_hard_later );
+			unset($do_hard_later);
 		}
 
 		delete_option('rewrite_rules');
@@ -2201,12 +2201,12 @@ 
 		 *
 		 * @param bool $hard Whether to flush rewrite rules "hard". Default true.
 		 */
-		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
+		if ( ! $hard || ! apply_filters('flush_rewrite_rules_hard', true)) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
+		if (function_exists('save_mod_rewrite_rules'))
 			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
+		if (function_exists('iis7_save_url_rewrite_rules'))
 			iis7_save_url_rewrite_rules();
 	}
 
@@ -2225,18 +2225,18 @@ 
 		$this->permalink_structure = get_option('permalink_structure');
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ($this->using_index_permalinks())
+			$this->root = $this->index.'/';
 		unset($this->author_structure);
 		unset($this->date_structure);
 		unset($this->page_structure);
 		unset($this->search_structure);
 		unset($this->feed_structure);
 		unset($this->comment_feed_structure);
-		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
+		$this->use_trailing_slashes = ('/' == substr($this->permalink_structure, -1, 1));
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
+		if (preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure))
 			 $this->use_verbose_page_rules = true;
 		else
 			$this->use_verbose_page_rules = false;
@@ -2258,7 +2258,7 @@ 
 	 * @param string $permalink_structure Permalink structure.
 	 */
 	public function set_permalink_structure($permalink_structure) {
-		if ( $permalink_structure != $this->permalink_structure ) {
+		if ($permalink_structure != $this->permalink_structure) {
 			$old_permalink_structure = $this->permalink_structure;
 			update_option('permalink_structure', $permalink_structure);
 			$this->init();
@@ -2271,7 +2271,7 @@ 
 			 * @param string $old_permalink_structure The previous permalink structure.
 			 * @param string $permalink_structure     The new permalink structure.
 			 */
-			do_action( 'permalink_structure_changed', $old_permalink_structure, $permalink_structure );
+			do_action('permalink_structure_changed', $old_permalink_structure, $permalink_structure);
 		}
 	}
 
@@ -2288,7 +2288,7 @@ 
 	 * @param string $category_base Category permalink structure base.
 	 */
 	public function set_category_base($category_base) {
-		if ( $category_base != get_option('category_base') ) {
+		if ($category_base != get_option('category_base')) {
 			update_option('category_base', $category_base);
 			$this->init();
 		}
@@ -2306,9 +2306,9 @@ 
 	 *
 	 * @param string $tag_base Tag permalink structure base.
 	 */
-	public function set_tag_base( $tag_base ) {
-		if ( $tag_base != get_option( 'tag_base') ) {
-			update_option( 'tag_base', $tag_base );
+	public function set_tag_base($tag_base) {
+		if ($tag_base != get_option('tag_base')) {
+			update_option('tag_base', $tag_base);
 			$this->init();
 		}
 	}

Braces +165 added lines, -112 removed lines

@@ -40,8 +40,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;
 
@@ -70,10 +71,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 );
 }
@@ -91,8 +94,10 @@ 
  */
 function add_feed($feedname, $function) {
 	global $wp_rewrite;
-	if ( ! in_array($feedname, $wp_rewrite->feeds) ) //override the file if it is
+	if ( ! in_array($feedname, $wp_rewrite->feeds) ) {
+		//override the file if it is
 		$wp_rewrite->feeds[] = $feedname;
+	}
 	$hook = 'do_feed_' . $feedname;
 	// Remove default function hook
 	remove_action($hook, $hook);
@@ -426,16 +431,18 @@ 
 	// 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;
+		}
 	}
 
 	// Check to see if we are using rewrite rules
 	$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;
+	}
 
 	// Get rid of the #anchor
 	$url_split = explode('#', $url);
@@ -446,16 +453,19 @@ 
 	$url = $url_split[0];
 
 	// 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);
+	}
 
 	// 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]
@@ -474,8 +484,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.
@@ -484,15 +495,17 @@ 
 
 		// 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 ( $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.
-				if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
-					continue;
+				if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) {
+									continue;
+				}
 			}
 
 			// Got a match.
@@ -521,10 +534,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;
@@ -979,8 +993,9 @@ 
 		$posts = get_page_hierarchy( $pages );
 
 		// If we have no pages get out quick
-		if ( !$posts )
-			return array( array(), array() );
+		if ( !$posts ) {
+					return array( array(), array() );
+		}
 
 		//now reverse it, because we need parents after children for rewrite rules to work properly
 		$posts = array_reverse($posts, true);
@@ -1041,8 +1056,9 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
-			return $this->date_structure;
+		if ( isset($this->date_structure) ) {
+					return $this->date_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->date_structure = '';
@@ -1062,8 +1078,9 @@ 
 			}
 		}
 
-		if ( empty($date_endian) )
-			$date_endian = '%year%/%monthnum%/%day%';
+		if ( empty($date_endian) ) {
+					$date_endian = '%year%/%monthnum%/%day%';
+		}
 
 		// Do not allow the date tags and %post_id% to overlap in the permalink
 		// structure. If they do, move the date tags to $front/date/.
@@ -1097,8 +1114,9 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%monthnum%', '', $structure);
 		$structure = str_replace('%day%', '', $structure);
@@ -1121,8 +1139,9 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%day%', '', $structure);
 		$structure = preg_replace('#/+#', '/', $structure);
@@ -1188,11 +1207,13 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
-			return false;
+		if ( empty($this->permalink_structure) ) {
+					return false;
+		}
 
-		if ( isset($this->extra_permastructs[$name]) )
-			return $this->extra_permastructs[$name]['struct'];
+		if ( isset($this->extra_permastructs[$name]) ) {
+					return $this->extra_permastructs[$name]['struct'];
+		}
 
 		return false;
 	}
@@ -1210,8 +1231,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
-			return $this->author_structure;
+		if ( isset($this->author_structure) ) {
+					return $this->author_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->author_structure = '';
@@ -1236,8 +1258,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
-			return $this->search_structure;
+		if ( isset($this->search_structure) ) {
+					return $this->search_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->search_structure = '';
@@ -1262,8 +1285,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
-			return $this->page_structure;
+		if ( isset($this->page_structure) ) {
+					return $this->page_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->page_structure = '';
@@ -1288,8 +1312,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
-			return $this->feed_structure;
+		if ( isset($this->feed_structure) ) {
+					return $this->feed_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->feed_structure = '';
@@ -1314,8 +1339,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
-			return $this->comment_feed_structure;
+		if ( isset($this->comment_feed_structure) ) {
+					return $this->comment_feed_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->comment_feed_structure = '';
@@ -1378,8 +1404,9 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		//build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
+		foreach ( (array) $this->feeds as $feed_name) {
+					$feedregex2 .= $feed_name . '|';
+		}
 		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
 
 		//$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
@@ -1417,10 +1444,11 @@ 
 		//tagname=$matches[i] where i is the current $i
 		$queries = array();
 		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
-			else
-				$queries[$i] = '';
+			if ( 0 < $i ) {
+							$queries[$i] = $queries[$i - 1] . '&';
+			} else {
+							$queries[$i] = '';
+			}
 
 			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
 			$queries[$i] .= $query_token;
@@ -1428,8 +1456,9 @@ 
 
 		//get the structure, minus any cruft (stuff that isn't tags) at the front
 		$structure = $permalink_structure;
-		if ( $front != '/' )
-			$structure = str_replace($front, '', $structure);
+		if ( $front != '/' ) {
+					$structure = str_replace($front, '', $structure);
+		}
 
 		//create a list of dirs to walk over, making rewrite rules for each level
 		//so for example, a $structure of /%year%/%monthnum%/%postname% would create
@@ -1503,10 +1532,14 @@ 
 
 			//start creating the array of rewrites for this dir
 			$rewrite = array();
-			if ( $feed ) //...adding on /feed/ regexes => queries
+			if ( $feed ) {
+				//...adding on /feed/ regexes => queries
 				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
-			if ( $paged ) //...and /page/xx ones
+			}
+			if ( $paged ) {
+				//...and /page/xx ones
 				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
+			}
 
 			//only on pages with comments add ../comment-page-xx/
 			if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
@@ -1518,8 +1551,9 @@ 
 			if ( $endpoints ) {
 				foreach ( (array) $ep_query_append as $regex => $ep) {
 					//add the endpoints on if the mask fits
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific ) {
+											$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					}
 				}
 			}
 
@@ -1538,8 +1572,9 @@ 
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
-						$page = true;
+					if ( strpos($struct, '%pagename%') !== false ) {
+											$page = true;
+					}
 				}
 
 				if ( ! $post ) {
@@ -1620,8 +1655,10 @@ 
 					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
 
 					//add regexes/queries for attachments, attachment trackbacks and so on
-					if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
+					if ( ! $page ) {
+						//require <permalink>/attachment/stuff form for pages because of confusion with subpages
 						$rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery, $sub1comment => $subcommentquery));
+					}
 					$rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery), $rewrite);
 				}
 			} //if($num_toks)
@@ -1671,8 +1708,9 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
-			return $rewrite;
+		if ( empty($this->permalink_structure) ) {
+					return $rewrite;
+		}
 
 		// robots.txt -only if installed at the root
 		$home_path = parse_url( home_url() );
@@ -1793,10 +1831,11 @@ 
 		// Extra permastructs.
 		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
 			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
-				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				if ( count( $struct ) == 2 ) {
+									$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+				} else {
+									$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				}
 			} else {
 				$rules = $this->generate_rewrite_rules( $struct );
 			}
@@ -1830,10 +1869,11 @@ 
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
-		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		if ( $this->use_verbose_page_rules ) {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		} else {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		}
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1896,18 +1936,21 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 
 		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
-			$site_root = trailingslashit($site_root['path']);
+		if ( isset( $site_root['path'] ) ) {
+					$site_root = trailingslashit($site_root['path']);
+		}
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
-			$home_root = trailingslashit($home_root['path']);
-		else
-			$home_root = '/';
+		if ( isset( $home_root['path'] ) ) {
+					$home_root = trailingslashit($home_root['path']);
+		} else {
+					$home_root = '/';
+		}
 
 		$rules = "<IfModule mod_rewrite.c>\n";
 		$rules .= "RewriteEngine On\n";
@@ -1946,10 +1989,11 @@ 
 					//nada.
 				//}
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
-				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				if ( strpos($query, $this->index) !== false ) {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				} else {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				}
 			}
 		} else {
 			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
@@ -1992,8 +2036,9 @@ 
 	 * @return string
 	 */
 	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 		$rules = '';
 		if ( $add_parent_tags ) {
 			$rules .= '<configuration>
@@ -2050,10 +2095,11 @@ 
 		if ( $front != $this->index ) { //it doesn't redirect to WP's index.php
 			$this->add_external_rule($regex, $redirect);
 		} else {
-			if ( 'bottom' == $after)
-				$this->extra_rules = array_merge($this->extra_rules, array($regex => $redirect));
-			else
-				$this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $redirect));
+			if ( 'bottom' == $after) {
+							$this->extra_rules = array_merge($this->extra_rules, array($regex => $redirect));
+			} else {
+							$this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $redirect));
+			}
 			//$this->extra_rules[$regex] = $redirect;
 		}
 	}
@@ -2135,10 +2181,12 @@ 
 	 */
 	public function add_permastruct( $name, $struct, $args = array() ) {
 		// 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 );
+		}
 
 		$defaults = array(
 			'with_front' => true,
@@ -2152,10 +2200,11 @@ 
 		$args = array_intersect_key( $args, $defaults );
 		$args = wp_parse_args( $args, $defaults );
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
-		else
-			$struct = $this->root . $struct;
+		if ( $args['with_front'] ) {
+					$struct = $this->front . $struct;
+		} else {
+					$struct = $this->root . $struct;
+		}
 		$args['struct'] = $struct;
 
 		$this->extra_permastructs[ $name ] = $args;
@@ -2204,10 +2253,12 @@ 
 		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
-			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
-			iis7_save_url_rewrite_rules();
+		if ( function_exists( 'save_mod_rewrite_rules' ) ) {
+					save_mod_rewrite_rules();
+		}
+		if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) {
+					iis7_save_url_rewrite_rules();
+		}
 	}
 
 	/**
@@ -2225,8 +2276,9 @@ 
 		$this->permalink_structure = get_option('permalink_structure');
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ( $this->using_index_permalinks() ) {
+					$this->root = $this->index . '/';
+		}
 		unset($this->author_structure);
 		unset($this->date_structure);
 		unset($this->page_structure);
@@ -2236,10 +2288,11 @@ 
 		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
-			 $this->use_verbose_page_rules = true;
-		else
-			$this->use_verbose_page_rules = false;
+		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) ) {
+					 $this->use_verbose_page_rules = true;
+		} else {
+					$this->use_verbose_page_rules = false;
+		}
 	}
 
 	/**

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

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Admin Bar
- *
- * This code handles the building and rendering of the press bar.
- */
+	 * Admin Bar
+	 *
+	 * This code handles the building and rendering of the press bar.
+	 */
 
 /**
  * Instantiate the admin bar object and set it up as a global for access elsewhere.

Spacing +287 added lines, -287 removed lines

@@ -21,11 +21,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 */
 
@@ -36,8 +36,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;
@@ -64,7 +64,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;
 
 	/**
@@ -76,14 +76,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();
 
@@ -92,7 +92,7 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'wp_after_admin_bar_render' );
+	do_action('wp_after_admin_bar_render');
 }
 
 /**
@@ -102,54 +102,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'),
-	) );
+	));
 }
 
 /**
@@ -159,13 +159,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'  => '#',
-		) );
+		));
 	}
 }
 
@@ -176,27 +176,27 @@ 
  *
  * @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();
-	$profile_url  = get_edit_profile_url( $user_id );
+	$profile_url  = get_edit_profile_url($user_id);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	$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,
 		),
-	) );
+	));
 }
 
 /**
@@ -206,26 +206,26 @@ 
  *
  * @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();
-	$profile_url  = get_edit_profile_url( $user_id );
+	$profile_url  = get_edit_profile_url($user_id);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return;
 
-	$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,
@@ -233,19 +233,19 @@ 
 		'meta'   => array(
 			'tabindex' => -1,
 		),
-	) );
-	$wp_admin_bar->add_menu( array(
+	));
+	$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(),
-	) );
+	));
 }
 
 /**
@@ -255,66 +255,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() ? home_url( '/' ) : admin_url(),
-	) );
+		'href'  => is_admin() ? 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 {
 		// 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);
 	}
 }
 
@@ -325,24 +325,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');
 }
 
 /**
@@ -352,132 +352,132 @@ 
  *
  * @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' ),
-		) );
+			'title'  => __('Plugins'),
+			'href'   => network_admin_url('plugins.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();
 	}
@@ -490,21 +490,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),
+	));
 }
 
 /**
@@ -517,76 +517,76 @@ 
  *
  * @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 = set_url_scheme( get_permalink( $post->ID ) );
+			if ('draft' == $post->post_status) {
+				$preview_link = set_url_scheme(get_permalink($post->ID));
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
-				$preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
-				$wp_admin_bar->add_menu( array(
+				$preview_link = apply_filters('preview_post_link', add_query_arg('preview', 'true', $preview_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 ( 'edit-tags' == $current_screen->base
-			&& isset( $tag ) && is_object( $tag )
-			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
-			&& $tax->public )
+		} elseif ('edit-tags' == $current_screen->base
+			&& isset($tag) && is_object($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_ui && $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 )
+			));
+		} elseif ( ! empty($current_object->taxonomy)
+			&& ($tax = get_taxonomy($current_object->taxonomy))
+			&& current_user_can($tax->cap->edit_terms)
 			&& $tax->show_ui
-			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
+			&& $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
-			) );
+			));
 		}
 	}
 }
@@ -598,60 +598,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)
+		));
 	}
 }
 
@@ -662,23 +662,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_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) );
+	$awaiting_title = esc_attr(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 . '">' . number_format_i18n( $awaiting_mod ) . '</span>';
+	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-'.$awaiting_mod.'">'.number_format_i18n($awaiting_mod).'</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'),
-		'meta'  => array( 'title' => $awaiting_title ),
-	) );
+		'meta'  => array('title' => $awaiting_title),
+	));
 }
 
 /**
@@ -688,56 +688,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',
 			),
-		) );
+		));
 	}
 
 }
@@ -749,24 +749,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'],
 		),
-	) );
+	));
 }
 
 /**
@@ -776,17 +776,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,
@@ -794,7 +794,7 @@ 
 			'class'    => 'admin-bar-search',
 			'tabindex' => -1,
 		)
-	) );
+	));
 }
 
 /**
@@ -804,21 +804,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',
 		),
-	) );
+	));
 }
 
 /**
@@ -859,7 +859,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;
 }
@@ -878,15 +878,15 @@ 
 	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;
 
 	// 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();
@@ -903,7 +903,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;
 }
@@ -919,9 +919,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;

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;
 }

src/wp-includes/bookmark-template.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Bookmark Template Functions for usage in Themes
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * Bookmark Template Functions for usage in Themes
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * The formatted output of a list of bookmarks.

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.

Spacing +24 added lines, -24 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_userdatabylogin') ) :
+if ( ! function_exists('get_userdatabylogin')) :
 /**
  * Retrieve user info by login name.
  *
@@ -47,12 +47,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.
  *
@@ -64,12 +64,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.
  *
@@ -85,15 +85,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.
  *
@@ -102,14 +102,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.
  *
@@ -122,14 +122,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.
  *
@@ -152,19 +152,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;
 
 /**
@@ -178,14 +178,14 @@ 
  *
  * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server' ) ) {
+if ( ! class_exists('wp_atom_server')) {
 	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');
 		}
 	}
 }
\ No newline at end of file

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;
 
 /**

src/wp-includes/atomlib.php

Indentation +292 added lines, -292 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Atom Syndication Format PHP Library
- *
- * @package AtomLib
- * @link http://code.google.com/p/phpatomlib/
- *
- * @author Elias Torres <elias@torrez.us>
- * @version 0.4
- * @since 2.3.0
- */
+	 * Atom Syndication Format PHP Library
+	 *
+	 * @package AtomLib
+	 * @link http://code.google.com/p/phpatomlib/
+	 *
+	 * @author Elias Torres <elias@torrez.us>
+	 * @version 0.4
+	 * @since 2.3.0
+	 */
 
 /**
  * Structure that store common Atom Feed Properties
@@ -21,20 +21,20 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
-     * @access public
-     */
-    var $categories = array();
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
+	 * @access public
+	 */
+	var $categories = array();
 	/**
 	 * Stores Entries
 	 *
 	 * @var array
 	 * @access public
 	 */
-    var $entries = array();
+	var $entries = array();
 }
 
 /**
@@ -48,13 +48,13 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
 	 * @access public
-     */
-    var $categories = array();
+	 */
+	var $categories = array();
 }
 
 /**
@@ -64,39 +64,39 @@ 
  */
 class AtomParser {
 
-    var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+	var $NS = 'http://www.w3.org/2005/Atom';
+	var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
+	var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
 
-    var $debug = false;
+	var $debug = false;
 
-    var $depth = 0;
-    var $indent = 2;
-    var $in_content;
-    var $ns_contexts = array();
-    var $ns_decls = array();
-    var $content_ns_decls = array();
-    var $content_ns_contexts = array();
-    var $is_xhtml = false;
-    var $is_html = false;
-    var $is_text = true;
-    var $skipped_div = false;
+	var $depth = 0;
+	var $indent = 2;
+	var $in_content;
+	var $ns_contexts = array();
+	var $ns_decls = array();
+	var $content_ns_decls = array();
+	var $content_ns_contexts = array();
+	var $is_xhtml = false;
+	var $is_html = false;
+	var $is_text = true;
+	var $skipped_div = false;
 
-    var $FILE = "php://input";
+	var $FILE = "php://input";
 
-    var $feed;
-    var $current;
+	var $feed;
+	var $current;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct() {
+	function __construct() {
 
-        $this->feed = new AtomFeed();
-        $this->current = null;
-        $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
-        $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
-    }
+		$this->feed = new AtomFeed();
+		$this->current = null;
+		$this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
+		$this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -105,259 +105,259 @@ 
 		self::__construct();
 	}
 
-    function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
-        }
-    }
+	function _p($msg) {
+		if($this->debug) {
+			print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+		}
+	}
+
+	function error_handler($log_level, $log_text, $error_file, $error_line) {
+		$this->error = $log_text;
+	}
+
+	function parse() {
+
+		set_error_handler(array(&$this, 'error_handler'));
+
+		array_unshift($this->ns_contexts, array());
+
+		$parser = xml_parser_create_ns();
+		xml_set_object($parser, $this);
+		xml_set_element_handler($parser, "start_element", "end_element");
+		xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
+		xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+		xml_set_character_data_handler($parser, "cdata");
+		xml_set_default_handler($parser, "_default");
+		xml_set_start_namespace_decl_handler($parser, "start_ns");
+		xml_set_end_namespace_decl_handler($parser, "end_ns");
 
-    function error_handler($log_level, $log_text, $error_file, $error_line) {
-        $this->error = $log_text;
-    }
+		$this->content = '';
+
+		$ret = true;
+
+		$fp = fopen($this->FILE, "r");
+		while ($data = fread($fp, 4096)) {
+			if($this->debug) $this->content .= $data;
+
+			if(!xml_parse($parser, $data, feof($fp))) {
+				/* translators: 1: error message, 2: line number */
+				trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
+					xml_error_string(xml_get_error_code($parser)),
+					xml_get_current_line_number($parser)));
+				$ret = false;
+				break;
+			}
+		}
+		fclose($fp);
+
+		xml_parser_free($parser);
+
+		restore_error_handler();
+
+		return $ret;
+	}
 
-    function parse() {
+	function start_element($parser, $name, $attrs) {
 
-        set_error_handler(array(&$this, 'error_handler'));
+		$tag = array_pop(split(":", $name));
 
-        array_unshift($this->ns_contexts, array());
+		switch($name) {
+			case $this->NS . ':feed':
+				$this->current = $this->feed;
+				break;
+			case $this->NS . ':entry':
+				$this->current = new AtomEntry();
+				break;
+		};
 
-        $parser = xml_parser_create_ns();
-        xml_set_object($parser, $this);
-        xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
-        xml_set_character_data_handler($parser, "cdata");
-        xml_set_default_handler($parser, "_default");
-        xml_set_start_namespace_decl_handler($parser, "start_ns");
-        xml_set_end_namespace_decl_handler($parser, "end_ns");
+		$this->_p("start_element('$name')");
+		#$this->_p(print_r($this->ns_contexts,true));
+		#$this->_p('current(' . $this->current . ')');
 
-        $this->content = '';
+		array_unshift($this->ns_contexts, $this->ns_decls);
 
-        $ret = true;
+		$this->depth++;
 
-        $fp = fopen($this->FILE, "r");
-        while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+		if(!empty($this->in_content)) {
 
-            if(!xml_parse($parser, $data, feof($fp))) {
-                /* translators: 1: error message, 2: line number */
-                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
-                    xml_error_string(xml_get_error_code($parser)),
-                    xml_get_current_line_number($parser)));
-                $ret = false;
-                break;
-            }
-        }
-        fclose($fp);
+			$this->content_ns_decls = array();
 
-        xml_parser_free($parser);
-
-        restore_error_handler();
-
-        return $ret;
-    }
-
-    function start_element($parser, $name, $attrs) {
-
-        $tag = array_pop(split(":", $name));
-
-        switch($name) {
-            case $this->NS . ':feed':
-                $this->current = $this->feed;
-                break;
-            case $this->NS . ':entry':
-                $this->current = new AtomEntry();
-                break;
-        };
-
-        $this->_p("start_element('$name')");
-        #$this->_p(print_r($this->ns_contexts,true));
-        #$this->_p('current(' . $this->current . ')');
-
-        array_unshift($this->ns_contexts, $this->ns_decls);
-
-        $this->depth++;
-
-        if(!empty($this->in_content)) {
-
-            $this->content_ns_decls = array();
-
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
-
-            $attrs_prefix = array();
-
-            // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
-                $with_prefix = $this->ns_to_prefix($key, true);
-                $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
-            }
-
-            $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
-            }
-
-            $with_prefix = $this->ns_to_prefix($name);
-
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
-                array_push($this->content_ns_decls, $with_prefix[0]);
-            }
-
-            $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
-                array_unshift($this->content_ns_contexts, $this->content_ns_decls);
-                $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
-                }
-            }
-
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
-
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
-            $this->in_content = array();
-            $this->is_xhtml = $attrs['type'] == 'xhtml';
-            $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
-            $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
-
-            if(in_array('src',array_keys($attrs))) {
-                $this->current->$tag = $attrs;
-            } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
-            }
-        } else if($tag == 'link') {
-            array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
-            array_push($this->current->categories, $attrs);
-        }
-
-        $this->ns_decls = array();
-    }
-
-    function end_element($parser, $name) {
-
-        $tag = array_pop(split(":", $name));
-
-        $ccount = count($this->in_content);
-
-        # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
-            # if we are ending the original content element
-            # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
-                $this->in_content[0][1] == $this->depth) {
-                $origtype = $this->in_content[0][2];
-                array_shift($this->in_content);
-                $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
-                        array_push($newcontent, $c[2]);
-                    } else {
-                        if($this->is_xhtml || $this->is_text) {
-                            array_push($newcontent, $this->xml_escape($c));
-                        } else {
-                            array_push($newcontent, $c);
-                        }
-                    }
-                }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
-                } else {
-                    $this->current->$tag = join('',$newcontent);
-                }
-                $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
-            } else {
-                # else, just finalize the current element's content
-                $endtag = $this->ns_to_prefix($name);
-                array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
-            }
-        }
-
-        array_shift($this->ns_contexts);
-
-        $this->depth--;
-
-        if($name == ($this->NS . ':entry')) {
-            array_push($this->feed->entries, $this->current);
-            $this->current = null;
-        }
-
-        $this->_p("end_element('$name')");
-    }
-
-    function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
-    }
-
-    function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
-    }
-
-    function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
-            array_push($this->in_content, $data);
-        }
-    }
-
-    function _default($parser, $data) {
-        # when does this gets called?
-    }
-
-
-    function ns_to_prefix($qname, $attr=false) {
-        # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
-        $components = split(":", $qname);
-
-        # grab the last one (e.g 'div')
-        $name = array_pop($components);
-
-        if(!empty($components)) {
-            # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
-                        return array($mapping, "$mapping[0]:$name");
-                    }
-                }
-            }
-        }
-
-        if($attr) {
-            return array(null, $name);
-        } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
-                        return array($mapping, $name);
-                    }
-                }
-            }
-        }
-    }
-
-    function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function xml_escape($string)
-    {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
-    }
+			if($this->is_html || $this->is_text)
+				trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+
+			$attrs_prefix = array();
+
+			// resolve prefixes for attributes
+			foreach($attrs as $key => $value) {
+				$with_prefix = $this->ns_to_prefix($key, true);
+				$attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
+			}
+
+			$attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
+			if(strlen($attrs_str) > 0) {
+				$attrs_str = " " . $attrs_str;
+			}
+
+			$with_prefix = $this->ns_to_prefix($name);
+
+			if(!$this->is_declared_content_ns($with_prefix[0])) {
+				array_push($this->content_ns_decls, $with_prefix[0]);
+			}
+
+			$xmlns_str = '';
+			if(count($this->content_ns_decls) > 0) {
+				array_unshift($this->content_ns_contexts, $this->content_ns_decls);
+				$xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
+				if(strlen($xmlns_str) > 0) {
+					$xmlns_str = " " . $xmlns_str;
+				}
+			}
+
+			array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+
+		} else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+			$this->in_content = array();
+			$this->is_xhtml = $attrs['type'] == 'xhtml';
+			$this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
+			$this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+			$type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
+
+			if(in_array('src',array_keys($attrs))) {
+				$this->current->$tag = $attrs;
+			} else {
+				array_push($this->in_content, array($tag,$this->depth, $type));
+			}
+		} else if($tag == 'link') {
+			array_push($this->current->links, $attrs);
+		} else if($tag == 'category') {
+			array_push($this->current->categories, $attrs);
+		}
+
+		$this->ns_decls = array();
+	}
+
+	function end_element($parser, $name) {
+
+		$tag = array_pop(split(":", $name));
+
+		$ccount = count($this->in_content);
+
+		# if we are *in* content, then let's proceed to serialize it
+		if(!empty($this->in_content)) {
+			# if we are ending the original content element
+			# then let's finalize the content
+			if($this->in_content[0][0] == $tag &&
+				$this->in_content[0][1] == $this->depth) {
+				$origtype = $this->in_content[0][2];
+				array_shift($this->in_content);
+				$newcontent = array();
+				foreach($this->in_content as $c) {
+					if(count($c) == 3) {
+						array_push($newcontent, $c[2]);
+					} else {
+						if($this->is_xhtml || $this->is_text) {
+							array_push($newcontent, $this->xml_escape($c));
+						} else {
+							array_push($newcontent, $c);
+						}
+					}
+				}
+				if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+					$this->current->$tag = array($origtype, join('',$newcontent));
+				} else {
+					$this->current->$tag = join('',$newcontent);
+				}
+				$this->in_content = array();
+			} else if($this->in_content[$ccount-1][0] == $tag &&
+				$this->in_content[$ccount-1][1] == $this->depth) {
+				$this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+			} else {
+				# else, just finalize the current element's content
+				$endtag = $this->ns_to_prefix($name);
+				array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
+			}
+		}
+
+		array_shift($this->ns_contexts);
+
+		$this->depth--;
+
+		if($name == ($this->NS . ':entry')) {
+			array_push($this->feed->entries, $this->current);
+			$this->current = null;
+		}
+
+		$this->_p("end_element('$name')");
+	}
+
+	function start_ns($parser, $prefix, $uri) {
+		$this->_p("starting: " . $prefix . ":" . $uri);
+		array_push($this->ns_decls, array($prefix,$uri));
+	}
+
+	function end_ns($parser, $prefix) {
+		$this->_p("ending: #" . $prefix . "#");
+	}
+
+	function cdata($parser, $data) {
+		$this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
+		if(!empty($this->in_content)) {
+			array_push($this->in_content, $data);
+		}
+	}
+
+	function _default($parser, $data) {
+		# when does this gets called?
+	}
+
+
+	function ns_to_prefix($qname, $attr=false) {
+		# split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
+		$components = split(":", $qname);
+
+		# grab the last one (e.g 'div')
+		$name = array_pop($components);
+
+		if(!empty($components)) {
+			# re-join back the namespace component
+			$ns = join(":",$components);
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+						return array($mapping, "$mapping[0]:$name");
+					}
+				}
+			}
+		}
+
+		if($attr) {
+			return array(null, $name);
+		} else {
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if(strlen($mapping[0]) == 0) {
+						return array($mapping, $name);
+					}
+				}
+			}
+		}
+	}
+
+	function is_declared_content_ns($new_mapping) {
+		foreach($this->content_ns_contexts as $context) {
+			foreach($context as $mapping) {
+				if($new_mapping == $mapping) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function xml_escape($string)
+	{
+			 return str_replace(array('&','"',"'",'<','>'),
+				array('&amp;','&quot;','&apos;','&lt;','&gt;'),
+				$string );
+	}
 }

Spacing +60 added lines, -60 removed lines

@@ -65,8 +65,8 @@ 
 class AtomParser {
 
     var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+    var $ATOM_CONTENT_ELEMENTS = array('content', 'summary', 'title', 'subtitle', 'rights');
+    var $ATOM_SIMPLE_ELEMENTS = array('id', 'updated', 'published', 'draft');
 
     var $debug = false;
 
@@ -106,8 +106,8 @@ 
 	}
 
     function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+        if ($this->debug) {
+            print str_repeat(" ", $this->depth * $this->indent).$msg."\n";
         }
     }
 
@@ -124,8 +124,8 @@ 
         $parser = xml_parser_create_ns();
         xml_set_object($parser, $this);
         xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
         xml_set_character_data_handler($parser, "cdata");
         xml_set_default_handler($parser, "_default");
         xml_set_start_namespace_decl_handler($parser, "start_ns");
@@ -137,9 +137,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if ($this->debug) $this->content .= $data;
 
-            if(!xml_parse($parser, $data, feof($fp))) {
+            if ( ! xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
                 trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
@@ -161,11 +161,11 @@ 
 
         $tag = array_pop(split(":", $name));
 
-        switch($name) {
-            case $this->NS . ':feed':
+        switch ($name) {
+            case $this->NS.':feed':
                 $this->current = $this->feed;
                 break;
-            case $this->NS . ':entry':
+            case $this->NS.':entry':
                 $this->current = new AtomEntry();
                 break;
         };
@@ -178,58 +178,58 @@ 
 
         $this->depth++;
 
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
+            if ($this->is_html || $this->is_text)
                 trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
 
             $attrs_prefix = array();
 
             // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
+            foreach ($attrs as $key => $value) {
                 $with_prefix = $this->ns_to_prefix($key, true);
                 $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
             }
 
             $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
+            if (strlen($attrs_str) > 0) {
+                $attrs_str = " ".$attrs_str;
             }
 
             $with_prefix = $this->ns_to_prefix($name);
 
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
+            if ( ! $this->is_declared_content_ns($with_prefix[0])) {
                 array_push($this->content_ns_decls, $with_prefix[0]);
             }
 
             $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
+            if (count($this->content_ns_decls) > 0) {
                 array_unshift($this->content_ns_contexts, $this->content_ns_decls);
                 $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
+                if (strlen($xmlns_str) > 0) {
+                    $xmlns_str = " ".$xmlns_str;
                 }
             }
 
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+            array_push($this->in_content, array($tag, $this->depth, "<".$with_prefix[1]."{$xmlns_str}{$attrs_str}".">"));
 
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+        } else if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
             $this->in_content = array();
             $this->is_xhtml = $attrs['type'] == 'xhtml';
             $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+            $this->is_text = ! in_array('type', array_keys($attrs)) || $attrs['type'] == 'text';
             $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
 
-            if(in_array('src',array_keys($attrs))) {
+            if (in_array('src', array_keys($attrs))) {
                 $this->current->$tag = $attrs;
             } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
+                array_push($this->in_content, array($tag, $this->depth, $type));
             }
-        } else if($tag == 'link') {
+        } else if ($tag == 'link') {
             array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
+        } else if ($tag == 'category') {
             array_push($this->current->categories, $attrs);
         }
 
@@ -243,34 +243,34 @@ 
         $ccount = count($this->in_content);
 
         # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
             # if we are ending the original content element
             # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
+            if ($this->in_content[0][0] == $tag &&
                 $this->in_content[0][1] == $this->depth) {
                 $origtype = $this->in_content[0][2];
                 array_shift($this->in_content);
                 $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
+                foreach ($this->in_content as $c) {
+                    if (count($c) == 3) {
                         array_push($newcontent, $c[2]);
                     } else {
-                        if($this->is_xhtml || $this->is_text) {
+                        if ($this->is_xhtml || $this->is_text) {
                             array_push($newcontent, $this->xml_escape($c));
                         } else {
                             array_push($newcontent, $c);
                         }
                     }
                 }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
+                if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+                    $this->current->$tag = array($origtype, join('', $newcontent));
                 } else {
-                    $this->current->$tag = join('',$newcontent);
+                    $this->current->$tag = join('', $newcontent);
                 }
                 $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+            } else if ($this->in_content[$ccount - 1][0] == $tag &&
+                $this->in_content[$ccount - 1][1] == $this->depth) {
+                $this->in_content[$ccount - 1][2] = substr($this->in_content[$ccount - 1][2], 0, -1)."/>";
             } else {
                 # else, just finalize the current element's content
                 $endtag = $this->ns_to_prefix($name);
@@ -282,7 +282,7 @@ 
 
         $this->depth--;
 
-        if($name == ($this->NS . ':entry')) {
+        if ($name == ($this->NS.':entry')) {
             array_push($this->feed->entries, $this->current);
             $this->current = null;
         }
@@ -291,17 +291,17 @@ 
     }
 
     function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
+        $this->_p("starting: ".$prefix.":".$uri);
+        array_push($this->ns_decls, array($prefix, $uri));
     }
 
     function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
+        $this->_p("ending: #".$prefix."#");
     }
 
     function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
+        $this->_p("data: #".str_replace(array("\n"), array("\\n"), trim($data))."#");
+        if ( ! empty($this->in_content)) {
             array_push($this->in_content, $data);
         }
     }
@@ -311,31 +311,31 @@ 
     }
 
 
-    function ns_to_prefix($qname, $attr=false) {
+    function ns_to_prefix($qname, $attr = false) {
         # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
         $components = split(":", $qname);
 
         # grab the last one (e.g 'div')
         $name = array_pop($components);
 
-        if(!empty($components)) {
+        if ( ! empty($components)) {
             # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+            $ns = join(":", $components);
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if ($mapping[1] == $ns && strlen($mapping[0]) > 0) {
                         return array($mapping, "$mapping[0]:$name");
                     }
                 }
             }
         }
 
-        if($attr) {
+        if ($attr) {
             return array(null, $name);
         } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if (strlen($mapping[0]) == 0) {
                         return array($mapping, $name);
                     }
                 }
@@ -344,9 +344,9 @@ 
     }
 
     function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
+        foreach ($this->content_ns_contexts as $context) {
+            foreach ($context as $mapping) {
+                if ($new_mapping == $mapping) {
                     return true;
                 }
             }
@@ -356,8 +356,8 @@ 
 
     function xml_escape($string)
     {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
+             return str_replace(array('&', '"', "'", '<', '>'),
+                array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'),
+                $string);
     }
 }

Braces +6 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if($this->debug) {
+            	$this->content .= $data;
+            }
 
             if(!xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
@@ -182,8 +184,9 @@ 
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            if($this->is_html || $this->is_text) {
+                            trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            }
 
             $attrs_prefix = array();
 

src/wp-includes/class-wp-image-editor-imagick.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Imagick Image Editor
- *
- * @package WordPress
- * @subpackage Image_Editor
- */
+	 * WordPress Imagick Image Editor
+	 *
+	 * @package WordPress
+	 * @subpackage Image_Editor
+	 */
 
 /**
  * WordPress Image Editor Class for Image Manipulation through Imagick PHP Module

Spacing +111 added lines, -111 removed lines

@@ -24,7 +24,7 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image instanceof Imagick ) {
+		if ($this->image instanceof Imagick) {
 			// we don't need the original in memory anymore
 			$this->image->clear();
 			$this->image->destroy();
@@ -45,13 +45,13 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
+		if ( ! extension_loaded('imagick') || ! class_exists('Imagick') || ! class_exists('ImagickPixel'))
 			return false;
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
+		if (version_compare(phpversion('imagick'), '2.2.0', '<'))
 			return false;
 
 		$required_methods = array(
@@ -75,10 +75,10 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+		if ( ! defined('imagick::COMPRESSION_JPEG'))
 			return false;
 
-		if ( array_diff( $required_methods, get_class_methods( 'Imagick' ) ) )
+		if (array_diff($required_methods, get_class_methods('Imagick')))
 			return false;
 
 		return true;
@@ -95,21 +95,21 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
-		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
+	public static function supports_mime_type($mime_type) {
+		$imagick_extension = strtoupper(self::get_extension($mime_type));
 
-		if ( ! $imagick_extension )
+		if ( ! $imagick_extension)
 			return false;
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+		if ( ! method_exists('Imagick', 'setIteratorIndex') && $mime_type != 'image/jpeg')
 				return false;
 
 		try {
-			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
+			return ((bool) @Imagick::queryFormats($imagick_extension));
 		}
-		catch ( Exception $e ) {
+		catch (Exception $e) {
 			return false;
 		}
 	}
@@ -123,34 +123,34 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
+		if ($this->image instanceof Imagick)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn&#8217;t exist?'), $this->file);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
-		@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+		@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
 
 		try {
-			$this->image = new Imagick( $this->file );
+			$this->image = new Imagick($this->file);
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid())
+				return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
+			if (is_callable(array($this->image, 'setIteratorIndex')))
 				$this->image->setIteratorIndex(0);
 
-			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
+			$this->mime_type = $this->get_mime_type($this->image->getImageFormat());
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
+		catch (Exception $e) {
+			return new WP_Error('invalid_image', $e->getMessage(), $this->file);
 		}
 
 		$updated_size = $this->update_size();
-		if ( is_wp_error( $updated_size ) ) {
+		if (is_wp_error($updated_size)) {
 			return $updated_size;
 		}
 
@@ -166,25 +166,25 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		$quality_result = parent::set_quality( $quality );
-		if ( is_wp_error( $quality_result ) ) {
+	public function set_quality($quality = null) {
+		$quality_result = parent::set_quality($quality);
+		if (is_wp_error($quality_result)) {
 			return $quality_result;
 		} else {
 			$quality = $this->get_quality();
 		}
 
 		try {
-			if ( 'image/jpeg' == $this->mime_type ) {
-				$this->image->setImageCompressionQuality( $quality );
-				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
+			if ('image/jpeg' == $this->mime_type) {
+				$this->image->setImageCompressionQuality($quality);
+				$this->image->setImageCompression(imagick::COMPRESSION_JPEG);
 			}
 			else {
-				$this->image->setImageCompressionQuality( $quality );
+				$this->image->setImageCompressionQuality($quality);
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_quality_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_quality_error', $e->getMessage());
 		}
 
 		return true;
@@ -201,24 +201,24 @@ 
 	 *
 	 * @return true|WP_Error
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$size = null;
-		if ( !$width || !$height ) {
+		if ( ! $width || ! $height) {
 			try {
 				$size = $this->image->getImageGeometry();
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'invalid_image', __('Could not read image size'), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('invalid_image', __('Could not read image size'), $this->file);
 			}
 		}
 
-		if ( ! $width )
+		if ( ! $width)
 			$width = $size['width'];
 
-		if ( ! $height )
+		if ( ! $height)
 			$height = $size['height'];
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -236,17 +236,17 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims)
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'));
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		if ( $crop ) {
-			return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
+		if ($crop) {
+			return $this->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h);
 		}
 
 		try {
@@ -254,13 +254,13 @@ 
 			 * @TODO: Thumbnail is more efficient, given a newer version of Imagemagick.
 			 * $this->image->thumbnailImage( $dst_w, $dst_h );
 			 */
-			$this->image->scaleImage( $dst_w, $dst_h );
+			$this->image->scaleImage($dst_w, $dst_h);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_resize_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_resize_error', $e->getMessage());
 		}
 
-		return $this->update_size( $dst_w, $dst_h );
+		return $this->update_size($dst_w, $dst_h);
 	}
 
 	/**
@@ -284,42 +284,42 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 		$orig_image = $this->image->getImage();
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
+		foreach ($sizes as $size => $size_data) {
+			if ( ! $this->image)
 				$this->image = $orig_image->getImage();
 
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$resize_result = $this->resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
-				$resized = $this->_save( $this->image );
+			if ( ! is_wp_error($resize_result) && ! $duplicate) {
+				$resized = $this->_save($this->image);
 
 				$this->image->clear();
 				$this->image->destroy();
 				$this->image = null;
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -347,30 +347,30 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
-		if ( $src_abs ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
 		try {
-			$this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
-			$this->image->setImagePage( $src_w, $src_h, 0, 0);
+			$this->image->cropImage($src_w, $src_h, $src_x, $src_y);
+			$this->image->setImagePage($src_w, $src_h, 0, 0);
 
-			if ( $dst_w || $dst_h ) {
+			if ($dst_w || $dst_h) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
+				if ( ! $dst_w)
 					$dst_w = $src_w;
-				if ( ! $dst_h )
+				if ( ! $dst_h)
 					$dst_h = $src_h;
 
-				$this->image->scaleImage( $dst_w, $dst_h );
+				$this->image->scaleImage($dst_w, $dst_h);
 				return $this->update_size();
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_crop_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_crop_error', $e->getMessage());
 		}
 		return $this->update_size();
 	}
@@ -384,23 +384,23 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
+	public function rotate($angle) {
 		/**
 		 * $angle is 360-$angle because Imagick rotates clockwise
 		 * (GD rotates counter-clockwise)
 		 */
 		try {
-			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+			$this->image->rotateImage(new ImagickPixel('none'), 360 - $angle);
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
+			if (is_wp_error($result))
 				return $result;
 
-			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
+			$this->image->setImagePage($this->size['width'], $this->size['height'], 0, 0);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_rotate_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_rotate_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -415,16 +415,16 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		try {
-			if ( $horz )
+			if ($horz)
 				$this->image->flipImage();
 
-			if ( $vert )
+			if ($vert)
 				$this->image->flopImage();
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_flip_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_flip_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -439,18 +439,18 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $destfilename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $destfilename, $mime_type );
+	public function save($destfilename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $destfilename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 
 			try {
-				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
+				$this->image->setImageFormat(strtoupper($this->get_extension($this->mime_type)));
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('image_save_error', $e->getMessage(), $this->file);
 			}
 		}
 
@@ -464,35 +464,35 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
 		try {
 			// Store initial Format
 			$orig_format = $this->image->getImageFormat();
 
-			$this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-			$this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+			$this->image->setImageFormat(strtoupper($this->get_extension($mime_type)));
+			$this->make_image($filename, array($image, 'writeImage'), array($filename));
 
 			// Reset original Format
-			$this->image->setImageFormat( $orig_format );
+			$this->image->setImageFormat($orig_format);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
+		catch (Exception $e) {
+			return new WP_Error('image_save_error', $e->getMessage(), $filename);
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -508,22 +508,22 @@ 
 	 * @param string $mime_type
 	 * @return true|WP_Error
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
 		try {
 			// Temporarily change format for stream
-			$this->image->setImageFormat( strtoupper( $extension ) );
+			$this->image->setImageFormat(strtoupper($extension));
 
 			// Output stream of image content
-			header( "Content-Type: $mime_type" );
+			header("Content-Type: $mime_type");
 			print $this->image->getImageBlob();
 
 			// Reset Image to original Format
-			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
+			$this->image->setImageFormat($this->get_extension($this->mime_type));
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_stream_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_stream_error', $e->getMessage());
 		}
 
 		return true;

Braces +75 added lines, -66 removed lines

@@ -48,11 +48,13 @@ 
 	public static function test( $args = array() ) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) )
-			return false;
+		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick' ) || ! class_exists( 'ImagickPixel' ) ) {
+					return false;
+		}
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
-			return false;
+		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) ) {
+					return false;
+		}
 
 		$required_methods = array(
 			'clear',
@@ -75,11 +77,13 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
-			return false;
+		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) ) {
+					return false;
+		}
 
-		if ( array_diff( $required_methods, get_class_methods( 'Imagick' ) ) )
-			return false;
+		if ( array_diff( $required_methods, get_class_methods( 'Imagick' ) ) ) {
+					return false;
+		}
 
 		return true;
 	}
@@ -98,18 +102,19 @@ 
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
-		if ( ! $imagick_extension )
-			return false;
+		if ( ! $imagick_extension ) {
+					return false;
+		}
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
-				return false;
+		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' ) {
+						return false;
+		}
 
 		try {
 			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return false;
 		}
 	}
@@ -123,11 +128,13 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
-			return true;
+		if ( $this->image instanceof Imagick ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		}
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
@@ -136,16 +143,17 @@ 
 		try {
 			$this->image = new Imagick( $this->file );
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid() ) {
+							return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			}
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
-				$this->image->setIteratorIndex(0);
+			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {
+							$this->image->setIteratorIndex(0);
+			}
 
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
 		}
 
@@ -178,12 +186,10 @@ 
 			if ( 'image/jpeg' == $this->mime_type ) {
 				$this->image->setImageCompressionQuality( $quality );
 				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
-			}
-			else {
+			} else {
 				$this->image->setImageCompressionQuality( $quality );
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_quality_error', $e->getMessage() );
 		}
 
@@ -206,17 +212,18 @@ 
 		if ( !$width || !$height ) {
 			try {
 				$size = $this->image->getImageGeometry();
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'invalid_image', __('Could not read image size'), $this->file );
 			}
 		}
 
-		if ( ! $width )
-			$width = $size['width'];
+		if ( ! $width ) {
+					$width = $size['width'];
+		}
 
-		if ( ! $height )
-			$height = $size['height'];
+		if ( ! $height ) {
+					$height = $size['height'];
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -237,12 +244,14 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		if ( ! $dims ) {
+					return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
 		if ( $crop ) {
@@ -255,8 +264,7 @@ 
 			 * $this->image->thumbnailImage( $dst_w, $dst_h );
 			 */
 			$this->image->scaleImage( $dst_w, $dst_h );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
 		}
 
@@ -290,8 +298,9 @@ 
 		$orig_image = $this->image->getImage();
 
 		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
-				$this->image = $orig_image->getImage();
+			if ( ! $this->image ) {
+							$this->image = $orig_image->getImage();
+			}
 
 			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
 				continue;
@@ -360,16 +369,17 @@ 
 			if ( $dst_w || $dst_h ) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
-					$dst_w = $src_w;
-				if ( ! $dst_h )
-					$dst_h = $src_h;
+				if ( ! $dst_w ) {
+									$dst_w = $src_w;
+				}
+				if ( ! $dst_h ) {
+									$dst_h = $src_h;
+				}
 
 				$this->image->scaleImage( $dst_w, $dst_h );
 				return $this->update_size();
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_crop_error', $e->getMessage() );
 		}
 		return $this->update_size();
@@ -394,12 +404,12 @@ 
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
-				return $result;
+			if ( is_wp_error( $result ) ) {
+							return $result;
+			}
 
 			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_rotate_error', $e->getMessage() );
 		}
 		return true;
@@ -417,13 +427,14 @@ 
 	 */
 	public function flip( $horz, $vert ) {
 		try {
-			if ( $horz )
-				$this->image->flipImage();
+			if ( $horz ) {
+							$this->image->flipImage();
+			}
 
-			if ( $vert )
-				$this->image->flopImage();
-		}
-		catch ( Exception $e ) {
+			if ( $vert ) {
+							$this->image->flopImage();
+			}
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_flip_error', $e->getMessage() );
 		}
 		return true;
@@ -448,8 +459,7 @@ 
 
 			try {
 				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
 			}
 		}
@@ -467,8 +477,9 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		try {
 			// Store initial Format
@@ -479,8 +490,7 @@ 
 
 			// Reset original Format
 			$this->image->setImageFormat( $orig_format );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
 		}
 
@@ -521,8 +531,7 @@ 
 
 			// Reset Image to original Format
 			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_stream_error', $e->getMessage() );
 		}