ntwb / wordpress

src/wp-includes/widgets/class-wp-widget-recent-comments.php

Spacing +34 added lines, -34 removed lines

@@ -25,14 +25,14 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_recent_comments',
-			'description' => __( 'Your site’s most recent comments.' ),
+			'description' => __('Your site’s most recent comments.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'recent-comments', __( 'Recent Comments' ), $widget_ops );
+		parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_comments';
 
-		if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) {
-			add_action( 'wp_head', array( $this, 'recent_comments_style' ) );
+		if (is_active_widget(false, false, $this->id_base) || is_customize_preview()) {
+			add_action('wp_head', array($this, 'recent_comments_style'));
 		}
 	}
 
@@ -51,8 +51,8 @@ 
 		 * @param bool   $active  Whether the widget is active. Default true.
 		 * @param string $id_base The widget ID.
 		 */
-		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+		if ( ! current_theme_supports('widgets') // Temp hack #14876
+			|| ! apply_filters('show_recent_comments_widget_style', true, $this->id_base))
 			return;
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
@@ -69,19 +69,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
+	public function widget($args, $instance) {
+		if ( ! isset($args['widget_id']))
 			$args['widget_id'] = $this->id;
 
 		$output = '';
 
-		$title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+		$title = ( ! empty($instance['title'])) ? $instance['title'] : __('Recent Comments');
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
-		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
+		$number = ( ! empty($instance['number'])) ? absint($instance['number']) : 5;
+		if ( ! $number)
 			$number = 5;
 
 		/**
@@ -93,29 +93,29 @@ 
 		 *
 		 * @param array $comment_args An array of arguments used to retrieve the recent comments.
 		 */
-		$comments = get_comments( apply_filters( 'widget_comments_args', array(
+		$comments = get_comments(apply_filters('widget_comments_args', array(
 			'number'      => $number,
 			'status'      => 'approve',
 			'post_status' => 'publish'
-		) ) );
+		)));
 
 		$output .= $args['before_widget'];
-		if ( $title ) {
-			$output .= $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			$output .= $args['before_title'].$title.$args['after_title'];
 		}
 
 		$output .= '<ul id="recentcomments">';
-		if ( is_array( $comments ) && $comments ) {
+		if (is_array($comments) && $comments) {
 			// Prime cache for associated posts. (Prime post term cache if we need it for permalinks.)
-			$post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) );
-			_prime_post_caches( $post_ids, strpos( get_option( 'permalink_structure' ), '%category%' ), false );
+			$post_ids = array_unique(wp_list_pluck($comments, 'comment_post_ID'));
+			_prime_post_caches($post_ids, strpos(get_option('permalink_structure'), '%category%'), false);
 
-			foreach ( (array) $comments as $comment ) {
+			foreach ((array) $comments as $comment) {
 				$output .= '<li class="recentcomments">';
 				/* translators: comments widget: 1: comment author, 2: post link */
-				$output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
-					'<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
-					'<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
+				$output .= sprintf(_x('%1$s on %2$s', 'widgets'),
+					'<span class="comment-author-link">'.get_comment_author_link($comment).'</span>',
+					'<a href="'.esc_url(get_comment_link($comment)).'">'.get_the_title($comment->comment_post_ID).'</a>'
 				);
 				$output .= '</li>';
 			}
@@ -137,10 +137,10 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['number'] = absint( $new_instance['number'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		$instance['number'] = absint($new_instance['number']);
 		return $instance;
 	}
 
@@ -152,15 +152,15 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
-		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
+	public function form($instance) {
+		$title = isset($instance['title']) ? $instance['title'] : '';
+		$number = isset($instance['number']) ? absint($instance['number']) : 5;
 		?>
-		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
-		<input class="tiny-text" id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
+		<p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of comments to show:'); ?></label>
+		<input class="tiny-text" id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="number" step="1" min="1" value="<?php echo $number; ?>" size="3" /></p>
 		<?php
 	}
 
@@ -173,6 +173,6 @@ 
 	 * @deprecated 4.4.0 Fragment caching was removed in favor of split queries.
 	 */
 	public function flush_widget_cache() {
-		_deprecated_function( __METHOD__, '4.4.0' );
+		_deprecated_function(__METHOD__, '4.4.0');
 	}
 }

src/wp-includes/rss-functions.php

Spacing +2 added lines, -2 removed lines

@@ -5,5 +5,5 @@
  * @package WordPress
  */
 
-_deprecated_file( basename(__FILE__), '2.1.0', WPINC . '/rss.php' );
-require_once( ABSPATH . WPINC . '/rss.php' );
+_deprecated_file(basename(__FILE__), '2.1.0', WPINC.'/rss.php');
+require_once(ABSPATH.WPINC.'/rss.php');

src/wp-includes/default-filters.php

Spacing +325 added lines, -325 removed lines

@@ -13,481 +13,481 @@
  */
 
 // Strip, trim, kses, special chars for string saves
-foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {
-	add_filter( $filter, 'sanitize_text_field'  );
-	add_filter( $filter, 'wp_filter_kses'       );
-	add_filter( $filter, '_wp_specialchars', 30 );
+foreach (array('pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname') as $filter) {
+	add_filter($filter, 'sanitize_text_field');
+	add_filter($filter, 'wp_filter_kses');
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Strip, kses, special chars for string display
-foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {
-	if ( is_admin() ) {
+foreach (array('term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname') as $filter) {
+	if (is_admin()) {
 		// These are expensive. Run only on admin pages for defense in depth.
-		add_filter( $filter, 'sanitize_text_field'  );
-		add_filter( $filter, 'wp_kses_data'       );
+		add_filter($filter, 'sanitize_text_field');
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( $filter, '_wp_specialchars', 30 );
+	add_filter($filter, '_wp_specialchars', 30);
 }
 
 // Kses only for textarea saves
-foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Kses only for textarea admin displays
-if ( is_admin() ) {
-	foreach ( array( 'term_description', 'link_description', 'link_notes', 'user_description' ) as $filter ) {
-		add_filter( $filter, 'wp_kses_data' );
+if (is_admin()) {
+	foreach (array('term_description', 'link_description', 'link_notes', 'user_description') as $filter) {
+		add_filter($filter, 'wp_kses_data');
 	}
-	add_filter( 'comment_text', 'wp_kses_post' );
+	add_filter('comment_text', 'wp_kses_post');
 }
 
 // Email saves
-foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {
-	add_filter( $filter, 'trim'           );
-	add_filter( $filter, 'sanitize_email' );
-	add_filter( $filter, 'wp_filter_kses' );
+foreach (array('pre_comment_author_email', 'pre_user_email') as $filter) {
+	add_filter($filter, 'trim');
+	add_filter($filter, 'sanitize_email');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Email admin display
-foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
-	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data' );
+foreach (array('comment_author_email', 'user_email') as $filter) {
+	add_filter($filter, 'sanitize_email');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Save URL
-foreach ( array( 'pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
-	'pre_link_rss', 'pre_post_guid' ) as $filter ) {
-	add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url_raw'       );
-	add_filter( $filter, 'wp_filter_kses'    );
+foreach (array('pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
+	'pre_link_rss', 'pre_post_guid') as $filter) {
+	add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url_raw');
+	add_filter($filter, 'wp_filter_kses');
 }
 
 // Display URL
-foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {
-	if ( is_admin() )
-		add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data'    );
+foreach (array('user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid') as $filter) {
+	if (is_admin())
+		add_filter($filter, 'wp_strip_all_tags');
+	add_filter($filter, 'esc_url');
+	if (is_admin())
+		add_filter($filter, 'wp_kses_data');
 }
 
 // Slugs
-add_filter( 'pre_term_slug', 'sanitize_title' );
+add_filter('pre_term_slug', 'sanitize_title');
 
 // Keys
-foreach ( array( 'pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status' ) as $filter ) {
-	add_filter( $filter, 'sanitize_key' );
+foreach (array('pre_post_type', 'pre_post_status', 'pre_post_comment_status', 'pre_post_ping_status') as $filter) {
+	add_filter($filter, 'sanitize_key');
 }
 
 // Mime types
-add_filter( 'pre_post_mime_type', 'sanitize_mime_type' );
-add_filter( 'post_mime_type', 'sanitize_mime_type' );
+add_filter('pre_post_mime_type', 'sanitize_mime_type');
+add_filter('post_mime_type', 'sanitize_mime_type');
 
 // Meta
-add_filter( 'register_meta_args', '_wp_register_meta_args_whitelist', 10, 2 );
+add_filter('register_meta_args', '_wp_register_meta_args_whitelist', 10, 2);
 
 // Places to balance tags on input
-foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content' ) as $filter ) {
-	add_filter( $filter, 'convert_invalid_entities' );
-	add_filter( $filter, 'balanceTags', 50 );
+foreach (array('content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content') as $filter) {
+	add_filter($filter, 'convert_invalid_entities');
+	add_filter($filter, 'balanceTags', 50);
 }
 
 // Format strings for display.
-foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'   );
-	add_filter( $filter, 'convert_chars' );
-	add_filter( $filter, 'esc_html'      );
+foreach (array('comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'esc_html');
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter )
-	add_filter( $filter, 'capital_P_dangit', 11 );
-add_filter( 'comment_text', 'capital_P_dangit', 31 );
+foreach (array('the_content', 'the_title', 'wp_title') as $filter)
+	add_filter($filter, 'capital_P_dangit', 11);
+add_filter('comment_text', 'capital_P_dangit', 31);
 
 // Format titles
-foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize' );
-	add_filter( $filter, 'strip_tags'  );
+foreach (array('single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'strip_tags');
 }
 
 // Format text area for display.
-foreach ( array( 'term_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'      );
-	add_filter( $filter, 'convert_chars'    );
-	add_filter( $filter, 'wpautop'          );
-	add_filter( $filter, 'shortcode_unautop');
+foreach (array('term_description') as $filter) {
+	add_filter($filter, 'wptexturize');
+	add_filter($filter, 'convert_chars');
+	add_filter($filter, 'wpautop');
+	add_filter($filter, 'shortcode_unautop');
 }
 
 // Format for RSS
-add_filter( 'term_name_rss', 'convert_chars' );
+add_filter('term_name_rss', 'convert_chars');
 
 // Pre save hierarchy
-add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2 );
-add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
+add_filter('wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2);
+add_filter('wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3);
 
 // Display filters
-add_filter( 'the_title', 'wptexturize'   );
-add_filter( 'the_title', 'convert_chars' );
-add_filter( 'the_title', 'trim'          );
+add_filter('the_title', 'wptexturize');
+add_filter('the_title', 'convert_chars');
+add_filter('the_title', 'trim');
 
-add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies',               20 );
-add_filter( 'the_content', 'wpautop'                           );
-add_filter( 'the_content', 'shortcode_unautop'                 );
-add_filter( 'the_content', 'prepend_attachment'                );
-add_filter( 'the_content', 'wp_make_content_images_responsive' );
+add_filter('the_content', 'wptexturize');
+add_filter('the_content', 'convert_smilies', 20);
+add_filter('the_content', 'wpautop');
+add_filter('the_content', 'shortcode_unautop');
+add_filter('the_content', 'prepend_attachment');
+add_filter('the_content', 'wp_make_content_images_responsive');
 
-add_filter( 'the_excerpt',     'wptexturize'      );
-add_filter( 'the_excerpt',     'convert_smilies'  );
-add_filter( 'the_excerpt',     'convert_chars'    );
-add_filter( 'the_excerpt',     'wpautop'          );
-add_filter( 'the_excerpt',     'shortcode_unautop');
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
+add_filter('the_excerpt', 'wptexturize');
+add_filter('the_excerpt', 'convert_smilies');
+add_filter('the_excerpt', 'convert_chars');
+add_filter('the_excerpt', 'wpautop');
+add_filter('the_excerpt', 'shortcode_unautop');
+add_filter('get_the_excerpt', 'wp_trim_excerpt');
 
-add_filter( 'the_post_thumbnail_caption', 'wptexturize'     );
-add_filter( 'the_post_thumbnail_caption', 'convert_smilies' );
-add_filter( 'the_post_thumbnail_caption', 'convert_chars'   );
+add_filter('the_post_thumbnail_caption', 'wptexturize');
+add_filter('the_post_thumbnail_caption', 'convert_smilies');
+add_filter('the_post_thumbnail_caption', 'convert_chars');
 
-add_filter( 'comment_text', 'wptexturize'            );
-add_filter( 'comment_text', 'convert_chars'          );
-add_filter( 'comment_text', 'make_clickable',      9 );
-add_filter( 'comment_text', 'force_balance_tags', 25 );
-add_filter( 'comment_text', 'convert_smilies',    20 );
-add_filter( 'comment_text', 'wpautop',            30 );
+add_filter('comment_text', 'wptexturize');
+add_filter('comment_text', 'convert_chars');
+add_filter('comment_text', 'make_clickable', 9);
+add_filter('comment_text', 'force_balance_tags', 25);
+add_filter('comment_text', 'convert_smilies', 20);
+add_filter('comment_text', 'wpautop', 30);
 
-add_filter( 'comment_excerpt', 'convert_chars' );
+add_filter('comment_excerpt', 'convert_chars');
 
-add_filter( 'list_cats',         'wptexturize' );
+add_filter('list_cats', 'wptexturize');
 
-add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
+add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
 
-add_filter( 'widget_text', 'balanceTags' );
+add_filter('widget_text', 'balanceTags');
 
-add_filter( 'date_i18n', 'wp_maybe_decline_date' );
+add_filter('date_i18n', 'wp_maybe_decline_date');
 
 // RSS filters
-add_filter( 'the_title_rss',      'strip_tags'                    );
-add_filter( 'the_title_rss',      'ent2ncr',                    8 );
-add_filter( 'the_title_rss',      'esc_html'                      );
-add_filter( 'the_content_rss',    'ent2ncr',                    8 );
-add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
-add_filter( 'the_content_feed',   '_oembed_filter_feed_content'   );
-add_filter( 'the_excerpt_rss',    'convert_chars'                 );
-add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
-add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'esc_html'                      );
-add_filter( 'comment_text_rss',   'wp_staticize_emoji'            );
-add_filter( 'bloginfo_rss',       'ent2ncr',                    8 );
-add_filter( 'the_author',         'ent2ncr',                    8 );
-add_filter( 'the_guid',           'esc_url'                       );
+add_filter('the_title_rss', 'strip_tags');
+add_filter('the_title_rss', 'ent2ncr', 8);
+add_filter('the_title_rss', 'esc_html');
+add_filter('the_content_rss', 'ent2ncr', 8);
+add_filter('the_content_feed', 'wp_staticize_emoji');
+add_filter('the_content_feed', '_oembed_filter_feed_content');
+add_filter('the_excerpt_rss', 'convert_chars');
+add_filter('the_excerpt_rss', 'ent2ncr', 8);
+add_filter('comment_author_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'ent2ncr', 8);
+add_filter('comment_text_rss', 'esc_html');
+add_filter('comment_text_rss', 'wp_staticize_emoji');
+add_filter('bloginfo_rss', 'ent2ncr', 8);
+add_filter('the_author', 'ent2ncr', 8);
+add_filter('the_guid', 'esc_url');
 
 // Email filters
-add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
+add_filter('wp_mail', 'wp_staticize_emoji_for_email');
 
 // Misc filters
-add_filter( 'option_ping_sites',        'privacy_ping_filter'                 );
-add_filter( 'option_blog_charset',      '_wp_specialchars'                    ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
-add_filter( 'option_blog_charset',      '_canonical_charset'                  );
-add_filter( 'option_home',              '_config_wp_home'                     );
-add_filter( 'option_siteurl',           '_config_wp_siteurl'                  );
-add_filter( 'tiny_mce_before_init',     '_mce_set_direction'                  );
-add_filter( 'teeny_mce_before_init',    '_mce_set_direction'                  );
-add_filter( 'pre_kses',                 'wp_pre_kses_less_than'               );
-add_filter( 'sanitize_title',           'sanitize_title_with_dashes',   10, 3 );
-add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 3 );
-add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 3 );
-add_filter( 'pre_comment_content',      'wp_rel_nofollow',              15    );
-add_filter( 'comment_email',            'antispambot'                         );
-add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );
-add_filter( 'option_category_base',     '_wp_filter_taxonomy_base'            );
-add_filter( 'the_posts',                '_close_comments_for_old_posts', 10, 2);
-add_filter( 'comments_open',            '_close_comments_for_old_post', 10, 2 );
-add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
-add_filter( 'editable_slug',            'urldecode'                           );
-add_filter( 'editable_slug',            'esc_textarea'                        );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
-add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri'            );
-add_filter( 'xmlrpc_pingback_error',    'xmlrpc_pingback_error'               );
-add_filter( 'title_save_pre',           'trim'                                );
-
-add_filter( 'http_request_host_is_external',    'allowed_http_request_hosts', 10, 2 );
+add_filter('option_ping_sites', 'privacy_ping_filter');
+add_filter('option_blog_charset', '_wp_specialchars'); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
+add_filter('option_blog_charset', '_canonical_charset');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
+add_filter('tiny_mce_before_init', '_mce_set_direction');
+add_filter('teeny_mce_before_init', '_mce_set_direction');
+add_filter('pre_kses', 'wp_pre_kses_less_than');
+add_filter('sanitize_title', 'sanitize_title_with_dashes', 10, 3);
+add_action('check_comment_flood', 'check_comment_flood_db', 10, 3);
+add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
+add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
+add_filter('comment_email', 'antispambot');
+add_filter('option_tag_base', '_wp_filter_taxonomy_base');
+add_filter('option_category_base', '_wp_filter_taxonomy_base');
+add_filter('the_posts', '_close_comments_for_old_posts', 10, 2);
+add_filter('comments_open', '_close_comments_for_old_post', 10, 2);
+add_filter('pings_open', '_close_comments_for_old_post', 10, 2);
+add_filter('editable_slug', 'urldecode');
+add_filter('editable_slug', 'esc_textarea');
+add_filter('nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object');
+add_filter('pingback_ping_source_uri', 'pingback_ping_source_uri');
+add_filter('xmlrpc_pingback_error', 'xmlrpc_pingback_error');
+add_filter('title_save_pre', 'trim');
+
+add_filter('http_request_host_is_external', 'allowed_http_request_hosts', 10, 2);
 
 // REST API filters.
-add_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
-add_action( 'wp_head',                    'rest_output_link_wp_head', 10, 0 );
-add_action( 'template_redirect',          'rest_output_link_header', 11, 0 );
-add_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
-add_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
-add_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
-add_filter( 'rest_authentication_errors', 'rest_cookie_check_errors', 100 );
+add_action('xmlrpc_rsd_apis', 'rest_output_rsd');
+add_action('wp_head', 'rest_output_link_wp_head', 10, 0);
+add_action('template_redirect', 'rest_output_link_header', 11, 0);
+add_action('auth_cookie_malformed', 'rest_cookie_collect_status');
+add_action('auth_cookie_expired', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_username', 'rest_cookie_collect_status');
+add_action('auth_cookie_bad_hash', 'rest_cookie_collect_status');
+add_action('auth_cookie_valid', 'rest_cookie_collect_status');
+add_filter('rest_authentication_errors', 'rest_cookie_check_errors', 100);
 
 // Actions
-add_action( 'wp_head',             '_wp_render_title_tag',            1     );
-add_action( 'wp_head',             'wp_enqueue_scripts',              1     );
-add_action( 'wp_head',             'wp_resource_hints',               2     );
-add_action( 'wp_head',             'feed_links',                      2     );
-add_action( 'wp_head',             'feed_links_extra',                3     );
-add_action( 'wp_head',             'rsd_link'                               );
-add_action( 'wp_head',             'wlwmanifest_link'                       );
-add_action( 'wp_head',             'adjacent_posts_rel_link_wp_head', 10, 0 );
-add_action( 'wp_head',             'locale_stylesheet'                      );
-add_action( 'publish_future_post', 'check_and_publish_future_post',   10, 1 );
-add_action( 'wp_head',             'noindex',                          1    );
-add_action( 'wp_head',             'print_emoji_detection_script',     7    );
-add_action( 'wp_head',             'wp_print_styles',                  8    );
-add_action( 'wp_head',             'wp_print_head_scripts',            9    );
-add_action( 'wp_head',             'wp_generator'                           );
-add_action( 'wp_head',             'rel_canonical'                          );
-add_action( 'wp_head',             'wp_shortlink_wp_head',            10, 0 );
-add_action( 'wp_head',             'wp_site_icon',                    99    );
-add_action( 'wp_footer',           'wp_print_footer_scripts',         20    );
-add_action( 'template_redirect',   'wp_shortlink_header',             11, 0 );
-add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
-add_action( 'init',                'check_theme_switched',            99    );
-add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
-add_action( 'wp_print_styles',     'print_emoji_styles'                     );
-
-if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
+add_action('wp_head', '_wp_render_title_tag', 1);
+add_action('wp_head', 'wp_enqueue_scripts', 1);
+add_action('wp_head', 'wp_resource_hints', 2);
+add_action('wp_head', 'feed_links', 2);
+add_action('wp_head', 'feed_links_extra', 3);
+add_action('wp_head', 'rsd_link');
+add_action('wp_head', 'wlwmanifest_link');
+add_action('wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0);
+add_action('wp_head', 'locale_stylesheet');
+add_action('publish_future_post', 'check_and_publish_future_post', 10, 1);
+add_action('wp_head', 'noindex', 1);
+add_action('wp_head', 'print_emoji_detection_script', 7);
+add_action('wp_head', 'wp_print_styles', 8);
+add_action('wp_head', 'wp_print_head_scripts', 9);
+add_action('wp_head', 'wp_generator');
+add_action('wp_head', 'rel_canonical');
+add_action('wp_head', 'wp_shortlink_wp_head', 10, 0);
+add_action('wp_head', 'wp_site_icon', 99);
+add_action('wp_footer', 'wp_print_footer_scripts', 20);
+add_action('template_redirect', 'wp_shortlink_header', 11, 0);
+add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+add_action('init', 'check_theme_switched', 99);
+add_action('after_switch_theme', '_wp_sidebars_changed');
+add_action('wp_print_styles', 'print_emoji_styles');
+
+if (isset($_GET['replytocom']))
+    add_action('wp_head', 'wp_no_robots');
 
 // Login actions
-add_filter( 'login_head',          'wp_resource_hints',             8     );
-add_action( 'login_head',          'wp_print_head_scripts',         9     );
-add_action( 'login_head',          'print_admin_styles',            9     );
-add_action( 'login_head',          'wp_site_icon',                  99    );
-add_action( 'login_footer',        'wp_print_footer_scripts',       20    );
-add_action( 'login_init',          'send_frame_options_header',     10, 0 );
+add_filter('login_head', 'wp_resource_hints', 8);
+add_action('login_head', 'wp_print_head_scripts', 9);
+add_action('login_head', 'print_admin_styles', 9);
+add_action('login_head', 'wp_site_icon', 99);
+add_action('login_footer', 'wp_print_footer_scripts', 20);
+add_action('login_init', 'send_frame_options_header', 10, 0);
 
 // Feed Generator Tags
-foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
-	add_action( $action, 'the_generator' );
+foreach (array('rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head') as $action) {
+	add_action($action, 'the_generator');
 }
 
 // Feed Site Icon
-add_action( 'atom_head', 'atom_site_icon' );
-add_action( 'rss2_head', 'rss2_site_icon' );
+add_action('atom_head', 'atom_site_icon');
+add_action('rss2_head', 'rss2_site_icon');
 
 
 // WP Cron
-if ( !defined( 'DOING_CRON' ) )
-	add_action( 'init', 'wp_cron' );
+if ( ! defined('DOING_CRON'))
+	add_action('init', 'wp_cron');
 
 // 2 Actions 2 Furious
-add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );
-add_action( 'do_feed_rss',                'do_feed_rss',                             10, 1 );
-add_action( 'do_feed_rss2',               'do_feed_rss2',                            10, 1 );
-add_action( 'do_feed_atom',               'do_feed_atom',                            10, 1 );
-add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
-add_action( 'do_robots',                  'do_robots'                                      );
-add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
-add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
-add_action( 'admin_print_scripts',        'print_emoji_detection_script'                   );
-add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
-add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
-add_action( 'admin_print_styles',         'print_emoji_styles'                             );
-add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
-add_action( 'init',                       'smilies_init',                             5    );
-add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
-add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
-add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
+add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
+add_action('do_feed_rss', 'do_feed_rss', 10, 1);
+add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);
+add_action('do_feed_atom', 'do_feed_atom', 10, 1);
+add_action('do_pings', 'do_all_pings', 10, 1);
+add_action('do_robots', 'do_robots');
+add_action('set_comment_cookies', 'wp_set_comment_cookies', 10, 2);
+add_action('sanitize_comment_cookies', 'sanitize_comment_cookies');
+add_action('admin_print_scripts', 'print_emoji_detection_script');
+add_action('admin_print_scripts', 'print_head_scripts', 20);
+add_action('admin_print_footer_scripts', '_wp_footer_scripts');
+add_action('admin_print_styles', 'print_emoji_styles');
+add_action('admin_print_styles', 'print_admin_styles', 20);
+add_action('init', 'smilies_init', 5);
+add_action('plugins_loaded', 'wp_maybe_load_widgets', 0);
+add_action('plugins_loaded', 'wp_maybe_load_embeds', 0);
+add_action('shutdown', 'wp_ob_end_flush_all', 1);
 // Create a revision whenever a post is updated.
-add_action( 'post_updated',               'wp_save_post_revision',                   10, 1 );
-add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
-add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
-add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
-add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
-add_action( 'wp_scheduled_delete',        'wp_scheduled_delete'                            );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'                      );
-add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
-add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment'                           );
-add_action( 'welcome_panel',              'wp_welcome_panel'                               );
+add_action('post_updated', 'wp_save_post_revision', 10, 1);
+add_action('publish_post', '_publish_post_hook', 5, 1);
+add_action('transition_post_status', '_transition_post_status', 5, 3);
+add_action('transition_post_status', '_update_term_count_on_transition_post_status', 10, 3);
+add_action('comment_form', 'wp_comment_form_unfiltered_html_nonce');
+add_action('wp_scheduled_delete', 'wp_scheduled_delete');
+add_action('wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts');
+add_action('admin_init', 'send_frame_options_header', 10, 0);
+add_action('importer_scheduled_cleanup', 'wp_delete_attachment');
+add_action('upgrader_scheduled_cleanup', 'wp_delete_attachment');
+add_action('welcome_panel', 'wp_welcome_panel');
 
 // Navigation menu actions
-add_action( 'delete_post',                '_wp_delete_post_menu_item'         );
-add_action( 'delete_term',                '_wp_delete_tax_menu_item',   10, 3 );
-add_action( 'transition_post_status',     '_wp_auto_add_pages_to_menu', 10, 3 );
+add_action('delete_post', '_wp_delete_post_menu_item');
+add_action('delete_term', '_wp_delete_tax_menu_item', 10, 3);
+add_action('transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3);
 
 // Post Thumbnail CSS class filtering
-add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add'    );
-add_action( 'end_fetch_post_thumbnail_html',   '_wp_post_thumbnail_class_filter_remove' );
+add_action('begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add');
+add_action('end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove');
 
 // Redirect Old Slugs
-add_action( 'template_redirect',  'wp_old_slug_redirect'              );
-add_action( 'post_updated',       'wp_check_for_changed_slugs', 12, 3 );
-add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );
+add_action('template_redirect', 'wp_old_slug_redirect');
+add_action('post_updated', 'wp_check_for_changed_slugs', 12, 3);
+add_action('attachment_updated', 'wp_check_for_changed_slugs', 12, 3);
 
 // Nonce check for Post Previews
-add_action( 'init', '_show_post_preview' );
+add_action('init', '_show_post_preview');
 
 // Output JS to reset window.name for previews
-add_action( 'wp_head', 'wp_post_preview_js', 1 );
+add_action('wp_head', 'wp_post_preview_js', 1);
 
 // Timezone
-add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
+add_filter('pre_option_gmt_offset', 'wp_timezone_override_offset');
 
 // Admin Color Schemes
-add_action( 'admin_init', 'register_admin_color_schemes', 1);
-add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
+add_action('admin_init', 'register_admin_color_schemes', 1);
+add_action('admin_color_scheme_picker', 'admin_color_scheme_picker');
 
 // If the upgrade hasn't run yet, assume link manager is used.
-add_filter( 'default_option_link_manager_enabled', '__return_true' );
+add_filter('default_option_link_manager_enabled', '__return_true');
 
 // This option no longer exists; tell plugins we always support auto-embedding.
-add_filter( 'default_option_embed_autourls', '__return_true' );
+add_filter('default_option_embed_autourls', '__return_true');
 
 // Default settings for heartbeat
-add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
+add_filter('heartbeat_settings', 'wp_heartbeat_settings');
 
 // Check if the user is logged out
-add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
-add_filter( 'heartbeat_send',        'wp_auth_check' );
-add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );
+add_action('admin_enqueue_scripts', 'wp_auth_check_load');
+add_filter('heartbeat_send', 'wp_auth_check');
+add_filter('heartbeat_nopriv_send', 'wp_auth_check');
 
 // Default authentication filters
-add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_email_password',     20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
-add_filter( 'determine_current_user', 'wp_validate_auth_cookie'          );
-add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
+add_filter('authenticate', 'wp_authenticate_username_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_email_password', 20, 3);
+add_filter('authenticate', 'wp_authenticate_spam_check', 99);
+add_filter('determine_current_user', 'wp_validate_auth_cookie');
+add_filter('determine_current_user', 'wp_validate_logged_in_cookie', 20);
 
 // Split term updates.
-add_action( 'admin_init',        '_wp_check_for_scheduled_split_terms' );
-add_action( 'split_shared_term', '_wp_check_split_default_terms',  10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 );
-add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
-add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
+add_action('admin_init', '_wp_check_for_scheduled_split_terms');
+add_action('split_shared_term', '_wp_check_split_default_terms', 10, 4);
+add_action('split_shared_term', '_wp_check_split_terms_in_menus', 10, 4);
+add_action('split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4);
+add_action('wp_split_shared_term_batch', '_wp_batch_split_terms');
 
 // Email notifications.
-add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
-add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
-add_action( 'after_password_reset', 'wp_password_change_notification' );
-add_action( 'register_new_user',      'wp_send_new_user_notifications' );
-add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
+add_action('comment_post', 'wp_new_comment_notify_moderator');
+add_action('comment_post', 'wp_new_comment_notify_postauthor');
+add_action('after_password_reset', 'wp_password_change_notification');
+add_action('register_new_user', 'wp_send_new_user_notifications');
+add_action('edit_user_created_user', 'wp_send_new_user_notifications', 10, 2);
 
 // REST API actions.
-add_action( 'init',          'rest_api_init' );
-add_action( 'rest_api_init', 'rest_api_default_filters', 10, 1 );
-add_action( 'parse_request', 'rest_api_loaded' );
+add_action('init', 'rest_api_init');
+add_action('rest_api_init', 'rest_api_default_filters', 10, 1);
+add_action('parse_request', 'rest_api_loaded');
 
 /**
  * Filters formerly mixed into wp-includes
  */
 // Theme
-add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
-add_action( 'wp_head', '_custom_logo_header_styles' );
-add_action( 'plugins_loaded', '_wp_customize_include' );
-add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
-add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
+add_action('wp_loaded', '_custom_header_background_just_in_time');
+add_action('wp_head', '_custom_logo_header_styles');
+add_action('plugins_loaded', '_wp_customize_include');
+add_action('admin_enqueue_scripts', '_wp_customize_loader_settings');
+add_action('delete_attachment', '_delete_attachment_theme_mod');
 
 // Calendar widget cache
-add_action( 'save_post', 'delete_get_calendar_cache' );
-add_action( 'delete_post', 'delete_get_calendar_cache' );
-add_action( 'update_option_start_of_week', 'delete_get_calendar_cache' );
-add_action( 'update_option_gmt_offset', 'delete_get_calendar_cache' );
+add_action('save_post', 'delete_get_calendar_cache');
+add_action('delete_post', 'delete_get_calendar_cache');
+add_action('update_option_start_of_week', 'delete_get_calendar_cache');
+add_action('update_option_gmt_offset', 'delete_get_calendar_cache');
 
 // Author
-add_action( 'transition_post_status', '__clear_multi_author_cache' );
+add_action('transition_post_status', '__clear_multi_author_cache');
 
 // Post
-add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
-add_action( 'admin_menu', '_add_post_type_submenus' );
-add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
-add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
+add_action('init', 'create_initial_post_types', 0); // highest priority
+add_action('admin_menu', '_add_post_type_submenus');
+add_action('before_delete_post', '_reset_front_page_settings_for_post');
+add_action('wp_trash_post', '_reset_front_page_settings_for_post');
 
 // Post Formats
-add_filter( 'request', '_post_format_request' );
-add_filter( 'term_link', '_post_format_link', 10, 3 );
-add_filter( 'get_post_format', '_post_format_get_term' );
-add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );
-add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
+add_filter('request', '_post_format_request');
+add_filter('term_link', '_post_format_link', 10, 3);
+add_filter('get_post_format', '_post_format_get_term');
+add_filter('get_terms', '_post_format_get_terms', 10, 3);
+add_filter('wp_get_object_terms', '_post_format_wp_get_object_terms');
 
 // KSES
-add_action( 'init', 'kses_init' );
-add_action( 'set_current_user', 'kses_init' );
+add_action('init', 'kses_init');
+add_action('set_current_user', 'kses_init');
 
 // Script Loader
-add_action( 'wp_default_scripts', 'wp_default_scripts' );
-add_action( 'wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
-add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
-add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
-add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
+add_action('wp_default_scripts', 'wp_default_scripts');
+add_action('wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000);
+add_action('admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000);
+add_filter('wp_print_scripts', 'wp_just_in_time_script_localization');
+add_filter('print_scripts_array', 'wp_prototype_before_jquery');
+add_filter('customize_controls_print_styles', 'wp_resource_hints', 1);
 
-add_action( 'wp_default_styles', 'wp_default_styles' );
-add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
+add_action('wp_default_styles', 'wp_default_styles');
+add_filter('style_loader_src', 'wp_style_loader_src', 10, 2);
 
 // Taxonomy
-add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
+add_action('init', 'create_initial_taxonomies', 0); // highest priority
 
 // Canonical
-add_action( 'template_redirect', 'redirect_canonical' );
-add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
+add_action('template_redirect', 'redirect_canonical');
+add_action('template_redirect', 'wp_redirect_admin_locations', 1000);
 
 // Shortcodes
-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
 
 // Media
-add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
-add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings' );
+add_action('wp_playlist_scripts', 'wp_playlist_scripts');
+add_action('customize_controls_enqueue_scripts', 'wp_plupload_default_settings');
 
 // Nav menu
-add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
+add_filter('nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2);
 
 // Widgets
-add_action( 'init', 'wp_widgets_init', 1 );
+add_action('init', 'wp_widgets_init', 1);
 
 // Admin Bar
 // Don't remove. Wrong way to disable.
-add_action( 'template_redirect', '_wp_admin_bar_init', 0 );
-add_action( 'admin_init', '_wp_admin_bar_init' );
-add_action( 'before_signup_header', '_wp_admin_bar_init' );
-add_action( 'activate_header', '_wp_admin_bar_init' );
-add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
+add_action('template_redirect', '_wp_admin_bar_init', 0);
+add_action('admin_init', '_wp_admin_bar_init');
+add_action('before_signup_header', '_wp_admin_bar_init');
+add_action('activate_header', '_wp_admin_bar_init');
+add_action('wp_footer', 'wp_admin_bar_render', 1000);
+add_action('in_admin_header', 'wp_admin_bar_render', 0);
 
 // Former admin filters that can also be hooked on the front end
-add_action( 'media_buttons', 'media_buttons' );
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
-add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
+add_action('media_buttons', 'media_buttons');
+add_filter('image_send_to_editor', 'image_add_caption', 20, 8);
+add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
 
 // Embeds
-add_action( 'rest_api_init',          'wp_oembed_register_route'              );
-add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );
-
-add_action( 'wp_head',                'wp_oembed_add_discovery_links'         );
-add_action( 'wp_head',                'wp_oembed_add_host_js'                 );
-
-add_action( 'embed_head',             'enqueue_embed_scripts',           1    );
-add_action( 'embed_head',             'print_emoji_detection_script'          );
-add_action( 'embed_head',             'print_embed_styles'                    );
-add_action( 'embed_head',             'wp_print_head_scripts',          20    );
-add_action( 'embed_head',             'wp_print_styles',                20    );
-add_action( 'embed_head',             'wp_no_robots'                          );
-add_action( 'embed_head',             'rel_canonical'                         );
-add_action( 'embed_head',             'locale_stylesheet',              30    );
-
-add_action( 'embed_content_meta',     'print_embed_comments_button'           );
-add_action( 'embed_content_meta',     'print_embed_sharing_button'            );
-
-add_action( 'embed_footer',           'print_embed_sharing_dialog'            );
-add_action( 'embed_footer',           'print_embed_scripts'                   );
-add_action( 'embed_footer',           'wp_print_footer_scripts',        20    );
-
-add_filter( 'excerpt_more',           'wp_embed_excerpt_more',          20    );
-add_filter( 'the_excerpt_embed',      'wptexturize'                           );
-add_filter( 'the_excerpt_embed',      'convert_chars'                         );
-add_filter( 'the_excerpt_embed',      'wpautop'                               );
-add_filter( 'the_excerpt_embed',      'shortcode_unautop'                     );
-add_filter( 'the_excerpt_embed',      'wp_embed_excerpt_attachment'           );
-
-add_filter( 'oembed_dataparse',       'wp_filter_oembed_result',        10, 3 );
-add_filter( 'oembed_response_data',   'get_oembed_response_data_rich',  10, 4 );
-add_filter( 'pre_oembed_result',      'wp_filter_pre_oembed_result',    10, 3 );
-
-unset( $filter, $action );
+add_action('rest_api_init', 'wp_oembed_register_route');
+add_filter('rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4);
+
+add_action('wp_head', 'wp_oembed_add_discovery_links');
+add_action('wp_head', 'wp_oembed_add_host_js');
+
+add_action('embed_head', 'enqueue_embed_scripts', 1);
+add_action('embed_head', 'print_emoji_detection_script');
+add_action('embed_head', 'print_embed_styles');
+add_action('embed_head', 'wp_print_head_scripts', 20);
+add_action('embed_head', 'wp_print_styles', 20);
+add_action('embed_head', 'wp_no_robots');
+add_action('embed_head', 'rel_canonical');
+add_action('embed_head', 'locale_stylesheet', 30);
+
+add_action('embed_content_meta', 'print_embed_comments_button');
+add_action('embed_content_meta', 'print_embed_sharing_button');
+
+add_action('embed_footer', 'print_embed_sharing_dialog');
+add_action('embed_footer', 'print_embed_scripts');
+add_action('embed_footer', 'wp_print_footer_scripts', 20);
+
+add_filter('excerpt_more', 'wp_embed_excerpt_more', 20);
+add_filter('the_excerpt_embed', 'wptexturize');
+add_filter('the_excerpt_embed', 'convert_chars');
+add_filter('the_excerpt_embed', 'wpautop');
+add_filter('the_excerpt_embed', 'shortcode_unautop');
+add_filter('the_excerpt_embed', 'wp_embed_excerpt_attachment');
+
+add_filter('oembed_dataparse', 'wp_filter_oembed_result', 10, 3);
+add_filter('oembed_response_data', 'get_oembed_response_data_rich', 10, 4);
+add_filter('pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3);
+
+unset($filter, $action);

src/wp-includes/rest-api/class-wp-rest-server.php

Spacing +251 added lines, -251 removed lines

@@ -91,7 +91,7 @@ 
 		$this->endpoints = array(
 			// Meta endpoints.
 			'/' => array(
-				'callback' => array( $this, 'get_index' ),
+				'callback' => array($this, 'get_index'),
 				'methods' => 'GET',
 				'args' => array(
 					'context' => array(
@@ -137,7 +137,7 @@ 
 		 * @param WP_Error|null|bool WP_Error if authentication error, null if authentication
 		 *                              method wasn't used, true if authentication succeeded.
 		 */
-		return apply_filters( 'rest_authentication_errors', null );
+		return apply_filters('rest_authentication_errors', null);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	 * @param WP_Error $error WP_Error instance.
 	 * @return WP_REST_Response List of associative arrays with code and message keys.
 	 */
-	protected function error_to_response( $error ) {
+	protected function error_to_response($error) {
 		$error_data = $error->get_error_data();
 
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
@@ -164,20 +164,20 @@ 
 
 		$errors = array();
 
-		foreach ( (array) $error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
-				$errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+		foreach ((array) $error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
+				$errors[] = array('code' => $code, 'message' => $message, 'data' => $error->get_error_data($code));
 			}
 		}
 
 		$data = $errors[0];
-		if ( count( $errors ) > 1 ) {
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
 
-		$response = new WP_REST_Response( $data, $status );
+		$response = new WP_REST_Response($data, $status);
 
 		return $response;
 	}
@@ -198,14 +198,14 @@ 
 	 * @param int    $status  Optional. HTTP status code to send. Default null.
 	 * @return string JSON representation of the error
 	 */
-	protected function json_error( $code, $message, $status = null ) {
-		if ( $status ) {
-			$this->set_status( $status );
+	protected function json_error($code, $message, $status = null) {
+		if ($status) {
+			$this->set_status($status);
 		}
 
-		$error = compact( 'code', 'message' );
+		$error = compact('code', 'message');
 
-		return wp_json_encode( $error );
+		return wp_json_encode($error);
 	}
 
 	/**
@@ -223,14 +223,14 @@ 
 	 *                     Default null.
 	 * @return false|null Null if not served and a HEAD request, false otherwise.
 	 */
-	public function serve_request( $path = null ) {
-		$content_type = isset( $_GET['_jsonp'] ) ? 'application/javascript' : 'application/json';
-		$this->send_header( 'Content-Type', $content_type . '; charset=' . get_option( 'blog_charset' ) );
-		$this->send_header( 'X-Robots-Tag', 'noindex' );
+	public function serve_request($path = null) {
+		$content_type = isset($_GET['_jsonp']) ? 'application/javascript' : 'application/json';
+		$this->send_header('Content-Type', $content_type.'; charset='.get_option('blog_charset'));
+		$this->send_header('X-Robots-Tag', 'noindex');
 
 		$api_root = get_rest_url();
-		if ( ! empty( $api_root ) ) {
-			$this->send_header( 'Link', '<' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"' );
+		if ( ! empty($api_root)) {
+			$this->send_header('Link', '<'.esc_url_raw($api_root).'>; rel="https://api.w.org/"');
 		}
 
 		/*
@@ -238,9 +238,9 @@ 
 		 *
 		 * https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
 		 */
-		$this->send_header( 'X-Content-Type-Options', 'nosniff' );
-		$this->send_header( 'Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages' );
-		$this->send_header( 'Access-Control-Allow-Headers', 'Authorization' );
+		$this->send_header('X-Content-Type-Options', 'nosniff');
+		$this->send_header('Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages');
+		$this->send_header('Access-Control-Allow-Headers', 'Authorization');
 
 		/**
 		 * Send nocache headers on authenticated requests.
@@ -249,10 +249,10 @@ 
 		 *
 		 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
 		 */
-		$send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
-		if ( $send_no_cache_headers ) {
-			foreach ( wp_get_nocache_headers() as $header => $header_value ) {
-				$this->send_header( $header, $header_value );
+		$send_no_cache_headers = apply_filters('rest_send_nocache_headers', is_user_logged_in());
+		if ($send_no_cache_headers) {
+			foreach (wp_get_nocache_headers() as $header => $header_value) {
+				$this->send_header($header, $header_value);
 			}
 		}
 
@@ -263,7 +263,7 @@ 
 		 *
 		 * @param bool $rest_enabled Whether the REST API is enabled. Default true.
 		 */
-		$enabled = apply_filters( 'rest_enabled', true );
+		$enabled = apply_filters('rest_enabled', true);
 
 		/**
 		 * Filters whether jsonp is enabled.
@@ -272,66 +272,66 @@ 
 		 *
 		 * @param bool $jsonp_enabled Whether jsonp is enabled. Default true.
 		 */
-		$jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
+		$jsonp_enabled = apply_filters('rest_jsonp_enabled', true);
 
 		$jsonp_callback = null;
 
-		if ( ! $enabled ) {
-			echo $this->json_error( 'rest_disabled', __( 'The REST API is disabled on this site.' ), 404 );
+		if ( ! $enabled) {
+			echo $this->json_error('rest_disabled', __('The REST API is disabled on this site.'), 404);
 			return false;
 		}
-		if ( isset( $_GET['_jsonp'] ) ) {
-			if ( ! $jsonp_enabled ) {
-				echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 );
+		if (isset($_GET['_jsonp'])) {
+			if ( ! $jsonp_enabled) {
+				echo $this->json_error('rest_callback_disabled', __('JSONP support is disabled on this site.'), 400);
 				return false;
 			}
 
 			$jsonp_callback = $_GET['_jsonp'];
-			if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
-				echo $this->json_error( 'rest_callback_invalid', __( 'The JSONP callback function is invalid.' ), 400 );
+			if ( ! wp_check_jsonp_callback($jsonp_callback)) {
+				echo $this->json_error('rest_callback_invalid', __('The JSONP callback function is invalid.'), 400);
 				return false;
 			}
 		}
 
-		if ( empty( $path ) ) {
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
+		if (empty($path)) {
+			if (isset($_SERVER['PATH_INFO'])) {
 				$path = $_SERVER['PATH_INFO'];
 			} else {
 				$path = '/';
 			}
 		}
 
-		$request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path );
+		$request = new WP_REST_Request($_SERVER['REQUEST_METHOD'], $path);
 
-		$request->set_query_params( wp_unslash( $_GET ) );
-		$request->set_body_params( wp_unslash( $_POST ) );
-		$request->set_file_params( $_FILES );
-		$request->set_headers( $this->get_headers( wp_unslash( $_SERVER ) ) );
-		$request->set_body( $this->get_raw_data() );
+		$request->set_query_params(wp_unslash($_GET));
+		$request->set_body_params(wp_unslash($_POST));
+		$request->set_file_params($_FILES);
+		$request->set_headers($this->get_headers(wp_unslash($_SERVER)));
+		$request->set_body($this->get_raw_data());
 
 		/*
 		 * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check
 		 * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
 		 * header.
 		 */
-		if ( isset( $_GET['_method'] ) ) {
-			$request->set_method( $_GET['_method'] );
-		} elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
-			$request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
+		if (isset($_GET['_method'])) {
+			$request->set_method($_GET['_method']);
+		} elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$request->set_method($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
 		}
 
 		$result = $this->check_authentication();
 
-		if ( ! is_wp_error( $result ) ) {
-			$result = $this->dispatch( $request );
+		if ( ! is_wp_error($result)) {
+			$result = $this->dispatch($request);
 		}
 
 		// Normalize to either WP_Error or WP_REST_Response...
-		$result = rest_ensure_response( $result );
+		$result = rest_ensure_response($result);
 
 		// ...then convert WP_Error across.
-		if ( is_wp_error( $result ) ) {
-			$result = $this->error_to_response( $result );
+		if (is_wp_error($result)) {
+			$result = $this->error_to_response($result);
 		}
 
 		/**
@@ -346,19 +346,19 @@ 
 		 * @param WP_REST_Server   $this    Server instance.
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
+		$result = apply_filters('rest_post_dispatch', rest_ensure_response($result), $this, $request);
 
 		// Wrap the response in an envelope if asked for.
-		if ( isset( $_GET['_envelope'] ) ) {
-			$result = $this->envelope_response( $result, isset( $_GET['_embed'] ) );
+		if (isset($_GET['_envelope'])) {
+			$result = $this->envelope_response($result, isset($_GET['_embed']));
 		}
 
 		// Send extra data from response objects.
 		$headers = $result->get_headers();
-		$this->send_headers( $headers );
+		$this->send_headers($headers);
 
 		$code = $result->get_status();
-		$this->set_status( $code );
+		$this->set_status($code);
 
 		/**
 		 * Filters whether the request has already been served.
@@ -374,29 +374,29 @@ 
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 * @param WP_REST_Server   $this    Server instance.
 		 */
-		$served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
+		$served = apply_filters('rest_pre_serve_request', false, $result, $request, $this);
 
-		if ( ! $served ) {
-			if ( 'HEAD' === $request->get_method() ) {
+		if ( ! $served) {
+			if ('HEAD' === $request->get_method()) {
 				return null;
 			}
 
 			// Embed links inside the request.
-			$result = $this->response_to_data( $result, isset( $_GET['_embed'] ) );
+			$result = $this->response_to_data($result, isset($_GET['_embed']));
 
-			$result = wp_json_encode( $result );
+			$result = wp_json_encode($result);
 
 			$json_error_message = $this->get_json_last_error();
-			if ( $json_error_message ) {
-				$json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );
-				$result = $this->error_to_response( $json_error_obj );
-				$result = wp_json_encode( $result->data[0] );
+			if ($json_error_message) {
+				$json_error_obj = new WP_Error('rest_encode_error', $json_error_message, array('status' => 500));
+				$result = $this->error_to_response($json_error_obj);
+				$result = wp_json_encode($result->data[0]);
 			}
 
-			if ( $jsonp_callback ) {
+			if ($jsonp_callback) {
 				// Prepend '/**/' to mitigate possible JSONP Flash attacks
 				// https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
-				echo '/**/' . $jsonp_callback . '(' . $result . ')';
+				echo '/**/'.$jsonp_callback.'('.$result.')';
 			} else {
 				echo $result;
 			}
@@ -419,20 +419,20 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	public function response_to_data( $response, $embed ) {
+	public function response_to_data($response, $embed) {
 		$data  = $response->get_data();
-		$links = $this->get_compact_response_links( $response );
+		$links = $this->get_compact_response_links($response);
 
-		if ( ! empty( $links ) ) {
+		if ( ! empty($links)) {
 			// Convert links to part of the data.
 			$data['_links'] = $links;
 		}
-		if ( $embed ) {
+		if ($embed) {
 			// Determine if this is a numeric array.
-			if ( wp_is_numeric_array( $data ) ) {
-				$data = array_map( array( $this, 'embed_links' ), $data );
+			if (wp_is_numeric_array($data)) {
+				$data = array_map(array($this, 'embed_links'), $data);
 			} else {
-				$data = $this->embed_links( $data );
+				$data = $this->embed_links($data);
 			}
 		}
 
@@ -452,21 +452,21 @@ 
 	 * @param WP_REST_Response $response Response to extract links from.
 	 * @return array Map of link relation to list of link hashes.
 	 */
-	public static function get_response_links( $response ) {
+	public static function get_response_links($response) {
 		$links = $response->get_links();
-		if ( empty( $links ) ) {
+		if (empty($links)) {
 			return array();
 		}
 
 		// Convert links to part of the data.
 		$data = array();
-		foreach ( $links as $rel => $items ) {
-			$data[ $rel ] = array();
+		foreach ($links as $rel => $items) {
+			$data[$rel] = array();
 
-			foreach ( $items as $item ) {
+			foreach ($items as $item) {
 				$attributes = $item['attributes'];
 				$attributes['href'] = $item['href'];
-				$data[ $rel ][] = $attributes;
+				$data[$rel][] = $attributes;
 			}
 		}
 
@@ -486,41 +486,41 @@ 
 	 * @param WP_REST_Response $response Response to extract links from.
 	 * @return array Map of link relation to list of link hashes.
 	 */
-	public static function get_compact_response_links( $response ) {
-		$links = self::get_response_links( $response );
+	public static function get_compact_response_links($response) {
+		$links = self::get_response_links($response);
 
-		if ( empty( $links ) ) {
+		if (empty($links)) {
 			return array();
 		}
 
 		$curies = $response->get_curies();
 		$used_curies = array();
 
-		foreach ( $links as $rel => $items ) {
+		foreach ($links as $rel => $items) {
 
 			// Convert $rel URIs to their compact versions if they exist.
-			foreach ( $curies as $curie ) {
-				$href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) );
-				if ( strpos( $rel, $href_prefix ) !== 0 ) {
+			foreach ($curies as $curie) {
+				$href_prefix = substr($curie['href'], 0, strpos($curie['href'], '{rel}'));
+				if (strpos($rel, $href_prefix) !== 0) {
 					continue;
 				}
 
 				// Relation now changes from '$uri' to '$curie:$relation'
-				$rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) );
-				preg_match( '!' . $rel_regex . '!', $rel, $matches );
-				if ( $matches ) {
-					$new_rel = $curie['name'] . ':' . $matches[1];
-					$used_curies[ $curie['name'] ] = $curie;
-					$links[ $new_rel ] = $items;
-					unset( $links[ $rel ] );
+				$rel_regex = str_replace('\{rel\}', '(.+)', preg_quote($curie['href'], '!'));
+				preg_match('!'.$rel_regex.'!', $rel, $matches);
+				if ($matches) {
+					$new_rel = $curie['name'].':'.$matches[1];
+					$used_curies[$curie['name']] = $curie;
+					$links[$new_rel] = $items;
+					unset($links[$rel]);
 					break;
 				}
 			}
 		}
 
 		// Push the curies onto the start of the links array.
-		if ( $used_curies ) {
-			$links['curies'] = array_values( $used_curies );
+		if ($used_curies) {
+			$links['curies'] = array_values($used_curies);
 		}
 
 		return $links;
@@ -540,57 +540,57 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	protected function embed_links( $data ) {
-		if ( empty( $data['_links'] ) ) {
+	protected function embed_links($data) {
+		if (empty($data['_links'])) {
 			return $data;
 		}
 
 		$embedded = array();
 
-		foreach ( $data['_links'] as $rel => $links ) {
+		foreach ($data['_links'] as $rel => $links) {
 			// Ignore links to self, for obvious reasons.
-			if ( 'self' === $rel ) {
+			if ('self' === $rel) {
 				continue;
 			}
 
 			$embeds = array();
 
-			foreach ( $links as $item ) {
+			foreach ($links as $item) {
 				// Determine if the link is embeddable.
-				if ( empty( $item['embeddable'] ) ) {
+				if (empty($item['embeddable'])) {
 					// Ensure we keep the same order.
 					$embeds[] = array();
 					continue;
 				}
 
 				// Run through our internal routing and serve.
-				$request = WP_REST_Request::from_url( $item['href'] );
-				if ( ! $request ) {
+				$request = WP_REST_Request::from_url($item['href']);
+				if ( ! $request) {
 					$embeds[] = array();
 					continue;
 				}
 
 				// Embedded resources get passed context=embed.
-				if ( empty( $request['context'] ) ) {
+				if (empty($request['context'])) {
 					$request['context'] = 'embed';
 				}
 
-				$response = $this->dispatch( $request );
+				$response = $this->dispatch($request);
 
 				/** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */
-				$response = apply_filters( 'rest_post_dispatch', rest_ensure_response( $response ), $this, $request );
+				$response = apply_filters('rest_post_dispatch', rest_ensure_response($response), $this, $request);
 
-				$embeds[] = $this->response_to_data( $response, false );
+				$embeds[] = $this->response_to_data($response, false);
 			}
 
 			// Determine if any real links were found.
-			$has_links = count( array_filter( $embeds ) );
-			if ( $has_links ) {
-				$embedded[ $rel ] = $embeds;
+			$has_links = count(array_filter($embeds));
+			if ($has_links) {
+				$embedded[$rel] = $embeds;
 			}
 		}
 
-		if ( ! empty( $embedded ) ) {
+		if ( ! empty($embedded)) {
 			$data['_embedded'] = $embedded;
 		}
 
@@ -611,9 +611,9 @@ 
 	 * @param bool             $embed    Whether links should be embedded.
 	 * @return WP_REST_Response New response with wrapped data
 	 */
-	public function envelope_response( $response, $embed ) {
+	public function envelope_response($response, $embed) {
 		$envelope = array(
-			'body'    => $this->response_to_data( $response, $embed ),
+			'body'    => $this->response_to_data($response, $embed),
 			'status'  => $response->get_status(),
 			'headers' => $response->get_headers(),
 		);
@@ -626,10 +626,10 @@ 
 		 * @param array            $envelope Envelope data.
 		 * @param WP_REST_Response $response Original response data.
 		 */
-		$envelope = apply_filters( 'rest_envelope_response', $envelope, $response );
+		$envelope = apply_filters('rest_envelope_response', $envelope, $response);
 
 		// Ensure it's still a response and return.
-		return rest_ensure_response( $envelope );
+		return rest_ensure_response($envelope);
 	}
 
 	/**
@@ -644,14 +644,14 @@ 
 	 * @param bool   $override   Optional. Whether the route should be overriden if it already exists.
 	 *                           Default false.
 	 */
-	public function register_route( $namespace, $route, $route_args, $override = false ) {
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			$this->namespaces[ $namespace ] = array();
+	public function register_route($namespace, $route, $route_args, $override = false) {
+		if ( ! isset($this->namespaces[$namespace])) {
+			$this->namespaces[$namespace] = array();
 
-			$this->register_route( $namespace, '/' . $namespace, array(
+			$this->register_route($namespace, '/'.$namespace, array(
 				array(
 					'methods' => self::READABLE,
-					'callback' => array( $this, 'get_namespace_index' ),
+					'callback' => array($this, 'get_namespace_index'),
 					'args' => array(
 						'namespace' => array(
 							'default' => $namespace,
@@ -661,17 +661,17 @@ 
 						),
 					),
 				),
-			) );
+			));
 		}
 
 		// Associative to avoid double-registration.
-		$this->namespaces[ $namespace ][ $route ] = true;
+		$this->namespaces[$namespace][$route] = true;
 		$route_args['namespace'] = $namespace;
 
-		if ( $override || empty( $this->endpoints[ $route ] ) ) {
-			$this->endpoints[ $route ] = $route_args;
+		if ($override || empty($this->endpoints[$route])) {
+			$this->endpoints[$route] = $route_args;
 		} else {
-			$this->endpoints[ $route ] = array_merge( $this->endpoints[ $route ], $route_args );
+			$this->endpoints[$route] = array_merge($this->endpoints[$route], $route_args);
 		}
 	}
 
@@ -708,7 +708,7 @@ 
 		 *                         `'/path/regex' => array( $callback, $bitmask )` or
 		 *                         `'/path/regex' => array( array( $callback, $bitmask ).
 		 */
-		$endpoints = apply_filters( 'rest_endpoints', $this->endpoints );
+		$endpoints = apply_filters('rest_endpoints', $this->endpoints);
 
 		// Normalise the endpoints.
 		$defaults = array(
@@ -719,32 +719,32 @@ 
 			'args'          => array(),
 		);
 
-		foreach ( $endpoints as $route => &$handlers ) {
+		foreach ($endpoints as $route => &$handlers) {
 
-			if ( isset( $handlers['callback'] ) ) {
+			if (isset($handlers['callback'])) {
 				// Single endpoint, add one deeper.
-				$handlers = array( $handlers );
+				$handlers = array($handlers);
 			}
 
-			if ( ! isset( $this->route_options[ $route ] ) ) {
-				$this->route_options[ $route ] = array();
+			if ( ! isset($this->route_options[$route])) {
+				$this->route_options[$route] = array();
 			}
 
-			foreach ( $handlers as $key => &$handler ) {
+			foreach ($handlers as $key => &$handler) {
 
-				if ( ! is_numeric( $key ) ) {
+				if ( ! is_numeric($key)) {
 					// Route option, move it to the options.
-					$this->route_options[ $route ][ $key ] = $handler;
-					unset( $handlers[ $key ] );
+					$this->route_options[$route][$key] = $handler;
+					unset($handlers[$key]);
 					continue;
 				}
 
-				$handler = wp_parse_args( $handler, $defaults );
+				$handler = wp_parse_args($handler, $defaults);
 
 				// Allow comma-separated HTTP methods.
-				if ( is_string( $handler['methods'] ) ) {
-					$methods = explode( ',', $handler['methods'] );
-				} else if ( is_array( $handler['methods'] ) ) {
+				if (is_string($handler['methods'])) {
+					$methods = explode(',', $handler['methods']);
+				} else if (is_array($handler['methods'])) {
 					$methods = $handler['methods'];
 				} else {
 					$methods = array();
@@ -752,9 +752,9 @@ 
 
 				$handler['methods'] = array();
 
-				foreach ( $methods as $method ) {
-					$method = strtoupper( trim( $method ) );
-					$handler['methods'][ $method ] = true;
+				foreach ($methods as $method) {
+					$method = strtoupper(trim($method));
+					$handler['methods'][$method] = true;
 				}
 			}
 		}
@@ -770,7 +770,7 @@ 
 	 * @return array List of registered namespaces.
 	 */
 	public function get_namespaces() {
-		return array_keys( $this->namespaces );
+		return array_keys($this->namespaces);
 	}
 
 	/**
@@ -782,12 +782,12 @@ 
 	 * @param string $route Route pattern to fetch options for.
 	 * @return array|null Data as an associative array if found, or null if not found.
 	 */
-	public function get_route_options( $route ) {
-		if ( ! isset( $this->route_options[ $route ] ) ) {
+	public function get_route_options($route) {
+		if ( ! isset($this->route_options[$route])) {
 			return null;
 		}
 
-		return $this->route_options[ $route ];
+		return $this->route_options[$route];
 	}
 
 	/**
@@ -799,7 +799,7 @@ 
 	 * @param WP_REST_Request $request Request to attempt dispatching.
 	 * @return WP_REST_Response Response returned by the callback.
 	 */
-	public function dispatch( $request ) {
+	public function dispatch($request) {
 		/**
 		 * Filters the pre-calculated result of a REST dispatch request.
 		 *
@@ -813,78 +813,78 @@ 
 		 * @param WP_REST_Server  $this    Server instance.
 		 * @param WP_REST_Request $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_pre_dispatch', null, $this, $request );
+		$result = apply_filters('rest_pre_dispatch', null, $this, $request);
 
-		if ( ! empty( $result ) ) {
+		if ( ! empty($result)) {
 			return $result;
 		}
 
 		$method = $request->get_method();
 		$path   = $request->get_route();
 
-		foreach ( $this->get_routes() as $route => $handlers ) {
-			$match = preg_match( '@^' . $route . '$@i', $path, $args );
+		foreach ($this->get_routes() as $route => $handlers) {
+			$match = preg_match('@^'.$route.'$@i', $path, $args);
 
-			if ( ! $match ) {
+			if ( ! $match) {
 				continue;
 			}
 
-			foreach ( $handlers as $handler ) {
-				$callback  = $handler['callback'];
+			foreach ($handlers as $handler) {
+				$callback = $handler['callback'];
 				$response = null;
 
 				// Fallback to GET method if no HEAD method is registered.
 				$checked_method = $method;
-				if ( 'HEAD' === $method && empty( $handler['methods']['HEAD'] ) ) {
+				if ('HEAD' === $method && empty($handler['methods']['HEAD'])) {
 					$checked_method = 'GET';
 				}
-				if ( empty( $handler['methods'][ $checked_method ] ) ) {
+				if (empty($handler['methods'][$checked_method])) {
 					continue;
 				}
 
-				if ( ! is_callable( $callback ) ) {
-					$response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) );
+				if ( ! is_callable($callback)) {
+					$response = new WP_Error('rest_invalid_handler', __('The handler for the route is invalid'), array('status' => 500));
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Remove the redundant preg_match argument.
-					unset( $args[0] );
+					unset($args[0]);
 
-					$request->set_url_params( $args );
-					$request->set_attributes( $handler );
+					$request->set_url_params($args);
+					$request->set_attributes($handler);
 
 					$defaults = array();
 
-					foreach ( $handler['args'] as $arg => $options ) {
-						if ( isset( $options['default'] ) ) {
-							$defaults[ $arg ] = $options['default'];
+					foreach ($handler['args'] as $arg => $options) {
+						if (isset($options['default'])) {
+							$defaults[$arg] = $options['default'];
 						}
 					}
 
-					$request->set_default_params( $defaults );
+					$request->set_default_params($defaults);
 
 					$check_required = $request->has_valid_params();
-					if ( is_wp_error( $check_required ) ) {
+					if (is_wp_error($check_required)) {
 						$response = $check_required;
 					}
 
 					$request->sanitize_params();
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Check permission specified on the route.
-					if ( ! empty( $handler['permission_callback'] ) ) {
-						$permission = call_user_func( $handler['permission_callback'], $request );
+					if ( ! empty($handler['permission_callback'])) {
+						$permission = call_user_func($handler['permission_callback'], $request);
 
-						if ( is_wp_error( $permission ) ) {
+						if (is_wp_error($permission)) {
 							$response = $permission;
-						} else if ( false === $permission || null === $permission ) {
-							$response = new WP_Error( 'rest_forbidden', __( 'Sorry, you are not allowed to do that.' ), array( 'status' => 403 ) );
+						} else if (false === $permission || null === $permission) {
+							$response = new WP_Error('rest_forbidden', __('Sorry, you are not allowed to do that.'), array('status' => 403));
 						}
 					}
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					/**
 					 * Filters the REST dispatch request result.
 					 *
@@ -898,30 +898,30 @@ 
 					 * @param string          $route           Route matched for the request.
 					 * @param array           $handler         Route handler used for the request.
 					 */
-					$dispatch_result = apply_filters( 'rest_dispatch_request', null, $request, $route, $handler );
+					$dispatch_result = apply_filters('rest_dispatch_request', null, $request, $route, $handler);
 
 					// Allow plugins to halt the request via this filter.
-					if ( null !== $dispatch_result ) {
+					if (null !== $dispatch_result) {
 						$response = $dispatch_result;
 					} else {
-						$response = call_user_func( $callback, $request );
+						$response = call_user_func($callback, $request);
 					}
 				}
 
-				if ( is_wp_error( $response ) ) {
-					$response = $this->error_to_response( $response );
+				if (is_wp_error($response)) {
+					$response = $this->error_to_response($response);
 				} else {
-					$response = rest_ensure_response( $response );
+					$response = rest_ensure_response($response);
 				}
 
-				$response->set_matched_route( $route );
-				$response->set_matched_handler( $handler );
+				$response->set_matched_route($route);
+				$response->set_matched_handler($handler);
 
 				return $response;
 			}
 		}
 
-		return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) );
+		return $this->error_to_response(new WP_Error('rest_no_route', __('No route was found matching the URL and request method'), array('status' => 404)));
 	}
 
 	/**
@@ -937,13 +937,13 @@ 
 	 */
 	protected function get_json_last_error() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
-		if ( ( defined( 'JSON_ERROR_NONE' ) && JSON_ERROR_NONE === $last_error_code ) || empty( $last_error_code ) ) {
+		if ((defined('JSON_ERROR_NONE') && JSON_ERROR_NONE === $last_error_code) || empty($last_error_code)) {
 			return false;
 		}
 
@@ -965,21 +965,21 @@ 
 	 * }
 	 * @return array Index entity
 	 */
-	public function get_index( $request ) {
+	public function get_index($request) {
 		// General site data.
 		$available = array(
-			'name'           => get_option( 'blogname' ),
-			'description'    => get_option( 'blogdescription' ),
-			'url'            => get_option( 'siteurl' ),
+			'name'           => get_option('blogname'),
+			'description'    => get_option('blogdescription'),
+			'url'            => get_option('siteurl'),
 			'home'           => home_url(),
-			'namespaces'     => array_keys( $this->namespaces ),
+			'namespaces'     => array_keys($this->namespaces),
 			'authentication' => array(),
-			'routes'         => $this->get_data_for_routes( $this->get_routes(), $request['context'] ),
+			'routes'         => $this->get_data_for_routes($this->get_routes(), $request['context']),
 		);
 
-		$response = new WP_REST_Response( $available );
+		$response = new WP_REST_Response($available);
 
-		$response->add_link( 'help', 'http://v2.wp-api.org/' );
+		$response->add_link('help', 'http://v2.wp-api.org/');
 
 		/**
 		 * Filters the API root index data.
@@ -992,7 +992,7 @@ 
 		 *
 		 * @param WP_REST_Response $response Response data.
 		 */
-		return apply_filters( 'rest_index', $response );
+		return apply_filters('rest_index', $response);
 	}
 
 	/**
@@ -1005,24 +1005,24 @@ 
 	 * @return WP_REST_Response|WP_Error WP_REST_Response instance if the index was found,
 	 *                                   WP_Error if the namespace isn't set.
 	 */
-	public function get_namespace_index( $request ) {
+	public function get_namespace_index($request) {
 		$namespace = $request['namespace'];
 
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) );
+		if ( ! isset($this->namespaces[$namespace])) {
+			return new WP_Error('rest_invalid_namespace', __('The specified namespace could not be found.'), array('status' => 404));
 		}
 
-		$routes = $this->namespaces[ $namespace ];
-		$endpoints = array_intersect_key( $this->get_routes(), $routes );
+		$routes = $this->namespaces[$namespace];
+		$endpoints = array_intersect_key($this->get_routes(), $routes);
 
 		$data = array(
 			'namespace' => $namespace,
-			'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ),
+			'routes' => $this->get_data_for_routes($endpoints, $request['context']),
 		);
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
 		// Link to the root index.
-		$response->add_link( 'up', rest_url( '/' ) );
+		$response->add_link('up', rest_url('/'));
 
 		/**
 		 * Filters the namespace index data.
@@ -1035,7 +1035,7 @@ 
 		 * @param WP_REST_Response $response Response data.
 		 * @param WP_REST_Request  $request  Request data. The namespace is passed as the 'namespace' parameter.
 		 */
-		return apply_filters( 'rest_namespace_index', $response, $request );
+		return apply_filters('rest_namespace_index', $response, $request);
 	}
 
 	/**
@@ -1048,13 +1048,13 @@ 
 	 * @param string $context Optional. Context for data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array Route data to expose in indexes.
 	 */
-	public function get_data_for_routes( $routes, $context = 'view' ) {
+	public function get_data_for_routes($routes, $context = 'view') {
 		$available = array();
 
 		// Find the available routes.
-		foreach ( $routes as $route => $callbacks ) {
-			$data = $this->get_data_for_route( $route, $callbacks, $context );
-			if ( empty( $data ) ) {
+		foreach ($routes as $route => $callbacks) {
+			$data = $this->get_data_for_route($route, $callbacks, $context);
+			if (empty($data)) {
 				continue;
 			}
 
@@ -1065,7 +1065,7 @@ 
 			 *
 			 * @param WP_REST_Request $request Request data. The namespace is passed as the 'namespace' parameter.
 			 */
-			$available[ $route ] = apply_filters( 'rest_endpoints_description', $data );
+			$available[$route] = apply_filters('rest_endpoints_description', $data);
 		}
 
 		/**
@@ -1080,7 +1080,7 @@ 
 		 * @param array $available Map of route to route data.
 		 * @param array $routes    Internal route data as an associative array.
 		 */
-		return apply_filters( 'rest_route_data', $available, $routes );
+		return apply_filters('rest_route_data', $available, $routes);
 	}
 
 	/**
@@ -1094,68 +1094,68 @@ 
 	 * @param string $context   Optional. Context for the data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array|null Data for the route, or null if no publicly-visible data.
 	 */
-	public function get_data_for_route( $route, $callbacks, $context = 'view' ) {
+	public function get_data_for_route($route, $callbacks, $context = 'view') {
 		$data = array(
 			'namespace' => '',
 			'methods' => array(),
 			'endpoints' => array(),
 		);
 
-		if ( isset( $this->route_options[ $route ] ) ) {
-			$options = $this->route_options[ $route ];
+		if (isset($this->route_options[$route])) {
+			$options = $this->route_options[$route];
 
-			if ( isset( $options['namespace'] ) ) {
+			if (isset($options['namespace'])) {
 				$data['namespace'] = $options['namespace'];
 			}
 
-			if ( isset( $options['schema'] ) && 'help' === $context ) {
-				$data['schema'] = call_user_func( $options['schema'] );
+			if (isset($options['schema']) && 'help' === $context) {
+				$data['schema'] = call_user_func($options['schema']);
 			}
 		}
 
-		$route = preg_replace( '#\(\?P<(\w+?)>.*?\)#', '{$1}', $route );
+		$route = preg_replace('#\(\?P<(\w+?)>.*?\)#', '{$1}', $route);
 
-		foreach ( $callbacks as $callback ) {
+		foreach ($callbacks as $callback) {
 			// Skip to the next route if any callback is hidden.
-			if ( empty( $callback['show_in_index'] ) ) {
+			if (empty($callback['show_in_index'])) {
 				continue;
 			}
 
-			$data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) );
+			$data['methods'] = array_merge($data['methods'], array_keys($callback['methods']));
 			$endpoint_data = array(
-				'methods' => array_keys( $callback['methods'] ),
+				'methods' => array_keys($callback['methods']),
 			);
 
-			if ( isset( $callback['args'] ) ) {
+			if (isset($callback['args'])) {
 				$endpoint_data['args'] = array();
-				foreach ( $callback['args'] as $key => $opts ) {
+				foreach ($callback['args'] as $key => $opts) {
 					$arg_data = array(
-						'required' => ! empty( $opts['required'] ),
+						'required' => ! empty($opts['required']),
 					);
-					if ( isset( $opts['default'] ) ) {
+					if (isset($opts['default'])) {
 						$arg_data['default'] = $opts['default'];
 					}
-					if ( isset( $opts['enum'] ) ) {
+					if (isset($opts['enum'])) {
 						$arg_data['enum'] = $opts['enum'];
 					}
-					if ( isset( $opts['description'] ) ) {
+					if (isset($opts['description'])) {
 						$arg_data['description'] = $opts['description'];
 					}
-					$endpoint_data['args'][ $key ] = $arg_data;
+					$endpoint_data['args'][$key] = $arg_data;
 				}
 			}
 
 			$data['endpoints'][] = $endpoint_data;
 
 			// For non-variable routes, generate links.
-			if ( strpos( $route, '{' ) === false ) {
+			if (strpos($route, '{') === false) {
 				$data['_links'] = array(
-					'self' => rest_url( $route ),
+					'self' => rest_url($route),
 				);
 			}
 		}
 
-		if ( empty( $data['methods'] ) ) {
+		if (empty($data['methods'])) {
 			// No methods supported, hide the route.
 			return null;
 		}
@@ -1171,8 +1171,8 @@ 
 	 *
 	 * @param int $code HTTP status.
 	 */
-	protected function set_status( $code ) {
-		status_header( $code );
+	protected function set_status($code) {
+		status_header($code);
 	}
 
 	/**
@@ -1184,7 +1184,7 @@ 
 	 * @param string $key Header key.
 	 * @param string $value Header value.
 	 */
-	public function send_header( $key, $value ) {
+	public function send_header($key, $value) {
 		/*
 		 * Sanitize as per RFC2616 (Section 4.2):
 		 *
@@ -1192,8 +1192,8 @@ 
 		 * single SP before interpreting the field value or forwarding the
 		 * message downstream.
 		 */
-		$value = preg_replace( '/\s+/', ' ', $value );
-		header( sprintf( '%s: %s', $key, $value ) );
+		$value = preg_replace('/\s+/', ' ', $value);
+		header(sprintf('%s: %s', $key, $value));
 	}
 
 	/**
@@ -1204,9 +1204,9 @@ 
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
-	public function send_headers( $headers ) {
-		foreach ( $headers as $key => $value ) {
-			$this->send_header( $key, $value );
+	public function send_headers($headers) {
+		foreach ($headers as $key => $value) {
+			$this->send_header($key, $value);
 		}
 	}
 
@@ -1227,8 +1227,8 @@ 
 		 * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 		 * but we can do it ourself.
 		 */
-		if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
-			$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+		if ( ! isset($HTTP_RAW_POST_DATA)) {
+			$HTTP_RAW_POST_DATA = file_get_contents('php://input');
 		}
 
 		return $HTTP_RAW_POST_DATA;
@@ -1243,17 +1243,17 @@ 
 	 * @param array $server Associative array similar to `$_SERVER`.
 	 * @return array Headers extracted from the input.
 	 */
-	public function get_headers( $server ) {
+	public function get_headers($server) {
 		$headers = array();
 
 		// CONTENT_* headers are not prefixed with HTTP_.
-		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
+		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
 
-		foreach ( $server as $key => $value ) {
-			if ( strpos( $key, 'HTTP_' ) === 0 ) {
-				$headers[ substr( $key, 5 ) ] = $value;
-			} elseif ( isset( $additional[ $key ] ) ) {
-				$headers[ $key ] = $value;
+		foreach ($server as $key => $value) {
+			if (strpos($key, 'HTTP_') === 0) {
+				$headers[substr($key, 5)] = $value;
+			} elseif (isset($additional[$key])) {
+				$headers[$key] = $value;
 			}
 		}
 

src/wp-includes/functions.wp-scripts.php

Spacing +56 added lines, -56 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_scripts() {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		$wp_scripts = new WP_Scripts();
 	}
 	return $wp_scripts;
@@ -33,17 +33,17 @@ 
  *
  * @param string $function Function name.
  */
-function _wp_scripts_maybe_doing_it_wrong( $function ) {
-	if ( did_action( 'init' ) ) {
+function _wp_scripts_maybe_doing_it_wrong($function) {
+	if (did_action('init')) {
 		return;
 	}
 
-	_doing_it_wrong( $function, sprintf(
-		__( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+	_doing_it_wrong($function, sprintf(
+		__('Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.'),
 		'<code>wp_enqueue_scripts</code>',
 		'<code>admin_enqueue_scripts</code>',
 		'<code>login_enqueue_scripts</code>'
-	), '3.3.0' );
+	), '3.3.0');
 }
 
 /**
@@ -62,27 +62,27 @@ 
  * @param string|bool|array $handles Optional. Scripts to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_scripts( $handles = false ) {
+function wp_print_scripts($handles = false) {
 	/**
 	 * Fires before scripts in the $handles queue are printed.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_print_scripts' );
-	if ( '' === $handles ) { // for wp_head
+	do_action('wp_print_scripts');
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_scripts()->do_items( $handles );
+	return wp_scripts()->do_items($handles);
 }
 
 /**
@@ -103,20 +103,20 @@ 
  *                         or after. Default 'after'.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_script( $handle, $data, $position = 'after' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_script($handle, $data, $position = 'after') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</script>' ) ) {
-		_doing_it_wrong( __FUNCTION__, sprintf(
+	if (false !== stripos($data, '</script>')) {
+		_doing_it_wrong(__FUNCTION__, sprintf(
 			/* translators: 1: <script>, 2: wp_add_inline_script() */
-			__( 'Do not pass %1$s tags to %2$s.' ),
+			__('Do not pass %1$s tags to %2$s.'),
 			'<code>&lt;script&gt;</code>',
 			'<code>wp_add_inline_script()</code>'
-		), '4.5.0' );
-		$data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
+		), '4.5.0');
+		$data = trim(preg_replace('#<script[^>]*>(.*)</script>#is', '$1', $data));
 	}
 
-	return wp_scripts()->add_inline_script( $handle, $data, $position );
+	return wp_scripts()->add_inline_script($handle, $data, $position);
 }
 
 /**
@@ -141,13 +141,13 @@ 
  *                                    Default 'false'.
  * @return bool Whether the script has been registered. True on success, false on failure.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_register_script($handle, $src, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	$registered = $wp_scripts->add( $handle, $src, $deps, $ver );
-	if ( $in_footer ) {
-		$wp_scripts->add_data( $handle, 'group', 1 );
+	$registered = $wp_scripts->add($handle, $src, $deps, $ver);
+	if ($in_footer) {
+		$wp_scripts->add_data($handle, 'group', 1);
 	}
 
 	return $registered;
@@ -181,14 +181,14 @@ 
  * @param array $l10n         The data itself. The data can be either a single or multi-dimensional array.
  * @return bool True if the script was successfully localized, false otherwise.
  */
-function wp_localize_script( $handle, $object_name, $l10n ) {
+function wp_localize_script($handle, $object_name, $l10n) {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 		return false;
 	}
 
-	return $wp_scripts->localize( $handle, $object_name, $l10n );
+	return $wp_scripts->localize($handle, $object_name, $l10n);
 }
 
 /**
@@ -203,16 +203,16 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_deregister_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	/**
 	 * Do not allow accidental or negligent de-registering of critical scripts in the admin.
 	 * Show minimal remorse if the correct hook is used.
 	 */
 	$current_filter = current_filter();
-	if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) ||
-		( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
+	if ((is_admin() && 'admin_enqueue_scripts' !== $current_filter) ||
+		('wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter)
 	) {
 		$no = array(
 			'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
@@ -223,15 +223,15 @@ 
 			'jquery-ui-tooltip', 'jquery-ui-widget', 'underscore', 'backbone',
 		);
 
-		if ( in_array( $handle, $no ) ) {
-			$message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
-				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
-			_doing_it_wrong( __FUNCTION__, $message, '3.6.0' );
+		if (in_array($handle, $no)) {
+			$message = sprintf(__('Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.'),
+				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>');
+			_doing_it_wrong(__FUNCTION__, $message, '3.6.0');
 			return;
 		}
 	}
 
-	wp_scripts()->remove( $handle );
+	wp_scripts()->remove($handle);
 }
 
 /**
@@ -255,25 +255,25 @@ 
  * @param bool             $in_footer Optional. Whether to enqueue the script before </body> instead of in the <head>.
  *                                    Default 'false'.
  */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script($handle, $src = false, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 
-	if ( $src || $in_footer ) {
-		$_handle = explode( '?', $handle );
+	if ($src || $in_footer) {
+		$_handle = explode('?', $handle);
 
-		if ( $src ) {
-			$wp_scripts->add( $_handle[0], $src, $deps, $ver );
+		if ($src) {
+			$wp_scripts->add($_handle[0], $src, $deps, $ver);
 		}
 
-		if ( $in_footer ) {
-			$wp_scripts->add_data( $_handle[0], 'group', 1 );
+		if ($in_footer) {
+			$wp_scripts->add_data($_handle[0], 'group', 1);
 		}
 	}
 
-	$wp_scripts->enqueue( $handle );
+	$wp_scripts->enqueue($handle);
 }
 
 /**
@@ -285,10 +285,10 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_dequeue_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_scripts()->dequeue( $handle );
+	wp_scripts()->dequeue($handle);
 }
 
 /**
@@ -302,10 +302,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether the script is queued.
  */
-function wp_script_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_script_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_scripts()->query( $handle, $list );
+	return (bool) wp_scripts()->query($handle, $list);
 }
 
 /**
@@ -325,6 +325,6 @@ 
  * @param mixed  $value  String containing the data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_script_add_data( $handle, $key, $value ){
-	return wp_scripts()->add_data( $handle, $key, $value );
+function wp_script_add_data($handle, $key, $value) {
+	return wp_scripts()->add_data($handle, $key, $value);
 }

src/wp-includes/ms-functions.php

Spacing +495 added lines, -495 removed lines

@@ -39,45 +39,45 @@ 
  * @param int $user_id The unique ID of the user
  * @return WP_Site|void The blog object
  */
-function get_active_blog_for_user( $user_id ) {
+function get_active_blog_for_user($user_id) {
 	global $wpdb;
-	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
+	$blogs = get_blogs_of_user($user_id);
+	if (empty($blogs))
 		return;
 
-	if ( !is_multisite() )
+	if ( ! is_multisite())
 		return $blogs[$wpdb->blogid];
 
-	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
+	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
 	$first_blog = current($blogs);
-	if ( false !== $primary_blog ) {
-		if ( ! isset( $blogs[ $primary_blog ] ) ) {
-			update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-			$primary = get_blog_details( $first_blog->userblog_id );
+	if (false !== $primary_blog) {
+		if ( ! isset($blogs[$primary_blog])) {
+			update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
+			$primary = get_blog_details($first_blog->userblog_id);
 		} else {
-			$primary = get_blog_details( $primary_blog );
+			$primary = get_blog_details($primary_blog);
 		}
 	} else {
 		//TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
-		add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
-		update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
+		add_user_to_blog($first_blog->userblog_id, $user_id, 'subscriber');
+		update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
 		$primary = $first_blog;
 	}
 
-	if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
-		$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
+	if (( ! is_object($primary)) || ($primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1)) {
+		$blogs = get_blogs_of_user($user_id, true); // if a user's primary blog is shut down, check their other blogs.
 		$ret = false;
-		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
-			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
+		if (is_array($blogs) && count($blogs) > 0) {
+			foreach ((array) $blogs as $blog_id => $blog) {
+				if ($blog->site_id != $wpdb->siteid)
 					continue;
-				$details = get_blog_details( $blog_id );
-				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
+				$details = get_blog_details($blog_id);
+				if (is_object($details) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if (get_user_meta($user_id, 'primary_blog', true) != $blog_id)
+						update_user_meta($user_id, 'primary_blog', $blog_id);
+					if ( ! get_user_meta($user_id, 'source_domain', true))
+						update_user_meta($user_id, 'source_domain', $blog->domain);
 					break;
 				}
 			}
@@ -100,7 +100,7 @@ 
  * @return int
  */
 function get_user_count() {
-	return get_site_option( 'user_count' );
+	return get_site_option('user_count');
 }
 
 /**
@@ -113,11 +113,11 @@ 
  * @param int $network_id Deprecated, not supported.
  * @return int
  */
-function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+function get_blog_count($network_id = 0) {
+	if (func_num_args())
+		_deprecated_argument(__FUNCTION__, '3.1.0');
 
-	return get_site_option( 'blog_count' );
+	return get_site_option('blog_count');
 }
 
 /**
@@ -129,9 +129,9 @@ 
  * @param int $post_id ID of the post you're looking for.
  * @return WP_Post|null WP_Post on success or null on failure
  */
-function get_blog_post( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$post = get_post( $post_id );
+function get_blog_post($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$post = get_post($post_id);
 	restore_current_blog();
 
 	return $post;
@@ -149,17 +149,17 @@ 
  * @param string $role    The role you want the user to have
  * @return true|WP_Error
  */
-function add_user_to_blog( $blog_id, $user_id, $role ) {
+function add_user_to_blog($blog_id, $user_id, $role) {
 	switch_to_blog($blog_id);
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		restore_current_blog();
-		return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
+		return new WP_Error('user_does_not_exist', __('The requested user does not exist.'));
 	}
 
-	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
+	if ( ! get_user_meta($user_id, 'primary_blog', true)) {
 		update_user_meta($user_id, 'primary_blog', $blog_id);
 		$details = get_blog_details($blog_id);
 		update_user_meta($user_id, 'source_domain', $details->domain);
@@ -176,9 +176,9 @@ 
 	 * @param string $role    User role.
 	 * @param int    $blog_id Blog ID.
 	 */
-	do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
+	do_action('add_user_to_blog', $user_id, $role, $blog_id);
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($blog_id.'_user_count', 'blog-details');
 	restore_current_blog();
 	return true;
 }
@@ -213,17 +213,17 @@ 
 	 * @param int $user_id User ID.
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'remove_user_from_blog', $user_id, $blog_id );
+	do_action('remove_user_from_blog', $user_id, $blog_id);
 
 	// If being removed from the primary blog, set a new primary if the user is assigned
 	// to multiple blogs.
 	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
-	if ( $primary_blog == $blog_id ) {
+	if ($primary_blog == $blog_id) {
 		$new_id = '';
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
-		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
+		foreach ((array) $blogs as $blog) {
+			if ($blog->userblog_id == $blog_id)
 				continue;
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
@@ -235,8 +235,8 @@ 
 	}
 
 	// wp_revoke_user($user_id);
-	$user = get_userdata( $user_id );
-	if ( ! $user ) {
+	$user = get_userdata($user_id);
+	if ( ! $user) {
 		restore_current_blog();
 		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 	}
@@ -244,24 +244,24 @@ 
 	$user->remove_all_caps();
 
 	$blogs = get_blogs_of_user($user_id);
-	if ( count($blogs) == 0 ) {
+	if (count($blogs) == 0) {
 		update_user_meta($user_id, 'primary_blog', '');
 		update_user_meta($user_id, 'source_domain', '');
 	}
 
-	if ( $reassign != '' ) {
+	if ($reassign != '') {
 		$reassign = (int) $reassign;
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id));
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id));
 
-		if ( ! empty( $post_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id ) );
-			array_walk( $post_ids, 'clean_post_cache' );
+		if ( ! empty($post_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id));
+			array_walk($post_ids, 'clean_post_cache');
 		}
 
-		if ( ! empty( $link_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id ) );
-			array_walk( $link_ids, 'clean_bookmark_cache' );
+		if ( ! empty($link_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id));
+			array_walk($link_ids, 'clean_bookmark_cache');
 		}
 	}
 
@@ -279,9 +279,9 @@ 
  * @param int $post_id ID of the desired post.
  * @return string The post's permalink
  */
-function get_blog_permalink( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$link = get_permalink( $post_id );
+function get_blog_permalink($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$link = get_permalink($post_id);
 	restore_current_blog();
 
 	return $link;
@@ -303,14 +303,14 @@ 
  * @param string $path   Optional. Not required for subdomain installations.
  * @return int 0 if no blog found, otherwise the ID of the matching blog
  */
-function get_blog_id_from_url( $domain, $path = '/' ) {
-	$domain = strtolower( $domain );
-	$path = strtolower( $path );
-	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+function get_blog_id_from_url($domain, $path = '/') {
+	$domain = strtolower($domain);
+	$path = strtolower($path);
+	$id = wp_cache_get(md5($domain.$path), 'blog-id-cache');
 
-	if ( $id == -1 ) // blog does not exist
+	if ($id == -1) // blog does not exist
 		return 0;
-	elseif ( $id )
+	elseif ($id)
 		return (int) $id;
 
 	$args = array(
@@ -318,15 +318,15 @@ 
 		'path' => $path,
 		'fields' => 'ids',
 	);
-	$result = get_sites( $args );
-	$id = array_shift( $result );
+	$result = get_sites($args);
+	$id = array_shift($result);
 
-	if ( ! $id ) {
-		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
+	if ( ! $id) {
+		wp_cache_set(md5($domain.$path), -1, 'blog-id-cache');
 		return 0;
 	}
 
-	wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
+	wp_cache_set(md5($domain.$path), $id, 'blog-id-cache');
 
 	return $id;
 }
@@ -346,30 +346,30 @@ 
  * @param string $user_email The email provided by the user at registration.
  * @return bool Returns true when the email address is banned.
  */
-function is_email_address_unsafe( $user_email ) {
-	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+function is_email_address_unsafe($user_email) {
+	$banned_names = get_site_option('banned_email_domains');
+	if ($banned_names && ! is_array($banned_names))
+		$banned_names = explode("\n", $banned_names);
 
 	$is_email_address_unsafe = false;
 
-	if ( $banned_names && is_array( $banned_names ) ) {
-		$banned_names = array_map( 'strtolower', $banned_names );
-		$normalized_email = strtolower( $user_email );
+	if ($banned_names && is_array($banned_names)) {
+		$banned_names = array_map('strtolower', $banned_names);
+		$normalized_email = strtolower($user_email);
 
-		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
+		list($email_local_part, $email_domain) = explode('@', $normalized_email);
 
-		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
+		foreach ($banned_names as $banned_domain) {
+			if ( ! $banned_domain)
 				continue;
 
-			if ( $email_domain == $banned_domain ) {
+			if ($email_domain == $banned_domain) {
 				$is_email_address_unsafe = true;
 				break;
 			}
 
 			$dotted_domain = ".$banned_domain";
-			if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+			if ($dotted_domain === substr($normalized_email, -strlen($dotted_domain))) {
 				$is_email_address_unsafe = true;
 				break;
 			}
@@ -384,7 +384,7 @@ 
 	 * @param bool   $is_email_address_unsafe Whether the email address is "unsafe". Default false.
 	 * @param string $user_email              User email address.
 	 */
-	return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
+	return apply_filters('is_email_address_unsafe', $is_email_address_unsafe, $user_email);
 }
 
 /**
@@ -413,86 +413,86 @@ 
 	$errors = new WP_Error();
 
 	$orig_username = $user_name;
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
-		$errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) );
+	if ($user_name != $orig_username || preg_match('/[^a-z0-9]/', $user_name)) {
+		$errors->add('user_name', __('Usernames can only contain lowercase letters (a-z) and numbers.'));
 		$user_name = $orig_username;
 	}
 
-	$user_email = sanitize_email( $user_email );
+	$user_email = sanitize_email($user_email);
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if (empty($user_name))
+	   	$errors->add('user_name', __('Please enter a username.'));
 
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( ! is_array( $illegal_names ) ) {
-		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ( ! is_array($illegal_names)) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
-	if ( in_array( $user_name, $illegal_names ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array($user_name, $illegal_names)) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_name), array_map('strtolower', $illegal_logins))) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if (is_email_address_unsafe($user_email))
+		$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if (strlen($user_name) < 4)
+		$errors->add('user_name', __('Username must be at least 4 characters.'));
 
-	if ( strlen( $user_name ) > 60 ) {
-		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
+	if (strlen($user_name) > 60) {
+		$errors->add('user_name', __('Username may not be longer than 60 characters.'));
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
+	if (preg_match('/^[0-9]*$/', $user_name))
 		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( ! is_email($user_email))
+		$errors->add('user_email', __('Please enter a valid email address.'));
 
-	$limited_email_domains = get_site_option( 'limited_email_domains' );
-	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
-		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-		if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+	$limited_email_domains = get_site_option('limited_email_domains');
+	if (is_array($limited_email_domains) && ! empty($limited_email_domains)) {
+		$emaildomain = substr($user_email, 1 + strpos($user_email, '@'));
+		if ( ! in_array($emaildomain, $limited_email_domains)) {
 			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
 		}
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if (username_exists($user_name))
+		$errors->add('user_name', __('Sorry, that username already exists!'));
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if (email_exists($user_email))
+		$errors->add('user_email', __('Sorry, that email address is already used!'));
 
 	// Has someone already signed up for this username?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
-	if ( $signup != null ) {
-		$registered_at =  mysql2date('U', $signup->registered);
-		$now = current_time( 'timestamp', true );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name));
+	if ($signup != null) {
+		$registered_at = mysql2date('U', $signup->registered);
+		$now = current_time('timestamp', true);
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_login' => $user_name));
 		else
 			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
 	}
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
-	if ( $signup != null ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email));
+	if ($signup != null) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_email' => $user_email));
 		else
 			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
 	}
@@ -516,7 +516,7 @@ 
 	 *     @type WP_Error $errors        WP_Error object containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_user_signup', $result );
+	return apply_filters('wpmu_validate_user_signup', $result);
 }
 
 /**
@@ -543,48 +543,48 @@ 
  * @param WP_User|string $user       Optional. The user object to check against the new site name.
  * @return array Contains the new site data and error messages.
  */
-function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
+function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
 	global $wpdb, $domain;
 
 	$current_site = get_current_site();
 	$base = $current_site->path;
 
-	$blog_title = strip_tags( $blog_title );
+	$blog_title = strip_tags($blog_title);
 
 	$errors = new WP_Error();
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( $illegal_names == false ) {
-		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ($illegal_names == false) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
 
 	/*
 	 * On sub dir installs, some names are so illegal, only a filter can
 	 * spring them from jail.
 	 */
-	if ( ! is_subdomain_install() ) {
-		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
+	if ( ! is_subdomain_install()) {
+		$illegal_names = array_merge($illegal_names, get_subdirectory_reserved_names());
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if (empty($blogname))
+		$errors->add('blogname', __('Please enter a site name.'));
 
-	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
-		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
+	if (preg_match('/[^a-z0-9]+/', $blogname)) {
+		$errors->add('blogname', __('Site names can only contain lowercase letters (a-z) and numbers.'));
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if (in_array($blogname, $illegal_names))
+		$errors->add('blogname', __('That name is not allowed.'));
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if (strlen($blogname) < 4 && ! is_super_admin())
+		$errors->add('blogname', __('Site name must be at least 4 characters.'));
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( ! is_subdomain_install() && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM ".$wpdb->get_blog_prefix($current_site->blog_id)."posts WHERE post_type = 'page' AND post_name = %s", $blogname)))
+		$errors->add('blogname', __('Sorry, you may not use that site name.'));
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
+	if (preg_match('/^[0-9]*$/', $blogname))
 		$errors->add('blogname', __('Sorry, site names must have letters too!'));
 
 	/**
@@ -597,36 +597,36 @@ 
 	 *
 	 * @param string $blogname Site name.
 	 */
-	$blogname = apply_filters( 'newblogname', $blogname );
+	$blogname = apply_filters('newblogname', $blogname);
 
-	$blog_title = wp_unslash(  $blog_title );
+	$blog_title = wp_unslash($blog_title);
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if (empty($blog_title))
+		$errors->add('blog_title', __('Please enter a site title.'));
 
 	// Check if the domain/path has been used already.
-	if ( is_subdomain_install() ) {
-		$mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
+	if (is_subdomain_install()) {
+		$mydomain = $blogname.'.'.preg_replace('|^www\.|', '', $domain);
 		$path = $base;
 	} else {
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($mydomain, $path, $current_site->id))
+		$errors->add('blogname', __('Sorry, that site already exists!'));
 
-	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+	if (username_exists($blogname)) {
+		if ( ! is_object($user) || (is_object($user) && ($user->user_login != $blogname)))
+			$errors->add('blogname', __('Sorry, that site is reserved!'));
 	}
 
 	// Has someone already signed up for this domain?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
-	if ( ! empty($signup) ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path)); // TODO: Check email too?
+	if ( ! empty($signup)) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('domain' => $mydomain, 'path' => $path));
 		else
 			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
 	}
@@ -649,7 +649,7 @@ 
 	 *     @type WP_Error       $errors     WP_Error containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_blog_signup', $result );
+	return apply_filters('wpmu_validate_blog_signup', $result);
 }
 
 /**
@@ -666,13 +666,13 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
+function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = array()) {
 	global $wpdb;
 
-	$key = substr( md5( time() . rand() . $domain ), 0, 16 );
+	$key = substr(md5(time().rand().$domain), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => $domain,
 		'path' => $path,
 		'title' => $title,
@@ -681,7 +681,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	/**
 	 * Fires after site signup information has been written to the database.
@@ -696,7 +696,7 @@ 
 	 * @param string $key        The user's activation key
 	 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 	 */
-	do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
+	do_action('after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta);
 }
 
 /**
@@ -713,16 +713,16 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, this is an empty array.
  */
-function wpmu_signup_user( $user, $user_email, $meta = array() ) {
+function wpmu_signup_user($user, $user_email, $meta = array()) {
 	global $wpdb;
 
 	// Format data
-	$user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
-	$user_email = sanitize_email( $user_email );
-	$key = substr( md5( time() . rand() . $user_email ), 0, 16 );
+	$user = preg_replace('/\s+/', '', sanitize_user($user, true));
+	$user_email = sanitize_email($user_email);
+	$key = substr(md5(time().rand().$user_email), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => '',
 		'path' => '',
 		'title' => '',
@@ -731,7 +731,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	/**
 	 * Fires after a user's signup information has been written to the database.
@@ -743,7 +743,7 @@ 
 	 * @param string $key        The user's activation key
 	 * @param array  $meta       Additional signup meta. By default, this is an empty array.
 	 */
-	do_action( 'after_signup_user', $user, $user_email, $key, $meta );
+	do_action('after_signup_user', $user, $user_email, $key, $meta);
 }
 
 /**
@@ -770,7 +770,7 @@ 
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
-function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filters whether to bypass the new site email notification.
 	 *
@@ -784,22 +784,22 @@ 
 	 * @param string      $key        Activation key created in wpmu_signup_blog().
 	 * @param array       $meta       By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta ) ) {
+	if ( ! apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta)) {
 		return false;
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
+	if ( ! is_subdomain_install() || get_current_site()->id != 1)
 		$activate_url = network_site_url("wp-activate.php?key=$key");
 	else
 		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filters the message content of the new blog notification email.
@@ -817,12 +817,12 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_email',
-			__( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ),
+		apply_filters('wpmu_signup_blog_notification_email',
+			__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s"),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$activate_url,
-		esc_url( "http://{$domain}{$path}" ),
+		esc_url("http://{$domain}{$path}"),
 		$key
 	);
 	// TODO: Don't hard code activation link.
@@ -841,14 +841,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_blog_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$from_name,
-		esc_url( 'http://' . $domain . $path )
+		esc_url('http://'.$domain.$path)
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -873,7 +873,7 @@ 
  * @param array  $meta       By default, an empty array.
  * @return bool
  */
-function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_user_notification($user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filters whether to bypass the email notification for new user sign-up.
 	 *
@@ -884,15 +884,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
+	if ( ! apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta))
 		return false;
 
 	// Send email with activation link.
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filters the content of the notification email for new user sign-up.
@@ -907,11 +907,11 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_email',
-			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
+		apply_filters('wpmu_signup_user_notification_email',
+			__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login."),
 			$user, $user_email, $key, $meta
 		),
-		site_url( "wp-activate.php?key=$key" )
+		site_url("wp-activate.php?key=$key")
 	);
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(
@@ -926,14 +926,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_user_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$user, $user_email, $key, $meta
 		),
 		$from_name,
 		$user
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -955,38 +955,38 @@ 
 function wpmu_activate_signup($key) {
 	global $wpdb;
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key));
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if (empty($signup))
+		return new WP_Error('invalid_key', __('Invalid activation key.'));
 
-	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+	if ($signup->active) {
+		if (empty($signup->domain))
+			return new WP_Error('already_active', __('The user is already active.'), $signup);
 		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+			return new WP_Error('already_active', __('The site is already active.'), $signup);
 	}
 
 	$meta = maybe_unserialize($signup->meta);
-	$password = wp_generate_password( 12, false );
+	$password = wp_generate_password(12, false);
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
 	else
 		$user_already_exists = true;
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return new WP_Error('create_user', __('Could not create user'), $signup);
 
 	$now = current_time('mysql', true);
 
-	if ( empty($signup->domain) ) {
-		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	if (empty($signup->domain)) {
+		$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if (isset($user_already_exists))
+			return new WP_Error('user_already_exists', __('That username is already activated.'), $signup);
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -997,24 +997,24 @@ 
 		 * @param int   $password User password.
 		 * @param array $meta     Signup meta data.
 		 */
-		do_action( 'wpmu_activate_user', $user_id, $password, $meta );
-		return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
+		do_action('wpmu_activate_user', $user_id, $password, $meta);
+		return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
 	}
 
-	$blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+	$blog_id = wpmu_create_blog($signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid);
 
 	// TODO: What to do if we create a user but cannot create a blog?
-	if ( is_wp_error($blog_id) ) {
+	if (is_wp_error($blog_id)) {
 		// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
 		// setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
-		if ( 'blog_taken' == $blog_id->get_error_code() ) {
-			$blog_id->add_data( $signup );
-			$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
+		if ('blog_taken' == $blog_id->get_error_code()) {
+			$blog_id->add_data($signup);
+			$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 		}
 		return $blog_id;
 	}
 
-	$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 	/**
 	 * Fires immediately after a site is activated.
 	 *
@@ -1026,7 +1026,7 @@ 
 	 * @param string $signup_title  Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
+	do_action('wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta);
 
 	return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
 }
@@ -1046,16 +1046,16 @@ 
  * @param string $email     The new user's email address.
  * @return int|false Returns false on failure, or int $user_id on success
  */
-function wpmu_create_user( $user_name, $password, $email ) {
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+function wpmu_create_user($user_name, $password, $email) {
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
+	$user_id = wp_create_user($user_name, $password, $email);
+	if (is_wp_error($user_id))
 		return false;
 
 	// Newly created users have no roles or caps until they are added to a blog.
-	delete_user_option( $user_id, 'capabilities' );
-	delete_user_option( $user_id, 'user_level' );
+	delete_user_option($user_id, 'capabilities');
+	delete_user_option($user_id, 'user_level');
 
 	/**
 	 * Fires immediately after a new user is created.
@@ -1064,7 +1064,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	do_action( 'wpmu_new_user', $user_id );
+	do_action('wpmu_new_user', $user_id);
 
 	return $user_id;
 }
@@ -1091,30 +1091,30 @@ 
  * @param int    $site_id Optional. Only relevant on multi-network installs.
  * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
-	$defaults = array( 'public' => 0 );
-	$meta = wp_parse_args( $meta, $defaults );
+function wpmu_create_blog($domain, $path, $title, $user_id, $meta = array(), $site_id = 1) {
+	$defaults = array('public' => 0);
+	$meta = wp_parse_args($meta, $defaults);
 
-	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
+	$domain = preg_replace('/\s+/', '', sanitize_user($domain, true));
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if (is_subdomain_install())
+		$domain = str_replace('@', '', $domain);
 
-	$title = strip_tags( $title );
+	$title = strip_tags($title);
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($domain, $path, $site_id))
+		return new WP_Error('blog_taken', __('Sorry, that site already exists!'));
 
-	if ( ! wp_installing() ) {
-		wp_installing( true );
+	if ( ! wp_installing()) {
+		wp_installing(true);
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
 		return new WP_Error('insert_blog', __('Could not create site.'));
 
 	switch_to_blog($blog_id);
@@ -1123,18 +1123,18 @@ 
 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
-	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		if (in_array($key, array('public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
+			update_blog_status($blog_id, $key, $value);
 		else
-			update_option( $key, $value );
+			update_option($key, $value);
 	}
 
-	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
-	update_option( 'blog_public', (int) $meta['public'] );
+	add_option('WPLANG', get_site_option('WPLANG'));
+	update_option('blog_public', (int) $meta['public']);
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin($user_id) && ! get_user_meta($user_id, 'primary_blog', true))
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 
 	restore_current_blog();
 	/**
@@ -1149,9 +1149,9 @@ 
 	 * @param int    $site_id Site ID. Only relevant on multi-network installs.
 	 * @param array  $meta    Meta data. Used to set initial site options.
 	 */
-	do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
+	do_action('wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta);
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set('last_changed', microtime(), 'sites');
 
 	return $blog_id;
 }
@@ -1168,26 +1168,26 @@ 
  * @param string $deprecated Not used.
  * @return bool
  */
-function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newblog_notify_siteadmin($blog_id, $deprecated = '') {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
+	$email = get_site_option('admin_email');
+	if (is_email($email) == false)
 		return false;
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
-	switch_to_blog( $blog_id );
-	$blogname = get_option( 'blogname' );
+	switch_to_blog($blog_id);
+	$blogname = get_option('blogname');
 	$siteurl = site_url();
 	restore_current_blog();
 
-	$msg = sprintf( __( 'New Site: %1$s
+	$msg = sprintf(__('New Site: %1$s
 URL: %2$s
 Remote IP: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 	/**
 	 * Filters the message body of the new site activation email sent
 	 * to the network administrator.
@@ -1196,9 +1196,9 @@ 
 	 *
 	 * @param string $msg Email body.
 	 */
-	$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
+	$msg = apply_filters('newblog_notify_siteadmin', $msg);
 
-	wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
+	wp_mail($email, sprintf(__('New Site Registration: %s'), $siteurl), $msg);
 	return true;
 }
 
@@ -1213,22 +1213,22 @@ 
  * @param int $user_id The new user's ID.
  * @return bool
  */
-function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newuser_notify_siteadmin($user_id) {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
+	$email = get_site_option('admin_email');
 
-	if ( is_email($email) == false )
+	if (is_email($email) == false)
 		return false;
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 	$msg = sprintf(__('New User: %1$s
 Remote IP: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 
 	/**
 	 * Filters the message body of the new user activation email sent
@@ -1239,8 +1239,8 @@ 
 	 * @param string  $msg  Email body.
 	 * @param WP_User $user WP_User instance of the new user.
 	 */
-	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
-	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
+	$msg = apply_filters('newuser_notify_siteadmin', $msg, $user);
+	wp_mail($email, sprintf(__('New User Registration: %s'), $user->user_login), $msg);
 	return true;
 }
 
@@ -1260,15 +1260,15 @@ 
  * @return int
  */
 function domain_exists($domain, $path, $site_id = 1) {
-	$path = trailingslashit( $path );
+	$path = trailingslashit($path);
 	$args = array(
 		'network_id' => $site_id,
 		'domain' => $domain,
 		'path' => $path,
 		'fields' => 'ids',
 	);
-	$result = get_sites( $args );
-	$result = array_shift( $result );
+	$result = get_sites($args);
+	$result = array_shift($result);
 
 	/**
 	 * Filters whether a blogname is taken.
@@ -1280,7 +1280,7 @@ 
 	 * @param string   $path    Path to be checked.
 	 * @param int      $site_id Site ID. Relevant only on multi-network installs.
 	 */
-	return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+	return apply_filters('domain_exists', $result, $domain, $path, $site_id);
 }
 
 /**
@@ -1304,12 +1304,12 @@ 
 	$path = trailingslashit($path);
 	$site_id = (int) $site_id;
 
-	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
+	$result = $wpdb->insert($wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
+	if ( ! $result)
 		return false;
 
 	$blog_id = $wpdb->insert_id;
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
 	wp_maybe_update_network_site_counts();
 
@@ -1331,57 +1331,57 @@ 
  * @param int    $blog_id    The value returned by insert_blog().
  * @param string $blog_title The title of the new site.
  */
-function install_blog( $blog_id, $blog_title = '' ) {
+function install_blog($blog_id, $blog_title = '') {
 	global $wpdb, $wp_roles, $current_site;
 
 	// Cast for security
 	$blog_id = (int) $blog_id;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
-	$wpdb->suppress_errors( $suppress );
+	if ($wpdb->get_results("DESCRIBE {$wpdb->posts}"))
+		die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+	$wpdb->suppress_errors($suppress);
 
-	$url = get_blogaddress_by_id( $blog_id );
+	$url = get_blogaddress_by_id($blog_id);
 
 	// Set everything up
-	make_db_current_silent( 'blog' );
+	make_db_current_silent('blog');
 	populate_options();
 	populate_roles();
 
 	// populate_roles() clears previous role definitions so we start over.
 	$wp_roles = new WP_Roles();
 
-	$siteurl = $home = untrailingslashit( $url );
+	$siteurl = $home = untrailingslashit($url);
 
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 
- 		if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
- 			$siteurl = set_url_scheme( $siteurl, 'https' );
+ 		if ('https' === parse_url(get_site_option('siteurl'), PHP_URL_SCHEME)) {
+ 			$siteurl = set_url_scheme($siteurl, 'https');
  		}
- 		if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) {
- 			$home = set_url_scheme( $home, 'https' );
+ 		if ('https' === parse_url(get_home_url($current_site->blog_id), PHP_URL_SCHEME)) {
+ 			$home = set_url_scheme($home, 'https');
  		}
 
 	}
 
-	update_option( 'siteurl', $siteurl );
-	update_option( 'home', $home );
+	update_option('siteurl', $siteurl);
+	update_option('home', $home);
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	if (get_site_option('ms_files_rewriting'))
+		update_option('upload_path', UPLOADBLOGSDIR."/$blog_id/files");
 	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+		update_option('upload_path', get_blog_option(get_current_site()->blog_id, 'upload_path'));
 
-	update_option( 'blogname', wp_unslash( $blog_title ) );
-	update_option( 'admin_email', '' );
+	update_option('blogname', wp_unslash($blog_title));
+	update_option('admin_email', '');
 
 	// remove all perms
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
-	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
+	delete_metadata('user', 0, $table_prefix.'user_level', null, true); // delete all
+	delete_metadata('user', 0, $table_prefix.'capabilities', null, true); // delete all
 }
 
 /**
@@ -1401,13 +1401,13 @@ 
 function install_blog_defaults($blog_id, $user_id) {
 	global $wpdb;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
 
 	wp_install_defaults($user_id);
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 }
 
 /**
@@ -1427,7 +1427,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
+function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1443,13 +1443,13 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_email' );
-	if ( $welcome_email == false ) {
+	$welcome_email = get_site_option('welcome_email');
+	if ($welcome_email == false) {
 		/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-		$welcome_email = __( 'Howdy USERNAME,
+		$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1466,13 +1466,13 @@ 
 	}
 
 	$url = get_blogaddress_by_id($blog_id);
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('BLOG_TITLE', $title, $welcome_email);
+	$welcome_email = str_replace('BLOG_URL', $url, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
 
 	/**
 	 * Filters the content of the welcome email after site activation.
@@ -1488,17 +1488,17 @@ 
 	 * @param string $title         Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-	$admin_email = get_site_option( 'admin_email' );
+	$welcome_email = apply_filters('update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta);
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1508,8 +1508,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, wp_unslash($title)));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1528,7 +1528,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
+function wpmu_welcome_user_notification($user_id, $password, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1542,12 +1542,12 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_user_email' );
+	$welcome_email = get_site_option('welcome_user_email');
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	/**
 	 * Filters the content of the welcome email after user activation.
@@ -1561,22 +1561,22 @@ 
 	 * @param string $password      User password.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
-	$welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
+	$welcome_email = apply_filters('update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
+	$welcome_email = str_replace('LOGINLINK', wp_login_url(), $welcome_email);
 
-	$admin_email = get_site_option( 'admin_email' );
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1586,8 +1586,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_user_subject', sprintf(__('New %1$s User: %2$s'), $current_site->site_name, $user->user_login));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1623,26 +1623,26 @@ 
  * @param int $user_id
  * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
  */
-function get_most_recent_post_of_user( $user_id ) {
+function get_most_recent_post_of_user($user_id) {
 	global $wpdb;
 
-	$user_blogs = get_blogs_of_user( (int) $user_id );
+	$user_blogs = get_blogs_of_user((int) $user_id);
 	$most_recent_post = array();
 
 	// Walk through each blog and get the most recent post
 	// published by $user_id
-	foreach ( (array) $user_blogs as $blog ) {
-		$prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
-		$recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
+	foreach ((array) $user_blogs as $blog) {
+		$prefix = $wpdb->get_blog_prefix($blog->userblog_id);
+		$recent_post = $wpdb->get_row($wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id), ARRAY_A);
 
 		// Make sure we found a post
-		if ( isset($recent_post['ID']) ) {
+		if (isset($recent_post['ID'])) {
 			$post_gmt_ts = strtotime($recent_post['post_date_gmt']);
 
 			// If this is the first post checked or if this post is
 			// newer than the current recent post, make it the new
 			// most recent post.
-			if ( !isset($most_recent_post['post_gmt_ts']) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
+			if ( ! isset($most_recent_post['post_gmt_ts']) || ($post_gmt_ts > $most_recent_post['post_gmt_ts'])) {
 				$most_recent_post = array(
 					'blog_id'		=> $blog->userblog_id,
 					'post_id'		=> $recent_post['ID'],
@@ -1669,24 +1669,24 @@ 
  * @param string $directory Full path of a directory.
  * @return int Size of the directory in MB.
  */
-function get_dirsize( $directory ) {
-	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+function get_dirsize($directory) {
+	$dirsize = get_transient('dirsize_cache');
+	if (is_array($dirsize) && isset($dirsize[$directory]['size']))
+		return $dirsize[$directory]['size'];
 
-	if ( ! is_array( $dirsize ) )
+	if ( ! is_array($dirsize))
 		$dirsize = array();
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
-	if ( is_main_site() ) {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+	if (is_main_site()) {
+		$dirsize[$directory]['size'] = recurse_dirsize($directory, $directory.'/sites');
 	} else {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+		$dirsize[$directory]['size'] = recurse_dirsize($directory);
 	}
 
-	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-	return $dirsize[ $directory ][ 'size' ];
+	set_transient('dirsize_cache', $dirsize, HOUR_IN_SECONDS);
+	return $dirsize[$directory]['size'];
 }
 
 /**
@@ -1702,23 +1702,23 @@ 
  * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
  * @return int|false Size in MB if a valid directory. False if not.
  */
-function recurse_dirsize( $directory, $exclude = null ) {
+function recurse_dirsize($directory, $exclude = null) {
 	$size = 0;
 
-	$directory = untrailingslashit( $directory );
+	$directory = untrailingslashit($directory);
 
-	if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
+	if ( ! file_exists($directory) || ! is_dir($directory) || ! is_readable($directory) || $directory === $exclude) {
 		return false;
 	}
 
 	if ($handle = opendir($directory)) {
-		while(($file = readdir($handle)) !== false) {
+		while (($file = readdir($handle)) !== false) {
 			$path = $directory.'/'.$file;
 			if ($file != '.' && $file != '..') {
 				if (is_file($path)) {
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
-					$handlesize = recurse_dirsize( $path, $exclude );
+					$handlesize = recurse_dirsize($path, $exclude);
 					if ($handlesize > 0)
 						$size += $handlesize;
 				}
@@ -1743,12 +1743,12 @@ 
  * @param array $mimes
  * @return array
  */
-function check_upload_mimes( $mimes ) {
-	$site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+function check_upload_mimes($mimes) {
+	$site_exts = explode(' ', get_site_option('upload_filetypes', 'jpg jpeg png gif'));
 	$site_mimes = array();
-	foreach ( $site_exts as $ext ) {
-		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
+	foreach ($site_exts as $ext) {
+		foreach ($mimes as $ext_pattern => $mime) {
+			if ($ext != '' && strpos($ext_pattern, $ext) !== false)
 				$site_mimes[$ext_pattern] = $mime;
 		}
 	}
@@ -1769,9 +1769,9 @@ 
  *
  * @param string $deprecated Not used.
  */
-function update_posts_count( $deprecated = '' ) {
+function update_posts_count($deprecated = '') {
 	global $wpdb;
-	update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
+	update_option('post_count', (int) $wpdb->get_var("SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'"));
 }
 
 /**
@@ -1784,11 +1784,11 @@ 
  * @param int $blog_id
  * @param int $user_id
  */
-function wpmu_log_new_registrations( $blog_id, $user_id ) {
+function wpmu_log_new_registrations($blog_id, $user_id) {
 	global $wpdb;
-	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	$user = get_userdata((int) $user_id);
+	if ($user)
+		$wpdb->insert($wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace('/[^0-9., ]/', '', wp_unslash($_SERVER['REMOTE_ADDR'])), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')));
 }
 
 /**
@@ -1805,61 +1805,61 @@ 
  * @param string $deprecated Not used.
  * @return int An ID from the global terms table mapped from $term_id.
  */
-function global_terms( $term_id, $deprecated = '' ) {
+function global_terms($term_id, $deprecated = '') {
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
+	if ( ! global_terms_enabled())
 		return $term_id;
 
 	// prevent a race condition
 	$recurse_start = false;
-	if ( $global_terms_recurse === null ) {
+	if ($global_terms_recurse === null) {
 		$recurse_start = true;
 		$global_terms_recurse = 1;
-	} elseif ( 10 < $global_terms_recurse++ ) {
+	} elseif (10 < $global_terms_recurse++) {
 		return $term_id;
 	}
 
-	$term_id = intval( $term_id );
-	$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
+	$term_id = intval($term_id);
+	$c = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id));
 
-	$global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-	if ( $global_id == null ) {
-		$used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
-		if ( null == $used_global_id ) {
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+	$global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug));
+	if ($global_id == null) {
+		$used_global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id));
+		if (null == $used_global_id) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
+			if (empty($global_id))
 				return $term_id;
 		} else {
-			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
-			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
-			$new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$max_global_id = $wpdb->get_var("SELECT MAX(cat_ID) FROM $wpdb->sitecategories");
+			$max_local_id = $wpdb->get_var("SELECT MAX(term_id) FROM $wpdb->terms");
+			$new_global_id = max($max_global_id, $max_local_id) + mt_rand(100, 400);
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
 		}
-	} elseif ( $global_id != $term_id ) {
-		$local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
-		if ( null != $local_id ) {
-			global_terms( $local_id );
-			if ( 10 < $global_terms_recurse ) {
+	} elseif ($global_id != $term_id) {
+		$local_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id));
+		if (null != $local_id) {
+			global_terms($local_id);
+			if (10 < $global_terms_recurse) {
 				$global_id = $term_id;
 			}
 		}
 	}
 
-	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+	if ($global_id != $term_id) {
+		if (get_option('default_category') == $term_id)
+			update_option('default_category', $global_id);
 
-		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
+		$wpdb->update($wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id));
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
+	if ($recurse_start)
 		$global_terms_recurse = null;
 
 	return $global_id;
@@ -1874,8 +1874,8 @@ 
  * @param array|string $deprecated Not used.
  * @return array The current site's domain
  */
-function redirect_this_site( $deprecated = '' ) {
-	return array( get_current_site()->domain );
+function redirect_this_site($deprecated = '') {
+	return array(get_current_site()->domain);
 }
 
 /**
@@ -1888,12 +1888,12 @@ 
  * @param array $upload
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
-function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_file_too_big($upload) {
+	if ( ! is_array($upload) || defined('WP_IMPORTING') || get_site_option('upload_space_check_disabled'))
 		return $upload;
 
-	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
-		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
+	if (strlen($upload['bits']) > (KB_IN_BYTES * get_site_option('fileupload_maxk', 1500))) {
+		return sprintf(__('This file is too big. Files must be less than %d KB in size.').'<br />', get_site_option('fileupload_maxk', 1500));
 	}
 
 	return $upload;
@@ -1907,7 +1907,7 @@ 
 function signup_nonce_fields() {
 	$id = mt_rand();
 	echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
-	wp_nonce_field('signup_form_' . $id, '_signup_form', false);
+	wp_nonce_field('signup_form_'.$id, '_signup_form', false);
 }
 
 /**
@@ -1918,12 +1918,12 @@ 
  * @param array $result
  * @return array
  */
-function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
+function signup_nonce_check($result) {
+	if ( ! strpos($_SERVER['PHP_SELF'], 'wp-signup.php'))
 		return $result;
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if (wp_create_nonce('signup_form_'.$_POST['signup_form_id']) != $_POST['_signup_form'])
+		wp_die(__('Please try again.'));
 
 	return $result;
 }
@@ -1943,10 +1943,10 @@ 
 	 *
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
-	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
+	if (is_main_site() && is_404() && defined('NOBLOGREDIRECT') && ($destination = apply_filters('blog_redirect_404', NOBLOGREDIRECT))) {
+		if ($destination == '%siteurl%')
 			$destination = network_home_url();
-		wp_redirect( $destination );
+		wp_redirect($destination);
 		exit();
 	}
 }
@@ -1961,23 +1961,23 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+	if (false === strpos($_SERVER['REQUEST_URI'], '/newbloguser/'))
 		return;
 
-	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
-	$key = array_pop( $parts );
+	$parts = explode('/', $_SERVER['REQUEST_URI']);
+	$key = array_pop($parts);
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ($key == '')
+		$key = array_pop($parts);
 
-	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	$details = get_option('new_user_'.$key);
+	if ( ! empty($details))
+		delete_option('new_user_'.$key);
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if (empty($details) || is_wp_error(add_existing_user_to_blog($details)))
+		wp_die(sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url()));
 
-	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+	wp_die(sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url()), __('WordPress &rsaquo; Success'), array('response' => 200));
 }
 
 /**
@@ -1990,11 +1990,11 @@ 
  * @param array $details
  * @return true|WP_Error|void
  */
-function add_existing_user_to_blog( $details = false ) {
+function add_existing_user_to_blog($details = false) {
 	global $blog_id;
 
-	if ( is_array( $details ) ) {
-		$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
+	if (is_array($details)) {
+		$result = add_user_to_blog($blog_id, $details['user_id'], $details['role']);
 		/**
 		 * Fires immediately after an existing user is added to a site.
 		 *
@@ -2003,7 +2003,7 @@ 
 		 * @param int   $user_id User ID.
 		 * @param mixed $result  True on success or a WP_Error object if the user doesn't exist.
 		 */
-		do_action( 'added_existing_user', $details['user_id'], $result );
+		do_action('added_existing_user', $details['user_id'], $result);
 		return $result;
 	}
 }
@@ -2021,13 +2021,13 @@ 
  * @param mixed $password Ignored.
  * @param array $meta
  */
-function add_new_user_to_blog( $user_id, $password, $meta ) {
-	if ( !empty( $meta[ 'add_to_blog' ] ) ) {
-		$blog_id = $meta[ 'add_to_blog' ];
-		$role = $meta[ 'new_role' ];
+function add_new_user_to_blog($user_id, $password, $meta) {
+	if ( ! empty($meta['add_to_blog'])) {
+		$blog_id = $meta['add_to_blog'];
+		$role = $meta['new_role'];
 		remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
-		add_user_to_blog( $blog_id, $user_id, $role );
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+		add_user_to_blog($blog_id, $user_id, $role);
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 	}
 }
 
@@ -2038,7 +2038,7 @@ 
  *
  * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
  */
-function fix_phpmailer_messageid( $phpmailer ) {
+function fix_phpmailer_messageid($phpmailer) {
 	$phpmailer->Hostname = get_current_site()->domain;
 }
 
@@ -2051,16 +2051,16 @@ 
  * 	                           or user login name as a string.
  * @return bool
  */
-function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
-		if ( $user ) {
-			$user = get_user_by( 'login', $user );
+function is_user_spammy($user = null) {
+    if ( ! ($user instanceof WP_User)) {
+		if ($user) {
+			$user = get_user_by('login', $user);
 		} else {
 			$user = wp_get_current_user();
 		}
 	}
 
-	return $user && isset( $user->spam ) && 1 == $user->spam;
+	return $user && isset($user->spam) && 1 == $user->spam;
 }
 
 /**
@@ -2073,8 +2073,8 @@ 
  * @param int $old_value
  * @param int $value     The new public value
  */
-function update_blog_public( $old_value, $value ) {
-	update_blog_status( get_current_blog_id(), 'public', (int) $value );
+function update_blog_public($old_value, $value) {
+	update_blog_status(get_current_blog_id(), 'public', (int) $value);
 }
 
 /**
@@ -2089,16 +2089,16 @@ 
  * @param int    $blog_id Optional. Defaults to current blog.
  * @return bool
  */
-function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
+function is_user_option_local($key, $user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$current_user = wp_get_current_user();
-	if ( $blog_id == 0 ) {
+	if ($blog_id == 0) {
 		$blog_id = $wpdb->blogid;
 	}
-	$local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
+	$local_key = $wpdb->get_blog_prefix($blog_id).$key;
 
-	return isset( $current_user->$local_key );
+	return isset($current_user->$local_key);
 }
 
 /**
@@ -2110,7 +2110,7 @@ 
  */
 function users_can_register_signup_filter() {
 	$registration = get_site_option('registration');
-	return ( $registration == 'all' || $registration == 'user' );
+	return ($registration == 'all' || $registration == 'user');
 }
 
 /**
@@ -2121,12 +2121,12 @@ 
  * @param string $text
  * @return string
  */
-function welcome_user_msg_filter( $text ) {
-	if ( !$text ) {
-		remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+function welcome_user_msg_filter($text) {
+	if ( ! $text) {
+		remove_filter('site_option_welcome_user_email', 'welcome_user_msg_filter');
 
 		/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
-		$text = __( 'Howdy USERNAME,
+		$text = __('Howdy USERNAME,
 
 Your new account is set up.
 
@@ -2138,7 +2138,7 @@ 
 Thanks!
 
 --The Team @ SITE_NAME' );
-		update_site_option( 'welcome_user_email', $text );
+		update_site_option('welcome_user_email', $text);
 	}
 	return $text;
 }
@@ -2153,10 +2153,10 @@ 
  * @param bool $force
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_content( $force = '' ) {
+function force_ssl_content($force = '') {
 	static $forced_content = false;
 
-	if ( '' != $force ) {
+	if ('' != $force) {
 		$old_forced = $forced_content;
 		$forced_content = $force;
 		return $old_forced;
@@ -2175,12 +2175,12 @@ 
  * @param string $url URL
  * @return string URL with https as the scheme
  */
-function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+function filter_SSL($url) {
+	if ( ! is_string($url))
+		return get_bloginfo('url'); // Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if (force_ssl_content() && is_ssl())
+		$url = set_url_scheme($url, 'https');
 
 	return $url;
 }
@@ -2191,10 +2191,10 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return;
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
 }
 
@@ -2217,7 +2217,7 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_site_counts() {
-	$is_small_network = ! wp_is_large_network( 'sites' );
+	$is_small_network = ! wp_is_large_network('sites');
 
 	/**
 	 * Filters whether to update network site or user counts when a new site is created.
@@ -2229,7 +2229,7 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'sites'))
 		return;
 
 	wp_update_network_site_counts();
@@ -2244,10 +2244,10 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_user_counts() {
-	$is_small_network = ! wp_is_large_network( 'users' );
+	$is_small_network = ! wp_is_large_network('users');
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'users'))
 		return;
 
 	wp_update_network_user_counts();
@@ -2263,15 +2263,15 @@ 
 function wp_update_network_site_counts() {
 	global $wpdb;
 
-	$count = get_sites( array(
+	$count = get_sites(array(
 		'network_id' => $wpdb->siteid,
 		'spam'       => 0,
 		'deleted'    => 0,
 		'archived'   => 0,
 		'count'      => true,
-	) );
+	));
 
-	update_site_option( 'blog_count', $count );
+	update_site_option('blog_count', $count);
 }
 
 /**
@@ -2284,8 +2284,8 @@ 
 function wp_update_network_user_counts() {
 	global $wpdb;
 
-	$count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-	update_site_option( 'user_count', $count );
+	$count = $wpdb->get_var("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'");
+	update_site_option('user_count', $count);
 }
 
 /**
@@ -2303,10 +2303,10 @@ 
 	 *
 	 * @param int|bool $space_used The amount of used space, in megabytes. Default false.
 	 */
-	$space_used = apply_filters( 'pre_get_space_used', false );
-	if ( false === $space_used ) {
+	$space_used = apply_filters('pre_get_space_used', false);
+	if (false === $space_used) {
 		$upload_dir = wp_upload_dir();
-		$space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES;
+		$space_used = get_dirsize($upload_dir['basedir']) / MB_IN_BYTES;
 	}
 
 	return $space_used;
@@ -2320,12 +2320,12 @@ 
  * @return int Quota in megabytes
  */
 function get_space_allowed() {
-	$space_allowed = get_option( 'blog_upload_space' );
+	$space_allowed = get_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric($space_allowed))
+		$space_allowed = get_site_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
+	if ( ! is_numeric($space_allowed))
 		$space_allowed = 100;
 
 	/**
@@ -2335,7 +2335,7 @@ 
 	 *
 	 * @param int $space_allowed Upload quota in megabytes for the current blog.
 	 */
-	return apply_filters( 'get_space_allowed', $space_allowed );
+	return apply_filters('get_space_allowed', $space_allowed);
 }
 
 /**
@@ -2347,16 +2347,16 @@ 
  */
 function get_upload_space_available() {
 	$allowed = get_space_allowed();
-	if ( $allowed < 0 ) {
+	if ($allowed < 0) {
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return $space_allowed;
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
+	if (($space_allowed - $space_used) <= 0)
 		return 0;
 
 	return $space_allowed - $space_used;
@@ -2369,7 +2369,7 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return true;
 
 	return (bool) get_upload_space_available();
@@ -2383,12 +2383,12 @@ 
  * @param  int $size Upload size limit in bytes.
  * @return int       Upload size limit in bytes.
  */
-function upload_size_limit_filter( $size ) {
-	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+function upload_size_limit_filter($size) {
+	$fileupload_maxk = KB_IN_BYTES * get_site_option('fileupload_maxk', 1500);
+	if (get_site_option('upload_space_check_disabled'))
+		return min($size, $fileupload_maxk);
 
-	return min( $size, $fileupload_maxk, get_upload_space_available() );
+	return min($size, $fileupload_maxk, get_upload_space_available());
 }
 
 /**
@@ -2401,8 +2401,8 @@ 
  * @param string $using 'sites or 'users'. Default is 'sites'.
  * @return bool True if the network meets the criteria for large. False otherwise.
  */
-function wp_is_large_network( $using = 'sites' ) {
-	if ( 'users' == $using ) {
+function wp_is_large_network($using = 'sites') {
+	if ('users' == $using) {
 		$count = get_user_count();
 		/**
 		 * Filters whether the network is considered large.
@@ -2413,12 +2413,12 @@ 
 		 * @param string $component        The component to count. Accepts 'users', or 'sites'.
 		 * @param int    $count            The count of items for the component.
 		 */
-		return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count );
+		return apply_filters('wp_is_large_network', $count > 10000, 'users', $count);
 	}
 
 	$count = get_blog_count();
 	/** This filter is documented in wp-includes/ms-functions.php */
-	return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count );
+	return apply_filters('wp_is_large_network', $count > 10000, 'sites', $count);
 }
 
 /**
@@ -2443,5 +2443,5 @@ 
 	 *
 	 * @param array $subdirectory_reserved_names Array of reserved names.
 	 */
-	return apply_filters( 'subdirectory_reserved_names', $names );
+	return apply_filters('subdirectory_reserved_names', $names);
 }

Braces +280 added lines, -191 removed lines

@@ -42,11 +42,13 @@ 
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
-		return;
+	if ( empty( $blogs ) ) {
+			return;
+	}
 
-	if ( !is_multisite() )
-		return $blogs[$wpdb->blogid];
+	if ( !is_multisite() ) {
+			return $blogs[$wpdb->blogid];
+	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	$first_blog = current($blogs);
@@ -69,15 +71,18 @@ 
 		$ret = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
-					continue;
+				if ( $blog->site_id != $wpdb->siteid ) {
+									continue;
+				}
 				$details = get_blog_details( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+											update_user_meta( $user_id, 'primary_blog', $blog_id );
+					}
+					if ( !get_user_meta($user_id , 'source_domain', true) ) {
+											update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -114,8 +119,9 @@ 
  * @return int
  */
 function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	if ( func_num_args() ) {
+			_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
 	return get_site_option( 'blog_count' );
 }
@@ -223,8 +229,9 @@ 
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
-				continue;
+			if ( $blog->userblog_id == $blog_id ) {
+							continue;
+			}
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
@@ -308,10 +315,12 @@ 
 	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) {
+		// blog does not exist
 		return 0;
-	elseif ( $id )
-		return (int) $id;
+	} elseif ( $id ) {
+			return (int) $id;
+	}
 
 	$args = array(
 		'domain' => $domain,
@@ -348,8 +357,9 @@ 
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+	if ( $banned_names && ! is_array( $banned_names ) ) {
+			$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
@@ -360,8 +370,9 @@ 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
-				continue;
+			if ( ! $banned_domain ) {
+							continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -422,8 +433,9 @@ 
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
@@ -441,22 +453,26 @@ 
 		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
 	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if ( is_email_address_unsafe( $user_email ) ) {
+			$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+			$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+			$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	}
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( !is_email( $user_email ) ) {
+			$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
@@ -467,12 +483,14 @@ 
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if ( username_exists($user_name) ) {
+			$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if ( email_exists($user_email) ) {
+			$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -481,20 +499,22 @@ 
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		} else {
+					$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		}
 	}
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		} else {
+					$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		}
 	}
 
 	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
@@ -566,26 +586,31 @@ 
 		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+			$errors->add('blogname', __( 'Please enter a site name.' ) );
+	}
 
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
 		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+			$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	}
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if ( strlen( $blogname ) < 4 && !is_super_admin() ) {
+			$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+			$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+			$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	}
 
 	/**
 	 * Filters the new site name during registration.
@@ -601,8 +626,9 @@ 
 
 	$blog_title = wp_unslash(  $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+			$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
@@ -612,12 +638,14 @@ 
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($mydomain, $path, $current_site->id) ) {
+			$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) {
+					$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
@@ -625,10 +653,11 @@ 
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		} else {
+					$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		}
 	}
 
 	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
@@ -789,15 +818,18 @@ 
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
-		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	if ( !is_subdomain_install() || get_current_site()->id != 1 ) {
+			$activate_url = network_site_url("wp-activate.php?key=$key");
+	} else {
+			$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+	}
+	// @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -884,13 +916,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) ) {
+			return false;
+	}
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -957,14 +991,16 @@ 
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if ( empty( $signup ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	}
 
 	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		if ( empty( $signup->domain ) ) {
+					return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+					return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
 	}
 
 	$meta = maybe_unserialize($signup->meta);
@@ -972,21 +1008,24 @@ 
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
-		$user_already_exists = true;
+	if ( ! $user_id ) {
+			$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
+	} else {
+			$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+			return new WP_Error('create_user', __('Could not create user'), $signup);
+	}
 
 	$now = current_time('mysql', true);
 
 	if ( empty($signup->domain) ) {
 		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+					return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		}
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1050,8 +1089,9 @@ 
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
-		return false;
+	if ( is_wp_error( $user_id ) ) {
+			return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1097,25 +1137,29 @@ 
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if ( is_subdomain_install() ) {
+			$domain = str_replace( '@', '', $domain );
+	}
 
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( ! wp_installing() ) {
 		wp_installing( true );
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return new WP_Error('insert_blog', __('Could not create site.'));
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id, $title);
@@ -1124,17 +1168,19 @@ 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
-		else
-			update_option( $key, $value );
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
+					update_blog_status( $blog_id, $key, $value );
+		} else {
+					update_option( $key, $value );
+		}
 	}
 
 	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1169,12 +1215,14 @@ 
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
@@ -1214,13 +1262,15 @@ 
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1305,8 +1355,9 @@ 
 	$site_id = (int) $site_id;
 
 	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	refresh_blog_details( $blog_id );
@@ -1340,8 +1391,9 @@ 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
+			die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1370,10 +1422,11 @@ 
 	update_option( 'siteurl', $siteurl );
 	update_option( 'home', $home );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
+			update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	} else {
+			update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
@@ -1443,8 +1496,9 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_email' );
 	if ( $welcome_email == false ) {
@@ -1491,15 +1545,17 @@ 
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filters the subject of the welcome email after site activation.
@@ -1542,8 +1598,9 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1569,15 +1626,17 @@ 
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filters the subject of the welcome email after user activation.
@@ -1671,11 +1730,13 @@ 
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
+			return $dirsize[ $directory ][ 'size' ];
+	}
 
-	if ( ! is_array( $dirsize ) )
-		$dirsize = array();
+	if ( ! is_array( $dirsize ) ) {
+			$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
@@ -1719,8 +1780,9 @@ 
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
-						$size += $handlesize;
+					if ($handlesize > 0) {
+											$size += $handlesize;
+					}
 				}
 			}
 		}
@@ -1748,8 +1810,9 @@ 
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+							$site_mimes[$ext_pattern] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1787,9 +1850,10 @@ 
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
+	if ( $user ) {
+			$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	}
+	}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
@@ -1809,8 +1873,9 @@ 
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
-		return $term_id;
+	if ( !global_terms_enabled() ) {
+			return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
@@ -1830,8 +1895,9 @@ 
 		if ( null == $used_global_id ) {
 			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
-				return $term_id;
+			if ( empty( $global_id ) ) {
+							return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
 			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
@@ -1850,8 +1916,9 @@ 
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+		if ( get_option( 'default_category' ) == $term_id ) {
+					update_option( 'default_category', $global_id );
+		}
 
 		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
 		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
@@ -1859,8 +1926,9 @@ 
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
-		$global_terms_recurse = null;
+	if ( $recurse_start ) {
+			$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -1889,8 +1957,9 @@ 
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return $upload;
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return $upload;
+	}
 
 	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
@@ -1919,11 +1988,13 @@ 
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
-		return $result;
+	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) ) {
+			return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] ) {
+			wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -1944,8 +2015,9 @@ 
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
-			$destination = network_home_url();
+		if ( $destination == '%siteurl%' ) {
+					$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -1961,21 +2033,25 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
-		return;
+	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+			return;
+	}
 
 	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
 	$key = array_pop( $parts );
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ( $key == '' ) {
+			$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	if ( !empty( $details ) ) {
+			delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+			wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	}
 
 	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
@@ -2176,11 +2252,14 @@ 
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	if ( ! is_string( $url ) ) {
+			return get_bloginfo( 'url' );
+	}
+	// Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if ( force_ssl_content() && is_ssl() ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2191,12 +2270,14 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
-		return;
+	if ( !is_main_site() ) {
+			return;
+	}
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
-}
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	}
+	}
 
 /**
  *  Update the network-wide counts for the current network.
@@ -2229,8 +2310,9 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
+			return;
+	}
 
 	wp_update_network_site_counts();
 }
@@ -2247,8 +2329,9 @@ 
 	$is_small_network = ! wp_is_large_network( 'users' );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
+			return;
+	}
 
 	wp_update_network_user_counts();
 }
@@ -2322,11 +2405,13 @@ 
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = 100;
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = 100;
+	}
 
 	/**
 	 * Filters the upload quota for the current site.
@@ -2351,13 +2436,15 @@ 
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $space_allowed;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $space_allowed;
+	}
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
-		return 0;
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
+			return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2369,8 +2456,9 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2385,8 +2473,9 @@ 
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }

src/wp-includes/taxonomy.php

Spacing +900 added lines, -900 removed lines

@@ -24,8 +24,8 @@ 
 function create_initial_taxonomies() {
 	global $wp_rewrite;
 
-	if ( ! did_action( 'init' ) ) {
-		$rewrite = array( 'category' => false, 'post_tag' => false, 'post_format' => false );
+	if ( ! did_action('init')) {
+		$rewrite = array('category' => false, 'post_tag' => false, 'post_format' => false);
 	} else {
 
 		/**
@@ -35,7 +35,7 @@ 
 		 *
 		 * @param string $context Context of the rewrite base. Default 'type'.
 		 */
-		$post_format_base = apply_filters( 'post_format_rewrite_base', 'type' );
+		$post_format_base = apply_filters('post_format_rewrite_base', 'type');
 		$rewrite = array(
 			'category' => array(
 				'hierarchical' => true,
@@ -49,11 +49,11 @@ 
 				'with_front' => ! get_option('tag_base') || $wp_rewrite->using_index_permalinks(),
 				'ep_mask' => EP_TAGS,
 			),
-			'post_format' => $post_format_base ? array( 'slug' => $post_format_base ) : false,
+			'post_format' => $post_format_base ? array('slug' => $post_format_base) : false,
 		);
 	}
 
-	register_taxonomy( 'category', 'post', array(
+	register_taxonomy('category', 'post', array(
 		'hierarchical' => true,
 		'query_var' => 'category_name',
 		'rewrite' => $rewrite['category'],
@@ -61,9 +61,9 @@ 
 		'show_ui' => true,
 		'show_admin_column' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'post_tag', 'post', array(
+	register_taxonomy('post_tag', 'post', array(
 	 	'hierarchical' => false,
 		'query_var' => 'tag',
 		'rewrite' => $rewrite['post_tag'],
@@ -71,34 +71,34 @@ 
 		'show_ui' => true,
 		'show_admin_column' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'nav_menu', 'nav_menu_item', array(
+	register_taxonomy('nav_menu', 'nav_menu_item', array(
 		'public' => false,
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Navigation Menus' ),
-			'singular_name' => __( 'Navigation Menu' ),
+			'name' => __('Navigation Menus'),
+			'singular_name' => __('Navigation Menu'),
 		),
 		'query_var' => false,
 		'rewrite' => false,
 		'show_ui' => false,
 		'_builtin' => true,
 		'show_in_nav_menus' => false,
-	) );
+	));
 
-	register_taxonomy( 'link_category', 'link', array(
+	register_taxonomy('link_category', 'link', array(
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Link Categories' ),
-			'singular_name' => __( 'Link Category' ),
-			'search_items' => __( 'Search Link Categories' ),
+			'name' => __('Link Categories'),
+			'singular_name' => __('Link Category'),
+			'search_items' => __('Search Link Categories'),
 			'popular_items' => null,
-			'all_items' => __( 'All Link Categories' ),
-			'edit_item' => __( 'Edit Link Category' ),
-			'update_item' => __( 'Update Link Category' ),
-			'add_new_item' => __( 'Add New Link Category' ),
-			'new_item_name' => __( 'New Link Category Name' ),
+			'all_items' => __('All Link Categories'),
+			'edit_item' => __('Edit Link Category'),
+			'update_item' => __('Update Link Category'),
+			'add_new_item' => __('Add New Link Category'),
+			'new_item_name' => __('New Link Category Name'),
 			'separate_items_with_commas' => null,
 			'add_or_remove_items' => null,
 			'choose_from_most_used' => null,
@@ -114,21 +114,21 @@ 
 		'public' => false,
 		'show_ui' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'post_format', 'post', array(
+	register_taxonomy('post_format', 'post', array(
 		'public' => true,
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => _x( 'Format', 'post format' ),
-			'singular_name' => _x( 'Format', 'post format' ),
+			'name' => _x('Format', 'post format'),
+			'singular_name' => _x('Format', 'post format'),
 		),
 		'query_var' => true,
 		'rewrite' => $rewrite['post_format'],
 		'show_ui' => false,
 		'_builtin' => true,
-		'show_in_nav_menus' => current_theme_supports( 'post-formats' ),
-	) );
+		'show_in_nav_menus' => current_theme_supports('post-formats'),
+	));
 }
 
 /**
@@ -147,7 +147,7 @@ 
  *                         Default 'and'.
  * @return array A list of taxonomy names or objects.
  */
-function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_taxonomies($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_taxonomies;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -176,11 +176,11 @@ 
  *                                     taxonomy 'names' or 'objects'. Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_object_taxonomies( $object, $output = 'names' ) {
+function get_object_taxonomies($object, $output = 'names') {
 	global $wp_taxonomies;
 
-	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
+	if (is_object($object)) {
+		if ($object->post_type == 'attachment')
 			return get_attachment_taxonomies($object);
 		$object = $object->post_type;
 	}
@@ -188,12 +188,12 @@ 
 	$object = (array) $object;
 
 	$taxonomies = array();
-	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
-		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-			if ( 'names' == $output )
+	foreach ((array) $wp_taxonomies as $tax_name => $tax_obj) {
+		if (array_intersect($object, (array) $tax_obj->object_type)) {
+			if ('names' == $output)
 				$taxonomies[] = $tax_name;
 			else
-				$taxonomies[ $tax_name ] = $tax_obj;
+				$taxonomies[$tax_name] = $tax_obj;
 		}
 	}
 
@@ -213,10 +213,10 @@ 
  * @param string $taxonomy Name of taxonomy object to return.
  * @return object|false The Taxonomy Object or false if $taxonomy doesn't exist.
  */
-function get_taxonomy( $taxonomy ) {
+function get_taxonomy($taxonomy) {
 	global $wp_taxonomies;
 
-	if ( ! taxonomy_exists( $taxonomy ) )
+	if ( ! taxonomy_exists($taxonomy))
 		return false;
 
 	return $wp_taxonomies[$taxonomy];
@@ -234,10 +234,10 @@ 
  * @param string $taxonomy Name of taxonomy object.
  * @return bool Whether the taxonomy exists.
  */
-function taxonomy_exists( $taxonomy ) {
+function taxonomy_exists($taxonomy) {
 	global $wp_taxonomies;
 
-	return isset( $wp_taxonomies[$taxonomy] );
+	return isset($wp_taxonomies[$taxonomy]);
 }
 
 /**
@@ -254,7 +254,7 @@ 
  * @return bool Whether the taxonomy is hierarchical.
  */
 function is_taxonomy_hierarchical($taxonomy) {
-	if ( ! taxonomy_exists($taxonomy) )
+	if ( ! taxonomy_exists($taxonomy))
 		return false;
 
 	$taxonomy = get_taxonomy($taxonomy);
@@ -348,13 +348,13 @@ 
  * }
  * @return WP_Error|void WP_Error, if errors.
  */
-function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
+function register_taxonomy($taxonomy, $object_type, $args = array()) {
 	global $wp_taxonomies, $wp;
 
-	if ( ! is_array( $wp_taxonomies ) )
+	if ( ! is_array($wp_taxonomies))
 		$wp_taxonomies = array();
 
-	$args = wp_parse_args( $args );
+	$args = wp_parse_args($args);
 
 	/**
 	 * Filters the arguments for registering a taxonomy.
@@ -365,7 +365,7 @@ 
 	 * @param string $taxonomy    Taxonomy key.
 	 * @param array  $object_type Array of names of object types for the taxonomy.
 	 */
-	$args = apply_filters( 'register_taxonomy_args', $args, $taxonomy, (array) $object_type );
+	$args = apply_filters('register_taxonomy_args', $args, $taxonomy, (array) $object_type);
 
 	$defaults = array(
 		'labels'                => array(),
@@ -386,67 +386,67 @@ 
 		'update_count_callback' => '',
 		'_builtin'              => false,
 	);
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-	if ( empty( $taxonomy ) || strlen( $taxonomy ) > 32 ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Taxonomy names must be between 1 and 32 characters in length.' ), '4.2.0' );
-		return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) );
+	if (empty($taxonomy) || strlen($taxonomy) > 32) {
+		_doing_it_wrong(__FUNCTION__, __('Taxonomy names must be between 1 and 32 characters in length.'), '4.2.0');
+		return new WP_Error('taxonomy_length_invalid', __('Taxonomy names must be between 1 and 32 characters in length.'));
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['publicly_queryable'] ) {
+	if (null === $args['publicly_queryable']) {
 		$args['publicly_queryable'] = $args['public'];
 	}
 
 	// Non-publicly queryable taxonomies should not register query vars, except in the admin.
-	if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
-		if ( true === $args['query_var'] )
+	if (false !== $args['query_var'] && (is_admin() || false !== $args['publicly_queryable']) && ! empty($wp)) {
+		if (true === $args['query_var'])
 			$args['query_var'] = $taxonomy;
 		else
-			$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
-		$wp->add_query_var( $args['query_var'] );
+			$args['query_var'] = sanitize_title_with_dashes($args['query_var']);
+		$wp->add_query_var($args['query_var']);
 	} else {
 		// Force query_var to false for non-public taxonomies.
 		$args['query_var'] = false;
 	}
 
-	if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-		$args['rewrite'] = wp_parse_args( $args['rewrite'], array(
+	if (false !== $args['rewrite'] && (is_admin() || '' != get_option('permalink_structure'))) {
+		$args['rewrite'] = wp_parse_args($args['rewrite'], array(
 			'with_front' => true,
 			'hierarchical' => false,
 			'ep_mask' => EP_NONE,
-		) );
+		));
 
-		if ( empty( $args['rewrite']['slug'] ) )
-			$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		if (empty($args['rewrite']['slug']))
+			$args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
 
-		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
+		if ($args['hierarchical'] && $args['rewrite']['hierarchical'])
 			$tag = '(.+?)';
 		else
 			$tag = '([^/]+)';
 
-		add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" );
-		add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
+		add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+		add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']);
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_ui'] )
+	if (null === $args['show_ui'])
 		$args['show_ui'] = $args['public'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
-		$args['show_in_menu' ] = $args['show_ui'];
+	if (null === $args['show_in_menu'] || ! $args['show_ui'])
+		$args['show_in_menu'] = $args['show_ui'];
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_in_nav_menus'] )
+	if (null === $args['show_in_nav_menus'])
 		$args['show_in_nav_menus'] = $args['public'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_tagcloud'] )
+	if (null === $args['show_tagcloud'])
 		$args['show_tagcloud'] = $args['show_ui'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_quick_edit'] ) {
+	if (null === $args['show_in_quick_edit']) {
 		$args['show_in_quick_edit'] = $args['show_ui'];
 	}
 
@@ -456,27 +456,27 @@ 
 		'delete_terms' => 'manage_categories',
 		'assign_terms' => 'edit_posts',
 	);
-	$args['cap'] = (object) array_merge( $default_caps, $args['capabilities'] );
-	unset( $args['capabilities'] );
+	$args['cap'] = (object) array_merge($default_caps, $args['capabilities']);
+	unset($args['capabilities']);
 
 	$args['name'] = $taxonomy;
-	$args['object_type'] = array_unique( (array) $object_type );
+	$args['object_type'] = array_unique((array) $object_type);
 
-	$args['labels'] = get_taxonomy_labels( (object) $args );
+	$args['labels'] = get_taxonomy_labels((object) $args);
 	$args['label'] = $args['labels']->name;
 
 	// If not set, use the default meta box
-	if ( null === $args['meta_box_cb'] ) {
-		if ( $args['hierarchical'] )
+	if (null === $args['meta_box_cb']) {
+		if ($args['hierarchical'])
 			$args['meta_box_cb'] = 'post_categories_meta_box';
 		else
 			$args['meta_box_cb'] = 'post_tags_meta_box';
 	}
 
-	$wp_taxonomies[ $taxonomy ] = (object) $args;
+	$wp_taxonomies[$taxonomy] = (object) $args;
 
 	// Register callback handling for meta box.
- 	add_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' );
+ 	add_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
 
 	/**
 	 * Fires after a taxonomy is registered.
@@ -487,7 +487,7 @@ 
 	 * @param array|string $object_type Object type or array of object types.
 	 * @param array        $args        Array of taxonomy registration arguments.
 	 */
-	do_action( 'registered_taxonomy', $taxonomy, $object_type, $args );
+	do_action('registered_taxonomy', $taxonomy, $object_type, $args);
 }
 
 /**
@@ -503,36 +503,36 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return bool|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
  */
-function unregister_taxonomy( $taxonomy ) {
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+function unregister_taxonomy($taxonomy) {
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	$taxonomy_args = get_taxonomy( $taxonomy );
+	$taxonomy_args = get_taxonomy($taxonomy);
 
 	// Do not allow unregistering internal taxonomies.
-	if ( $taxonomy_args->_builtin ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) );
+	if ($taxonomy_args->_builtin) {
+		return new WP_Error('invalid_taxonomy', __('Unregistering a built-in taxonomy is not allowed'));
 	}
 
 	global $wp, $wp_taxonomies;
 
 	// Remove query var.
-	if ( false !== $taxonomy_args->query_var ) {
-		$wp->remove_query_var( $taxonomy_args->query_var );
+	if (false !== $taxonomy_args->query_var) {
+		$wp->remove_query_var($taxonomy_args->query_var);
 	}
 
 	// Remove rewrite tags and permastructs.
-	if ( false !== $taxonomy_args->rewrite ) {
-		remove_rewrite_tag( "%$taxonomy%" );
-		remove_permastruct( $taxonomy );
+	if (false !== $taxonomy_args->rewrite) {
+		remove_rewrite_tag("%$taxonomy%");
+		remove_permastruct($taxonomy);
 	}
 
 	// Unregister callback handling for meta box.
-	remove_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' );
+	remove_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
 
 	// Remove the taxonomy.
-	unset( $wp_taxonomies[ $taxonomy ] );
+	unset($wp_taxonomies[$taxonomy]);
 
 	/**
 	 * Fires after a taxonomy is unregistered.
@@ -541,7 +541,7 @@ 
 	 *
 	 * @param string $taxonomy Taxonomy name.
 	 */
-	do_action( 'unregistered_taxonomy', $taxonomy );
+	do_action('unregistered_taxonomy', $taxonomy);
 
 	return true;
 }
@@ -582,39 +582,39 @@ 
  * @param object $tax Taxonomy object.
  * @return object object with all the labels as member variables.
  */
-function get_taxonomy_labels( $tax ) {
+function get_taxonomy_labels($tax) {
 	$tax->labels = (array) $tax->labels;
 
-	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
+	if (isset($tax->helps) && empty($tax->labels['separate_items_with_commas']))
 		$tax->labels['separate_items_with_commas'] = $tax->helps;
 
-	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
+	if (isset($tax->no_tagcloud) && empty($tax->labels['not_found']))
 		$tax->labels['not_found'] = $tax->no_tagcloud;
 
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
-		'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
-		'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
-		'popular_items' => array( __( 'Popular Tags' ), null ),
-		'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
-		'parent_item' => array( null, __( 'Parent Category' ) ),
-		'parent_item_colon' => array( null, __( 'Parent Category:' ) ),
-		'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
-		'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ),
-		'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ),
-		'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
-		'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
-		'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
-		'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
-		'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
-		'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ),
-		'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ),
-		'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
-		'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
+		'name' => array(_x('Tags', 'taxonomy general name'), _x('Categories', 'taxonomy general name')),
+		'singular_name' => array(_x('Tag', 'taxonomy singular name'), _x('Category', 'taxonomy singular name')),
+		'search_items' => array(__('Search Tags'), __('Search Categories')),
+		'popular_items' => array(__('Popular Tags'), null),
+		'all_items' => array(__('All Tags'), __('All Categories')),
+		'parent_item' => array(null, __('Parent Category')),
+		'parent_item_colon' => array(null, __('Parent Category:')),
+		'edit_item' => array(__('Edit Tag'), __('Edit Category')),
+		'view_item' => array(__('View Tag'), __('View Category')),
+		'update_item' => array(__('Update Tag'), __('Update Category')),
+		'add_new_item' => array(__('Add New Tag'), __('Add New Category')),
+		'new_item_name' => array(__('New Tag Name'), __('New Category Name')),
+		'separate_items_with_commas' => array(__('Separate tags with commas'), null),
+		'add_or_remove_items' => array(__('Add or remove tags'), null),
+		'choose_from_most_used' => array(__('Choose from the most used tags'), null),
+		'not_found' => array(__('No tags found.'), __('No categories found.')),
+		'no_terms' => array(__('No tags'), __('No categories')),
+		'items_list_navigation' => array(__('Tags list navigation'), __('Categories list navigation')),
+		'items_list' => array(__('Tags list'), __('Categories list')),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
-	$labels = _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
+	$labels = _get_custom_object_labels($tax, $nohier_vs_hier_defaults);
 
 	$taxonomy = $tax->name;
 
@@ -631,10 +631,10 @@ 
 	 *
 	 * @param object $labels Object with labels for the taxonomy as member variables.
 	 */
-	$labels = apply_filters( "taxonomy_labels_{$taxonomy}", $labels );
+	$labels = apply_filters("taxonomy_labels_{$taxonomy}", $labels);
 
 	// Ensure that the filtered labels contain all required default values.
-	$labels = (object) array_merge( (array) $default_labels, (array) $labels );
+	$labels = (object) array_merge((array) $default_labels, (array) $labels);
 
 	return $labels;
 }
@@ -650,20 +650,20 @@ 
  * @param string $object_type Name of the object type.
  * @return bool True if successful, false if not.
  */
-function register_taxonomy_for_object_type( $taxonomy, $object_type) {
+function register_taxonomy_for_object_type($taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( !isset($wp_taxonomies[$taxonomy]) )
+	if ( ! isset($wp_taxonomies[$taxonomy]))
 		return false;
 
-	if ( ! get_post_type_object($object_type) )
+	if ( ! get_post_type_object($object_type))
 		return false;
 
-	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
+	if ( ! in_array($object_type, $wp_taxonomies[$taxonomy]->object_type))
 		$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
 
 	// Filter out empties.
-	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
+	$wp_taxonomies[$taxonomy]->object_type = array_filter($wp_taxonomies[$taxonomy]->object_type);
 
 	return true;
 }
@@ -679,20 +679,20 @@ 
  * @param string $object_type Name of the object type.
  * @return bool True if successful, false if not.
  */
-function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
+function unregister_taxonomy_for_object_type($taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
+	if ( ! isset($wp_taxonomies[$taxonomy]))
 		return false;
 
-	if ( ! get_post_type_object( $object_type ) )
+	if ( ! get_post_type_object($object_type))
 		return false;
 
-	$key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
-	if ( false === $key )
+	$key = array_search($object_type, $wp_taxonomies[$taxonomy]->object_type, true);
+	if (false === $key)
 		return false;
 
-	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
+	unset($wp_taxonomies[$taxonomy]->object_type[$key]);
 	return true;
 }
 
@@ -725,34 +725,34 @@ 
  * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
  *	the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
  */
-function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
+function get_objects_in_term($term_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( ! is_array( $term_ids ) ) {
-		$term_ids = array( $term_ids );
+	if ( ! is_array($term_ids)) {
+		$term_ids = array($term_ids);
 	}
-	if ( ! is_array( $taxonomies ) ) {
-		$taxonomies = array( $taxonomies );
+	if ( ! is_array($taxonomies)) {
+		$taxonomies = array($taxonomies);
 	}
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists( $taxonomy ) ) {
-			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	foreach ((array) $taxonomies as $taxonomy) {
+		if ( ! taxonomy_exists($taxonomy)) {
+			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 		}
 	}
 
-	$defaults = array( 'order' => 'ASC' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'ASC');
+	$args = wp_parse_args($args, $defaults);
 
-	$order = ( 'desc' == strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
+	$order = ('desc' == strtolower($args['order'])) ? 'DESC' : 'ASC';
 
-	$term_ids = array_map('intval', $term_ids );
+	$term_ids = array_map('intval', $term_ids);
 
-	$taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
-	$term_ids = "'" . implode( "', '", $term_ids ) . "'";
+	$taxonomies = "'".implode("', '", array_map('esc_sql', $taxonomies))."'";
+	$term_ids = "'".implode("', '", $term_ids)."'";
 
 	$object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
 
-	if ( ! $object_ids ){
+	if ( ! $object_ids) {
 		return array();
 	}
 	return $object_ids;
@@ -770,9 +770,9 @@ 
  * @param string $primary_id_column
  * @return array
  */
-function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
-	$tax_query_obj = new WP_Tax_Query( $tax_query );
-	return $tax_query_obj->get_sql( $primary_table, $primary_id_column );
+function get_tax_sql($tax_query, $primary_table, $primary_id_column) {
+	$tax_query_obj = new WP_Tax_Query($tax_query);
+	return $tax_query_obj->get_sql($primary_table, $primary_id_column);
 }
 
 /**
@@ -820,31 +820,31 @@ 
  *                                     a WP_Term instance is returned. If taxonomy does not exist, a WP_Error is
  *                                     returned. Returns null for miscellaneous failure.
  */
-function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $term ) ) {
-		return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+function get_term($term, $taxonomy = '', $output = OBJECT, $filter = 'raw') {
+	if (empty($term)) {
+		return new WP_Error('invalid_term', __('Empty Term'));
 	}
 
-	if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ($taxonomy && ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	if ( $term instanceof WP_Term ) {
+	if ($term instanceof WP_Term) {
 		$_term = $term;
-	} elseif ( is_object( $term ) ) {
-		if ( empty( $term->filter ) || 'raw' === $term->filter ) {
-			$_term = sanitize_term( $term, $taxonomy, 'raw' );
-			$_term = new WP_Term( $_term );
+	} elseif (is_object($term)) {
+		if (empty($term->filter) || 'raw' === $term->filter) {
+			$_term = sanitize_term($term, $taxonomy, 'raw');
+			$_term = new WP_Term($_term);
 		} else {
-			$_term = WP_Term::get_instance( $term->term_id );
+			$_term = WP_Term::get_instance($term->term_id);
 		}
 	} else {
-		$_term = WP_Term::get_instance( $term, $taxonomy );
+		$_term = WP_Term::get_instance($term, $taxonomy);
 	}
 
-	if ( is_wp_error( $_term ) ) {
+	if (is_wp_error($_term)) {
 		return $_term;
-	} elseif ( ! $_term ) {
+	} elseif ( ! $_term) {
 		return null;
 	}
 
@@ -857,7 +857,7 @@ 
 	 * @param int|WP_Term $_term    Term object or ID.
 	 * @param string      $taxonomy The taxonomy slug.
 	 */
-	$_term = apply_filters( 'get_term', $_term, $taxonomy );
+	$_term = apply_filters('get_term', $_term, $taxonomy);
 
 	/**
 	 * Filters a taxonomy.
@@ -871,20 +871,20 @@ 
 	 * @param int|WP_Term $_term    Term object or ID.
 	 * @param string      $taxonomy The taxonomy slug.
 	 */
-	$_term = apply_filters( "get_$taxonomy", $_term, $taxonomy );
+	$_term = apply_filters("get_$taxonomy", $_term, $taxonomy);
 
 	// Bail if a filter callback has changed the type of the `$_term` object.
-	if ( ! ( $_term instanceof WP_Term ) ) {
+	if ( ! ($_term instanceof WP_Term)) {
 		return $_term;
 	}
 
 	// Sanitize term, according to the specified filter.
-	$_term->filter( $filter );
+	$_term->filter($filter);
 
-	if ( $output == ARRAY_A ) {
+	if ($output == ARRAY_A) {
 		return $_term->to_array();
-	} elseif ( $output == ARRAY_N ) {
-		return array_values( $_term->to_array() );
+	} elseif ($output == ARRAY_N) {
+		return array_values($_term->to_array());
 	}
 
 	return $_term;
@@ -926,51 +926,51 @@ 
  * @return WP_Term|bool WP_Term instance on success. Will return false if `$taxonomy` does not exist
  *                      or `$term` was not found.
  */
-function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
+function get_term_by($field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
 
 	// 'term_taxonomy_id' lookups don't require taxonomy checks.
-	if ( 'term_taxonomy_id' !== $field && ! taxonomy_exists( $taxonomy ) ) {
+	if ('term_taxonomy_id' !== $field && ! taxonomy_exists($taxonomy)) {
 		return false;
 	}
 
-	$tax_clause = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+	$tax_clause = $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-	if ( 'slug' == $field ) {
+	if ('slug' == $field) {
 		$_field = 't.slug';
 		$value = sanitize_title($value);
-		if ( empty($value) )
+		if (empty($value))
 			return false;
-	} elseif ( 'name' == $field ) {
+	} elseif ('name' == $field) {
 		// Assume already escaped
 		$value = wp_unslash($value);
 		$_field = 't.name';
-	} elseif ( 'term_taxonomy_id' == $field ) {
+	} elseif ('term_taxonomy_id' == $field) {
 		$value = (int) $value;
 		$_field = 'tt.term_taxonomy_id';
 
 		// No `taxonomy` clause when searching by 'term_taxonomy_id'.
 		$tax_clause = '';
 	} else {
-		$term = get_term( (int) $value, $taxonomy, $output, $filter );
-		if ( is_wp_error( $term ) || is_null( $term ) ) {
+		$term = get_term((int) $value, $taxonomy, $output, $filter);
+		if (is_wp_error($term) || is_null($term)) {
 			$term = false;
 		}
 		return $term;
 	}
 
-	$term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value ) . " $tax_clause LIMIT 1" );
-	if ( ! $term )
+	$term = $wpdb->get_row($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value)." $tax_clause LIMIT 1");
+	if ( ! $term)
 		return false;
 
 	// In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
-	if ( 'term_taxonomy_id' === $field ) {
+	if ('term_taxonomy_id' === $field) {
 		$taxonomy = $term->taxonomy;
 	}
 
-	wp_cache_add( $term->term_id, $term, 'terms' );
+	wp_cache_add($term->term_id, $term, 'terms');
 
-	return get_term( $term, $taxonomy, $output, $filter );
+	return get_term($term, $taxonomy, $output, $filter);
 }
 
 /**
@@ -987,26 +987,26 @@ 
  * @param string $taxonomy Taxonomy Name.
  * @return array|WP_Error List of Term IDs. WP_Error returned if `$taxonomy` does not exist.
  */
-function get_term_children( $term_id, $taxonomy ) {
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+function get_term_children($term_id, $taxonomy) {
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	$term_id = intval( $term_id );
+	$term_id = intval($term_id);
 
 	$terms = _get_term_hierarchy($taxonomy);
 
-	if ( ! isset($terms[$term_id]) )
+	if ( ! isset($terms[$term_id]))
 		return array();
 
 	$children = $terms[$term_id];
 
-	foreach ( (array) $terms[$term_id] as $child ) {
-		if ( $term_id == $child ) {
+	foreach ((array) $terms[$term_id] as $child) {
+		if ($term_id == $child) {
 			continue;
 		}
 
-		if ( isset($terms[$child]) )
+		if (isset($terms[$child]))
 			$children = array_merge($children, get_term_children($child, $taxonomy));
 	}
 
@@ -1029,18 +1029,18 @@ 
  * @param string      $context  Optional, default is display. Look at sanitize_term_field() for available options.
  * @return string|int|null|WP_Error Will return an empty string if $term is not an object or if $field is not set in $term.
  */
-function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
-	$term = get_term( $term, $taxonomy );
-	if ( is_wp_error($term) )
+function get_term_field($field, $term, $taxonomy = '', $context = 'display') {
+	$term = get_term($term, $taxonomy);
+	if (is_wp_error($term))
 		return $term;
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		return '';
 
-	if ( !isset($term->$field) )
+	if ( ! isset($term->$field))
 		return '';
 
-	return sanitize_term_field( $field, $term->$field, $term->term_id, $term->taxonomy, $context );
+	return sanitize_term_field($field, $term->$field, $term->term_id, $term->taxonomy, $context);
 }
 
 /**
@@ -1055,13 +1055,13 @@ 
  * @param string     $taxonomy Taxonomy name.
  * @return string|int|null|WP_Error Will return empty string if $term is not an object.
  */
-function get_term_to_edit( $id, $taxonomy ) {
-	$term = get_term( $id, $taxonomy );
+function get_term_to_edit($id, $taxonomy) {
+	$term = get_term($id, $taxonomy);
 
-	if ( is_wp_error($term) )
+	if (is_wp_error($term))
 		return $term;
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		return '';
 
 	return sanitize_term($term, $taxonomy, 'edit');
@@ -1179,7 +1179,7 @@ 
  * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
  *                            do not exist.
  */
-function get_terms( $args = array(), $deprecated = '' ) {
+function get_terms($args = array(), $deprecated = '') {
 	global $wpdb;
 
 	$term_query = new WP_Term_Query();
@@ -1191,33 +1191,33 @@ 
 	 * (a) a second non-empty parameter is passed, or
 	 * (b) the first parameter shares no keys with the default array (ie, it's a list of taxonomies)
 	 */
-	$_args = wp_parse_args( $args );
-	$key_intersect  = array_intersect_key( $term_query->query_var_defaults, (array) $_args );
-	$do_legacy_args = $deprecated || empty( $key_intersect );
+	$_args = wp_parse_args($args);
+	$key_intersect  = array_intersect_key($term_query->query_var_defaults, (array) $_args);
+	$do_legacy_args = $deprecated || empty($key_intersect);
 
-	if ( $do_legacy_args ) {
+	if ($do_legacy_args) {
 		$taxonomies = (array) $args;
-		$args = wp_parse_args( $deprecated );
+		$args = wp_parse_args($deprecated);
 		$args['taxonomy'] = $taxonomies;
 	} else {
-		$args = wp_parse_args( $args );
-		if ( isset( $args['taxonomy'] ) && null !== $args['taxonomy'] ) {
+		$args = wp_parse_args($args);
+		if (isset($args['taxonomy']) && null !== $args['taxonomy']) {
 			$args['taxonomy'] = (array) $args['taxonomy'];
 		}
 	}
 
-	if ( ! empty( $args['taxonomy'] ) ) {
-		foreach ( $args['taxonomy'] as $taxonomy ) {
-			if ( ! taxonomy_exists( $taxonomy ) ) {
-				return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ( ! empty($args['taxonomy'])) {
+		foreach ($args['taxonomy'] as $taxonomy) {
+			if ( ! taxonomy_exists($taxonomy)) {
+				return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 			}
 		}
 	}
 
-	$terms = $term_query->query( $args );
+	$terms = $term_query->query($args);
 
 	// Count queries are not filtered, for legacy reasons.
-	if ( ! is_array( $terms ) ) {
+	if ( ! is_array($terms)) {
 		return $terms;
 	}
 
@@ -1232,7 +1232,7 @@ 
 	 * @param array         $args       An array of get_terms() arguments.
 	 * @param WP_Term_Query $term_query The WP_Term_Query object.
 	 */
-	return apply_filters( 'get_terms', $terms, $term_query->query_vars['taxonomy'], $term_query->query_vars, $term_query );
+	return apply_filters('get_terms', $terms, $term_query->query_vars['taxonomy'], $term_query->query_vars, $term_query);
 }
 
 /**
@@ -1248,21 +1248,21 @@ 
  * @return int|WP_Error|bool Meta ID on success. WP_Error when term_id is ambiguous between taxonomies.
  *                           False on failure.
  */
-function add_term_meta( $term_id, $meta_key, $meta_value, $unique = false ) {
+function add_term_meta($term_id, $meta_key, $meta_value, $unique = false) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+	if (wp_term_is_shared($term_id)) {
+		return new WP_Error('ambiguous_term_id', __('Term meta cannot be added to terms that are shared between taxonomies.'), $term_id);
 	}
 
-	$added = add_metadata( 'term', $term_id, $meta_key, $meta_value, $unique );
+	$added = add_metadata('term', $term_id, $meta_key, $meta_value, $unique);
 
 	// Bust term query cache.
-	if ( $added ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($added) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $added;
@@ -1278,17 +1278,17 @@ 
  * @param mixed  $meta_value Optional. Metadata value. If provided, rows will only be removed that match the value.
  * @return bool True on success, false on failure.
  */
-function delete_term_meta( $term_id, $meta_key, $meta_value = '' ) {
+function delete_term_meta($term_id, $meta_key, $meta_value = '') {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	$deleted = delete_metadata( 'term', $term_id, $meta_key, $meta_value );
+	$deleted = delete_metadata('term', $term_id, $meta_key, $meta_value);
 
 	// Bust term query cache.
-	if ( $deleted ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($deleted) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $deleted;
@@ -1305,13 +1305,13 @@ 
  *                        `$term_id`/`$key` pair will be returned. Default: false.
  * @return mixed If `$single` is false, an array of metadata values. If `$single` is true, a single metadata value.
  */
-function get_term_meta( $term_id, $key = '', $single = false ) {
+function get_term_meta($term_id, $key = '', $single = false) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	return get_metadata( 'term', $term_id, $key, $single );
+	return get_metadata('term', $term_id, $key, $single);
 }
 
 /**
@@ -1330,21 +1330,21 @@ 
  * @return int|WP_Error|bool Meta ID if the key didn't previously exist. True on successful update.
  *                           WP_Error when term_id is ambiguous between taxonomies. False on failure.
  */
-function update_term_meta( $term_id, $meta_key, $meta_value, $prev_value = '' ) {
+function update_term_meta($term_id, $meta_key, $meta_value, $prev_value = '') {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+	if (wp_term_is_shared($term_id)) {
+		return new WP_Error('ambiguous_term_id', __('Term meta cannot be added to terms that are shared between taxonomies.'), $term_id);
 	}
 
-	$updated = update_metadata( 'term', $term_id, $meta_key, $meta_value, $prev_value );
+	$updated = update_metadata('term', $term_id, $meta_key, $meta_value, $prev_value);
 
 	// Bust term query cache.
-	if ( $updated ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($updated) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $updated;
@@ -1361,13 +1361,13 @@ 
  * @param array $term_ids List of term IDs.
  * @return array|false Returns false if there is nothing to update. Returns an array of metadata on success.
  */
-function update_termmeta_cache( $term_ids ) {
+function update_termmeta_cache($term_ids) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return;
 	}
 
-	return update_meta_cache( 'term', $term_ids );
+	return update_meta_cache('term', $term_ids);
 }
 
 /**
@@ -1387,24 +1387,24 @@ 
  *               an array of the term ID and the term taxonomy ID the taxonomy
  *               is specified and the pairing exists.
  */
-function term_exists( $term, $taxonomy = '', $parent = null ) {
+function term_exists($term, $taxonomy = '', $parent = null) {
 	global $wpdb;
 
 	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 
-	if ( is_int($term) ) {
-		if ( 0 == $term )
+	if (is_int($term)) {
+		if (0 == $term)
 			return 0;
 		$where = 't.term_id = %d';
-		if ( !empty($taxonomy) )
-			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+		if ( ! empty($taxonomy))
+			return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
 		else
-			return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+			return $wpdb->get_var($wpdb->prepare($select.$where, $term));
 	}
 
-	$term = trim( wp_unslash( $term ) );
-	$slug = sanitize_title( $term );
+	$term = trim(wp_unslash($term));
+	$slug = sanitize_title($term);
 
 	$where = 't.slug = %s';
 	$else_where = 't.name = %s';
@@ -1412,8 +1412,8 @@ 
 	$else_where_fields = array($term);
 	$orderby = 'ORDER BY t.term_id ASC';
 	$limit = 'LIMIT 1';
-	if ( !empty($taxonomy) ) {
-		if ( is_numeric( $parent ) ) {
+	if ( ! empty($taxonomy)) {
+		if (is_numeric($parent)) {
 			$parent = (int) $parent;
 			$where_fields[] = $parent;
 			$else_where_fields[] = $parent;
@@ -1424,16 +1424,16 @@ 
 		$where_fields[] = $taxonomy;
 		$else_where_fields[] = $taxonomy;
 
-		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) )
+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A))
 			return $result;
 
-		return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
+		return $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
 	}
 
-	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) )
+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields)))
 		return $result;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields) );
+	return $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields));
 }
 
 /**
@@ -1448,18 +1448,18 @@ 
  * @param string     $taxonomy Taxonomy name that $term1 and `$term2` belong to.
  * @return bool Whether `$term2` is a child of `$term1`.
  */
-function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
-	if ( ! isset( $term1->term_id ) )
-		$term1 = get_term( $term1, $taxonomy );
-	if ( ! isset( $term2->parent ) )
-		$term2 = get_term( $term2, $taxonomy );
+function term_is_ancestor_of($term1, $term2, $taxonomy) {
+	if ( ! isset($term1->term_id))
+		$term1 = get_term($term1, $taxonomy);
+	if ( ! isset($term2->parent))
+		$term2 = get_term($term2, $taxonomy);
 
-	if ( empty( $term1->term_id ) || empty( $term2->parent ) )
+	if (empty($term1->term_id) || empty($term2->parent))
 		return false;
-	if ( $term2->parent == $term1->term_id )
+	if ($term2->parent == $term1->term_id)
 		return true;
 
-	return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
+	return term_is_ancestor_of($term1, get_term($term2->parent, $taxonomy), $taxonomy);
 }
 
 /**
@@ -1480,23 +1480,23 @@ 
  * @return array|object Term with all fields sanitized.
  */
 function sanitize_term($term, $taxonomy, $context = 'display') {
-	$fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
+	$fields = array('term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id');
 
-	$do_object = is_object( $term );
+	$do_object = is_object($term);
 
 	$term_id = $do_object ? $term->term_id : (isset($term['term_id']) ? $term['term_id'] : 0);
 
-	foreach ( (array) $fields as $field ) {
-		if ( $do_object ) {
-			if ( isset($term->$field) )
+	foreach ((array) $fields as $field) {
+		if ($do_object) {
+			if (isset($term->$field))
 				$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
 		} else {
-			if ( isset($term[$field]) )
+			if (isset($term[$field]))
 				$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
 		}
 	}
 
-	if ( $do_object )
+	if ($do_object)
 		$term->filter = $context;
 	else
 		$term['filter'] = $context;
@@ -1528,17 +1528,17 @@ 
  * @return mixed Sanitized field.
  */
 function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
-	$int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
-	if ( in_array( $field, $int_fields ) ) {
+	$int_fields = array('parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id');
+	if (in_array($field, $int_fields)) {
 		$value = (int) $value;
-		if ( $value < 0 )
+		if ($value < 0)
 			$value = 0;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 
 		/**
 		 * Filters a term field to edit before it is sanitized.
@@ -1551,7 +1551,7 @@ 
 		 * @param int   $term_id   Term ID.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "edit_term_{$field}", $value, $term_id, $taxonomy );
+		$value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
 
 		/**
 		 * Filters the taxonomy field to edit before it is sanitized.
@@ -1564,13 +1564,13 @@ 
 		 * @param mixed $value   Value of the taxonomy field to edit.
 		 * @param int   $term_id Term ID.
 		 */
-		$value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
+		$value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
 
-		if ( 'description' == $field )
+		if ('description' == $field)
 			$value = esc_html($value); // textarea_escaped
 		else
 			$value = esc_attr($value);
-	} elseif ( 'db' == $context ) {
+	} elseif ('db' == $context) {
 
 		/**
 		 * Filters a term field value before it is sanitized.
@@ -1582,7 +1582,7 @@ 
 		 * @param mixed  $value    Value of the term field.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "pre_term_{$field}", $value, $taxonomy );
+		$value = apply_filters("pre_term_{$field}", $value, $taxonomy);
 
 		/**
 		 * Filters a taxonomy field before it is sanitized.
@@ -1594,10 +1594,10 @@ 
 		 *
 		 * @param mixed $value Value of the taxonomy field.
 		 */
-		$value = apply_filters( "pre_{$taxonomy}_{$field}", $value );
+		$value = apply_filters("pre_{$taxonomy}_{$field}", $value);
 
 		// Back compat filters
-		if ( 'slug' == $field ) {
+		if ('slug' == $field) {
 			/**
 			 * Filters the category nicename before it is sanitized.
 			 *
@@ -1607,10 +1607,10 @@ 
 			 *
 			 * @param string $value The category nicename.
 			 */
-			$value = apply_filters( 'pre_category_nicename', $value );
+			$value = apply_filters('pre_category_nicename', $value);
 		}
 
-	} elseif ( 'rss' == $context ) {
+	} elseif ('rss' == $context) {
 
 		/**
 		 * Filters the term field for use in RSS.
@@ -1622,7 +1622,7 @@ 
 		 * @param mixed  $value    Value of the term field.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "term_{$field}_rss", $value, $taxonomy );
+		$value = apply_filters("term_{$field}_rss", $value, $taxonomy);
 
 		/**
 		 * Filters the taxonomy field for use in RSS.
@@ -1634,7 +1634,7 @@ 
 		 *
 		 * @param mixed $value Value of the taxonomy field.
 		 */
-		$value = apply_filters( "{$taxonomy}_{$field}_rss", $value );
+		$value = apply_filters("{$taxonomy}_{$field}_rss", $value);
 	} else {
 		// Use display filters by default.
 
@@ -1650,7 +1650,7 @@ 
 		 * @param string $taxonomy Taxonomy slug.
 		 * @param string $context  Context to retrieve the term field value.
 		 */
-		$value = apply_filters( "term_{$field}", $value, $term_id, $taxonomy, $context );
+		$value = apply_filters("term_{$field}", $value, $term_id, $taxonomy, $context);
 
 		/**
 		 * Filters the taxonomy field sanitized for display.
@@ -1664,12 +1664,12 @@ 
 		 * @param int    $term_id Term ID.
 		 * @param string $context Context to retrieve the taxonomy field value.
 		 */
-		$value = apply_filters( "{$taxonomy}_{$field}", $value, $term_id, $context );
+		$value = apply_filters("{$taxonomy}_{$field}", $value, $term_id, $context);
 	}
 
-	if ( 'attribute' == $context ) {
+	if ('attribute' == $context) {
 		$value = esc_attr($value);
-	} elseif ( 'js' == $context ) {
+	} elseif ('js' == $context) {
 		$value = esc_js($value);
 	}
 	return $value;
@@ -1687,12 +1687,12 @@ 
  *                               Default empty array.
  * @return array|int|WP_Error Number of terms in that taxonomy or WP_Error if the taxonomy does not exist.
  */
-function wp_count_terms( $taxonomy, $args = array() ) {
+function wp_count_terms($taxonomy, $args = array()) {
 	$defaults = array('hide_empty' => false);
 	$args = wp_parse_args($args, $defaults);
 
 	// backward compatibility
-	if ( isset($args['ignore_empty']) ) {
+	if (isset($args['ignore_empty'])) {
 		$args['hide_empty'] = $args['ignore_empty'];
 		unset($args['ignore_empty']);
 	}
@@ -1714,16 +1714,16 @@ 
  * @param int          $object_id  The term Object Id that refers to the term.
  * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
  */
-function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
+function wp_delete_object_term_relationships($object_id, $taxonomies) {
 	$object_id = (int) $object_id;
 
-	if ( !is_array($taxonomies) )
+	if ( ! is_array($taxonomies))
 		$taxonomies = array($taxonomies);
 
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
-		$term_ids = array_map( 'intval', $term_ids );
-		wp_remove_object_terms( $object_id, $term_ids, $taxonomy );
+	foreach ((array) $taxonomies as $taxonomy) {
+		$term_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'ids'));
+		$term_ids = array_map('intval', $term_ids);
+		wp_remove_object_terms($object_id, $term_ids, $taxonomy);
 	}
 }
 
@@ -1754,36 +1754,36 @@ 
  * @return bool|int|WP_Error True on success, false if term does not exist. Zero on attempted
  *                           deletion of default Category. WP_Error if the taxonomy does not exist.
  */
-function wp_delete_term( $term, $taxonomy, $args = array() ) {
+function wp_delete_term($term, $taxonomy, $args = array()) {
 	global $wpdb;
 
 	$term = (int) $term;
 
-	if ( ! $ids = term_exists($term, $taxonomy) )
+	if ( ! $ids = term_exists($term, $taxonomy))
 		return false;
-	if ( is_wp_error( $ids ) )
+	if (is_wp_error($ids))
 		return $ids;
 
 	$tt_id = $ids['term_taxonomy_id'];
 
 	$defaults = array();
 
-	if ( 'category' == $taxonomy ) {
-		$defaults['default'] = get_option( 'default_category' );
-		if ( $defaults['default'] == $term )
+	if ('category' == $taxonomy) {
+		$defaults['default'] = get_option('default_category');
+		if ($defaults['default'] == $term)
 			return 0; // Don't delete the default category
 	}
 
 	$args = wp_parse_args($args, $defaults);
 
-	if ( isset( $args['default'] ) ) {
+	if (isset($args['default'])) {
 		$default = (int) $args['default'];
-		if ( ! term_exists( $default, $taxonomy ) ) {
-			unset( $default );
+		if ( ! term_exists($default, $taxonomy)) {
+			unset($default);
 		}
 	}
 
-	if ( isset( $args['force_default'] ) ) {
+	if (isset($args['force_default'])) {
 		$force_default = $args['force_default'];
 	}
 
@@ -1795,17 +1795,17 @@ 
 	 * @param int    $term     Term ID.
 	 * @param string $taxonomy Taxonomy Name.
 	 */
-	do_action( 'pre_delete_term', $term, $taxonomy );
+	do_action('pre_delete_term', $term, $taxonomy);
 
 	// Update children to point to new parent
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
+	if (is_taxonomy_hierarchical($taxonomy)) {
 		$term_obj = get_term($term, $taxonomy);
-		if ( is_wp_error( $term_obj ) )
+		if (is_wp_error($term_obj))
 			return $term_obj;
 		$parent = $term_obj->parent;
 
-		$edit_ids = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int)$term_obj->term_id );
-		$edit_tt_ids = wp_list_pluck( $edit_ids, 'term_taxonomy_id' );
+		$edit_ids = $wpdb->get_results("SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = ".(int) $term_obj->term_id);
+		$edit_tt_ids = wp_list_pluck($edit_ids, 'term_taxonomy_id');
 
 		/**
 		 * Fires immediately before a term to delete's children are reassigned a parent.
@@ -1814,13 +1814,13 @@ 
 		 *
 		 * @param array $edit_tt_ids An array of term taxonomy IDs for the given term.
 		 */
-		do_action( 'edit_term_taxonomies', $edit_tt_ids );
+		do_action('edit_term_taxonomies', $edit_tt_ids);
 
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id) + compact( 'taxonomy' ) );
+		$wpdb->update($wpdb->term_taxonomy, compact('parent'), array('parent' => $term_obj->term_id) + compact('taxonomy'));
 
 		// Clean the cache for all child terms.
-		$edit_term_ids = wp_list_pluck( $edit_ids, 'term_id' );
-		clean_term_cache( $edit_term_ids, $taxonomy );
+		$edit_term_ids = wp_list_pluck($edit_ids, 'term_id');
+		clean_term_cache($edit_term_ids, $taxonomy);
 
 		/**
 		 * Fires immediately after a term to delete's children are reassigned a parent.
@@ -1829,17 +1829,17 @@ 
 		 *
 		 * @param array $edit_tt_ids An array of term taxonomy IDs for the given term.
 		 */
-		do_action( 'edited_term_taxonomies', $edit_tt_ids );
+		do_action('edited_term_taxonomies', $edit_tt_ids);
 	}
 
 	// Get the term before deleting it or its term relationships so we can pass to actions below.
-	$deleted_term = get_term( $term, $taxonomy );
+	$deleted_term = get_term($term, $taxonomy);
 
-	$object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
+	$object_ids = (array) $wpdb->get_col($wpdb->prepare("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id));
 
-	foreach ( $object_ids as $object_id ) {
-		$terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
-		if ( 1 == count($terms) && isset($default) ) {
+	foreach ($object_ids as $object_id) {
+		$terms = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
+		if (1 == count($terms) && isset($default)) {
 			$terms = array($default);
 		} else {
 			$terms = array_diff($terms, array($term));
@@ -1847,17 +1847,17 @@ 
 				$terms = array_merge($terms, array($default));
 		}
 		$terms = array_map('intval', $terms);
-		wp_set_object_terms( $object_id, $terms, $taxonomy );
+		wp_set_object_terms($object_id, $terms, $taxonomy);
 	}
 
 	// Clean the relationship caches for all object types using this term.
-	$tax_object = get_taxonomy( $taxonomy );
-	foreach ( $tax_object->object_type as $object_type )
-		clean_object_term_cache( $object_ids, $object_type );
+	$tax_object = get_taxonomy($taxonomy);
+	foreach ($tax_object->object_type as $object_type)
+		clean_object_term_cache($object_ids, $object_type);
 
-	$term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
-	foreach ( $term_meta_ids as $mid ) {
-		delete_metadata_by_mid( 'term', $mid );
+	$term_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term));
+	foreach ($term_meta_ids as $mid) {
+		delete_metadata_by_mid('term', $mid);
 	}
 
 	/**
@@ -1867,8 +1867,8 @@ 
 	 *
 	 * @param int $tt_id Term taxonomy ID.
 	 */
-	do_action( 'delete_term_taxonomy', $tt_id );
-	$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $tt_id ) );
+	do_action('delete_term_taxonomy', $tt_id);
+	$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $tt_id));
 
 	/**
 	 * Fires immediately after a term taxonomy ID is deleted.
@@ -1877,11 +1877,11 @@ 
 	 *
 	 * @param int $tt_id Term taxonomy ID.
 	 */
-	do_action( 'deleted_term_taxonomy', $tt_id );
+	do_action('deleted_term_taxonomy', $tt_id);
 
 	// Delete the term if no taxonomies use it.
-	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) )
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	if ( ! $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term)))
+		$wpdb->delete($wpdb->terms, array('term_id' => $term));
 
 	clean_term_cache($term, $taxonomy);
 
@@ -1898,7 +1898,7 @@ 
 	 *                              by the parent function. WP_Error otherwise.
 	 * @param array   $object_ids   List of term object IDs.
 	 */
-	do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids );
+	do_action('delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids);
 
 	/**
 	 * Fires after a term in a specific taxonomy is deleted.
@@ -1915,7 +1915,7 @@ 
 	 *                              by the parent function. WP_Error otherwise.
 	 * @param array   $object_ids   List of term object IDs.
 	 */
-	do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids );
+	do_action("delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids);
 
 	return true;
 }
@@ -1929,8 +1929,8 @@ 
  * @return bool|int|WP_Error Returns true if completes delete action; false if term doesn't exist;
  * 	Zero on attempted deletion of default Category; WP_Error object is also a possibility.
  */
-function wp_delete_category( $cat_ID ) {
-	return wp_delete_term( $cat_ID, 'category' );
+function wp_delete_category($cat_ID) {
+	return wp_delete_term($cat_ID, 'category');
 }
 
 /**
@@ -1968,18 +1968,18 @@ 
 function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( empty( $object_ids ) || empty( $taxonomies ) )
+	if (empty($object_ids) || empty($taxonomies))
 		return array();
 
-	if ( !is_array($taxonomies) )
+	if ( ! is_array($taxonomies))
 		$taxonomies = array($taxonomies);
 
-	foreach ( $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists($taxonomy) )
-			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	foreach ($taxonomies as $taxonomy) {
+		if ( ! taxonomy_exists($taxonomy))
+			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = array($object_ids);
 	$object_ids = array_map('intval', $object_ids);
 
@@ -1991,20 +1991,20 @@ 
 		'update_term_meta_cache' => true,
 		'meta_query' => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$terms = array();
-	if ( count($taxonomies) > 1 ) {
-		foreach ( $taxonomies as $index => $taxonomy ) {
+	if (count($taxonomies) > 1) {
+		foreach ($taxonomies as $index => $taxonomy) {
 			$t = get_taxonomy($taxonomy);
-			if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) {
+			if (isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args)) {
 				unset($taxonomies[$index]);
 				$terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
 			}
 		}
 	} else {
 		$t = get_taxonomy($taxonomies[0]);
-		if ( isset($t->args) && is_array($t->args) )
+		if (isset($t->args) && is_array($t->args))
 			$args = array_merge($args, $t->args);
 	}
 
@@ -2012,13 +2012,13 @@ 
 	$order = $args['order'];
 	$fields = $args['fields'];
 
-	if ( in_array( $orderby, array( 'term_id', 'name', 'slug', 'term_group' ) ) ) {
+	if (in_array($orderby, array('term_id', 'name', 'slug', 'term_group'))) {
 		$orderby = "t.$orderby";
-	} elseif ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
+	} elseif (in_array($orderby, array('count', 'parent', 'taxonomy', 'term_taxonomy_id'))) {
 		$orderby = "tt.$orderby";
-	} elseif ( 'term_order' === $orderby ) {
+	} elseif ('term_order' === $orderby) {
 		$orderby = 'tr.term_order';
-	} elseif ( 'none' === $orderby ) {
+	} elseif ('none' === $orderby) {
 		$orderby = '';
 		$order = '';
 	} else {
@@ -2026,31 +2026,31 @@ 
 	}
 
 	// tt_ids queries can only be none or tr.term_taxonomy_id
-	if ( ('tt_ids' == $fields) && !empty($orderby) )
+	if (('tt_ids' == $fields) && ! empty($orderby))
 		$orderby = 'tr.term_taxonomy_id';
 
-	if ( !empty($orderby) )
+	if ( ! empty($orderby))
 		$orderby = "ORDER BY $orderby";
 
-	$order = strtoupper( $order );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
+	$order = strtoupper($order);
+	if ('' !== $order && ! in_array($order, array('ASC', 'DESC')))
 		$order = 'ASC';
 
 	$taxonomy_array = $taxonomies;
 	$object_id_array = $object_ids;
-	$taxonomies = "'" . implode("', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
+	$taxonomies = "'".implode("', '", array_map('esc_sql', $taxonomies))."'";
 	$object_ids = implode(', ', $object_ids);
 
 	$select_this = '';
-	if ( 'all' == $fields ) {
+	if ('all' == $fields) {
 		$select_this = 't.*, tt.*';
-	} elseif ( 'ids' == $fields ) {
+	} elseif ('ids' == $fields) {
 		$select_this = 't.term_id';
-	} elseif ( 'names' == $fields ) {
+	} elseif ('names' == $fields) {
 		$select_this = 't.name';
-	} elseif ( 'slugs' == $fields ) {
+	} elseif ('slugs' == $fields) {
 		$select_this = 't.slug';
-	} elseif ( 'all_with_object_id' == $fields ) {
+	} elseif ('all_with_object_id' == $fields) {
 		$select_this = 't.*, tt.*, tr.object_id';
 	}
 
@@ -2059,86 +2059,86 @@ 
 		"tr.object_id IN ($object_ids)",
 	);
 
-	if ( '' !== $args['parent'] ) {
-		$where[] = $wpdb->prepare( 'tt.parent = %d', $args['parent'] );
+	if ('' !== $args['parent']) {
+		$where[] = $wpdb->prepare('tt.parent = %d', $args['parent']);
 	}
 
 	// Meta query support.
 	$meta_query_join = '';
-	if ( ! empty( $args['meta_query'] ) ) {
-		$mquery = new WP_Meta_Query( $args['meta_query'] );
-		$mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
+	if ( ! empty($args['meta_query'])) {
+		$mquery = new WP_Meta_Query($args['meta_query']);
+		$mq_sql = $mquery->get_sql('term', 't', 'term_id');
 
 		$meta_query_join .= $mq_sql['join'];
 
 		// Strip leading AND.
-		$where[] = preg_replace( '/^\s*AND/', '', $mq_sql['where'] );
+		$where[] = preg_replace('/^\s*AND/', '', $mq_sql['where']);
 	}
 
-	$where = implode( ' AND ', $where );
+	$where = implode(' AND ', $where);
 
 	$query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id $meta_query_join WHERE $where $orderby $order";
 
 	$objects = false;
-	if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
-		$_terms = $wpdb->get_results( $query );
+	if ('all' == $fields || 'all_with_object_id' == $fields) {
+		$_terms = $wpdb->get_results($query);
 		$object_id_index = array();
-		foreach ( $_terms as $key => $term ) {
-			$term = sanitize_term( $term, $taxonomy, 'raw' );
-			$_terms[ $key ] = $term;
+		foreach ($_terms as $key => $term) {
+			$term = sanitize_term($term, $taxonomy, 'raw');
+			$_terms[$key] = $term;
 
-			if ( isset( $term->object_id ) ) {
-				$object_id_index[ $key ] = $term->object_id;
+			if (isset($term->object_id)) {
+				$object_id_index[$key] = $term->object_id;
 			}
 		}
 
-		update_term_cache( $_terms );
-		$_terms = array_map( 'get_term', $_terms );
+		update_term_cache($_terms);
+		$_terms = array_map('get_term', $_terms);
 
 		// Re-add the object_id data, which is lost when fetching terms from cache.
-		if ( 'all_with_object_id' === $fields ) {
-			foreach ( $_terms as $key => $_term ) {
-				if ( isset( $object_id_index[ $key ] ) ) {
-					$_term->object_id = $object_id_index[ $key ];
+		if ('all_with_object_id' === $fields) {
+			foreach ($_terms as $key => $_term) {
+				if (isset($object_id_index[$key])) {
+					$_term->object_id = $object_id_index[$key];
 				}
 			}
 		}
 
-		$terms = array_merge( $terms, $_terms );
+		$terms = array_merge($terms, $_terms);
 		$objects = true;
 
-	} elseif ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
-		$_terms = $wpdb->get_col( $query );
-		$_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
-		foreach ( $_terms as $key => $term ) {
-			$_terms[$key] = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' );
+	} elseif ('ids' == $fields || 'names' == $fields || 'slugs' == $fields) {
+		$_terms = $wpdb->get_col($query);
+		$_field = ('ids' == $fields) ? 'term_id' : 'name';
+		foreach ($_terms as $key => $term) {
+			$_terms[$key] = sanitize_term_field($_field, $term, $term, $taxonomy, 'raw');
 		}
-		$terms = array_merge( $terms, $_terms );
-	} elseif ( 'tt_ids' == $fields ) {
+		$terms = array_merge($terms, $_terms);
+	} elseif ('tt_ids' == $fields) {
 		$terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
-		foreach ( $terms as $key => $tt_id ) {
-			$terms[$key] = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
+		foreach ($terms as $key => $tt_id) {
+			$terms[$key] = sanitize_term_field('term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw'); // 0 should be the term id, however is not needed when using raw context.
 		}
 	}
 
 	// Update termmeta cache, if necessary.
-	if ( $args['update_term_meta_cache'] && ( 'all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields ) ) {
-		if ( 'ids' === $fields ) {
+	if ($args['update_term_meta_cache'] && ('all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields)) {
+		if ('ids' === $fields) {
 			$term_ids = $terms;
 		} else {
-			$term_ids = wp_list_pluck( $terms, 'term_id' );
+			$term_ids = wp_list_pluck($terms, 'term_id');
 		}
 
-		update_termmeta_cache( $term_ids );
+		update_termmeta_cache($term_ids);
 	}
 
-	if ( ! $terms ) {
+	if ( ! $terms) {
 		$terms = array();
-	} elseif ( $objects && 'all_with_object_id' !== $fields ) {
+	} elseif ($objects && 'all_with_object_id' !== $fields) {
 		$_tt_ids = array();
 		$_terms = array();
-		foreach ( $terms as $term ) {
-			if ( in_array( $term->term_taxonomy_id, $_tt_ids ) ) {
+		foreach ($terms as $term) {
+			if (in_array($term->term_taxonomy_id, $_tt_ids)) {
 				continue;
 			}
 
@@ -2146,8 +2146,8 @@ 
 			$_terms[] = $term;
 		}
 		$terms = $_terms;
-	} elseif ( ! $objects ) {
-		$terms = array_values( array_unique( $terms ) );
+	} elseif ( ! $objects) {
+		$terms = array_values(array_unique($terms));
 	}
 
 	/**
@@ -2161,7 +2161,7 @@ 
 	 * @param array $args            An array of arguments for retrieving terms for the given
 	 *                               object(s). See wp_get_object_terms() for details.
 	 */
-	$terms = apply_filters( 'get_object_terms', $terms, $object_id_array, $taxonomy_array, $args );
+	$terms = apply_filters('get_object_terms', $terms, $object_id_array, $taxonomy_array, $args);
 
 	/**
 	 * Filters the terms for a given object or objects.
@@ -2177,7 +2177,7 @@ 
 	 * @param array     $args       An array of arguments for retrieving terms for the given object(s).
 	 *                              See wp_get_object_terms() for details.
 	 */
-	return apply_filters( 'wp_get_object_terms', $terms, $object_ids, $taxonomies, $args );
+	return apply_filters('wp_get_object_terms', $terms, $object_ids, $taxonomies, $args);
 }
 
 /**
@@ -2223,11 +2223,11 @@ 
  * @return array|WP_Error An array containing the `term_id` and `term_taxonomy_id`,
  *                        WP_Error otherwise.
  */
-function wp_insert_term( $term, $taxonomy, $args = array() ) {
+function wp_insert_term($term, $taxonomy, $args = array()) {
 	global $wpdb;
 
-	if ( ! taxonomy_exists($taxonomy) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 	/**
 	 * Filters a term before it is sanitized and inserted into the database.
@@ -2237,21 +2237,21 @@ 
 	 * @param string $term     The term to add or update.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	$term = apply_filters( 'pre_insert_term', $term, $taxonomy );
-	if ( is_wp_error( $term ) ) {
+	$term = apply_filters('pre_insert_term', $term, $taxonomy);
+	if (is_wp_error($term)) {
 		return $term;
 	}
-	if ( is_int( $term ) && 0 == $term ) {
-		return new WP_Error( 'invalid_term_id', __( 'Invalid term ID.' ) );
+	if (is_int($term) && 0 == $term) {
+		return new WP_Error('invalid_term_id', __('Invalid term ID.'));
 	}
-	if ( '' == trim( $term ) ) {
-		return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
+	if ('' == trim($term)) {
+		return new WP_Error('empty_term_name', __('A name is required for this term.'));
 	}
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['parent'] > 0 && ! term_exists( (int) $args['parent'] ) ) {
-		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
+	if ($args['parent'] > 0 && ! term_exists((int) $args['parent'])) {
+		return new WP_Error('missing_parent', __('Parent term does not exist.'));
 	}
 
 	$args['name'] = $term;
@@ -2263,33 +2263,33 @@ 
 	$args = sanitize_term($args, $taxonomy, 'db');
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
-	$description = wp_unslash( $args['description'] );
+	$name = wp_unslash($args['name']);
+	$description = wp_unslash($args['description']);
 	$parent = (int) $args['parent'];
 
-	$slug_provided = ! empty( $args['slug'] );
-	if ( ! $slug_provided ) {
-		$slug = sanitize_title( $name );
+	$slug_provided = ! empty($args['slug']);
+	if ( ! $slug_provided) {
+		$slug = sanitize_title($name);
 	} else {
 		$slug = $args['slug'];
 	}
 
 	$term_group = 0;
-	if ( $args['alias_of'] ) {
-		$alias = get_term_by( 'slug', $args['alias_of'], $taxonomy );
-		if ( ! empty( $alias->term_group ) ) {
+	if ($args['alias_of']) {
+		$alias = get_term_by('slug', $args['alias_of'], $taxonomy);
+		if ( ! empty($alias->term_group)) {
 			// The alias we want is already in a group, so let's use that one.
 			$term_group = $alias->term_group;
-		} elseif ( ! empty( $alias->term_id ) ) {
+		} elseif ( ! empty($alias->term_id)) {
 			/*
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
 			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
+			wp_update_term($alias->term_id, $taxonomy, array(
 				'term_group' => $term_group,
-			) );
+			));
 		}
 	}
 
@@ -2297,73 +2297,73 @@ 
 	 * Prevent the creation of terms with duplicate names at the same level of a taxonomy hierarchy,
 	 * unless a unique slug has been explicitly provided.
 	 */
-	$name_matches = get_terms( $taxonomy, array(
+	$name_matches = get_terms($taxonomy, array(
 		'name' => $name,
 		'hide_empty' => false,
-	) );
+	));
 
 	/*
 	 * The `name` match in `get_terms()` doesn't differentiate accented characters,
 	 * so we do a stricter comparison here.
 	 */
 	$name_match = null;
-	if ( $name_matches ) {
-		foreach ( $name_matches as $_match ) {
-			if ( strtolower( $name ) === strtolower( $_match->name ) ) {
+	if ($name_matches) {
+		foreach ($name_matches as $_match) {
+			if (strtolower($name) === strtolower($_match->name)) {
 				$name_match = $_match;
 				break;
 			}
 		}
 	}
 
-	if ( $name_match ) {
-		$slug_match = get_term_by( 'slug', $slug, $taxonomy );
-		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-				$siblings = get_terms( $taxonomy, array( 'get' => 'all', 'parent' => $parent ) );
+	if ($name_match) {
+		$slug_match = get_term_by('slug', $slug, $taxonomy);
+		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
+				$siblings = get_terms($taxonomy, array('get' => 'all', 'parent' => $parent));
 
 				$existing_term = null;
-				if ( $name_match->slug === $slug && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
+				if ($name_match->slug === $slug && in_array($name, wp_list_pluck($siblings, 'name'))) {
 					$existing_term = $name_match;
-				} elseif ( $slug_match && in_array( $slug, wp_list_pluck( $siblings, 'slug' ) ) ) {
+				} elseif ($slug_match && in_array($slug, wp_list_pluck($siblings, 'slug'))) {
 					$existing_term = $slug_match;
 				}
 
-				if ( $existing_term ) {
-					return new WP_Error( 'term_exists', __( 'A term with the name provided already exists with this parent.' ), $existing_term->term_id );
+				if ($existing_term) {
+					return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'), $existing_term->term_id);
 				}
 			} else {
-				return new WP_Error( 'term_exists', __( 'A term with the name provided already exists in this taxonomy.' ), $name_match->term_id );
+				return new WP_Error('term_exists', __('A term with the name provided already exists in this taxonomy.'), $name_match->term_id);
 			}
 		}
 	}
 
-	$slug = wp_unique_term_slug( $slug, (object) $args );
+	$slug = wp_unique_term_slug($slug, (object) $args);
 
-	if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
-		return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error );
+	if (false === $wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'))) {
+		return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
 	}
 
 	$term_id = (int) $wpdb->insert_id;
 
 	// Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
-	if ( empty($slug) ) {
+	if (empty($slug)) {
 		$slug = sanitize_title($slug, $term_id);
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_terms', $term_id, $taxonomy );
-		$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
+		do_action('edit_terms', $term_id, $taxonomy);
+		$wpdb->update($wpdb->terms, compact('slug'), compact('term_id'));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_terms', $term_id, $taxonomy );
+		do_action('edited_terms', $term_id, $taxonomy);
 	}
 
-	$tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id ) );
+	$tt_id = $wpdb->get_var($wpdb->prepare("SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id));
 
-	if ( !empty($tt_id) ) {
+	if ( ! empty($tt_id)) {
 		return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 	}
-	$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent') + array( 'count' => 0 ) );
+	$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent') + array('count' => 0));
 	$tt_id = (int) $wpdb->insert_id;
 
 	/*
@@ -2372,16 +2372,16 @@ 
 	 * and term_taxonomy_id of the older term instead. Then return out of the function so that the "create" hooks
 	 * are not fired.
 	 */
-	$duplicate_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.term_id, tt.term_taxonomy_id FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id ) );
-	if ( $duplicate_term ) {
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term_id ) );
-		$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $tt_id ) );
+	$duplicate_term = $wpdb->get_row($wpdb->prepare("SELECT t.term_id, tt.term_taxonomy_id FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id));
+	if ($duplicate_term) {
+		$wpdb->delete($wpdb->terms, array('term_id' => $term_id));
+		$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $tt_id));
 
 		$term_id = (int) $duplicate_term->term_id;
 		$tt_id   = (int) $duplicate_term->term_taxonomy_id;
 
-		clean_term_cache( $term_id, $taxonomy );
-		return array( 'term_id' => $term_id, 'term_taxonomy_id' => $tt_id );
+		clean_term_cache($term_id, $taxonomy);
+		return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 	}
 
 	/**
@@ -2393,7 +2393,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "create_term", $term_id, $tt_id, $taxonomy );
+	do_action("create_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a new term is created for a specific taxonomy.
@@ -2406,7 +2406,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "create_$taxonomy", $term_id, $tt_id );
+	do_action("create_$taxonomy", $term_id, $tt_id);
 
 	/**
 	 * Filters the term ID after a new term is created.
@@ -2416,7 +2416,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Taxonomy term ID.
 	 */
-	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
+	$term_id = apply_filters('term_id_filter', $term_id, $tt_id);
 
 	clean_term_cache($term_id, $taxonomy);
 
@@ -2429,7 +2429,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'created_term', $term_id, $tt_id, $taxonomy );
+	do_action('created_term', $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a new term in a specific taxonomy is created, and after the term
@@ -2442,7 +2442,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "created_$taxonomy", $term_id, $tt_id );
+	do_action("created_$taxonomy", $term_id, $tt_id);
 
 	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 }
@@ -2469,20 +2469,20 @@ 
  * @param bool             $append    Optional. If false will delete difference of terms. Default false.
  * @return array|WP_Error Term taxonomy IDs of the affected terms.
  */
-function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
+function wp_set_object_terms($object_id, $terms, $taxonomy, $append = false) {
 	global $wpdb;
 
 	$object_id = (int) $object_id;
 
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	if ( !is_array($terms) )
+	if ( ! is_array($terms))
 		$terms = array($terms);
 
-	if ( ! $append )
-		$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
+	if ( ! $append)
+		$old_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
 	else
 		$old_tt_ids = array();
 
@@ -2490,23 +2490,23 @@ 
 	$term_ids = array();
 	$new_tt_ids = array();
 
-	foreach ( (array) $terms as $term) {
-		if ( !strlen(trim($term)) )
+	foreach ((array) $terms as $term) {
+		if ( ! strlen(trim($term)))
 			continue;
 
-		if ( !$term_info = term_exists($term, $taxonomy) ) {
+		if ( ! $term_info = term_exists($term, $taxonomy)) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int($term) )
+			if (is_int($term))
 				continue;
 			$term_info = wp_insert_term($term, $taxonomy);
 		}
-		if ( is_wp_error($term_info) )
+		if (is_wp_error($term_info))
 			return $term_info;
 		$term_ids[] = $term_info['term_id'];
 		$tt_id = $term_info['term_taxonomy_id'];
 		$tt_ids[] = $tt_id;
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) )
+		if ($wpdb->get_var($wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id)))
 			continue;
 
 		/**
@@ -2517,8 +2517,8 @@ 
 		 * @param int $object_id Object ID.
 		 * @param int $tt_id     Term taxonomy ID.
 		 */
-		do_action( 'add_term_relationship', $object_id, $tt_id );
-		$wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) );
+		do_action('add_term_relationship', $object_id, $tt_id);
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $object_id, 'term_taxonomy_id' => $tt_id));
 
 		/**
 		 * Fires immediately after an object-term relationship is added.
@@ -2528,42 +2528,42 @@ 
 		 * @param int $object_id Object ID.
 		 * @param int $tt_id     Term taxonomy ID.
 		 */
-		do_action( 'added_term_relationship', $object_id, $tt_id );
+		do_action('added_term_relationship', $object_id, $tt_id);
 		$new_tt_ids[] = $tt_id;
 	}
 
-	if ( $new_tt_ids )
-		wp_update_term_count( $new_tt_ids, $taxonomy );
+	if ($new_tt_ids)
+		wp_update_term_count($new_tt_ids, $taxonomy);
 
-	if ( ! $append ) {
-		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
+	if ( ! $append) {
+		$delete_tt_ids = array_diff($old_tt_ids, $tt_ids);
 
-		if ( $delete_tt_ids ) {
-			$in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
-			$delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
-			$delete_term_ids = array_map( 'intval', $delete_term_ids );
+		if ($delete_tt_ids) {
+			$in_delete_tt_ids = "'".implode("', '", $delete_tt_ids)."'";
+			$delete_term_ids = $wpdb->get_col($wpdb->prepare("SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy));
+			$delete_term_ids = array_map('intval', $delete_term_ids);
 
-			$remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
-			if ( is_wp_error( $remove ) ) {
+			$remove = wp_remove_object_terms($object_id, $delete_term_ids, $taxonomy);
+			if (is_wp_error($remove)) {
 				return $remove;
 			}
 		}
 	}
 
 	$t = get_taxonomy($taxonomy);
-	if ( ! $append && isset($t->sort) && $t->sort ) {
+	if ( ! $append && isset($t->sort) && $t->sort) {
 		$values = array();
 		$term_order = 0;
 		$final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-		foreach ( $tt_ids as $tt_id )
-			if ( in_array($tt_id, $final_tt_ids) )
-				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
-		if ( $values )
-			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
-				return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
+		foreach ($tt_ids as $tt_id)
+			if (in_array($tt_id, $final_tt_ids))
+				$values[] = $wpdb->prepare("(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
+		if ($values)
+			if (false === $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES ".join(',', $values)." ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)"))
+				return new WP_Error('db_insert_error', __('Could not insert term relationship into the database'), $wpdb->last_error);
 	}
 
-	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+	wp_cache_delete($object_id, $taxonomy.'_relationships');
 
 	/**
 	 * Fires after an object's terms have been set.
@@ -2577,7 +2577,7 @@ 
 	 * @param bool   $append     Whether to append new terms to the old terms.
 	 * @param array  $old_tt_ids Old array of term taxonomy IDs.
 	 */
-	do_action( 'set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids );
+	do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
 	return $tt_ids;
 }
 
@@ -2591,8 +2591,8 @@ 
  * @param array|string     $taxonomy  Taxonomy name.
  * @return array|WP_Error Term taxonomy IDs of the affected terms.
  */
-function wp_add_object_terms( $object_id, $terms, $taxonomy ) {
-	return wp_set_object_terms( $object_id, $terms, $taxonomy, true );
+function wp_add_object_terms($object_id, $terms, $taxonomy) {
+	return wp_set_object_terms($object_id, $terms, $taxonomy, true);
 }
 
 /**
@@ -2607,42 +2607,42 @@ 
  * @param array|string     $taxonomy  Taxonomy name.
  * @return bool|WP_Error True on success, false or WP_Error on failure.
  */
-function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
+function wp_remove_object_terms($object_id, $terms, $taxonomy) {
 	global $wpdb;
 
 	$object_id = (int) $object_id;
 
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
-	if ( ! is_array( $terms ) ) {
-		$terms = array( $terms );
+	if ( ! is_array($terms)) {
+		$terms = array($terms);
 	}
 
 	$tt_ids = array();
 
-	foreach ( (array) $terms as $term ) {
-		if ( ! strlen( trim( $term ) ) ) {
+	foreach ((array) $terms as $term) {
+		if ( ! strlen(trim($term))) {
 			continue;
 		}
 
-		if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
+		if ( ! $term_info = term_exists($term, $taxonomy)) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int( $term ) ) {
+			if (is_int($term)) {
 				continue;
 			}
 		}
 
-		if ( is_wp_error( $term_info ) ) {
+		if (is_wp_error($term_info)) {
 			return $term_info;
 		}
 
 		$tt_ids[] = $term_info['term_taxonomy_id'];
 	}
 
-	if ( $tt_ids ) {
-		$in_tt_ids = "'" . implode( "', '", $tt_ids ) . "'";
+	if ($tt_ids) {
+		$in_tt_ids = "'".implode("', '", $tt_ids)."'";
 
 		/**
 		 * Fires immediately before an object-term relationship is deleted.
@@ -2652,10 +2652,10 @@ 
 		 * @param int   $object_id Object ID.
 		 * @param array $tt_ids    An array of term taxonomy IDs.
 		 */
-		do_action( 'delete_term_relationships', $object_id, $tt_ids );
-		$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
+		do_action('delete_term_relationships', $object_id, $tt_ids);
+		$deleted = $wpdb->query($wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id));
 
-		wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+		wp_cache_delete($object_id, $taxonomy.'_relationships');
 
 		/**
 		 * Fires immediately after an object-term relationship is deleted.
@@ -2665,9 +2665,9 @@ 
 		 * @param int   $object_id Object ID.
 		 * @param array $tt_ids    An array of term taxonomy IDs.
 		 */
-		do_action( 'deleted_term_relationships', $object_id, $tt_ids );
+		do_action('deleted_term_relationships', $object_id, $tt_ids);
 
-		wp_update_term_count( $tt_ids, $taxonomy );
+		wp_update_term_count($tt_ids, $taxonomy);
 
 		return (bool) $deleted;
 	}
@@ -2698,14 +2698,14 @@ 
  * @param object $term The term object that the `$slug` will belong to.
  * @return string Will return a true unique slug.
  */
-function wp_unique_term_slug( $slug, $term ) {
+function wp_unique_term_slug($slug, $term) {
 	global $wpdb;
 
 	$needs_suffix = true;
 	$original_slug = $slug;
 
 	// As of 4.1, duplicate slugs are allowed as long as they're in different taxonomies.
-	if ( ! term_exists( $slug ) || get_option( 'db_version' ) >= 30133 && ! get_term_by( 'slug', $slug, $term->taxonomy ) ) {
+	if ( ! term_exists($slug) || get_option('db_version') >= 30133 && ! get_term_by('slug', $slug, $term->taxonomy)) {
 		$needs_suffix = false;
 	}
 
@@ -2714,18 +2714,18 @@ 
 	 * by incorporating parent slugs.
 	 */
 	$parent_suffix = '';
-	if ( $needs_suffix && is_taxonomy_hierarchical( $term->taxonomy ) && ! empty( $term->parent ) ) {
+	if ($needs_suffix && is_taxonomy_hierarchical($term->taxonomy) && ! empty($term->parent)) {
 		$the_parent = $term->parent;
-		while ( ! empty($the_parent) ) {
+		while ( ! empty($the_parent)) {
 			$parent_term = get_term($the_parent, $term->taxonomy);
-			if ( is_wp_error($parent_term) || empty($parent_term) )
+			if (is_wp_error($parent_term) || empty($parent_term))
 				break;
-			$parent_suffix .= '-' . $parent_term->slug;
-			if ( ! term_exists( $slug . $parent_suffix ) ) {
+			$parent_suffix .= '-'.$parent_term->slug;
+			if ( ! term_exists($slug.$parent_suffix)) {
 				break;
 			}
 
-			if ( empty($parent_term->parent) )
+			if (empty($parent_term->parent))
 				break;
 			$the_parent = $parent_term->parent;
 		}
@@ -2742,22 +2742,22 @@ 
 	 * @param string $slug         The slug.
 	 * @param object $term         Term object.
 	 */
-	if ( apply_filters( 'wp_unique_term_slug_is_bad_slug', $needs_suffix, $slug, $term ) ) {
-		if ( $parent_suffix ) {
+	if (apply_filters('wp_unique_term_slug_is_bad_slug', $needs_suffix, $slug, $term)) {
+		if ($parent_suffix) {
 			$slug .= $parent_suffix;
 		} else {
-			if ( ! empty( $term->term_id ) )
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
+			if ( ! empty($term->term_id))
+				$query = $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id);
 			else
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+				$query = $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug);
 
-			if ( $wpdb->get_var( $query ) ) {
+			if ($wpdb->get_var($query)) {
 				$num = 2;
 				do {
-					$alt_slug = $slug . "-$num";
+					$alt_slug = $slug."-$num";
 					$num++;
-					$slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
-				} while ( $slug_check );
+					$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+				} while ($slug_check);
 				$slug = $alt_slug;
 			}
 		}
@@ -2772,7 +2772,7 @@ 
 	 * @param object $term          Term object.
 	 * @param string $original_slug Slug originally passed to the function for testing.
 	 */
-	return apply_filters( 'wp_unique_term_slug', $slug, $term, $original_slug );
+	return apply_filters('wp_unique_term_slug', $slug, $term, $original_slug);
 }
 
 /**
@@ -2805,56 +2805,56 @@ 
  * @param array|string $args     Optional. Array of get_terms() arguments. Default empty array.
  * @return array|WP_Error Returns Term ID and Taxonomy Term ID
  */
-function wp_update_term( $term_id, $taxonomy, $args = array() ) {
+function wp_update_term($term_id, $taxonomy, $args = array()) {
 	global $wpdb;
 
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 	}
 
 	$term_id = (int) $term_id;
 
 	// First, get all of the original args
-	$term = get_term( $term_id, $taxonomy );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( is_wp_error( $term ) ) {
+	if (is_wp_error($term)) {
 		return $term;
 	}
 
-	if ( ! $term ) {
-		return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+	if ( ! $term) {
+		return new WP_Error('invalid_term', __('Empty Term'));
 	}
 
 	$term = (array) $term->data;
 
 	// Escape data pulled from DB.
-	$term = wp_slash( $term );
+	$term = wp_slash($term);
 
 	// Merge old and new args with new args overwriting old ones.
 	$args = array_merge($term, $args);
 
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
+	$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
 	$args = wp_parse_args($args, $defaults);
 	$args = sanitize_term($args, $taxonomy, 'db');
 	$parsed_args = $args;
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
-	$description = wp_unslash( $args['description'] );
+	$name = wp_unslash($args['name']);
+	$description = wp_unslash($args['description']);
 
 	$parsed_args['name'] = $name;
 	$parsed_args['description'] = $description;
 
-	if ( '' == trim( $name ) ) {
-		return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
+	if ('' == trim($name)) {
+		return new WP_Error('empty_term_name', __('A name is required for this term.'));
 	}
 
-	if ( $parsed_args['parent'] > 0 && ! term_exists( (int) $parsed_args['parent'] ) ) {
-		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
+	if ($parsed_args['parent'] > 0 && ! term_exists((int) $parsed_args['parent'])) {
+		return new WP_Error('missing_parent', __('Parent term does not exist.'));
 	}
 
 	$empty_slug = false;
-	if ( empty( $args['slug'] ) ) {
+	if (empty($args['slug'])) {
 		$empty_slug = true;
 		$slug = sanitize_title($name);
 	} else {
@@ -2863,22 +2863,22 @@ 
 
 	$parsed_args['slug'] = $slug;
 
-	$term_group = isset( $parsed_args['term_group'] ) ? $parsed_args['term_group'] : 0;
-	if ( $args['alias_of'] ) {
-		$alias = get_term_by( 'slug', $args['alias_of'], $taxonomy );
-		if ( ! empty( $alias->term_group ) ) {
+	$term_group = isset($parsed_args['term_group']) ? $parsed_args['term_group'] : 0;
+	if ($args['alias_of']) {
+		$alias = get_term_by('slug', $args['alias_of'], $taxonomy);
+		if ( ! empty($alias->term_group)) {
 			// The alias we want is already in a group, so let's use that one.
 			$term_group = $alias->term_group;
-		} elseif ( ! empty( $alias->term_id ) ) {
+		} elseif ( ! empty($alias->term_id)) {
 			/*
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
 			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
+			wp_update_term($alias->term_id, $taxonomy, array(
 				'term_group' => $term_group,
-			) );
+			));
 		}
 
 		$parsed_args['term_group'] = $term_group;
@@ -2897,24 +2897,24 @@ 
 	 * @param array  $parsed_args An array of potentially altered update arguments for the given term.
 	 * @param array  $args        An array of update arguments for the given term.
 	 */
-	$parent = apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
+	$parent = apply_filters('wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args);
 
 	// Check for duplicate slug
-	$duplicate = get_term_by( 'slug', $slug, $taxonomy );
-	if ( $duplicate && $duplicate->term_id != $term_id ) {
+	$duplicate = get_term_by('slug', $slug, $taxonomy);
+	if ($duplicate && $duplicate->term_id != $term_id) {
 		// If an empty slug was passed or the parent changed, reset the slug to something unique.
 		// Otherwise, bail.
-		if ( $empty_slug || ( $parent != $term['parent']) )
+		if ($empty_slug || ($parent != $term['parent']))
 			$slug = wp_unique_term_slug($slug, (object) $args);
 		else
 			return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
 	}
 
-	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
+	$tt_id = (int) $wpdb->get_var($wpdb->prepare("SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id));
 
 	// Check whether this is a shared term that needs splitting.
-	$_term_id = _split_shared_term( $term_id, $tt_id );
-	if ( ! is_wp_error( $_term_id ) ) {
+	$_term_id = _split_shared_term($term_id, $tt_id);
+	if ( ! is_wp_error($_term_id)) {
 		$term_id = $_term_id;
 	}
 
@@ -2926,11 +2926,11 @@ 
 	 * @param int    $term_id  Term ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edit_terms', $term_id, $taxonomy );
-	$wpdb->update($wpdb->terms, compact( 'name', 'slug', 'term_group' ), compact( 'term_id' ) );
-	if ( empty($slug) ) {
+	do_action('edit_terms', $term_id, $taxonomy);
+	$wpdb->update($wpdb->terms, compact('name', 'slug', 'term_group'), compact('term_id'));
+	if (empty($slug)) {
 		$slug = sanitize_title($name, $term_id);
-		$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
+		$wpdb->update($wpdb->terms, compact('slug'), compact('term_id'));
 	}
 
 	/**
@@ -2941,7 +2941,7 @@ 
 	 * @param int    $term_id  Term ID
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edited_terms', $term_id, $taxonomy );
+	do_action('edited_terms', $term_id, $taxonomy);
 
 	/**
 	 * Fires immediate before a term-taxonomy relationship is updated.
@@ -2951,9 +2951,9 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edit_term_taxonomy', $tt_id, $taxonomy );
+	do_action('edit_term_taxonomy', $tt_id, $taxonomy);
 
-	$wpdb->update( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent' ), array( 'term_taxonomy_id' => $tt_id ) );
+	$wpdb->update($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent'), array('term_taxonomy_id' => $tt_id));
 
 	/**
 	 * Fires immediately after a term-taxonomy relationship is updated.
@@ -2963,7 +2963,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edited_term_taxonomy', $tt_id, $taxonomy );
+	do_action('edited_term_taxonomy', $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term has been updated, but before the term cache has been cleaned.
@@ -2974,7 +2974,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edit_term", $term_id, $tt_id, $taxonomy );
+	do_action("edit_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term in a specific taxonomy has been updated, but before the term
@@ -2987,10 +2987,10 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "edit_$taxonomy", $term_id, $tt_id );
+	do_action("edit_$taxonomy", $term_id, $tt_id);
 
 	/** This filter is documented in wp-includes/taxonomy.php */
-	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
+	$term_id = apply_filters('term_id_filter', $term_id, $tt_id);
 
 	clean_term_cache($term_id, $taxonomy);
 
@@ -3003,7 +3003,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edited_term", $term_id, $tt_id, $taxonomy );
+	do_action("edited_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term for a specific taxonomy has been updated, and the term
@@ -3016,7 +3016,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "edited_$taxonomy", $term_id, $tt_id );
+	do_action("edited_$taxonomy", $term_id, $tt_id);
 
 	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 }
@@ -3031,14 +3031,14 @@ 
  * @param bool $defer Optional. Enable if true, disable if false.
  * @return bool Whether term counting is enabled or disabled.
  */
-function wp_defer_term_counting($defer=null) {
+function wp_defer_term_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_term_count( null, null, true );
+		if ( ! $defer)
+			wp_update_term_count(null, null, true);
 	}
 
 	return $_defer;
@@ -3062,30 +3062,30 @@ 
  * @param bool      $do_deferred Whether to flush the deferred term counts too. Default false.
  * @return bool If no terms will return false, and if successful will return true.
  */
-function wp_update_term_count( $terms, $taxonomy, $do_deferred = false ) {
+function wp_update_term_count($terms, $taxonomy, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( $do_deferred ) {
-		foreach ( (array) array_keys($_deferred) as $tax ) {
-			wp_update_term_count_now( $_deferred[$tax], $tax );
-			unset( $_deferred[$tax] );
+	if ($do_deferred) {
+		foreach ((array) array_keys($_deferred) as $tax) {
+			wp_update_term_count_now($_deferred[$tax], $tax);
+			unset($_deferred[$tax]);
 		}
 	}
 
-	if ( empty($terms) )
+	if (empty($terms))
 		return false;
 
-	if ( !is_array($terms) )
+	if ( ! is_array($terms))
 		$terms = array($terms);
 
-	if ( wp_defer_term_counting() ) {
-		if ( !isset($_deferred[$taxonomy]) )
+	if (wp_defer_term_counting()) {
+		if ( ! isset($_deferred[$taxonomy]))
 			$_deferred[$taxonomy] = array();
-		$_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
+		$_deferred[$taxonomy] = array_unique(array_merge($_deferred[$taxonomy], $terms));
 		return true;
 	}
 
-	return wp_update_term_count_now( $terms, $taxonomy );
+	return wp_update_term_count_now($terms, $taxonomy);
 }
 
 /**
@@ -3097,25 +3097,25 @@ 
  * @param string $taxonomy The context of the term.
  * @return true Always true when complete.
  */
-function wp_update_term_count_now( $terms, $taxonomy ) {
+function wp_update_term_count_now($terms, $taxonomy) {
 	$terms = array_map('intval', $terms);
 
 	$taxonomy = get_taxonomy($taxonomy);
-	if ( !empty($taxonomy->update_count_callback) ) {
+	if ( ! empty($taxonomy->update_count_callback)) {
 		call_user_func($taxonomy->update_count_callback, $terms, $taxonomy);
 	} else {
 		$object_types = (array) $taxonomy->object_type;
-		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) )
-				list( $object_type ) = explode( ':', $object_type );
+		foreach ($object_types as &$object_type) {
+			if (0 === strpos($object_type, 'attachment:'))
+				list($object_type) = explode(':', $object_type);
 		}
 
-		if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
+		if ($object_types == array_filter($object_types, 'post_type_exists')) {
 			// Only post types are attached to this taxonomy
-			_update_post_term_count( $terms, $taxonomy );
+			_update_post_term_count($terms, $taxonomy);
 		} else {
 			// Default count updater
-			_update_generic_term_count( $terms, $taxonomy );
+			_update_generic_term_count($terms, $taxonomy);
 		}
 	}
 
@@ -3147,17 +3147,17 @@ 
 function clean_object_term_cache($object_ids, $object_type) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = array($object_ids);
 
-	$taxonomies = get_object_taxonomies( $object_type );
+	$taxonomies = get_object_taxonomies($object_type);
 
-	foreach ( $object_ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
+	foreach ($object_ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
 			wp_cache_delete($id, "{$taxonomy}_relationships");
 		}
 	}
@@ -3170,7 +3170,7 @@ 
 	 * @param array  $object_ids An array of object IDs.
 	 * @param string $objet_type Object type.
 	 */
-	do_action( 'clean_object_term_cache', $object_ids, $object_type );
+	do_action('clean_object_term_cache', $object_ids, $object_type);
 }
 
 /**
@@ -3190,37 +3190,37 @@ 
 function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
 	global $wpdb, $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
-	if ( !is_array($ids) )
+	if ( ! is_array($ids))
 		$ids = array($ids);
 
 	$taxonomies = array();
 	// If no taxonomy, assume tt_ids.
-	if ( empty($taxonomy) ) {
+	if (empty($taxonomy)) {
 		$tt_ids = array_map('intval', $ids);
 		$tt_ids = implode(', ', $tt_ids);
 		$terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
 		$ids = array();
-		foreach ( (array) $terms as $term ) {
+		foreach ((array) $terms as $term) {
 			$taxonomies[] = $term->taxonomy;
 			$ids[] = $term->term_id;
-			wp_cache_delete( $term->term_id, 'terms' );
+			wp_cache_delete($term->term_id, 'terms');
 		}
 		$taxonomies = array_unique($taxonomies);
 	} else {
 		$taxonomies = array($taxonomy);
-		foreach ( $taxonomies as $taxonomy ) {
-			foreach ( $ids as $id ) {
-				wp_cache_delete( $id, 'terms' );
+		foreach ($taxonomies as $taxonomy) {
+			foreach ($ids as $id) {
+				wp_cache_delete($id, 'terms');
 			}
 		}
 	}
 
-	foreach ( $taxonomies as $taxonomy ) {
-		if ( $clean_taxonomy ) {
+	foreach ($taxonomies as $taxonomy) {
+		if ($clean_taxonomy) {
 			wp_cache_delete('all_ids', $taxonomy);
 			wp_cache_delete('get', $taxonomy);
 			delete_option("{$taxonomy}_children");
@@ -3238,10 +3238,10 @@ 
 		 * @param string $taxonomy       Taxonomy slug.
 		 * @param bool   $clean_taxonomy Whether or not to clean taxonomy-wide caches
 		 */
-		do_action( 'clean_term_cache', $ids, $taxonomy, $clean_taxonomy );
+		do_action('clean_term_cache', $ids, $taxonomy, $clean_taxonomy);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'terms' );
+	wp_cache_set('last_changed', microtime(), 'terms');
 }
 
 /**
@@ -3257,33 +3257,33 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return bool|array Array of `WP_Term` objects, if cached False if cache is empty for `$taxonomy` and `$id`.
  */
-function get_object_term_cache( $id, $taxonomy ) {
-	$_term_ids = wp_cache_get( $id, "{$taxonomy}_relationships" );
+function get_object_term_cache($id, $taxonomy) {
+	$_term_ids = wp_cache_get($id, "{$taxonomy}_relationships");
 
 	// We leave the priming of relationship caches to upstream functions.
-	if ( false === $_term_ids ) {
+	if (false === $_term_ids) {
 		return false;
 	}
 
 	// Backward compatibility for if a plugin is putting objects into the cache, rather than IDs.
 	$term_ids = array();
-	foreach ( $_term_ids as $term_id ) {
-		if ( is_numeric( $term_id ) ) {
-			$term_ids[] = intval( $term_id );
-		} elseif ( isset( $term_id->term_id ) ) {
-			$term_ids[] = intval( $term_id->term_id );
+	foreach ($_term_ids as $term_id) {
+		if (is_numeric($term_id)) {
+			$term_ids[] = intval($term_id);
+		} elseif (isset($term_id->term_id)) {
+			$term_ids[] = intval($term_id->term_id);
 		}
 	}
 
 	// Fill the term objects.
-	_prime_term_caches( $term_ids );
+	_prime_term_caches($term_ids);
 
 	$terms = array();
-	foreach ( $term_ids as $term_id ) {
-		$terms[] = wp_cache_get( $term_id, 'terms' );
+	foreach ($term_ids as $term_id) {
+		$terms[] = wp_cache_get($term_id, 'terms');
 	}
 
-	return array_map( 'get_term', $terms );
+	return array_map('get_term', $terms);
 }
 
 /**
@@ -3303,10 +3303,10 @@ 
  * @return void|false False if all of the terms in `$object_ids` are already cached.
  */
 function update_object_term_cache($object_ids, $object_type) {
-	if ( empty($object_ids) )
+	if (empty($object_ids))
 		return;
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = explode(',', $object_ids);
 
 	$object_ids = array_map('intval', $object_ids);
@@ -3314,42 +3314,42 @@ 
 	$taxonomies = get_object_taxonomies($object_type);
 
 	$ids = array();
-	foreach ( (array) $object_ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( false === wp_cache_get($id, "{$taxonomy}_relationships") ) {
+	foreach ((array) $object_ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
+			if (false === wp_cache_get($id, "{$taxonomy}_relationships")) {
 				$ids[] = $id;
 				break;
 			}
 		}
 	}
 
-	if ( empty( $ids ) )
+	if (empty($ids))
 		return false;
 
-	$terms = wp_get_object_terms( $ids, $taxonomies, array(
+	$terms = wp_get_object_terms($ids, $taxonomies, array(
 		'fields' => 'all_with_object_id',
 		'orderby' => 'name',
 		'update_term_meta_cache' => false,
-	) );
+	));
 
 	$object_terms = array();
-	foreach ( (array) $terms as $term ) {
-		$object_terms[ $term->object_id ][ $term->taxonomy ][] = $term->term_id;
+	foreach ((array) $terms as $term) {
+		$object_terms[$term->object_id][$term->taxonomy][] = $term->term_id;
 	}
 
-	foreach ( $ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( ! isset($object_terms[$id][$taxonomy]) ) {
-				if ( !isset($object_terms[$id]) )
+	foreach ($ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( ! isset($object_terms[$id][$taxonomy])) {
+				if ( ! isset($object_terms[$id]))
 					$object_terms[$id] = array();
 				$object_terms[$id][$taxonomy] = array();
 			}
 		}
 	}
 
-	foreach ( $object_terms as $id => $value ) {
-		foreach ( $value as $taxonomy => $terms ) {
-			wp_cache_add( $id, $terms, "{$taxonomy}_relationships" );
+	foreach ($object_terms as $id => $value) {
+		foreach ($value as $taxonomy => $terms) {
+			wp_cache_add($id, $terms, "{$taxonomy}_relationships");
 		}
 	}
 }
@@ -3362,15 +3362,15 @@ 
  * @param array  $terms    List of term objects to change.
  * @param string $taxonomy Optional. Update Term to this taxonomy in cache. Default empty.
  */
-function update_term_cache( $terms, $taxonomy = '' ) {
-	foreach ( (array) $terms as $term ) {
+function update_term_cache($terms, $taxonomy = '') {
+	foreach ((array) $terms as $term) {
 		// Create a copy in case the array was passed by reference.
 		$_term = clone $term;
 
 		// Object ID should not be cached.
-		unset( $_term->object_id );
+		unset($_term->object_id);
 
-		wp_cache_add( $term->term_id, $_term, 'terms' );
+		wp_cache_add($term->term_id, $_term, 'terms');
 	}
 }
 
@@ -3387,17 +3387,17 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
  */
-function _get_term_hierarchy( $taxonomy ) {
-	if ( !is_taxonomy_hierarchical($taxonomy) )
+function _get_term_hierarchy($taxonomy) {
+	if ( ! is_taxonomy_hierarchical($taxonomy))
 		return array();
 	$children = get_option("{$taxonomy}_children");
 
-	if ( is_array($children) )
+	if (is_array($children))
 		return $children;
 	$children = array();
 	$terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
-	foreach ( $terms as $term_id => $parent ) {
-		if ( $parent > 0 )
+	foreach ($terms as $term_id => $parent) {
+		if ($parent > 0)
 			$children[$parent][] = $term_id;
 	}
 	update_option("{$taxonomy}_children", $children);
@@ -3424,48 +3424,48 @@ 
  *                          with 1 as value. Default empty array.
  * @return array|WP_Error The subset of $terms that are descendants of $term_id.
  */
-function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
+function _get_term_children($term_id, $terms, $taxonomy, &$ancestors = array()) {
 	$empty_array = array();
-	if ( empty($terms) )
+	if (empty($terms))
 		return $empty_array;
 
 	$term_list = array();
 	$has_children = _get_term_hierarchy($taxonomy);
 
-	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
+	if ((0 != $term_id) && ! isset($has_children[$term_id]))
 		return $empty_array;
 
 	// Include the term itself in the ancestors array, so we can properly detect when a loop has occurred.
-	if ( empty( $ancestors ) ) {
-		$ancestors[ $term_id ] = 1;
+	if (empty($ancestors)) {
+		$ancestors[$term_id] = 1;
 	}
 
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$use_id = false;
-		if ( !is_object($term) ) {
+		if ( ! is_object($term)) {
 			$term = get_term($term, $taxonomy);
-			if ( is_wp_error( $term ) )
+			if (is_wp_error($term))
 				return $term;
 			$use_id = true;
 		}
 
 		// Don't recurse if we've already identified the term as a child - this indicates a loop.
-		if ( isset( $ancestors[ $term->term_id ] ) ) {
+		if (isset($ancestors[$term->term_id])) {
 			continue;
 		}
 
-		if ( $term->parent == $term_id ) {
-			if ( $use_id )
+		if ($term->parent == $term_id) {
+			if ($use_id)
 				$term_list[] = $term->term_id;
 			else
 				$term_list[] = $term;
 
-			if ( !isset($has_children[$term->term_id]) )
+			if ( ! isset($has_children[$term->term_id]))
 				continue;
 
-			$ancestors[ $term->term_id ] = 1;
+			$ancestors[$term->term_id] = 1;
 
-			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) )
+			if ($children = _get_term_children($term->term_id, $terms, $taxonomy, $ancestors))
 				$term_list = array_merge($term_list, $children);
 		}
 	}
@@ -3487,23 +3487,23 @@ 
  * @param array  $terms    List of term objects, passed by reference.
  * @param string $taxonomy Term context.
  */
-function _pad_term_counts( &$terms, $taxonomy ) {
+function _pad_term_counts(&$terms, $taxonomy) {
 	global $wpdb;
 
 	// This function only works for hierarchical taxonomies like post categories.
-	if ( !is_taxonomy_hierarchical( $taxonomy ) )
+	if ( ! is_taxonomy_hierarchical($taxonomy))
 		return;
 
 	$term_hier = _get_term_hierarchy($taxonomy);
 
-	if ( empty($term_hier) )
+	if (empty($term_hier))
 		return;
 
 	$term_items = array();
 	$terms_by_id = array();
 	$term_ids = array();
 
-	foreach ( (array) $terms as $key => $term ) {
+	foreach ((array) $terms as $key => $term) {
 		$terms_by_id[$term->term_id] = & $terms[$key];
 		$term_ids[$term->term_taxonomy_id] = $term->term_id;
 	}
@@ -3511,33 +3511,33 @@ 
 	// Get the object and term ids and stick them in a lookup table.
 	$tax_obj = get_taxonomy($taxonomy);
 	$object_types = esc_sql($tax_obj->object_type);
-	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
-	foreach ( $results as $row ) {
+	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (".implode(',', array_keys($term_ids)).") AND post_type IN ('".implode("', '", $object_types)."') AND post_status = 'publish'");
+	foreach ($results as $row) {
 		$id = $term_ids[$row->term_taxonomy_id];
 		$term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
 	}
 
 	// Touch every ancestor's lookup row for each post in each term.
-	foreach ( $term_ids as $term_id ) {
+	foreach ($term_ids as $term_id) {
 		$child = $term_id;
 		$ancestors = array();
-		while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
+		while ( ! empty($terms_by_id[$child]) && $parent = $terms_by_id[$child]->parent) {
 			$ancestors[] = $child;
-			if ( !empty( $term_items[$term_id] ) )
-				foreach ( $term_items[$term_id] as $item_id => $touches ) {
-					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
+			if ( ! empty($term_items[$term_id]))
+				foreach ($term_items[$term_id] as $item_id => $touches) {
+					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id] : 1;
 				}
 			$child = $parent;
 
-			if ( in_array( $parent, $ancestors ) ) {
+			if (in_array($parent, $ancestors)) {
 				break;
 			}
 		}
 	}
 
 	// Transfer the touched cells.
-	foreach ( (array) $term_items as $id => $items )
-		if ( isset($terms_by_id[$id]) )
+	foreach ((array) $term_items as $id => $items)
+		if (isset($terms_by_id[$id]))
 			$terms_by_id[$id]->count = count($items);
 }
 
@@ -3552,17 +3552,17 @@ 
  * @param array $term_ids          Array of term IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_term_caches( $term_ids, $update_meta_cache = true ) {
+function _prime_term_caches($term_ids, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $term_ids, 'terms' );
-	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($term_ids, 'terms');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_terms = $wpdb->get_results(sprintf("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_term_cache( $fresh_terms, $update_meta_cache );
+		update_term_cache($fresh_terms, $update_meta_cache);
 
-		if ( $update_meta_cache ) {
-			update_termmeta_cache( $non_cached_ids );
+		if ($update_meta_cache) {
+			update_termmeta_cache($non_cached_ids);
 		}
 	}
 }
@@ -3585,40 +3585,40 @@ 
  * @param array  $terms    List of Term taxonomy IDs.
  * @param object $taxonomy Current taxonomy object of terms.
  */
-function _update_post_term_count( $terms, $taxonomy ) {
+function _update_post_term_count($terms, $taxonomy) {
 	global $wpdb;
 
 	$object_types = (array) $taxonomy->object_type;
 
-	foreach ( $object_types as &$object_type )
-		list( $object_type ) = explode( ':', $object_type );
+	foreach ($object_types as &$object_type)
+		list($object_type) = explode(':', $object_type);
 
-	$object_types = array_unique( $object_types );
+	$object_types = array_unique($object_types);
 
-	if ( false !== ( $check_attachments = array_search( 'attachment', $object_types ) ) ) {
-		unset( $object_types[ $check_attachments ] );
+	if (false !== ($check_attachments = array_search('attachment', $object_types))) {
+		unset($object_types[$check_attachments]);
 		$check_attachments = true;
 	}
 
-	if ( $object_types )
-		$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	if ($object_types)
+		$object_types = esc_sql(array_filter($object_types, 'post_type_exists'));
 
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$count = 0;
 
 		// Attachments can be 'inherit' status, we need to base count off the parent's status if so.
-		if ( $check_attachments )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		if ($check_attachments)
+			$count += (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term));
 
-		if ( $object_types )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		if ($object_types)
+			$count += (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('".implode("', '", $object_types)."') AND term_taxonomy_id = %d", $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+		do_action('edit_term_taxonomy', $term, $taxonomy->name);
+		$wpdb->update($wpdb->term_taxonomy, compact('count'), array('term_taxonomy_id' => $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
+		do_action('edited_term_taxonomy', $term, $taxonomy->name);
 	}
 }
 
@@ -3634,18 +3634,18 @@ 
  * @param array  $terms    List of term taxonomy IDs.
  * @param object $taxonomy Current taxonomy object of terms.
  */
-function _update_generic_term_count( $terms, $taxonomy ) {
+function _update_generic_term_count($terms, $taxonomy) {
 	global $wpdb;
 
-	foreach ( (array) $terms as $term ) {
-		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term ) );
+	foreach ((array) $terms as $term) {
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+		do_action('edit_term_taxonomy', $term, $taxonomy->name);
+		$wpdb->update($wpdb->term_taxonomy, compact('count'), array('term_taxonomy_id' => $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
+		do_action('edited_term_taxonomy', $term, $taxonomy->name);
 	}
 }
 
@@ -3672,23 +3672,23 @@ 
  *                      database schema), `$term_id` is returned. When the term is successfully split, the
  *                      new term_id is returned. A WP_Error is returned for miscellaneous errors.
  */
-function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
+function _split_shared_term($term_id, $term_taxonomy_id, $record = true) {
 	global $wpdb;
 
-	if ( is_object( $term_id ) ) {
+	if (is_object($term_id)) {
 		$shared_term = $term_id;
-		$term_id = intval( $shared_term->term_id );
+		$term_id = intval($shared_term->term_id);
 	}
 
-	if ( is_object( $term_taxonomy_id ) ) {
+	if (is_object($term_taxonomy_id)) {
 		$term_taxonomy = $term_taxonomy_id;
-		$term_taxonomy_id = intval( $term_taxonomy->term_taxonomy_id );
+		$term_taxonomy_id = intval($term_taxonomy->term_taxonomy_id);
 	}
 
 	// If there are no shared term_taxonomy rows, there's nothing to do here.
-	$shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
+	$shared_tt_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id));
 
-	if ( ! $shared_tt_count ) {
+	if ( ! $shared_tt_count) {
 		return $term_id;
 	}
 
@@ -3696,14 +3696,14 @@ 
 	 * Verify that the term_taxonomy_id passed to the function is actually associated with the term_id.
 	 * If there's a mismatch, it may mean that the term is already split. Return the actual term_id from the db.
 	 */
-	$check_term_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
-	if ( $check_term_id != $term_id ) {
+	$check_term_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id));
+	if ($check_term_id != $term_id) {
 		return $check_term_id;
 	}
 
 	// Pull up data about the currently shared slug, which we'll use to populate the new one.
-	if ( empty( $shared_term ) ) {
-		$shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) );
+	if (empty($shared_term)) {
+		$shared_term = $wpdb->get_row($wpdb->prepare("SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id));
 	}
 
 	$new_term_data = array(
@@ -3712,54 +3712,54 @@ 
 		'term_group' => $shared_term->term_group,
 	);
 
-	if ( false === $wpdb->insert( $wpdb->terms, $new_term_data ) ) {
-		return new WP_Error( 'db_insert_error', __( 'Could not split shared term.' ), $wpdb->last_error );
+	if (false === $wpdb->insert($wpdb->terms, $new_term_data)) {
+		return new WP_Error('db_insert_error', __('Could not split shared term.'), $wpdb->last_error);
 	}
 
 	$new_term_id = (int) $wpdb->insert_id;
 
 	// Update the existing term_taxonomy to point to the newly created term.
-	$wpdb->update( $wpdb->term_taxonomy,
-		array( 'term_id' => $new_term_id ),
-		array( 'term_taxonomy_id' => $term_taxonomy_id )
+	$wpdb->update($wpdb->term_taxonomy,
+		array('term_id' => $new_term_id),
+		array('term_taxonomy_id' => $term_taxonomy_id)
 	);
 
 	// Reassign child terms to the new parent.
-	if ( empty( $term_taxonomy ) ) {
-		$term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
+	if (empty($term_taxonomy)) {
+		$term_taxonomy = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id));
 	}
 
-	$children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy ) );
-	if ( ! empty( $children_tt_ids ) ) {
-		foreach ( $children_tt_ids as $child_tt_id ) {
-			$wpdb->update( $wpdb->term_taxonomy,
-				array( 'parent' => $new_term_id ),
-				array( 'term_taxonomy_id' => $child_tt_id )
+	$children_tt_ids = $wpdb->get_col($wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy));
+	if ( ! empty($children_tt_ids)) {
+		foreach ($children_tt_ids as $child_tt_id) {
+			$wpdb->update($wpdb->term_taxonomy,
+				array('parent' => $new_term_id),
+				array('term_taxonomy_id' => $child_tt_id)
 			);
-			clean_term_cache( $term_id, $term_taxonomy->taxonomy );
+			clean_term_cache($term_id, $term_taxonomy->taxonomy);
 		}
 	} else {
 		// If the term has no children, we must force its taxonomy cache to be rebuilt separately.
-		clean_term_cache( $new_term_id, $term_taxonomy->taxonomy );
+		clean_term_cache($new_term_id, $term_taxonomy->taxonomy);
 	}
 
 	// Clean the cache for term taxonomies formerly shared with the current term.
-	$shared_term_taxonomies = $wpdb->get_row( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
-	if ( $shared_term_taxonomies ) {
-		foreach ( $shared_term_taxonomies as $shared_term_taxonomy ) {
-			clean_term_cache( $term_id, $shared_term_taxonomy );
+	$shared_term_taxonomies = $wpdb->get_row($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id));
+	if ($shared_term_taxonomies) {
+		foreach ($shared_term_taxonomies as $shared_term_taxonomy) {
+			clean_term_cache($term_id, $shared_term_taxonomy);
 		}
 	}
 
 	// Keep a record of term_ids that have been split, keyed by old term_id. See wp_get_split_term().
-	if ( $record ) {
-		$split_term_data = get_option( '_split_terms', array() );
-		if ( ! isset( $split_term_data[ $term_id ] ) ) {
-			$split_term_data[ $term_id ] = array();
+	if ($record) {
+		$split_term_data = get_option('_split_terms', array());
+		if ( ! isset($split_term_data[$term_id])) {
+			$split_term_data[$term_id] = array();
 		}
 
-		$split_term_data[ $term_id ][ $term_taxonomy->taxonomy ] = $new_term_id;
-		update_option( '_split_terms', $split_term_data );
+		$split_term_data[$term_id][$term_taxonomy->taxonomy] = $new_term_id;
+		update_option('_split_terms', $split_term_data);
 	}
 
 	// If we've just split the final shared term, set the "finished" flag.
@@ -3770,8 +3770,8 @@ 
 		 HAVING term_tt_count > 1
 		 LIMIT 1"
 	);
-	if ( ! $shared_terms_exist ) {
-		update_option( 'finished_splitting_shared_terms', true );
+	if ( ! $shared_terms_exist) {
+		update_option('finished_splitting_shared_terms', true);
 	}
 
 	/**
@@ -3784,7 +3784,7 @@ 
 	 * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
 	 * @param string $taxonomy         Taxonomy for the split term.
 	 */
-	do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy );
+	do_action('split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy);
 
 	return $new_term_id;
 }
@@ -3802,20 +3802,20 @@ 
 	$lock_name = 'term_split.lock';
 
 	// Try to lock.
-	$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
+	$lock_result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time()));
 
-	if ( ! $lock_result ) {
-		$lock_result = get_option( $lock_name );
+	if ( ! $lock_result) {
+		$lock_result = get_option($lock_name);
 
 		// Bail if we were unable to create a lock, or if the existing lock is still valid.
-		if ( ! $lock_result || ( $lock_result > ( time() - HOUR_IN_SECONDS ) ) ) {
-			wp_schedule_single_event( time() + ( 5 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+		if ( ! $lock_result || ($lock_result > (time() - HOUR_IN_SECONDS))) {
+			wp_schedule_single_event(time() + (5 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 			return;
 		}
 	}
 
 	// Update the lock, as by this point we've definitely got a lock, just need to fire the actions.
-	update_option( $lock_name, time() );
+	update_option($lock_name, time());
 
 	// Get a list of shared terms (those with more than one associated row in term_taxonomy).
 	$shared_terms = $wpdb->get_results(
@@ -3827,61 +3827,61 @@ 
 	);
 
 	// No more terms, we're done here.
-	if ( ! $shared_terms ) {
-		update_option( 'finished_splitting_shared_terms', true );
-		delete_option( $lock_name );
+	if ( ! $shared_terms) {
+		update_option('finished_splitting_shared_terms', true);
+		delete_option($lock_name);
 		return;
 	}
 
 	// Shared terms found? We'll need to run this script again.
-	wp_schedule_single_event( time() + ( 2 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	wp_schedule_single_event(time() + (2 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 
 	// Rekey shared term array for faster lookups.
 	$_shared_terms = array();
-	foreach ( $shared_terms as $shared_term ) {
-		$term_id = intval( $shared_term->term_id );
-		$_shared_terms[ $term_id ] = $shared_term;
+	foreach ($shared_terms as $shared_term) {
+		$term_id = intval($shared_term->term_id);
+		$_shared_terms[$term_id] = $shared_term;
 	}
 	$shared_terms = $_shared_terms;
 
 	// Get term taxonomy data for all shared terms.
-	$shared_term_ids = implode( ',', array_keys( $shared_terms ) );
-	$shared_tts = $wpdb->get_results( "SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})" );
+	$shared_term_ids = implode(',', array_keys($shared_terms));
+	$shared_tts = $wpdb->get_results("SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})");
 
 	// Split term data recording is slow, so we do it just once, outside the loop.
-	$split_term_data = get_option( '_split_terms', array() );
+	$split_term_data = get_option('_split_terms', array());
 	$skipped_first_term = $taxonomies = array();
-	foreach ( $shared_tts as $shared_tt ) {
-		$term_id = intval( $shared_tt->term_id );
+	foreach ($shared_tts as $shared_tt) {
+		$term_id = intval($shared_tt->term_id);
 
 		// Don't split the first tt belonging to a given term_id.
-		if ( ! isset( $skipped_first_term[ $term_id ] ) ) {
-			$skipped_first_term[ $term_id ] = 1;
+		if ( ! isset($skipped_first_term[$term_id])) {
+			$skipped_first_term[$term_id] = 1;
 			continue;
 		}
 
-		if ( ! isset( $split_term_data[ $term_id ] ) ) {
-			$split_term_data[ $term_id ] = array();
+		if ( ! isset($split_term_data[$term_id])) {
+			$split_term_data[$term_id] = array();
 		}
 
 		// Keep track of taxonomies whose hierarchies need flushing.
-		if ( ! isset( $taxonomies[ $shared_tt->taxonomy ] ) ) {
-			$taxonomies[ $shared_tt->taxonomy ] = 1;
+		if ( ! isset($taxonomies[$shared_tt->taxonomy])) {
+			$taxonomies[$shared_tt->taxonomy] = 1;
 		}
 
 		// Split the term.
-		$split_term_data[ $term_id ][ $shared_tt->taxonomy ] = _split_shared_term( $shared_terms[ $term_id ], $shared_tt, false );
+		$split_term_data[$term_id][$shared_tt->taxonomy] = _split_shared_term($shared_terms[$term_id], $shared_tt, false);
 	}
 
 	// Rebuild the cached hierarchy for each affected taxonomy.
-	foreach ( array_keys( $taxonomies ) as $tax ) {
-		delete_option( "{$tax}_children" );
-		_get_term_hierarchy( $tax );
+	foreach (array_keys($taxonomies) as $tax) {
+		delete_option("{$tax}_children");
+		_get_term_hierarchy($tax);
 	}
 
-	update_option( '_split_terms', $split_term_data );
+	update_option('_split_terms', $split_term_data);
 
-	delete_option( $lock_name );
+	delete_option($lock_name);
 }
 
 /**
@@ -3892,8 +3892,8 @@ 
  * @since 4.3.0
  */
 function _wp_check_for_scheduled_split_terms() {
-	if ( ! get_option( 'finished_splitting_shared_terms' ) && ! wp_next_scheduled( 'wp_split_shared_term_batch' ) ) {
-		wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_split_shared_term_batch' );
+	if ( ! get_option('finished_splitting_shared_terms') && ! wp_next_scheduled('wp_split_shared_term_batch')) {
+		wp_schedule_single_event(time() + MINUTE_IN_SECONDS, 'wp_split_shared_term_batch');
 	}
 }
 
@@ -3908,14 +3908,14 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_default_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
-	if ( 'category' != $taxonomy ) {
+function _wp_check_split_default_terms($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
+	if ('category' != $taxonomy) {
 		return;
 	}
 
-	foreach ( array( 'default_category', 'default_link_category', 'default_email_category' ) as $option ) {
-		if ( $term_id == get_option( $option, -1 ) ) {
-			update_option( $option, $new_term_id );
+	foreach (array('default_category', 'default_link_category', 'default_email_category') as $option) {
+		if ($term_id == get_option($option, -1)) {
+			update_option($option, $new_term_id);
 		}
 	}
 }
@@ -3933,9 +3933,9 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
+function _wp_check_split_terms_in_menus($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
 	global $wpdb;
-	$post_ids = $wpdb->get_col( $wpdb->prepare(
+	$post_ids = $wpdb->get_col($wpdb->prepare(
 		"SELECT m1.post_id
 		FROM {$wpdb->postmeta} AS m1
 			INNER JOIN {$wpdb->postmeta} AS m2 ON ( m2.post_id = m1.post_id )
@@ -3945,11 +3945,11 @@ 
 			AND ( m3.meta_key = '_menu_item_object_id' AND m3.meta_value = %d )",
 		$taxonomy,
 		$term_id
-	) );
+	));
 
-	if ( $post_ids ) {
-		foreach ( $post_ids as $post_id ) {
-			update_post_meta( $post_id, '_menu_item_object_id', $new_term_id, $term_id );
+	if ($post_ids) {
+		foreach ($post_ids as $post_id) {
+			update_post_meta($post_id, '_menu_item_object_id', $new_term_id, $term_id);
 		}
 	}
 }
@@ -3965,19 +3965,19 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_nav_menu_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
-	if ( 'nav_menu' !== $taxonomy ) {
+function _wp_check_split_nav_menu_terms($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
+	if ('nav_menu' !== $taxonomy) {
 		return;
 	}
 
 	// Update menu locations.
 	$locations = get_nav_menu_locations();
-	foreach ( $locations as $location => $menu_id ) {
-		if ( $term_id == $menu_id ) {
-			$locations[ $location ] = $new_term_id;
+	foreach ($locations as $location => $menu_id) {
+		if ($term_id == $menu_id) {
+			$locations[$location] = $new_term_id;
 		}
 	}
-	set_theme_mod( 'nav_menu_locations', $locations );
+	set_theme_mod('nav_menu_locations', $locations);
 }
 
 /**
@@ -3988,12 +3988,12 @@ 
  * @param int $old_term_id Term ID. This is the old, pre-split term ID.
  * @return array Array of new term IDs, keyed by taxonomy.
  */
-function wp_get_split_terms( $old_term_id ) {
-	$split_terms = get_option( '_split_terms', array() );
+function wp_get_split_terms($old_term_id) {
+	$split_terms = get_option('_split_terms', array());
 
 	$terms = array();
-	if ( isset( $split_terms[ $old_term_id ] ) ) {
-		$terms = $split_terms[ $old_term_id ];
+	if (isset($split_terms[$old_term_id])) {
+		$terms = $split_terms[$old_term_id];
 	}
 
 	return $terms;
@@ -4010,12 +4010,12 @@ 
  *                   the new term_id will be returned. If no previously split term is found matching
  *                   the parameters, returns false.
  */
-function wp_get_split_term( $old_term_id, $taxonomy ) {
-	$split_terms = wp_get_split_terms( $old_term_id );
+function wp_get_split_term($old_term_id, $taxonomy) {
+	$split_terms = wp_get_split_terms($old_term_id);
 
 	$term_id = false;
-	if ( isset( $split_terms[ $taxonomy ] ) ) {
-		$term_id = (int) $split_terms[ $taxonomy ];
+	if (isset($split_terms[$taxonomy])) {
+		$term_id = (int) $split_terms[$taxonomy];
 	}
 
 	return $term_id;
@@ -4032,14 +4032,14 @@ 
  * @param int $term_id
  * @return bool
  */
-function wp_term_is_shared( $term_id ) {
+function wp_term_is_shared($term_id) {
 	global $wpdb;
 
-	if ( get_option( 'finished_splitting_shared_terms' ) ) {
+	if (get_option('finished_splitting_shared_terms')) {
 		return false;
 	}
 
-	$tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
+	$tt_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id));
 
 	return $tt_count > 1;
 }
@@ -4055,21 +4055,21 @@ 
  * @param string            $taxonomy Optional. Taxonomy. Default empty.
  * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
  */
-function get_term_link( $term, $taxonomy = '' ) {
+function get_term_link($term, $taxonomy = '') {
 	global $wp_rewrite;
 
-	if ( !is_object($term) ) {
-		if ( is_int( $term ) ) {
-			$term = get_term( $term, $taxonomy );
+	if ( ! is_object($term)) {
+		if (is_int($term)) {
+			$term = get_term($term, $taxonomy);
 		} else {
-			$term = get_term_by( 'slug', $term, $taxonomy );
+			$term = get_term_by('slug', $term, $taxonomy);
 		}
 	}
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		$term = new WP_Error('invalid_term', __('Empty Term'));
 
-	if ( is_wp_error( $term ) )
+	if (is_wp_error($term))
 		return $term;
 
 	$taxonomy = $term->taxonomy;
@@ -4079,19 +4079,19 @@ 
 	$slug = $term->slug;
 	$t = get_taxonomy($taxonomy);
 
-	if ( empty($termlink) ) {
-		if ( 'category' == $taxonomy )
-			$termlink = '?cat=' . $term->term_id;
-		elseif ( $t->query_var )
+	if (empty($termlink)) {
+		if ('category' == $taxonomy)
+			$termlink = '?cat='.$term->term_id;
+		elseif ($t->query_var)
 			$termlink = "?$t->query_var=$slug";
 		else
 			$termlink = "?taxonomy=$taxonomy&term=$slug";
 		$termlink = home_url($termlink);
 	} else {
-		if ( $t->rewrite['hierarchical'] ) {
+		if ($t->rewrite['hierarchical']) {
 			$hierarchical_slugs = array();
-			$ancestors = get_ancestors( $term->term_id, $taxonomy, 'taxonomy' );
-			foreach ( (array)$ancestors as $ancestor ) {
+			$ancestors = get_ancestors($term->term_id, $taxonomy, 'taxonomy');
+			foreach ((array) $ancestors as $ancestor) {
 				$ancestor_term = get_term($ancestor, $taxonomy);
 				$hierarchical_slugs[] = $ancestor_term->slug;
 			}
@@ -4101,10 +4101,10 @@ 
 		} else {
 			$termlink = str_replace("%$taxonomy%", $slug, $termlink);
 		}
-		$termlink = home_url( user_trailingslashit($termlink, 'category') );
+		$termlink = home_url(user_trailingslashit($termlink, 'category'));
 	}
 	// Back Compat filters.
-	if ( 'post_tag' == $taxonomy ) {
+	if ('post_tag' == $taxonomy) {
 
 		/**
 		 * Filters the tag link.
@@ -4115,8 +4115,8 @@ 
 		 * @param string $termlink Tag link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
-	} elseif ( 'category' == $taxonomy ) {
+		$termlink = apply_filters('tag_link', $termlink, $term->term_id);
+	} elseif ('category' == $taxonomy) {
 
 		/**
 		 * Filters the category link.
@@ -4127,7 +4127,7 @@ 
 		 * @param string $termlink Category link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters( 'category_link', $termlink, $term->term_id );
+		$termlink = apply_filters('category_link', $termlink, $term->term_id);
 	}
 
 	/**
@@ -4139,7 +4139,7 @@ 
 	 * @param object $term     Term object.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	return apply_filters( 'term_link', $termlink, $term, $taxonomy );
+	return apply_filters('term_link', $termlink, $term, $taxonomy);
 }
 
 /**
@@ -4161,7 +4161,7 @@ 
  *     @type  string      $after  Displays after the taxonomies. Default empty string.
  * }
  */
-function the_taxonomies( $args = array() ) {
+function the_taxonomies($args = array()) {
 	$defaults = array(
 		'post' => 0,
 		'before' => '',
@@ -4169,9 +4169,9 @@ 
 		'after' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	echo $r['before'] . join( $r['sep'], get_the_taxonomies( $r['post'], $r ) ) . $r['after'];
+	echo $r['before'].join($r['sep'], get_the_taxonomies($r['post'], $r)).$r['after'];
 }
 
 /**
@@ -4193,47 +4193,47 @@ 
  * }
  * @return array List of taxonomies.
  */
-function get_the_taxonomies( $post = 0, $args = array() ) {
-	$post = get_post( $post );
+function get_the_taxonomies($post = 0, $args = array()) {
+	$post = get_post($post);
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		/* translators: %s: taxonomy label, %l: list of terms formatted as per $term_template */
-		'template' => __( '%s: %l.' ),
+		'template' => __('%s: %l.'),
 		'term_template' => '<a href="%1$s">%2$s</a>',
-	) );
+	));
 
 	$taxonomies = array();
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return $taxonomies;
 	}
 
-	foreach ( get_object_taxonomies( $post ) as $taxonomy ) {
-		$t = (array) get_taxonomy( $taxonomy );
-		if ( empty( $t['label'] ) ) {
+	foreach (get_object_taxonomies($post) as $taxonomy) {
+		$t = (array) get_taxonomy($taxonomy);
+		if (empty($t['label'])) {
 			$t['label'] = $taxonomy;
 		}
-		if ( empty( $t['args'] ) ) {
+		if (empty($t['args'])) {
 			$t['args'] = array();
 		}
-		if ( empty( $t['template'] ) ) {
+		if (empty($t['template'])) {
 			$t['template'] = $args['template'];
 		}
-		if ( empty( $t['term_template'] ) ) {
+		if (empty($t['term_template'])) {
 			$t['term_template'] = $args['term_template'];
 		}
 
-		$terms = get_object_term_cache( $post->ID, $taxonomy );
-		if ( false === $terms ) {
-			$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
+		$terms = get_object_term_cache($post->ID, $taxonomy);
+		if (false === $terms) {
+			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 		}
 		$links = array();
 
-		foreach ( $terms as $term ) {
-			$links[] = wp_sprintf( $t['term_template'], esc_attr( get_term_link( $term ) ), $term->name );
+		foreach ($terms as $term) {
+			$links[] = wp_sprintf($t['term_template'], esc_attr(get_term_link($term)), $term->name);
 		}
-		if ( $links ) {
-			$taxonomies[$taxonomy] = wp_sprintf( $t['template'], $t['label'], $links, $terms );
+		if ($links) {
+			$taxonomies[$taxonomy] = wp_sprintf($t['template'], $t['label'], $links, $terms);
 		}
 	}
 	return $taxonomies;
@@ -4247,8 +4247,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array
  */
-function get_post_taxonomies( $post = 0 ) {
-	$post = get_post( $post );
+function get_post_taxonomies($post = 0) {
+	$post = get_post($post);
 
 	return get_object_taxonomies($post);
 }
@@ -4267,45 +4267,45 @@ 
  * @param int|string|array $terms     Optional. Term term_id, name, slug or array of said. Default null.
  * @return bool|WP_Error WP_Error on input error.
  */
-function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
-	if ( !$object_id = (int) $object_id )
-		return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+function is_object_in_term($object_id, $taxonomy, $terms = null) {
+	if ( ! $object_id = (int) $object_id)
+		return new WP_Error('invalid_object', __('Invalid object ID'));
 
-	$object_terms = get_object_term_cache( $object_id, $taxonomy );
-	if ( false === $object_terms ) {
-		$object_terms = wp_get_object_terms( $object_id, $taxonomy, array( 'update_term_meta_cache' => false ) );
-		wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
+	$object_terms = get_object_term_cache($object_id, $taxonomy);
+	if (false === $object_terms) {
+		$object_terms = wp_get_object_terms($object_id, $taxonomy, array('update_term_meta_cache' => false));
+		wp_cache_set($object_id, wp_list_pluck($object_terms, 'term_id'), "{$taxonomy}_relationships");
 	}
 
-	if ( is_wp_error( $object_terms ) )
+	if (is_wp_error($object_terms))
 		return $object_terms;
-	if ( empty( $object_terms ) )
+	if (empty($object_terms))
 		return false;
-	if ( empty( $terms ) )
-		return ( !empty( $object_terms ) );
+	if (empty($terms))
+		return ( ! empty($object_terms));
 
 	$terms = (array) $terms;
 
-	if ( $ints = array_filter( $terms, 'is_int' ) )
-		$strs = array_diff( $terms, $ints );
+	if ($ints = array_filter($terms, 'is_int'))
+		$strs = array_diff($terms, $ints);
 	else
-		$strs =& $terms;
+		$strs = & $terms;
 
-	foreach ( $object_terms as $object_term ) {
+	foreach ($object_terms as $object_term) {
 		// If term is an int, check against term_ids only.
-		if ( $ints && in_array( $object_term->term_id, $ints ) ) {
+		if ($ints && in_array($object_term->term_id, $ints)) {
 			return true;
 		}
 
-		if ( $strs ) {
+		if ($strs) {
 			// Only check numeric strings against term_id, to avoid false matches due to type juggling.
-			$numeric_strs = array_map( 'intval', array_filter( $strs, 'is_numeric' ) );
-			if ( in_array( $object_term->term_id, $numeric_strs, true ) ) {
+			$numeric_strs = array_map('intval', array_filter($strs, 'is_numeric'));
+			if (in_array($object_term->term_id, $numeric_strs, true)) {
 				return true;
 			}
 
-			if ( in_array( $object_term->name, $strs ) ) return true;
-			if ( in_array( $object_term->slug, $strs ) ) return true;
+			if (in_array($object_term->name, $strs)) return true;
+			if (in_array($object_term->slug, $strs)) return true;
 		}
 	}
 
@@ -4321,12 +4321,12 @@ 
  * @param string $taxonomy    Single taxonomy name.
  * @return bool True if object is associated with the taxonomy, otherwise false.
  */
-function is_object_in_taxonomy( $object_type, $taxonomy ) {
-	$taxonomies = get_object_taxonomies( $object_type );
-	if ( empty( $taxonomies ) ) {
+function is_object_in_taxonomy($object_type, $taxonomy) {
+	$taxonomies = get_object_taxonomies($object_type);
+	if (empty($taxonomies)) {
 		return false;
 	}
-	return in_array( $taxonomy, $taxonomies );
+	return in_array($taxonomy, $taxonomies);
 }
 
 /**
@@ -4342,32 +4342,32 @@ 
  *                              or 'taxonomy'. Default empty.
  * @return array An array of ancestors from lowest to highest in the hierarchy.
  */
-function get_ancestors( $object_id = 0, $object_type = '', $resource_type = '' ) {
+function get_ancestors($object_id = 0, $object_type = '', $resource_type = '') {
 	$object_id = (int) $object_id;
 
 	$ancestors = array();
 
-	if ( empty( $object_id ) ) {
+	if (empty($object_id)) {
 
 		/** This filter is documented in wp-includes/taxonomy.php */
-		return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
+		return apply_filters('get_ancestors', $ancestors, $object_id, $object_type, $resource_type);
 	}
 
-	if ( ! $resource_type ) {
-		if ( is_taxonomy_hierarchical( $object_type ) ) {
+	if ( ! $resource_type) {
+		if (is_taxonomy_hierarchical($object_type)) {
 			$resource_type = 'taxonomy';
-		} elseif ( post_type_exists( $object_type ) ) {
+		} elseif (post_type_exists($object_type)) {
 			$resource_type = 'post_type';
 		}
 	}
 
-	if ( 'taxonomy' === $resource_type ) {
+	if ('taxonomy' === $resource_type) {
 		$term = get_term($object_id, $object_type);
-		while ( ! is_wp_error($term) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+		while ( ! is_wp_error($term) && ! empty($term->parent) && ! in_array($term->parent, $ancestors)) {
 			$ancestors[] = (int) $term->parent;
 			$term = get_term($term->parent, $object_type);
 		}
-	} elseif ( 'post_type' === $resource_type ) {
+	} elseif ('post_type' === $resource_type) {
 		$ancestors = get_post_ancestors($object_id);
 	}
 
@@ -4382,7 +4382,7 @@ 
 	 * @param string $object_type   Type of object.
 	 * @param string $resource_type Type of resource $object_type is.
 	 */
-	return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
+	return apply_filters('get_ancestors', $ancestors, $object_id, $object_type, $resource_type);
 }
 
 /**
@@ -4394,9 +4394,9 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return int|false False on error.
  */
-function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function wp_get_term_taxonomy_parent_id($term_id, $taxonomy) {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return false;
 	}
 	return (int) $term->parent;
@@ -4416,26 +4416,26 @@ 
  *
  * @return int The new parent for the term.
  */
-function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
+function wp_check_term_hierarchy_for_loops($parent, $term_id, $taxonomy) {
 	// Nothing fancy here - bail
-	if ( !$parent )
+	if ( ! $parent)
 		return 0;
 
 	// Can't be its own parent.
-	if ( $parent == $term_id )
+	if ($parent == $term_id)
 		return 0;
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
+	if ( ! $loop = wp_find_hierarchy_loop('wp_get_term_taxonomy_parent_id', $term_id, $parent, array($taxonomy)))
 		return $parent; // No loop
 
 	// Setting $parent to the given value causes a loop.
-	if ( isset( $loop[$term_id] ) )
+	if (isset($loop[$term_id]))
 		return 0;
 
 	// There's a loop, but it doesn't contain $term_id. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	foreach (array_keys($loop) as $loop_member)
+		wp_update_term($loop_member, $taxonomy, array('parent' => 0));
 
 	return $parent;
 }

Braces +381 added lines, -259 removed lines

@@ -180,8 +180,9 @@ 
 	global $wp_taxonomies;
 
 	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
-			return get_attachment_taxonomies($object);
+		if ( $object->post_type == 'attachment' ) {
+					return get_attachment_taxonomies($object);
+		}
 		$object = $object->post_type;
 	}
 
@@ -190,10 +191,11 @@ 
 	$taxonomies = array();
 	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
 		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-			if ( 'names' == $output )
-				$taxonomies[] = $tax_name;
-			else
-				$taxonomies[ $tax_name ] = $tax_obj;
+			if ( 'names' == $output ) {
+							$taxonomies[] = $tax_name;
+			} else {
+							$taxonomies[ $tax_name ] = $tax_obj;
+			}
 		}
 	}
 
@@ -216,8 +218,9 @@ 
 function get_taxonomy( $taxonomy ) {
 	global $wp_taxonomies;
 
-	if ( ! taxonomy_exists( $taxonomy ) )
-		return false;
+	if ( ! taxonomy_exists( $taxonomy ) ) {
+			return false;
+	}
 
 	return $wp_taxonomies[$taxonomy];
 }
@@ -254,8 +257,9 @@ 
  * @return bool Whether the taxonomy is hierarchical.
  */
 function is_taxonomy_hierarchical($taxonomy) {
-	if ( ! taxonomy_exists($taxonomy) )
-		return false;
+	if ( ! taxonomy_exists($taxonomy) ) {
+			return false;
+	}
 
 	$taxonomy = get_taxonomy($taxonomy);
 	return $taxonomy->hierarchical;
@@ -351,8 +355,9 @@ 
 function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 	global $wp_taxonomies, $wp;
 
-	if ( ! is_array( $wp_taxonomies ) )
-		$wp_taxonomies = array();
+	if ( ! is_array( $wp_taxonomies ) ) {
+			$wp_taxonomies = array();
+	}
 
 	$args = wp_parse_args( $args );
 
@@ -400,10 +405,11 @@ 
 
 	// Non-publicly queryable taxonomies should not register query vars, except in the admin.
 	if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
-		if ( true === $args['query_var'] )
-			$args['query_var'] = $taxonomy;
-		else
-			$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
+		if ( true === $args['query_var'] ) {
+					$args['query_var'] = $taxonomy;
+		} else {
+					$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
+		}
 		$wp->add_query_var( $args['query_var'] );
 	} else {
 		// Force query_var to false for non-public taxonomies.
@@ -417,33 +423,39 @@ 
 			'ep_mask' => EP_NONE,
 		) );
 
-		if ( empty( $args['rewrite']['slug'] ) )
-			$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		if ( empty( $args['rewrite']['slug'] ) ) {
+					$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		}
 
-		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
-			$tag = '(.+?)';
-		else
-			$tag = '([^/]+)';
+		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] ) {
+					$tag = '(.+?)';
+		} else {
+					$tag = '([^/]+)';
+		}
 
 		add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" );
 		add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_ui'] )
-		$args['show_ui'] = $args['public'];
+	if ( null === $args['show_ui'] ) {
+			$args['show_ui'] = $args['public'];
+	}
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
-		$args['show_in_menu' ] = $args['show_ui'];
+	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] ) {
+			$args['show_in_menu' ] = $args['show_ui'];
+	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_in_nav_menus'] )
-		$args['show_in_nav_menus'] = $args['public'];
+	if ( null === $args['show_in_nav_menus'] ) {
+			$args['show_in_nav_menus'] = $args['public'];
+	}
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_tagcloud'] )
-		$args['show_tagcloud'] = $args['show_ui'];
+	if ( null === $args['show_tagcloud'] ) {
+			$args['show_tagcloud'] = $args['show_ui'];
+	}
 
 	// If not set, default to the setting for show_ui.
 	if ( null === $args['show_in_quick_edit'] ) {
@@ -467,10 +479,11 @@ 
 
 	// If not set, use the default meta box
 	if ( null === $args['meta_box_cb'] ) {
-		if ( $args['hierarchical'] )
-			$args['meta_box_cb'] = 'post_categories_meta_box';
-		else
-			$args['meta_box_cb'] = 'post_tags_meta_box';
+		if ( $args['hierarchical'] ) {
+					$args['meta_box_cb'] = 'post_categories_meta_box';
+		} else {
+					$args['meta_box_cb'] = 'post_tags_meta_box';
+		}
 	}
 
 	$wp_taxonomies[ $taxonomy ] = (object) $args;
@@ -585,11 +598,13 @@ 
 function get_taxonomy_labels( $tax ) {
 	$tax->labels = (array) $tax->labels;
 
-	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
-		$tax->labels['separate_items_with_commas'] = $tax->helps;
+	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) {
+			$tax->labels['separate_items_with_commas'] = $tax->helps;
+	}
 
-	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
-		$tax->labels['not_found'] = $tax->no_tagcloud;
+	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) ) {
+			$tax->labels['not_found'] = $tax->no_tagcloud;
+	}
 
 	$nohier_vs_hier_defaults = array(
 		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
@@ -653,14 +668,17 @@ 
 function register_taxonomy_for_object_type( $taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( !isset($wp_taxonomies[$taxonomy]) )
-		return false;
+	if ( !isset($wp_taxonomies[$taxonomy]) ) {
+			return false;
+	}
 
-	if ( ! get_post_type_object($object_type) )
-		return false;
+	if ( ! get_post_type_object($object_type) ) {
+			return false;
+	}
 
-	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
-		$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) ) {
+			$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+	}
 
 	// Filter out empties.
 	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
@@ -682,15 +700,18 @@ 
 function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
 	global $wp_taxonomies;
 
-	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
-		return false;
+	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) ) {
+			return false;
+	}
 
-	if ( ! get_post_type_object( $object_type ) )
-		return false;
+	if ( ! get_post_type_object( $object_type ) ) {
+			return false;
+	}
 
 	$key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
-	if ( false === $key )
-		return false;
+	if ( false === $key ) {
+			return false;
+	}
 
 	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
 	return true;
@@ -939,8 +960,9 @@ 
 	if ( 'slug' == $field ) {
 		$_field = 't.slug';
 		$value = sanitize_title($value);
-		if ( empty($value) )
-			return false;
+		if ( empty($value) ) {
+					return false;
+		}
 	} elseif ( 'name' == $field ) {
 		// Assume already escaped
 		$value = wp_unslash($value);
@@ -960,8 +982,9 @@ 
 	}
 
 	$term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value ) . " $tax_clause LIMIT 1" );
-	if ( ! $term )
-		return false;
+	if ( ! $term ) {
+			return false;
+	}
 
 	// In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
 	if ( 'term_taxonomy_id' === $field ) {
@@ -996,8 +1019,9 @@ 
 
 	$terms = _get_term_hierarchy($taxonomy);
 
-	if ( ! isset($terms[$term_id]) )
-		return array();
+	if ( ! isset($terms[$term_id]) ) {
+			return array();
+	}
 
 	$children = $terms[$term_id];
 
@@ -1006,8 +1030,9 @@ 
 			continue;
 		}
 
-		if ( isset($terms[$child]) )
-			$children = array_merge($children, get_term_children($child, $taxonomy));
+		if ( isset($terms[$child]) ) {
+					$children = array_merge($children, get_term_children($child, $taxonomy));
+		}
 	}
 
 	return $children;
@@ -1031,14 +1056,17 @@ 
  */
 function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
 	$term = get_term( $term, $taxonomy );
-	if ( is_wp_error($term) )
-		return $term;
+	if ( is_wp_error($term) ) {
+			return $term;
+	}
 
-	if ( !is_object($term) )
-		return '';
+	if ( !is_object($term) ) {
+			return '';
+	}
 
-	if ( !isset($term->$field) )
-		return '';
+	if ( !isset($term->$field) ) {
+			return '';
+	}
 
 	return sanitize_term_field( $field, $term->$field, $term->term_id, $term->taxonomy, $context );
 }
@@ -1058,11 +1086,13 @@ 
 function get_term_to_edit( $id, $taxonomy ) {
 	$term = get_term( $id, $taxonomy );
 
-	if ( is_wp_error($term) )
-		return $term;
+	if ( is_wp_error($term) ) {
+			return $term;
+	}
 
-	if ( !is_object($term) )
-		return '';
+	if ( !is_object($term) ) {
+			return '';
+	}
 
 	return sanitize_term($term, $taxonomy, 'edit');
 }
@@ -1394,13 +1424,15 @@ 
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 
 	if ( is_int($term) ) {
-		if ( 0 == $term )
-			return 0;
+		if ( 0 == $term ) {
+					return 0;
+		}
 		$where = 't.term_id = %d';
-		if ( !empty($taxonomy) )
-			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
-		else
-			return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+		if ( !empty($taxonomy) ) {
+					return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+		} else {
+					return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+		}
 	}
 
 	$term = trim( wp_unslash( $term ) );
@@ -1424,14 +1456,16 @@ 
 		$where_fields[] = $taxonomy;
 		$else_where_fields[] = $taxonomy;
 
-		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) )
-			return $result;
+		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) ) {
+					return $result;
+		}
 
 		return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
 	}
 
-	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) )
-		return $result;
+	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) ) {
+			return $result;
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields) );
 }
@@ -1449,15 +1483,19 @@ 
  * @return bool Whether `$term2` is a child of `$term1`.
  */
 function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
-	if ( ! isset( $term1->term_id ) )
-		$term1 = get_term( $term1, $taxonomy );
-	if ( ! isset( $term2->parent ) )
-		$term2 = get_term( $term2, $taxonomy );
+	if ( ! isset( $term1->term_id ) ) {
+			$term1 = get_term( $term1, $taxonomy );
+	}
+	if ( ! isset( $term2->parent ) ) {
+			$term2 = get_term( $term2, $taxonomy );
+	}
 
-	if ( empty( $term1->term_id ) || empty( $term2->parent ) )
-		return false;
-	if ( $term2->parent == $term1->term_id )
-		return true;
+	if ( empty( $term1->term_id ) || empty( $term2->parent ) ) {
+			return false;
+	}
+	if ( $term2->parent == $term1->term_id ) {
+			return true;
+	}
 
 	return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
 }
@@ -1488,18 +1526,21 @@ 
 
 	foreach ( (array) $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($term->$field) )
-				$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
+			if ( isset($term->$field) ) {
+							$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
+			}
 		} else {
-			if ( isset($term[$field]) )
-				$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
+			if ( isset($term[$field]) ) {
+							$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
+			}
 		}
 	}
 
-	if ( $do_object )
-		$term->filter = $context;
-	else
-		$term['filter'] = $context;
+	if ( $do_object ) {
+			$term->filter = $context;
+	} else {
+			$term['filter'] = $context;
+	}
 
 	return $term;
 }
@@ -1531,12 +1572,14 @@ 
 	$int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
 	if ( in_array( $field, $int_fields ) ) {
 		$value = (int) $value;
-		if ( $value < 0 )
-			$value = 0;
+		if ( $value < 0 ) {
+					$value = 0;
+		}
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	if ( 'edit' == $context ) {
 
@@ -1566,10 +1609,13 @@ 
 		 */
 		$value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
 
-		if ( 'description' == $field )
-			$value = esc_html($value); // textarea_escaped
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+					$value = esc_html($value);
+		}
+		// textarea_escaped
+		else {
+					$value = esc_attr($value);
+		}
 	} elseif ( 'db' == $context ) {
 
 		/**
@@ -1717,8 +1763,9 @@ 
 function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
 	$object_id = (int) $object_id;
 
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
+	if ( !is_array($taxonomies) ) {
+			$taxonomies = array($taxonomies);
+	}
 
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
@@ -1759,10 +1806,12 @@ 
 
 	$term = (int) $term;
 
-	if ( ! $ids = term_exists($term, $taxonomy) )
-		return false;
-	if ( is_wp_error( $ids ) )
-		return $ids;
+	if ( ! $ids = term_exists($term, $taxonomy) ) {
+			return false;
+	}
+	if ( is_wp_error( $ids ) ) {
+			return $ids;
+	}
 
 	$tt_id = $ids['term_taxonomy_id'];
 
@@ -1770,8 +1819,10 @@ 
 
 	if ( 'category' == $taxonomy ) {
 		$defaults['default'] = get_option( 'default_category' );
-		if ( $defaults['default'] == $term )
-			return 0; // Don't delete the default category
+		if ( $defaults['default'] == $term ) {
+					return 0;
+		}
+		// Don't delete the default category
 	}
 
 	$args = wp_parse_args($args, $defaults);
@@ -1800,8 +1851,9 @@ 
 	// Update children to point to new parent
 	if ( is_taxonomy_hierarchical($taxonomy) ) {
 		$term_obj = get_term($term, $taxonomy);
-		if ( is_wp_error( $term_obj ) )
-			return $term_obj;
+		if ( is_wp_error( $term_obj ) ) {
+					return $term_obj;
+		}
 		$parent = $term_obj->parent;
 
 		$edit_ids = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int)$term_obj->term_id );
@@ -1843,8 +1895,9 @@ 
 			$terms = array($default);
 		} else {
 			$terms = array_diff($terms, array($term));
-			if (isset($default) && isset($force_default) && $force_default)
-				$terms = array_merge($terms, array($default));
+			if (isset($default) && isset($force_default) && $force_default) {
+							$terms = array_merge($terms, array($default));
+			}
 		}
 		$terms = array_map('intval', $terms);
 		wp_set_object_terms( $object_id, $terms, $taxonomy );
@@ -1852,8 +1905,9 @@ 
 
 	// Clean the relationship caches for all object types using this term.
 	$tax_object = get_taxonomy( $taxonomy );
-	foreach ( $tax_object->object_type as $object_type )
-		clean_object_term_cache( $object_ids, $object_type );
+	foreach ( $tax_object->object_type as $object_type ) {
+			clean_object_term_cache( $object_ids, $object_type );
+	}
 
 	$term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
 	foreach ( $term_meta_ids as $mid ) {
@@ -1880,8 +1934,9 @@ 
 	do_action( 'deleted_term_taxonomy', $tt_id );
 
 	// Delete the term if no taxonomies use it.
-	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) )
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) ) {
+			$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	}
 
 	clean_term_cache($term, $taxonomy);
 
@@ -1968,19 +2023,23 @@ 
 function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( empty( $object_ids ) || empty( $taxonomies ) )
-		return array();
+	if ( empty( $object_ids ) || empty( $taxonomies ) ) {
+			return array();
+	}
 
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
+	if ( !is_array($taxonomies) ) {
+			$taxonomies = array($taxonomies);
+	}
 
 	foreach ( $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists($taxonomy) )
-			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+		if ( ! taxonomy_exists($taxonomy) ) {
+					return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+		}
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = array($object_ids);
+	}
 	$object_ids = array_map('intval', $object_ids);
 
 	$defaults = array(
@@ -2004,8 +2063,9 @@ 
 		}
 	} else {
 		$t = get_taxonomy($taxonomies[0]);
-		if ( isset($t->args) && is_array($t->args) )
-			$args = array_merge($args, $t->args);
+		if ( isset($t->args) && is_array($t->args) ) {
+					$args = array_merge($args, $t->args);
+		}
 	}
 
 	$orderby = $args['orderby'];
@@ -2026,15 +2086,18 @@ 
 	}
 
 	// tt_ids queries can only be none or tr.term_taxonomy_id
-	if ( ('tt_ids' == $fields) && !empty($orderby) )
-		$orderby = 'tr.term_taxonomy_id';
+	if ( ('tt_ids' == $fields) && !empty($orderby) ) {
+			$orderby = 'tr.term_taxonomy_id';
+	}
 
-	if ( !empty($orderby) )
-		$orderby = "ORDER BY $orderby";
+	if ( !empty($orderby) ) {
+			$orderby = "ORDER BY $orderby";
+	}
 
 	$order = strtoupper( $order );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
-		$order = 'ASC';
+	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
+			$order = 'ASC';
+	}
 
 	$taxonomy_array = $taxonomies;
 	$object_id_array = $object_ids;
@@ -2478,36 +2541,42 @@ 
 		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( !is_array($terms) ) {
+			$terms = array($terms);
+	}
 
-	if ( ! $append )
-		$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
-	else
-		$old_tt_ids = array();
+	if ( ! $append ) {
+			$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
+	} else {
+			$old_tt_ids = array();
+	}
 
 	$tt_ids = array();
 	$term_ids = array();
 	$new_tt_ids = array();
 
 	foreach ( (array) $terms as $term) {
-		if ( !strlen(trim($term)) )
-			continue;
+		if ( !strlen(trim($term)) ) {
+					continue;
+		}
 
 		if ( !$term_info = term_exists($term, $taxonomy) ) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int($term) )
-				continue;
+			if ( is_int($term) ) {
+							continue;
+			}
 			$term_info = wp_insert_term($term, $taxonomy);
 		}
-		if ( is_wp_error($term_info) )
-			return $term_info;
+		if ( is_wp_error($term_info) ) {
+					return $term_info;
+		}
 		$term_ids[] = $term_info['term_id'];
 		$tt_id = $term_info['term_taxonomy_id'];
 		$tt_ids[] = $tt_id;
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) )
-			continue;
+		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) ) {
+					continue;
+		}
 
 		/**
 		 * Fires immediately before an object-term relationship is added.
@@ -2532,8 +2601,9 @@ 
 		$new_tt_ids[] = $tt_id;
 	}
 
-	if ( $new_tt_ids )
-		wp_update_term_count( $new_tt_ids, $taxonomy );
+	if ( $new_tt_ids ) {
+			wp_update_term_count( $new_tt_ids, $taxonomy );
+	}
 
 	if ( ! $append ) {
 		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
@@ -2555,12 +2625,14 @@ 
 		$values = array();
 		$term_order = 0;
 		$final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-		foreach ( $tt_ids as $tt_id )
-			if ( in_array($tt_id, $final_tt_ids) )
+		foreach ( $tt_ids as $tt_id ) {
+					if ( in_array($tt_id, $final_tt_ids) )
 				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
-		if ( $values )
-			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
+		}
+		if ( $values ) {
+					if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
 				return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
+		}
 	}
 
 	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
@@ -2718,15 +2790,17 @@ 
 		$the_parent = $term->parent;
 		while ( ! empty($the_parent) ) {
 			$parent_term = get_term($the_parent, $term->taxonomy);
-			if ( is_wp_error($parent_term) || empty($parent_term) )
-				break;
+			if ( is_wp_error($parent_term) || empty($parent_term) ) {
+							break;
+			}
 			$parent_suffix .= '-' . $parent_term->slug;
 			if ( ! term_exists( $slug . $parent_suffix ) ) {
 				break;
 			}
 
-			if ( empty($parent_term->parent) )
-				break;
+			if ( empty($parent_term->parent) ) {
+							break;
+			}
 			$the_parent = $parent_term->parent;
 		}
 	}
@@ -2746,10 +2820,11 @@ 
 		if ( $parent_suffix ) {
 			$slug .= $parent_suffix;
 		} else {
-			if ( ! empty( $term->term_id ) )
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
-			else
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+			if ( ! empty( $term->term_id ) ) {
+							$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
+			} else {
+							$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+			}
 
 			if ( $wpdb->get_var( $query ) ) {
 				$num = 2;
@@ -2904,10 +2979,11 @@ 
 	if ( $duplicate && $duplicate->term_id != $term_id ) {
 		// If an empty slug was passed or the parent changed, reset the slug to something unique.
 		// Otherwise, bail.
-		if ( $empty_slug || ( $parent != $term['parent']) )
-			$slug = wp_unique_term_slug($slug, (object) $args);
-		else
-			return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
+		if ( $empty_slug || ( $parent != $term['parent']) ) {
+					$slug = wp_unique_term_slug($slug, (object) $args);
+		} else {
+					return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
+		}
 	}
 
 	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
@@ -3037,8 +3113,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_term_count( null, null, true );
+		if ( !$defer ) {
+					wp_update_term_count( null, null, true );
+		}
 	}
 
 	return $_defer;
@@ -3072,15 +3149,18 @@ 
 		}
 	}
 
-	if ( empty($terms) )
-		return false;
+	if ( empty($terms) ) {
+			return false;
+	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( !is_array($terms) ) {
+			$terms = array($terms);
+	}
 
 	if ( wp_defer_term_counting() ) {
-		if ( !isset($_deferred[$taxonomy]) )
-			$_deferred[$taxonomy] = array();
+		if ( !isset($_deferred[$taxonomy]) ) {
+					$_deferred[$taxonomy] = array();
+		}
 		$_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
 		return true;
 	}
@@ -3106,8 +3186,9 @@ 
 	} else {
 		$object_types = (array) $taxonomy->object_type;
 		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) )
-				list( $object_type ) = explode( ':', $object_type );
+			if ( 0 === strpos( $object_type, 'attachment:' ) ) {
+							list( $object_type ) = explode( ':', $object_type );
+			}
 		}
 
 		if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
@@ -3151,8 +3232,9 @@ 
 		return;
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = array($object_ids);
+	}
 
 	$taxonomies = get_object_taxonomies( $object_type );
 
@@ -3194,8 +3276,9 @@ 
 		return;
 	}
 
-	if ( !is_array($ids) )
-		$ids = array($ids);
+	if ( !is_array($ids) ) {
+			$ids = array($ids);
+	}
 
 	$taxonomies = array();
 	// If no taxonomy, assume tt_ids.
@@ -3303,11 +3386,13 @@ 
  * @return void|false False if all of the terms in `$object_ids` are already cached.
  */
 function update_object_term_cache($object_ids, $object_type) {
-	if ( empty($object_ids) )
-		return;
+	if ( empty($object_ids) ) {
+			return;
+	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = explode(',', $object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = explode(',', $object_ids);
+	}
 
 	$object_ids = array_map('intval', $object_ids);
 
@@ -3323,8 +3408,9 @@ 
 		}
 	}
 
-	if ( empty( $ids ) )
-		return false;
+	if ( empty( $ids ) ) {
+			return false;
+	}
 
 	$terms = wp_get_object_terms( $ids, $taxonomies, array(
 		'fields' => 'all_with_object_id',
@@ -3340,8 +3426,9 @@ 
 	foreach ( $ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {
 			if ( ! isset($object_terms[$id][$taxonomy]) ) {
-				if ( !isset($object_terms[$id]) )
-					$object_terms[$id] = array();
+				if ( !isset($object_terms[$id]) ) {
+									$object_terms[$id] = array();
+				}
 				$object_terms[$id][$taxonomy] = array();
 			}
 		}
@@ -3388,17 +3475,20 @@ 
  * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
  */
 function _get_term_hierarchy( $taxonomy ) {
-	if ( !is_taxonomy_hierarchical($taxonomy) )
-		return array();
+	if ( !is_taxonomy_hierarchical($taxonomy) ) {
+			return array();
+	}
 	$children = get_option("{$taxonomy}_children");
 
-	if ( is_array($children) )
-		return $children;
+	if ( is_array($children) ) {
+			return $children;
+	}
 	$children = array();
 	$terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
 	foreach ( $terms as $term_id => $parent ) {
-		if ( $parent > 0 )
-			$children[$parent][] = $term_id;
+		if ( $parent > 0 ) {
+					$children[$parent][] = $term_id;
+		}
 	}
 	update_option("{$taxonomy}_children", $children);
 
@@ -3426,14 +3516,16 @@ 
  */
 function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
 	$empty_array = array();
-	if ( empty($terms) )
-		return $empty_array;
+	if ( empty($terms) ) {
+			return $empty_array;
+	}
 
 	$term_list = array();
 	$has_children = _get_term_hierarchy($taxonomy);
 
-	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
-		return $empty_array;
+	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) ) {
+			return $empty_array;
+	}
 
 	// Include the term itself in the ancestors array, so we can properly detect when a loop has occurred.
 	if ( empty( $ancestors ) ) {
@@ -3444,8 +3536,9 @@ 
 		$use_id = false;
 		if ( !is_object($term) ) {
 			$term = get_term($term, $taxonomy);
-			if ( is_wp_error( $term ) )
-				return $term;
+			if ( is_wp_error( $term ) ) {
+							return $term;
+			}
 			$use_id = true;
 		}
 
@@ -3455,18 +3548,21 @@ 
 		}
 
 		if ( $term->parent == $term_id ) {
-			if ( $use_id )
-				$term_list[] = $term->term_id;
-			else
-				$term_list[] = $term;
+			if ( $use_id ) {
+							$term_list[] = $term->term_id;
+			} else {
+							$term_list[] = $term;
+			}
 
-			if ( !isset($has_children[$term->term_id]) )
-				continue;
+			if ( !isset($has_children[$term->term_id]) ) {
+							continue;
+			}
 
 			$ancestors[ $term->term_id ] = 1;
 
-			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) )
-				$term_list = array_merge($term_list, $children);
+			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) ) {
+							$term_list = array_merge($term_list, $children);
+			}
 		}
 	}
 
@@ -3491,13 +3587,15 @@ 
 	global $wpdb;
 
 	// This function only works for hierarchical taxonomies like post categories.
-	if ( !is_taxonomy_hierarchical( $taxonomy ) )
-		return;
+	if ( !is_taxonomy_hierarchical( $taxonomy ) ) {
+			return;
+	}
 
 	$term_hier = _get_term_hierarchy($taxonomy);
 
-	if ( empty($term_hier) )
-		return;
+	if ( empty($term_hier) ) {
+			return;
+	}
 
 	$term_items = array();
 	$terms_by_id = array();
@@ -3523,9 +3621,10 @@ 
 		$ancestors = array();
 		while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
 			$ancestors[] = $child;
-			if ( !empty( $term_items[$term_id] ) )
-				foreach ( $term_items[$term_id] as $item_id => $touches ) {
+			if ( !empty( $term_items[$term_id] ) ) {
+							foreach ( $term_items[$term_id] as $item_id => $touches ) {
 					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
+			}
 				}
 			$child = $parent;
 
@@ -3536,10 +3635,11 @@ 
 	}
 
 	// Transfer the touched cells.
-	foreach ( (array) $term_items as $id => $items )
-		if ( isset($terms_by_id[$id]) )
+	foreach ( (array) $term_items as $id => $items ) {
+			if ( isset($terms_by_id[$id]) )
 			$terms_by_id[$id]->count = count($items);
-}
+	}
+	}
 
 /**
  * Adds any terms from the given IDs to the cache that do not already exist in cache.
@@ -3590,8 +3690,9 @@ 
 
 	$object_types = (array) $taxonomy->object_type;
 
-	foreach ( $object_types as &$object_type )
-		list( $object_type ) = explode( ':', $object_type );
+	foreach ( $object_types as &$object_type ) {
+			list( $object_type ) = explode( ':', $object_type );
+	}
 
 	$object_types = array_unique( $object_types );
 
@@ -3600,18 +3701,21 @@ 
 		$check_attachments = true;
 	}
 
-	if ( $object_types )
-		$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	if ( $object_types ) {
+			$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	}
 
 	foreach ( (array) $terms as $term ) {
 		$count = 0;
 
 		// Attachments can be 'inherit' status, we need to base count off the parent's status if so.
-		if ( $check_attachments )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		if ( $check_attachments ) {
+					$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		}
 
-		if ( $object_types )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		if ( $object_types ) {
+					$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		}
 
 		/** This action is documented in wp-includes/taxonomy.php */
 		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
@@ -4066,11 +4170,13 @@ 
 		}
 	}
 
-	if ( !is_object($term) )
-		$term = new WP_Error('invalid_term', __('Empty Term'));
+	if ( !is_object($term) ) {
+			$term = new WP_Error('invalid_term', __('Empty Term'));
+	}
 
-	if ( is_wp_error( $term ) )
-		return $term;
+	if ( is_wp_error( $term ) ) {
+			return $term;
+	}
 
 	$taxonomy = $term->taxonomy;
 
@@ -4080,12 +4186,13 @@ 
 	$t = get_taxonomy($taxonomy);
 
 	if ( empty($termlink) ) {
-		if ( 'category' == $taxonomy )
-			$termlink = '?cat=' . $term->term_id;
-		elseif ( $t->query_var )
-			$termlink = "?$t->query_var=$slug";
-		else
-			$termlink = "?taxonomy=$taxonomy&term=$slug";
+		if ( 'category' == $taxonomy ) {
+					$termlink = '?cat=' . $term->term_id;
+		} elseif ( $t->query_var ) {
+					$termlink = "?$t->query_var=$slug";
+		} else {
+					$termlink = "?taxonomy=$taxonomy&term=$slug";
+		}
 		$termlink = home_url($termlink);
 	} else {
 		if ( $t->rewrite['hierarchical'] ) {
@@ -4268,8 +4375,9 @@ 
  * @return bool|WP_Error WP_Error on input error.
  */
 function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
-	if ( !$object_id = (int) $object_id )
-		return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+	if ( !$object_id = (int) $object_id ) {
+			return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+	}
 
 	$object_terms = get_object_term_cache( $object_id, $taxonomy );
 	if ( false === $object_terms ) {
@@ -4277,19 +4385,23 @@ 
 		wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
 	}
 
-	if ( is_wp_error( $object_terms ) )
-		return $object_terms;
-	if ( empty( $object_terms ) )
-		return false;
-	if ( empty( $terms ) )
-		return ( !empty( $object_terms ) );
+	if ( is_wp_error( $object_terms ) ) {
+			return $object_terms;
+	}
+	if ( empty( $object_terms ) ) {
+			return false;
+	}
+	if ( empty( $terms ) ) {
+			return ( !empty( $object_terms ) );
+	}
 
 	$terms = (array) $terms;
 
-	if ( $ints = array_filter( $terms, 'is_int' ) )
-		$strs = array_diff( $terms, $ints );
-	else
-		$strs =& $terms;
+	if ( $ints = array_filter( $terms, 'is_int' ) ) {
+			$strs = array_diff( $terms, $ints );
+	} else {
+			$strs =& $terms;
+	}
 
 	foreach ( $object_terms as $object_term ) {
 		// If term is an int, check against term_ids only.
@@ -4304,8 +4416,12 @@ 
 				return true;
 			}
 
-			if ( in_array( $object_term->name, $strs ) ) return true;
-			if ( in_array( $object_term->slug, $strs ) ) return true;
+			if ( in_array( $object_term->name, $strs ) ) {
+				return true;
+			}
+			if ( in_array( $object_term->slug, $strs ) ) {
+				return true;
+			}
 		}
 	}
 
@@ -4418,24 +4534,30 @@ 
  */
 function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
 	// Nothing fancy here - bail
-	if ( !$parent )
-		return 0;
+	if ( !$parent ) {
+			return 0;
+	}
 
 	// Can't be its own parent.
-	if ( $parent == $term_id )
-		return 0;
+	if ( $parent == $term_id ) {
+			return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
-		return $parent; // No loop
+	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) ) {
+			return $parent;
+	}
+	// No loop
 
 	// Setting $parent to the given value causes a loop.
-	if ( isset( $loop[$term_id] ) )
-		return 0;
+	if ( isset( $loop[$term_id] ) ) {
+			return 0;
+	}
 
 	// There's a loop, but it doesn't contain $term_id. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	foreach ( array_keys( $loop ) as $loop_member ) {
+			wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	}
 
 	return $parent;
 }

src/wp-includes/general-template.php

Spacing +763 added lines, -763 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @param string $name The name of the specialised header.
  */
-function get_header( $name = null ) {
+function get_header($name = null) {
 	/**
 	 * Fires before the header template file is loaded.
 	 *
@@ -32,17 +32,17 @@ 
 	 *
 	 * @param string $name Name of the specific header file to use.
 	 */
-	do_action( 'get_header', $name );
+	do_action('get_header', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name ) {
+	if ('' !== $name) {
 		$templates[] = "header-{$name}.php";
 	}
 
 	$templates[] = 'header.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -58,7 +58,7 @@ 
  *
  * @param string $name The name of the specialised footer.
  */
-function get_footer( $name = null ) {
+function get_footer($name = null) {
 	/**
 	 * Fires before the footer template file is loaded.
 	 *
@@ -71,17 +71,17 @@ 
 	 *
 	 * @param string $name Name of the specific footer file to use.
 	 */
-	do_action( 'get_footer', $name );
+	do_action('get_footer', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name ) {
+	if ('' !== $name) {
 		$templates[] = "footer-{$name}.php";
 	}
 
-	$templates[]    = 'footer.php';
+	$templates[] = 'footer.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -97,7 +97,7 @@ 
  *
  * @param string $name The name of the specialised sidebar.
  */
-function get_sidebar( $name = null ) {
+function get_sidebar($name = null) {
 	/**
 	 * Fires before the sidebar template file is loaded.
 	 *
@@ -110,16 +110,16 @@ 
 	 *
 	 * @param string $name Name of the specific sidebar file to use.
 	 */
-	do_action( 'get_sidebar', $name );
+	do_action('get_sidebar', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "sidebar-{$name}.php";
 
 	$templates[] = 'sidebar.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -143,7 +143,7 @@ 
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
  */
-function get_template_part( $slug, $name = null ) {
+function get_template_part($slug, $name = null) {
 	/**
 	 * Fires before the specified template part file is loaded.
 	 *
@@ -155,11 +155,11 @@ 
 	 * @param string $slug The slug name for the generic template.
 	 * @param string $name The name of the specialized template.
 	 */
-	do_action( "get_template_part_{$slug}", $slug, $name );
+	do_action("get_template_part_{$slug}", $slug, $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "{$slug}-{$name}.php";
 
 	$templates[] = "{$slug}.php";
@@ -189,7 +189,7 @@ 
  * @param bool $echo Default to echo and not return the form.
  * @return string|void String when $echo is false.
  */
-function get_search_form( $echo = true ) {
+function get_search_form($echo = true) {
 	/**
 	 * Fires before the search form is retrieved, at the start of get_search_form().
 	 *
@@ -198,9 +198,9 @@ 
 	 *
 	 * @link https://core.trac.wordpress.org/ticket/19321
 	 */
-	do_action( 'pre_get_search_form' );
+	do_action('pre_get_search_form');
 
-	$format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
+	$format = current_theme_supports('html5', 'search-form') ? 'html5' : 'xhtml';
 
 	/**
 	 * Filters the HTML format of the search form.
@@ -210,28 +210,28 @@ 
 	 * @param string $format The type of markup to use in the search form.
 	 *                       Accepts 'html5', 'xhtml'.
 	 */
-	$format = apply_filters( 'search_form_format', $format );
+	$format = apply_filters('search_form_format', $format);
 
-	$search_form_template = locate_template( 'searchform.php' );
-	if ( '' != $search_form_template ) {
+	$search_form_template = locate_template('searchform.php');
+	if ('' != $search_form_template) {
 		ob_start();
-		require( $search_form_template );
+		require($search_form_template);
 		$form = ob_get_clean();
 	} else {
-		if ( 'html5' == $format ) {
-			$form = '<form role="search" method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
+		if ('html5' == $format) {
+			$form = '<form role="search" method="get" class="search-form" action="'.esc_url(home_url('/')).'">
 				<label>
-					<span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
-					<input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" />
+					<span class="screen-reader-text">' . _x('Search for:', 'label').'</span>
+					<input type="search" class="search-field" placeholder="' . esc_attr_x('Search &hellip;', 'placeholder').'" value="'.get_search_query().'" name="s" />
 				</label>
-				<input type="submit" class="search-submit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+				<input type="submit" class="search-submit" value="'. esc_attr_x('Search', 'submit button').'" />
 			</form>';
 		} else {
-			$form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+			$form = '<form role="search" method="get" id="searchform" class="searchform" action="'.esc_url(home_url('/')).'">
 				<div>
-					<label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
-					<input type="text" value="' . get_search_query() . '" name="s" id="s" />
-					<input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+					<label class="screen-reader-text" for="s">' . _x('Search for:', 'label').'</label>
+					<input type="text" value="' . get_search_query().'" name="s" id="s" />
+					<input type="submit" id="searchsubmit" value="'. esc_attr_x('Search', 'submit button').'" />
 				</div>
 			</form>';
 		}
@@ -244,12 +244,12 @@ 
 	 *
 	 * @param string $form The search form HTML output.
 	 */
-	$result = apply_filters( 'get_search_form', $form );
+	$result = apply_filters('get_search_form', $form);
 
-	if ( null === $result )
+	if (null === $result)
 		$result = $form;
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 	else
 		return $result;
@@ -268,12 +268,12 @@ 
  * @return string|void String when retrieving.
  */
 function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+	if ( ! is_user_logged_in())
+		$link = '<a href="'.esc_url(wp_login_url($redirect)).'">'.__('Log in').'</a>';
 	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+		$link = '<a href="'.esc_url(wp_logout_url($redirect)).'">'.__('Log out').'</a>';
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filters the HTML output for the Log In/Log Out link.
 		 *
@@ -281,10 +281,10 @@ 
 		 *
 		 * @param string $link The HTML link content.
 		 */
-		echo apply_filters( 'loginout', $link );
+		echo apply_filters('loginout', $link);
 	} else {
 		/** This filter is documented in wp-includes/general-template.php */
-		return apply_filters( 'loginout', $link );
+		return apply_filters('loginout', $link);
 	}
 }
 
@@ -299,13 +299,13 @@ 
  * @return string The logout URL. Note: HTML-encoded via esc_html() in wp_nonce_url().
  */
 function wp_logout_url($redirect = '') {
-	$args = array( 'action' => 'logout' );
-	if ( !empty($redirect) ) {
-		$args['redirect_to'] = urlencode( $redirect );
+	$args = array('action' => 'logout');
+	if ( ! empty($redirect)) {
+		$args['redirect_to'] = urlencode($redirect);
 	}
 
 	$logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
-	$logout_url = wp_nonce_url( $logout_url, 'log-out' );
+	$logout_url = wp_nonce_url($logout_url, 'log-out');
 
 	/**
 	 * Filters the logout URL.
@@ -315,7 +315,7 @@ 
 	 * @param string $logout_url The HTML-encoded logout URL.
 	 * @param string $redirect   Path to redirect to on logout.
 	 */
-	return apply_filters( 'logout_url', $logout_url, $redirect );
+	return apply_filters('logout_url', $logout_url, $redirect);
 }
 
 /**
@@ -331,10 +331,10 @@ 
 function wp_login_url($redirect = '', $force_reauth = false) {
 	$login_url = site_url('wp-login.php', 'login');
 
-	if ( !empty($redirect) )
+	if ( ! empty($redirect))
 		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
 
-	if ( $force_reauth )
+	if ($force_reauth)
 		$login_url = add_query_arg('reauth', '1', $login_url);
 
 	/**
@@ -347,7 +347,7 @@ 
 	 * @param string $redirect     The path to redirect to on login, if supplied.
 	 * @param bool   $force_reauth Whether to force reauthorization, even if a cookie is present.
 	 */
-	return apply_filters( 'login_url', $login_url, $redirect, $force_reauth );
+	return apply_filters('login_url', $login_url, $redirect, $force_reauth);
 }
 
 /**
@@ -365,7 +365,7 @@ 
 	 *
 	 * @param string $register The user registration URL.
 	 */
-	return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', 'login' ) );
+	return apply_filters('register_url', site_url('wp-login.php?action=register', 'login'));
 }
 
 /**
@@ -399,16 +399,16 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_login_form( $args = array() ) {
+function wp_login_form($args = array()) {
 	$defaults = array(
 		'echo' => true,
 		// Default 'redirect' value takes the user back to the request URI.
-		'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+		'redirect' => (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
 		'form_id' => 'loginform',
-		'label_username' => __( 'Username or Email' ),
-		'label_password' => __( 'Password' ),
-		'label_remember' => __( 'Remember Me' ),
-		'label_log_in' => __( 'Log In' ),
+		'label_username' => __('Username or Email'),
+		'label_password' => __('Password'),
+		'label_remember' => __('Remember Me'),
+		'label_log_in' => __('Log In'),
 		'id_username' => 'user_login',
 		'id_password' => 'user_pass',
 		'id_remember' => 'rememberme',
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param array $defaults An array of default login form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('login_form_defaults', $defaults));
 
 	/**
 	 * Filters content to display at the top of the login form.
@@ -440,7 +440,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_top = apply_filters( 'login_form_top', '', $args );
+	$login_form_top = apply_filters('login_form_top', '', $args);
 
 	/**
 	 * Filters content to display in the middle of the login form.
@@ -453,7 +453,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_middle = apply_filters( 'login_form_middle', '', $args );
+	$login_form_middle = apply_filters('login_form_middle', '', $args);
 
 	/**
 	 * Filters content to display at the bottom of the login form.
@@ -465,29 +465,29 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_bottom = apply_filters( 'login_form_bottom', '', $args );
+	$login_form_bottom = apply_filters('login_form_bottom', '', $args);
 
 	$form = '
-		<form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
-			' . $login_form_top . '
+		<form name="' . $args['form_id'].'" id="'.$args['form_id'].'" action="'.esc_url(site_url('wp-login.php', 'login_post')).'" method="post">
+			' . $login_form_top.'
 			<p class="login-username">
-				<label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
-				<input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" />
+				<label for="' . esc_attr($args['id_username']).'">'.esc_html($args['label_username']).'</label>
+				<input type="text" name="log" id="' . esc_attr($args['id_username']).'" class="input" value="'.esc_attr($args['value_username']).'" size="20" />
 			</p>
 			<p class="login-password">
-				<label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
-				<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
+				<label for="' . esc_attr($args['id_password']).'">'.esc_html($args['label_password']).'</label>
+				<input type="password" name="pwd" id="' . esc_attr($args['id_password']).'" class="input" value="" size="20" />
 			</p>
-			' . $login_form_middle . '
-			' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
+			' . $login_form_middle.'
+			' . ($args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="'.esc_attr($args['id_remember']).'" value="forever"'.($args['value_remember'] ? ' checked="checked"' : '').' /> '.esc_html($args['label_remember']).'</label></p>' : '').'
 			<p class="login-submit">
-				<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
-				<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
+				<input type="submit" name="wp-submit" id="' . esc_attr($args['id_submit']).'" class="button-primary" value="'.esc_attr($args['label_log_in']).'" />
+				<input type="hidden" name="redirect_to" value="' . esc_url($args['redirect']).'" />
 			</p>
-			' . $login_form_bottom . '
+			' . $login_form_bottom.'
 		</form>';
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $form;
 	else
 		return $form;
@@ -501,13 +501,13 @@ 
  * @param string $redirect Path to redirect to on login.
  * @return string Lost password URL.
  */
-function wp_lostpassword_url( $redirect = '' ) {
-	$args = array( 'action' => 'lostpassword' );
-	if ( !empty($redirect) ) {
+function wp_lostpassword_url($redirect = '') {
+	$args = array('action' => 'lostpassword');
+	if ( ! empty($redirect)) {
 		$args['redirect_to'] = $redirect;
 	}
 
-	$lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+	$lostpassword_url = add_query_arg($args, network_site_url('wp-login.php', 'login'));
 
 	/**
 	 * Filters the Lost Password URL.
@@ -517,7 +517,7 @@ 
 	 * @param string $lostpassword_url The lost password page URL.
 	 * @param string $redirect         The path to redirect to on login.
 	 */
-	return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
+	return apply_filters('lostpassword_url', $lostpassword_url, $redirect);
 }
 
 /**
@@ -533,14 +533,14 @@ 
  * @param bool   $echo   Default to echo and not return the link.
  * @return string|void String when retrieving.
  */
-function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
-	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+function wp_register($before = '<li>', $after = '</li>', $echo = true) {
+	if ( ! is_user_logged_in()) {
+		if (get_option('users_can_register'))
+			$link = $before.'<a href="'.esc_url(wp_registration_url()).'">'.__('Register').'</a>'.$after;
 		else
 			$link = '';
-	} elseif ( current_user_can( 'read' ) ) {
-		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
+	} elseif (current_user_can('read')) {
+		$link = $before.'<a href="'.admin_url().'">'.__('Site Admin').'</a>'.$after;
 	} else {
 		$link = '';
 	}
@@ -555,9 +555,9 @@ 
 	 *
 	 * @param string $link The HTML code for the link to the Registration or Admin page.
 	 */
-	$link = apply_filters( 'register', $link );
+	$link = apply_filters('register', $link);
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $link;
 	} else {
 		return $link;
@@ -580,7 +580,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_meta' );
+	do_action('wp_meta');
 }
 
 /**
@@ -592,8 +592,8 @@ 
  *
  * @param string $show Optional. Site information to display. Default empty.
  */
-function bloginfo( $show = '' ) {
-	echo get_bloginfo( $show, 'display' );
+function bloginfo($show = '') {
+	echo get_bloginfo($show, 'display');
 }
 
 /**
@@ -643,17 +643,17 @@ 
  * @param string $filter Optional. How to filter what is retrieved. Default 'raw'.
  * @return string Mostly string values, might be empty.
  */
-function get_bloginfo( $show = '', $filter = 'raw' ) {
-	switch( $show ) {
+function get_bloginfo($show = '', $filter = 'raw') {
+	switch ($show) {
 		case 'home' : // DEPRECATED
 		case 'siteurl' : // DEPRECATED
-			_deprecated_argument( __FUNCTION__, '2.2.0', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2.0', sprintf(
 				/* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>url</code>'
-			) );
+			));
 		case 'url' :
 			$output = home_url();
 			break;
@@ -682,7 +682,7 @@ 
 			$output = get_feed_link('comments_rss2');
 			break;
 		case 'pingback_url':
-			$output = site_url( 'xmlrpc.php' );
+			$output = site_url('xmlrpc.php');
 			break;
 		case 'stylesheet_url':
 			$output = get_stylesheet_uri();
@@ -713,21 +713,21 @@ 
 			 * see https://www.w3.org/International/articles/language-tags/ for reference.
 			 * Do not translate into your own language.
 			 */
-			$output = __( 'html_lang_attribute' );
-			if ( 'html_lang_attribute' === $output || preg_match( '/[^a-zA-Z0-9-]/', $output ) ) {
+			$output = __('html_lang_attribute');
+			if ('html_lang_attribute' === $output || preg_match('/[^a-zA-Z0-9-]/', $output)) {
 				$output = get_locale();
-				$output = str_replace( '_', '-', $output );
+				$output = str_replace('_', '-', $output);
 			}
 			break;
 		case 'text_direction':
-			_deprecated_argument( __FUNCTION__, '2.2.0', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2.0', sprintf(
 				/* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>is_rtl()</code>'
-			) );
-			if ( function_exists( 'is_rtl' ) ) {
+			));
+			if (function_exists('is_rtl')) {
 				$output = is_rtl() ? 'rtl' : 'ltr';
 			} else {
 				$output = 'ltr';
@@ -745,8 +745,8 @@ 
 		strpos($show, 'home') === false)
 		$url = false;
 
-	if ( 'display' == $filter ) {
-		if ( $url ) {
+	if ('display' == $filter) {
+		if ($url) {
 			/**
 			 * Filters the URL returned by get_bloginfo().
 			 *
@@ -755,7 +755,7 @@ 
 			 * @param mixed $output The URL returned by bloginfo().
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo_url', $output, $show );
+			$output = apply_filters('bloginfo_url', $output, $show);
 		} else {
 			/**
 			 * Filters the site information returned by get_bloginfo().
@@ -765,7 +765,7 @@ 
 			 * @param mixed $output The requested non-URL site information.
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo', $output, $show );
+			$output = apply_filters('bloginfo', $output, $show);
 		}
 	}
 
@@ -782,23 +782,23 @@ 
  * @param int    $blog_id Optional. ID of the blog to get the site icon for. Default current blog.
  * @return string Site Icon URL.
  */
-function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+function get_site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$site_icon_id = get_option( 'site_icon' );
+	$site_icon_id = get_option('site_icon');
 
-	if ( $site_icon_id ) {
-		if ( $size >= 512 ) {
+	if ($site_icon_id) {
+		if ($size >= 512) {
 			$size_data = 'full';
 		} else {
-			$size_data = array( $size, $size );
+			$size_data = array($size, $size);
 		}
-		$url = wp_get_attachment_image_url( $site_icon_id, $size_data );
+		$url = wp_get_attachment_image_url($site_icon_id, $size_data);
 	}
 
-	if ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -811,7 +811,7 @@ 
 	 * @param int    $size    Size of the site icon.
 	 * @param int    $blog_id ID of the blog to get the site icon for.
 	 */
-	return apply_filters( 'get_site_icon_url', $url, $size, $blog_id );
+	return apply_filters('get_site_icon_url', $url, $size, $blog_id);
 }
 
 /**
@@ -823,8 +823,8 @@ 
  * @param string $url     Optional. Fallback url if no site icon is found. Default empty.
  * @param int    $blog_id Optional. ID of the blog to get the site icon for. Default current blog.
  */
-function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
+function site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	echo esc_url(get_site_icon_url($size, $url, $blog_id));
 }
 
 /**
@@ -835,8 +835,8 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default current blog.
  * @return bool Whether the site has a site icon or not.
  */
-function has_site_icon( $blog_id = 0 ) {
-	return (bool) get_site_icon_url( 512, '', $blog_id );
+function has_site_icon($blog_id = 0) {
+	return (bool) get_site_icon_url(512, '', $blog_id);
 }
 
 /**
@@ -847,14 +847,14 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  * @return bool Whether the site has a custom logo or not.
  */
-function has_custom_logo( $blog_id = 0 ) {
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+function has_custom_logo($blog_id = 0) {
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	$custom_logo_id = get_theme_mod('custom_logo');
 
-	if ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -869,34 +869,34 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  * @return string Custom logo markup.
  */
-function get_custom_logo( $blog_id = 0 ) {
+function get_custom_logo($blog_id = 0) {
 	$html = '';
 
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	$custom_logo_id = get_theme_mod('custom_logo');
 
 	// We have a logo. Logo is go.
-	if ( $custom_logo_id ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
-			esc_url( home_url( '/' ) ),
-			wp_get_attachment_image( $custom_logo_id, 'full', false, array(
+	if ($custom_logo_id) {
+		$html = sprintf('<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
+			esc_url(home_url('/')),
+			wp_get_attachment_image($custom_logo_id, 'full', false, array(
 				'class'    => 'custom-logo',
 				'itemprop' => 'logo',
-			) )
+			))
 		);
 	}
 
 	// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
-	elseif ( is_customize_preview() ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
-			esc_url( home_url( '/' ) )
+	elseif (is_customize_preview()) {
+		$html = sprintf('<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
+			esc_url(home_url('/'))
 		);
 	}
 
-	if ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -909,7 +909,7 @@ 
 	 * @param string $html    Custom logo HTML output.
 	 * @param int    $blog_id ID of the blog to get the custom logo for.
 	 */
-	return apply_filters( 'get_custom_logo', $html, $blog_id );
+	return apply_filters('get_custom_logo', $html, $blog_id);
 }
 
 /**
@@ -919,8 +919,8 @@ 
  *
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  */
-function the_custom_logo( $blog_id = 0 ) {
-	echo get_custom_logo( $blog_id );
+function the_custom_logo($blog_id = 0) {
+	echo get_custom_logo($blog_id);
 }
 
 /**
@@ -945,8 +945,8 @@ 
 	 *
 	 * @param string $title The document title. Default empty string.
 	 */
-	$title = apply_filters( 'pre_get_document_title', '' );
-	if ( ! empty( $title ) ) {
+	$title = apply_filters('pre_get_document_title', '');
+	if ( ! empty($title)) {
 		return $title;
 	}
 
@@ -957,62 +957,62 @@ 
 	);
 
 	// If it's a 404 page, use a "Page not found" title.
-	if ( is_404() ) {
-		$title['title'] = __( 'Page not found' );
+	if (is_404()) {
+		$title['title'] = __('Page not found');
 
 	// If it's a search, use a dynamic search results title.
-	} elseif ( is_search() ) {
+	} elseif (is_search()) {
 		/* translators: %s: search phrase */
-		$title['title'] = sprintf( __( 'Search Results for &#8220;%s&#8221;' ), get_search_query() );
+		$title['title'] = sprintf(__('Search Results for &#8220;%s&#8221;'), get_search_query());
 
 	// If on the front page, use the site title.
-	} elseif ( is_front_page() ) {
-		$title['title'] = get_bloginfo( 'name', 'display' );
+	} elseif (is_front_page()) {
+		$title['title'] = get_bloginfo('name', 'display');
 
 	// If on a post type archive, use the post type archive title.
-	} elseif ( is_post_type_archive() ) {
-		$title['title'] = post_type_archive_title( '', false );
+	} elseif (is_post_type_archive()) {
+		$title['title'] = post_type_archive_title('', false);
 
 	// If on a taxonomy archive, use the term title.
-	} elseif ( is_tax() ) {
-		$title['title'] = single_term_title( '', false );
+	} elseif (is_tax()) {
+		$title['title'] = single_term_title('', false);
 
 	/*
 	 * If we're on the blog page that is not the homepage or
 	 * a single post of any post type, use the post title.
 	 */
-	} elseif ( is_home() || is_singular() ) {
-		$title['title'] = single_post_title( '', false );
+	} elseif (is_home() || is_singular()) {
+		$title['title'] = single_post_title('', false);
 
 	// If on a category or tag archive, use the term title.
-	} elseif ( is_category() || is_tag() ) {
-		$title['title'] = single_term_title( '', false );
+	} elseif (is_category() || is_tag()) {
+		$title['title'] = single_term_title('', false);
 
 	// If on an author archive, use the author's display name.
-	} elseif ( is_author() && $author = get_queried_object() ) {
+	} elseif (is_author() && $author = get_queried_object()) {
 		$title['title'] = $author->display_name;
 
 	// If it's a date archive, use the date as the title.
-	} elseif ( is_year() ) {
-		$title['title'] = get_the_date( _x( 'Y', 'yearly archives date format' ) );
+	} elseif (is_year()) {
+		$title['title'] = get_the_date(_x('Y', 'yearly archives date format'));
 
-	} elseif ( is_month() ) {
-		$title['title'] = get_the_date( _x( 'F Y', 'monthly archives date format' ) );
+	} elseif (is_month()) {
+		$title['title'] = get_the_date(_x('F Y', 'monthly archives date format'));
 
-	} elseif ( is_day() ) {
+	} elseif (is_day()) {
 		$title['title'] = get_the_date();
 	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-		$title['page'] = sprintf( __( 'Page %s' ), max( $paged, $page ) );
+	if (($paged >= 2 || $page >= 2) && ! is_404()) {
+		$title['page'] = sprintf(__('Page %s'), max($paged, $page));
 	}
 
 	// Append the description or site title to give context.
-	if ( is_front_page() ) {
-		$title['tagline'] = get_bloginfo( 'description', 'display' );
+	if (is_front_page()) {
+		$title['tagline'] = get_bloginfo('description', 'display');
 	} else {
-		$title['site'] = get_bloginfo( 'name', 'display' );
+		$title['site'] = get_bloginfo('name', 'display');
 	}
 
 	/**
@@ -1022,7 +1022,7 @@ 
 	 *
 	 * @param string $sep Document title separator. Default '-'.
 	 */
-	$sep = apply_filters( 'document_title_separator', '-' );
+	$sep = apply_filters('document_title_separator', '-');
 
 	/**
 	 * Filters the parts of the document title.
@@ -1038,13 +1038,13 @@ 
 	 *     @type string $site    Optional. Site title when not on home page.
 	 * }
 	 */
-	$title = apply_filters( 'document_title_parts', $title );
+	$title = apply_filters('document_title_parts', $title);
 
-	$title = implode( " $sep ", array_filter( $title ) );
-	$title = wptexturize( $title );
-	$title = convert_chars( $title );
-	$title = esc_html( $title );
-	$title = capital_P_dangit( $title );
+	$title = implode(" $sep ", array_filter($title));
+	$title = wptexturize($title);
+	$title = convert_chars($title);
+	$title = esc_html($title);
+	$title = capital_P_dangit($title);
 
 	return $title;
 }
@@ -1058,11 +1058,11 @@ 
  * @access private
  */
 function _wp_render_title_tag() {
-	if ( ! current_theme_supports( 'title-tag' ) ) {
+	if ( ! current_theme_supports('title-tag')) {
 		return;
 	}
 
-	echo '<title>' . wp_get_document_title() . '</title>' . "\n";
+	echo '<title>'.wp_get_document_title().'</title>'."\n";
 }
 
 /**
@@ -1090,94 +1090,94 @@ 
  * @param string $seplocation Optional. Direction to display title, 'right'.
  * @return string|null String on retrieve, null when displaying.
  */
-function wp_title( $sep = '&raquo;', $display = true, $seplocation = '' ) {
+function wp_title($sep = '&raquo;', $display = true, $seplocation = '') {
 	global $wp_locale;
 
-	$m        = get_query_var( 'm' );
-	$year     = get_query_var( 'year' );
-	$monthnum = get_query_var( 'monthnum' );
-	$day      = get_query_var( 'day' );
-	$search   = get_query_var( 's' );
+	$m        = get_query_var('m');
+	$year     = get_query_var('year');
+	$monthnum = get_query_var('monthnum');
+	$day      = get_query_var('day');
+	$search   = get_query_var('s');
 	$title    = '';
 
 	$t_sep = '%WP_TITLE_SEP%'; // Temporary separator, for accurate flipping, if necessary
 
 	// If there is a post
-	if ( is_single() || ( is_home() && ! is_front_page() ) || ( is_page() && ! is_front_page() ) ) {
-		$title = single_post_title( '', false );
+	if (is_single() || (is_home() && ! is_front_page()) || (is_page() && ! is_front_page())) {
+		$title = single_post_title('', false);
 	}
 
 	// If there's a post type archive
-	if ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) ) {
-			$post_type = reset( $post_type );
+	if (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type)) {
+			$post_type = reset($post_type);
 		}
-		$post_type_object = get_post_type_object( $post_type );
-		if ( ! $post_type_object->has_archive ) {
-			$title = post_type_archive_title( '', false );
+		$post_type_object = get_post_type_object($post_type);
+		if ( ! $post_type_object->has_archive) {
+			$title = post_type_archive_title('', false);
 		}
 	}
 
 	// If there's a category or tag
-	if ( is_category() || is_tag() ) {
-		$title = single_term_title( '', false );
+	if (is_category() || is_tag()) {
+		$title = single_term_title('', false);
 	}
 
 	// If there's a taxonomy
-	if ( is_tax() ) {
+	if (is_tax()) {
 		$term = get_queried_object();
-		if ( $term ) {
-			$tax   = get_taxonomy( $term->taxonomy );
-			$title = single_term_title( $tax->labels->name . $t_sep, false );
+		if ($term) {
+			$tax   = get_taxonomy($term->taxonomy);
+			$title = single_term_title($tax->labels->name.$t_sep, false);
 		}
 	}
 
 	// If there's an author
-	if ( is_author() && ! is_post_type_archive() ) {
+	if (is_author() && ! is_post_type_archive()) {
 		$author = get_queried_object();
-		if ( $author ) {
+		if ($author) {
 			$title = $author->display_name;
 		}
 	}
 
 	// Post type archives with has_archive should override terms.
-	if ( is_post_type_archive() && $post_type_object->has_archive ) {
-		$title = post_type_archive_title( '', false );
+	if (is_post_type_archive() && $post_type_object->has_archive) {
+		$title = post_type_archive_title('', false);
 	}
 
 	// If there's a month
-	if ( is_archive() && ! empty( $m ) ) {
-		$my_year  = substr( $m, 0, 4 );
-		$my_month = $wp_locale->get_month( substr( $m, 4, 2 ) );
-		$my_day   = intval( substr( $m, 6, 2 ) );
-		$title    = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
+	if (is_archive() && ! empty($m)) {
+		$my_year  = substr($m, 0, 4);
+		$my_month = $wp_locale->get_month(substr($m, 4, 2));
+		$my_day   = intval(substr($m, 6, 2));
+		$title    = $my_year.($my_month ? $t_sep.$my_month : '').($my_day ? $t_sep.$my_day : '');
 	}
 
 	// If there's a year
-	if ( is_archive() && ! empty( $year ) ) {
+	if (is_archive() && ! empty($year)) {
 		$title = $year;
-		if ( ! empty( $monthnum ) ) {
-			$title .= $t_sep . $wp_locale->get_month( $monthnum );
+		if ( ! empty($monthnum)) {
+			$title .= $t_sep.$wp_locale->get_month($monthnum);
 		}
-		if ( ! empty( $day ) ) {
-			$title .= $t_sep . zeroise( $day, 2 );
+		if ( ! empty($day)) {
+			$title .= $t_sep.zeroise($day, 2);
 		}
 	}
 
 	// If it's a search
-	if ( is_search() ) {
+	if (is_search()) {
 		/* translators: 1: separator, 2: search phrase */
-		$title = sprintf( __( 'Search Results %1$s %2$s' ), $t_sep, strip_tags( $search ) );
+		$title = sprintf(__('Search Results %1$s %2$s'), $t_sep, strip_tags($search));
 	}
 
 	// If it's a 404 page
-	if ( is_404() ) {
-		$title = __( 'Page not found' );
+	if (is_404()) {
+		$title = __('Page not found');
 	}
 
 	$prefix = '';
-	if ( ! empty( $title ) ) {
+	if ( ! empty($title)) {
 		$prefix = " $sep ";
 	}
 
@@ -1188,14 +1188,14 @@ 
 	 *
 	 * @param array $title_array Parts of the page title.
 	 */
-	$title_array = apply_filters( 'wp_title_parts', explode( $t_sep, $title ) );
+	$title_array = apply_filters('wp_title_parts', explode($t_sep, $title));
 
 	// Determines position of the separator and direction of the breadcrumb
-	if ( 'right' == $seplocation ) { // sep on right, so reverse the order
-		$title_array = array_reverse( $title_array );
-		$title       = implode( " $sep ", $title_array ) . $prefix;
+	if ('right' == $seplocation) { // sep on right, so reverse the order
+		$title_array = array_reverse($title_array);
+		$title       = implode(" $sep ", $title_array).$prefix;
 	} else {
-		$title = $prefix . implode( " $sep ", $title_array );
+		$title = $prefix.implode(" $sep ", $title_array);
 	}
 
 	/**
@@ -1207,10 +1207,10 @@ 
 	 * @param string $sep Title separator.
 	 * @param string $seplocation Location of the separator (left or right).
 	 */
-	$title = apply_filters( 'wp_title', $title, $sep, $seplocation );
+	$title = apply_filters('wp_title', $title, $sep, $seplocation);
 
 	// Send it out
-	if ( $display ) {
+	if ($display) {
 		echo $title;
 	} else {
 		return $title;
@@ -1233,10 +1233,10 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_post_title( $prefix = '', $display = true ) {
+function single_post_title($prefix = '', $display = true) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
+	if ( ! isset($_post->post_title))
 		return;
 
 	/**
@@ -1247,11 +1247,11 @@ 
 	 * @param string $_post_title The single post page title.
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
-	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
-		echo $prefix . $title;
+	$title = apply_filters('single_post_title', $_post->post_title, $_post);
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1266,15 +1266,15 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving, null when displaying or failure.
  */
-function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
+function post_type_archive_title($prefix = '', $display = true) {
+	if ( ! is_post_type_archive())
 		return;
 
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$post_type_obj = get_post_type_object( $post_type );
+	$post_type_obj = get_post_type_object($post_type);
 
 	/**
 	 * Filters the post type archive title.
@@ -1284,12 +1284,12 @@ 
 	 * @param string $post_type_name Post type 'name' label.
 	 * @param string $post_type      Post type.
 	 */
-	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
+	$title = apply_filters('post_type_archive_title', $post_type_obj->labels->name, $post_type);
 
-	if ( $display )
-		echo $prefix . $title;
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1305,8 +1305,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_cat_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_cat_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1322,8 +1322,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_tag_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_tag_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1339,13 +1339,13 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_term_title( $prefix = '', $display = true ) {
+function single_term_title($prefix = '', $display = true) {
 	$term = get_queried_object();
 
-	if ( !$term )
+	if ( ! $term)
 		return;
 
-	if ( is_category() ) {
+	if (is_category()) {
 		/**
 		 * Filters the category archive page title.
 		 *
@@ -1353,8 +1353,8 @@ 
 		 *
 		 * @param string $term_name Category name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_cat_title', $term->name );
-	} elseif ( is_tag() ) {
+		$term_name = apply_filters('single_cat_title', $term->name);
+	} elseif (is_tag()) {
 		/**
 		 * Filters the tag archive page title.
 		 *
@@ -1362,8 +1362,8 @@ 
 		 *
 		 * @param string $term_name Tag name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_tag_title', $term->name );
-	} elseif ( is_tax() ) {
+		$term_name = apply_filters('single_tag_title', $term->name);
+	} elseif (is_tax()) {
 		/**
 		 * Filters the custom taxonomy archive page title.
 		 *
@@ -1371,18 +1371,18 @@ 
 		 *
 		 * @param string $term_name Term name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_term_title', $term->name );
+		$term_name = apply_filters('single_term_title', $term->name);
 	} else {
 		return;
 	}
 
-	if ( empty( $term_name ) )
+	if (empty($term_name))
 		return;
 
-	if ( $display )
-		echo $prefix . $term_name;
+	if ($display)
+		echo $prefix.$term_name;
 	else
-		return $prefix . $term_name;
+		return $prefix.$term_name;
 }
 
 /**
@@ -1401,27 +1401,27 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_month_title($prefix = '', $display = true ) {
+function single_month_title($prefix = '', $display = true) {
 	global $wp_locale;
 
 	$m = get_query_var('m');
 	$year = get_query_var('year');
 	$monthnum = get_query_var('monthnum');
 
-	if ( !empty($monthnum) && !empty($year) ) {
+	if ( ! empty($monthnum) && ! empty($year)) {
 		$my_year = $year;
 		$my_month = $wp_locale->get_month($monthnum);
-	} elseif ( !empty($m) ) {
+	} elseif ( ! empty($m)) {
 		$my_year = substr($m, 0, 4);
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 	}
 
-	if ( empty($my_month) )
+	if (empty($my_month))
 		return false;
 
-	$result = $prefix . $my_month . $prefix . $my_year;
+	$result = $prefix.$my_month.$prefix.$my_year;
 
-	if ( !$display )
+	if ( ! $display)
 		return $result;
 	echo $result;
 }
@@ -1436,11 +1436,11 @@ 
  * @param string $before Optional. Content to prepend to the title. Default empty.
  * @param string $after  Optional. Content to append to the title. Default empty.
  */
-function the_archive_title( $before = '', $after = '' ) {
+function the_archive_title($before = '', $after = '') {
 	$title = get_the_archive_title();
 
-	if ( ! empty( $title ) ) {
-		echo $before . $title . $after;
+	if ( ! empty($title)) {
+		echo $before.$title.$after;
 	}
 }
 
@@ -1452,46 +1452,46 @@ 
  * @return string Archive title.
  */
 function get_the_archive_title() {
-	if ( is_category() ) {
-		$title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
-	} elseif ( is_tag() ) {
-		$title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
-	} elseif ( is_author() ) {
-		$title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
-	} elseif ( is_year() ) {
-		$title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
-	} elseif ( is_month() ) {
-		$title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
-	} elseif ( is_day() ) {
-		$title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
-	} elseif ( is_tax( 'post_format' ) ) {
-		if ( is_tax( 'post_format', 'post-format-aside' ) ) {
-			$title = _x( 'Asides', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) {
-			$title = _x( 'Galleries', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-image' ) ) {
-			$title = _x( 'Images', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-video' ) ) {
-			$title = _x( 'Videos', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-quote' ) ) {
-			$title = _x( 'Quotes', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-link' ) ) {
-			$title = _x( 'Links', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-status' ) ) {
-			$title = _x( 'Statuses', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-audio' ) ) {
-			$title = _x( 'Audio', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
-			$title = _x( 'Chats', 'post format archive title' );
+	if (is_category()) {
+		$title = sprintf(__('Category: %s'), single_cat_title('', false));
+	} elseif (is_tag()) {
+		$title = sprintf(__('Tag: %s'), single_tag_title('', false));
+	} elseif (is_author()) {
+		$title = sprintf(__('Author: %s'), '<span class="vcard">'.get_the_author().'</span>');
+	} elseif (is_year()) {
+		$title = sprintf(__('Year: %s'), get_the_date(_x('Y', 'yearly archives date format')));
+	} elseif (is_month()) {
+		$title = sprintf(__('Month: %s'), get_the_date(_x('F Y', 'monthly archives date format')));
+	} elseif (is_day()) {
+		$title = sprintf(__('Day: %s'), get_the_date(_x('F j, Y', 'daily archives date format')));
+	} elseif (is_tax('post_format')) {
+		if (is_tax('post_format', 'post-format-aside')) {
+			$title = _x('Asides', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-gallery')) {
+			$title = _x('Galleries', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-image')) {
+			$title = _x('Images', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-video')) {
+			$title = _x('Videos', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-quote')) {
+			$title = _x('Quotes', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-link')) {
+			$title = _x('Links', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-status')) {
+			$title = _x('Statuses', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-audio')) {
+			$title = _x('Audio', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-chat')) {
+			$title = _x('Chats', 'post format archive title');
 		}
-	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
-	} elseif ( is_tax() ) {
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf(__('Archives: %s'), post_type_archive_title('', false));
+	} elseif (is_tax()) {
+		$tax = get_taxonomy(get_queried_object()->taxonomy);
 		/* translators: 1: Taxonomy singular name, 2: Current taxonomy term */
-		$title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
+		$title = sprintf(__('%1$s: %2$s'), $tax->labels->singular_name, single_term_title('', false));
 	} else {
-		$title = __( 'Archives' );
+		$title = __('Archives');
 	}
 
 	/**
@@ -1501,7 +1501,7 @@ 
 	 *
 	 * @param string $title Archive title to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_title', $title );
+	return apply_filters('get_the_archive_title', $title);
 }
 
 /**
@@ -1514,10 +1514,10 @@ 
  * @param string $before Optional. Content to prepend to the description. Default empty.
  * @param string $after  Optional. Content to append to the description. Default empty.
  */
-function the_archive_description( $before = '', $after = '' ) {
+function the_archive_description($before = '', $after = '') {
 	$description = get_the_archive_description();
-	if ( $description ) {
-		echo $before . $description . $after;
+	if ($description) {
+		echo $before.$description.$after;
 	}
 }
 
@@ -1538,7 +1538,7 @@ 
 	 *
 	 * @param string $description Archive description to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_description', term_description() );
+	return apply_filters('get_the_archive_description', term_description());
 }
 
 /**
@@ -1579,7 +1579,7 @@ 
 	$url = esc_url($url);
 
 	if ('link' == $format)
-		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
+		$link_html = "\t<link rel='archives' title='".esc_attr($text)."' href='$url' />\n";
 	elseif ('option' == $format)
 		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
 	elseif ('html' == $format)
@@ -1600,7 +1600,7 @@ 
 	 * @param string $before    Content to prepend to the description.
 	 * @param string $after     Content to append to the description.
 	 */
-	return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after );
+	return apply_filters('get_archives_link', $link_html, $url, $text, $format, $before, $after);
 }
 
 /**
@@ -1638,7 +1638,7 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_get_archives( $args = '' ) {
+function wp_get_archives($args = '') {
 	global $wpdb, $wp_locale;
 
 	$defaults = array(
@@ -1649,32 +1649,32 @@ 
 		'post_type' => 'post'
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$post_type_object = get_post_type_object( $r['post_type'] );
-	if ( ! is_post_type_viewable( $post_type_object ) ) {
+	$post_type_object = get_post_type_object($r['post_type']);
+	if ( ! is_post_type_viewable($post_type_object)) {
 		return;
 	}
 	$r['post_type'] = $post_type_object->name;
 
-	if ( '' == $r['type'] ) {
+	if ('' == $r['type']) {
 		$r['type'] = 'monthly';
 	}
 
-	if ( ! empty( $r['limit'] ) ) {
-		$r['limit'] = absint( $r['limit'] );
-		$r['limit'] = ' LIMIT ' . $r['limit'];
+	if ( ! empty($r['limit'])) {
+		$r['limit'] = absint($r['limit']);
+		$r['limit'] = ' LIMIT '.$r['limit'];
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( $order !== 'ASC' ) {
+	$order = strtoupper($r['order']);
+	if ($order !== 'ASC') {
 		$order = 'DESC';
 	}
 
 	// this is what will separate dates on weekly archive links
 	$archive_week_separator = '&#8211;';
 
-	$sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
+	$sql_where = $wpdb->prepare("WHERE post_type = %s AND post_status = 'publish'", $r['post_type']);
 
 	/**
 	 * Filters the SQL WHERE clause for retrieving archives.
@@ -1684,7 +1684,7 @@ 
 	 * @param string $sql_where Portion of SQL query containing the WHERE clause.
 	 * @param array  $r         An array of default arguments.
 	 */
-	$where = apply_filters( 'getarchives_where', $sql_where, $r );
+	$where = apply_filters('getarchives_where', $sql_where, $r);
 
 	/**
 	 * Filters the SQL JOIN clause for retrieving archives.
@@ -1694,142 +1694,142 @@ 
 	 * @param string $sql_join Portion of SQL query containing JOIN clause.
 	 * @param array  $r        An array of default arguments.
 	 */
-	$join = apply_filters( 'getarchives_join', '', $r );
+	$join = apply_filters('getarchives_join', '', $r);
 
 	$output = '';
 
-	$last_changed = wp_cache_get( 'last_changed', 'posts' );
-	if ( ! $last_changed ) {
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $last_changed, 'posts');
 	}
 
 	$limit = $r['limit'];
 
-	if ( 'monthly' == $r['type'] ) {
+	if ('monthly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url = get_month_link( $result->year, $result->month );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url = get_month_link($result->year, $result->month);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
 				/* translators: 1: month name, 2: 4-digit year */
-				$text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'yearly' == $r['type'] ) {
+	} elseif ('yearly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result) {
-				$url = get_year_link( $result->year );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url = get_year_link($result->year);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
-				$text = sprintf( '%d', $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$text = sprintf('%d', $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'daily' == $r['type'] ) {
+	} elseif ('daily' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url  = get_day_link( $result->year, $result->month, $result->dayofmonth );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url  = get_day_link($result->year, $result->month, $result->dayofmonth);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
-				$date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
-				$text = mysql2date( get_option( 'date_format' ), $date );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
+				$text = mysql2date(get_option('date_format'), $date);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'weekly' == $r['type'] ) {
-		$week = _wp_mysql_week( '`post_date`' );
+	} elseif ('weekly' == $r['type']) {
+		$week = _wp_mysql_week('`post_date`');
 		$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
 		$arc_w_last = '';
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				if ( $result->week != $arc_w_last ) {
+			foreach ((array) $results as $result) {
+				if ($result->week != $arc_w_last) {
 					$arc_year       = $result->yr;
 					$arc_w_last     = $result->week;
-					$arc_week       = get_weekstartend( $result->yyyymmdd, get_option( 'start_of_week' ) );
-					$arc_week_start = date_i18n( get_option( 'date_format' ), $arc_week['start'] );
-					$arc_week_end   = date_i18n( get_option( 'date_format' ), $arc_week['end'] );
-					$url            = add_query_arg( array( 'm' => $arc_year, 'w' => $result->week, ), home_url( '/' ) );
-					if ( 'post' !== $r['post_type'] ) {
-						$url = add_query_arg( 'post_type', $r['post_type'], $url );
+					$arc_week       = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
+					$arc_week_start = date_i18n(get_option('date_format'), $arc_week['start']);
+					$arc_week_end   = date_i18n(get_option('date_format'), $arc_week['end']);
+					$url            = add_query_arg(array('m' => $arc_year, 'w' => $result->week,), home_url('/'));
+					if ('post' !== $r['post_type']) {
+						$url = add_query_arg('post_type', $r['post_type'], $url);
 					}
-					$text           = $arc_week_start . $archive_week_separator . $arc_week_end;
-					if ( $r['show_post_count'] ) {
-						$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+					$text = $arc_week_start.$archive_week_separator.$arc_week_end;
+					if ($r['show_post_count']) {
+						$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
-	} elseif ( ( 'postbypost' == $r['type'] ) || ('alpha' == $r['type'] ) ) {
-		$orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
+	} elseif (('postbypost' == $r['type']) || ('alpha' == $r['type'])) {
+		$orderby = ('alpha' == $r['type']) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
 		$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
-			foreach ( (array) $results as $result ) {
-				if ( $result->post_date != '0000-00-00 00:00:00' ) {
-					$url = get_permalink( $result );
-					if ( $result->post_title ) {
+		if ($results) {
+			foreach ((array) $results as $result) {
+				if ($result->post_date != '0000-00-00 00:00:00') {
+					$url = get_permalink($result);
+					if ($result->post_title) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$text = strip_tags( apply_filters( 'the_title', $result->post_title, $result->ID ) );
+						$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
 					} else {
 						$text = $result->ID;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
 	}
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -1846,7 +1846,7 @@ 
  */
 function calendar_week_mod($num) {
 	$base = 7;
-	return ($num - $base*floor($num/$base));
+	return ($num - $base * floor($num / $base));
 }
 
 /**
@@ -1868,17 +1868,17 @@ 
  * @param bool $echo    Optional, default is true. Set to false for return.
  * @return string|void String when retrieving.
  */
-function get_calendar( $initial = true, $echo = true ) {
+function get_calendar($initial = true, $echo = true) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
-	$key = md5( $m . $monthnum . $year );
-	$cache = wp_cache_get( 'get_calendar', 'calendar' );
+	$key = md5($m.$monthnum.$year);
+	$cache = wp_cache_get('get_calendar', 'calendar');
 
-	if ( $cache && is_array( $cache ) && isset( $cache[ $key ] ) ) {
+	if ($cache && is_array($cache) && isset($cache[$key])) {
 		/** This filter is documented in wp-includes/general-template.php */
-		$output = apply_filters( 'get_calendar', $cache[ $key ] );
+		$output = apply_filters('get_calendar', $cache[$key]);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output;
 			return;
 		}
@@ -1886,51 +1886,51 @@ 
 		return $output;
 	}
 
-	if ( ! is_array( $cache ) ) {
+	if ( ! is_array($cache)) {
 		$cache = array();
 	}
 
 	// Quick check. If we have no posts at all, abort!
-	if ( ! $posts ) {
+	if ( ! $posts) {
 		$gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
-		if ( ! $gotsome ) {
-			$cache[ $key ] = '';
-			wp_cache_set( 'get_calendar', $cache, 'calendar' );
+		if ( ! $gotsome) {
+			$cache[$key] = '';
+			wp_cache_set('get_calendar', $cache, 'calendar');
 			return;
 		}
 	}
 
-	if ( isset( $_GET['w'] ) ) {
+	if (isset($_GET['w'])) {
 		$w = (int) $_GET['w'];
 	}
 	// week_begins = 0 stands for Sunday
-	$week_begins = (int) get_option( 'start_of_week' );
-	$ts = current_time( 'timestamp' );
+	$week_begins = (int) get_option('start_of_week');
+	$ts = current_time('timestamp');
 
 	// Let's figure out when we are
-	if ( ! empty( $monthnum ) && ! empty( $year ) ) {
-		$thismonth = zeroise( intval( $monthnum ), 2 );
+	if ( ! empty($monthnum) && ! empty($year)) {
+		$thismonth = zeroise(intval($monthnum), 2);
 		$thisyear = (int) $year;
-	} elseif ( ! empty( $w ) ) {
+	} elseif ( ! empty($w)) {
 		// We need to get the month from MySQL
-		$thisyear = (int) substr( $m, 0, 4 );
+		$thisyear = (int) substr($m, 0, 4);
 		//it seems MySQL's weeks disagree with PHP's
-		$d = ( ( $w - 1 ) * 7 ) + 6;
+		$d = (($w - 1) * 7) + 6;
 		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
-	} elseif ( ! empty( $m ) ) {
-		$thisyear = (int) substr( $m, 0, 4 );
-		if ( strlen( $m ) < 6 ) {
+	} elseif ( ! empty($m)) {
+		$thisyear = (int) substr($m, 0, 4);
+		if (strlen($m) < 6) {
 			$thismonth = '01';
 		} else {
-			$thismonth = zeroise( (int) substr( $m, 4, 2 ), 2 );
+			$thismonth = zeroise((int) substr($m, 4, 2), 2);
 		}
 	} else {
-		$thisyear = gmdate( 'Y', $ts );
-		$thismonth = gmdate( 'm', $ts );
+		$thisyear = gmdate('Y', $ts);
+		$thismonth = gmdate('m', $ts);
 	}
 
-	$unixmonth = mktime( 0, 0 , 0, $thismonth, 1, $thisyear );
-	$last_day = date( 't', $unixmonth );
+	$unixmonth = mktime(0, 0, 0, $thismonth, 1, $thisyear);
+	$last_day = date('t', $unixmonth);
 
 	// Get the next and previous month and year with at least one post
 	$previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
@@ -1951,21 +1951,21 @@ 
 	$calendar_output = '<table id="wp-calendar">
 	<caption>' . sprintf(
 		$calendar_caption,
-		$wp_locale->get_month( $thismonth ),
-		date( 'Y', $unixmonth )
-	) . '</caption>
+		$wp_locale->get_month($thismonth),
+		date('Y', $unixmonth)
+	).'</caption>
 	<thead>
 	<tr>';
 
 	$myweek = array();
 
-	for ( $wdcount = 0; $wdcount <= 6; $wdcount++ ) {
-		$myweek[] = $wp_locale->get_weekday( ( $wdcount + $week_begins ) % 7 );
+	for ($wdcount = 0; $wdcount <= 6; $wdcount++) {
+		$myweek[] = $wp_locale->get_weekday(($wdcount + $week_begins) % 7);
 	}
 
-	foreach ( $myweek as $wd ) {
-		$day_name = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
-		$wd = esc_attr( $wd );
+	foreach ($myweek as $wd) {
+		$day_name = $initial ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
+		$wd = esc_attr($wd);
 		$calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
 	}
 
@@ -1976,9 +1976,9 @@ 
 	<tfoot>
 	<tr>';
 
-	if ( $previous ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
-			$wp_locale->get_month_abbrev( $wp_locale->get_month( $previous->month ) ) .
+	if ($previous) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="'.get_month_link($previous->year, $previous->month).'">&laquo; '.
+			$wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)).
 		'</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
@@ -1986,9 +1986,9 @@ 
 
 	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
 
-	if ( $next ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
-			$wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) .
+	if ($next) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="'.get_month_link($next->year, $next->month).'">'.
+			$wp_locale->get_month_abbrev($wp_locale->get_month($next->month)).
 		' &raquo;</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
@@ -2008,43 +2008,43 @@ 
 		FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
 		AND post_type = 'post' AND post_status = 'publish'
 		AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
-	if ( $dayswithposts ) {
-		foreach ( (array) $dayswithposts as $daywith ) {
+	if ($dayswithposts) {
+		foreach ((array) $dayswithposts as $daywith) {
 			$daywithpost[] = $daywith[0];
 		}
 	}
 
 	// See how much we should pad in the beginning
-	$pad = calendar_week_mod( date( 'w', $unixmonth ) - $week_begins );
-	if ( 0 != $pad ) {
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr( $pad ) .'" class="pad">&nbsp;</td>';
+	$pad = calendar_week_mod(date('w', $unixmonth) - $week_begins);
+	if (0 != $pad) {
+		$calendar_output .= "\n\t\t".'<td colspan="'.esc_attr($pad).'" class="pad">&nbsp;</td>';
 	}
 
 	$newrow = false;
-	$daysinmonth = (int) date( 't', $unixmonth );
+	$daysinmonth = (int) date('t', $unixmonth);
 
-	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
-		if ( isset($newrow) && $newrow ) {
+	for ($day = 1; $day <= $daysinmonth; ++$day) {
+		if (isset($newrow) && $newrow) {
 			$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
 		}
 		$newrow = false;
 
-		if ( $day == gmdate( 'j', $ts ) &&
-			$thismonth == gmdate( 'm', $ts ) &&
-			$thisyear == gmdate( 'Y', $ts ) ) {
+		if ($day == gmdate('j', $ts) &&
+			$thismonth == gmdate('m', $ts) &&
+			$thisyear == gmdate('Y', $ts)) {
 			$calendar_output .= '<td id="today">';
 		} else {
 			$calendar_output .= '<td>';
 		}
 
-		if ( in_array( $day, $daywithpost ) ) {
+		if (in_array($day, $daywithpost)) {
 			// any posts today?
-			$date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
-			$label = sprintf( __( 'Posts published on %s' ), $date_format );
+			$date_format = date(_x('F j, Y', 'daily archives date format'), strtotime("{$thisyear}-{$thismonth}-{$day}"));
+			$label = sprintf(__('Posts published on %s'), $date_format);
 			$calendar_output .= sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_day_link( $thisyear, $thismonth, $day ),
-				esc_attr( $label ),
+				get_day_link($thisyear, $thismonth, $day),
+				esc_attr($label),
 				$day
 			);
 		} else {
@@ -2052,21 +2052,21 @@ 
 		}
 		$calendar_output .= '</td>';
 
-		if ( 6 == calendar_week_mod( date( 'w', mktime(0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
+		if (6 == calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins)) {
 			$newrow = true;
 		}
 	}
 
-	$pad = 7 - calendar_week_mod( date( 'w', mktime( 0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins );
-	if ( $pad != 0 && $pad != 7 ) {
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr( $pad ) .'">&nbsp;</td>';
+	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins);
+	if ($pad != 0 && $pad != 7) {
+		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'.esc_attr($pad).'">&nbsp;</td>';
 	}
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
-	$cache[ $key ] = $calendar_output;
-	wp_cache_set( 'get_calendar', $cache, 'calendar' );
+	$cache[$key] = $calendar_output;
+	wp_cache_set('get_calendar', $cache, 'calendar');
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filters the HTML calendar output.
 		 *
@@ -2074,11 +2074,11 @@ 
 		 *
 		 * @param string $calendar_output HTML output of the calendar.
 		 */
-		echo apply_filters( 'get_calendar', $calendar_output );
+		echo apply_filters('get_calendar', $calendar_output);
 		return;
 	}
 	/** This filter is documented in wp-includes/general-template.php */
-	return apply_filters( 'get_calendar', $calendar_output );
+	return apply_filters('get_calendar', $calendar_output);
 }
 
 /**
@@ -2088,7 +2088,7 @@ 
  * @since 2.1.0
  */
 function delete_get_calendar_cache() {
-	wp_cache_delete( 'get_calendar', 'calendar' );
+	wp_cache_delete('get_calendar', 'calendar');
 }
 
 /**
@@ -2106,16 +2106,16 @@ 
 function allowed_tags() {
 	global $allowedtags;
 	$allowed = '';
-	foreach ( (array) $allowedtags as $tag => $attributes ) {
+	foreach ((array) $allowedtags as $tag => $attributes) {
 		$allowed .= '<'.$tag;
-		if ( 0 < count($attributes) ) {
-			foreach ( $attributes as $attribute => $limits ) {
+		if (0 < count($attributes)) {
+			foreach ($attributes as $attribute => $limits) {
 				$allowed .= ' '.$attribute.'=""';
 			}
 		}
 		$allowed .= '> ';
 	}
-	return htmlentities( $allowed );
+	return htmlentities($allowed);
 }
 
 /***** Date/Time tags *****/
@@ -2126,7 +2126,7 @@ 
  * @since 1.0.0
  */
 function the_date_xml() {
-	echo mysql2date( 'Y-m-d', get_post()->post_date, false );
+	echo mysql2date('Y-m-d', get_post()->post_date, false);
 }
 
 /**
@@ -2152,11 +2152,11 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_date( $d = '', $before = '', $after = '', $echo = true ) {
+function the_date($d = '', $before = '', $after = '', $echo = true) {
 	global $currentday, $previousday;
 
-	if ( is_new_day() ) {
-		$the_date = $before . get_the_date( $d ) . $after;
+	if (is_new_day()) {
+		$the_date = $before.get_the_date($d).$after;
 		$previousday = $currentday;
 
 		/**
@@ -2170,9 +2170,9 @@ 
 		 * @param string $before   HTML output before the date.
 		 * @param string $after    HTML output after the date.
 		 */
-		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
+		$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
 
-		if ( $echo )
+		if ($echo)
 			echo $the_date;
 		else
 			return $the_date;
@@ -2191,17 +2191,17 @@ 
  * @param  int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Date the current post was written. False on failure.
  */
-function get_the_date( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_date($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d ) {
-		$the_date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	if ('' == $d) {
+		$the_date = mysql2date(get_option('date_format'), $post->post_date);
 	} else {
-		$the_date = mysql2date( $d, $post->post_date );
+		$the_date = mysql2date($d, $post->post_date);
 	}
 
 	/**
@@ -2214,7 +2214,7 @@ 
 	 *                              if not specified.
 	 * @param int|WP_Post $post     The post object or ID.
 	 */
-	return apply_filters( 'get_the_date', $the_date, $d, $post );
+	return apply_filters('get_the_date', $the_date, $d, $post);
 }
 
 /**
@@ -2228,8 +2228,8 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_modified_date( $d = '', $before = '', $after = '', $echo = true ) {
-	$the_modified_date = $before . get_the_modified_date($d) . $after;
+function the_modified_date($d = '', $before = '', $after = '', $echo = true) {
+	$the_modified_date = $before.get_the_modified_date($d).$after;
 
 	/**
 	 * Filters the date a post was last modified for display.
@@ -2242,9 +2242,9 @@ 
 	 * @param string $before            HTML output before the date.
 	 * @param string $after             HTML output after the date.
 	 */
-	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
+	$the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
 
-	if ( $echo )
+	if ($echo)
 		echo $the_modified_date;
 	else
 		return $the_modified_date;
@@ -2261,16 +2261,16 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Date the current post was modified. False on failure.
  */
-function get_the_modified_date( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_modified_date($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		// For backward compatibility, failures go through the filter below.
 		$the_time = false;
-	} elseif ( empty( $d ) ) {
-		$the_time = get_post_modified_time( get_option( 'date_format' ), false, $post, true );
+	} elseif (empty($d)) {
+		$the_time = get_post_modified_time(get_option('date_format'), false, $post, true);
 	} else {
-		$the_time = get_post_modified_time( $d, false, $post, true );
+		$the_time = get_post_modified_time($d, false, $post, true);
 	}
 
 	/**
@@ -2284,7 +2284,7 @@ 
 	 *                          'date_format' option.
 	 * @param WP_Post $post     WP_Post object.
 	 */
-	return apply_filters( 'get_the_modified_date', $the_time, $d, $post );
+	return apply_filters('get_the_modified_date', $the_time, $d, $post);
 }
 
 /**
@@ -2294,7 +2294,7 @@ 
  *
  * @param string $d Either 'G', 'U', or php date format.
  */
-function the_time( $d = '' ) {
+function the_time($d = '') {
 	/**
 	 * Filters the time a post was written for display.
 	 *
@@ -2304,7 +2304,7 @@ 
 	 * @param string $d            The time format. Accepts 'G', 'U',
 	 *                             or php date format.
 	 */
-	echo apply_filters( 'the_time', get_the_time( $d ), $d );
+	echo apply_filters('the_time', get_the_time($d), $d);
 }
 
 /**
@@ -2318,14 +2318,14 @@ 
  * @param int|WP_Post $post WP_Post object or ID. Default is global $post object.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_the_time( $d = '', $post = null ) {
+function get_the_time($d = '', $post = null) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_time(get_option('time_format'), false, $post, true);
 	else
 		$the_time = get_post_time($d, false, $post, true);
@@ -2341,7 +2341,7 @@ 
 	 *                              in 'time_format' option. Default empty.
 	 * @param int|WP_Post $post     WP_Post object or ID.
 	 */
-	return apply_filters( 'get_the_time', $the_time, $d, $post );
+	return apply_filters('get_the_time', $the_time, $d, $post);
 }
 
 /**
@@ -2356,14 +2356,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_date_gmt;
 	else
 		$time = $post->post_date;
@@ -2380,7 +2380,7 @@ 
 	 *                     Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to retrieve the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_time', $time, $d, $gmt );
+	return apply_filters('get_post_time', $time, $d, $gmt);
 }
 
 /**
@@ -2401,7 +2401,7 @@ 
 	 *                                      or php date format. Defaults to value
 	 *                                      specified in 'time_format' option.
 	 */
-	echo apply_filters( 'the_modified_time', get_the_modified_time($d), $d );
+	echo apply_filters('the_modified_time', get_the_modified_time($d), $d);
 }
 
 /**
@@ -2416,16 +2416,16 @@ 
  * @param int|WP_Post $post  Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Formatted date string or Unix timestamp. False on failure.
  */
-function get_the_modified_time( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_modified_time($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		// For backward compatibility, failures go through the filter below.
 		$the_time = false;
-	} elseif ( empty( $d ) ) {
-		$the_time = get_post_modified_time( get_option( 'time_format' ), false, $post, true );
+	} elseif (empty($d)) {
+		$the_time = get_post_modified_time(get_option('time_format'), false, $post, true);
 	} else {
-		$the_time = get_post_modified_time( $d, false, $post, true );
+		$the_time = get_post_modified_time($d, false, $post, true);
 	}
 
 	/**
@@ -2440,7 +2440,7 @@ 
 	 *                         to value specified in 'time_format' option.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	return apply_filters( 'get_the_modified_time', $the_time, $d, $post );
+	return apply_filters('get_the_modified_time', $the_time, $d, $post);
 }
 
 /**
@@ -2455,14 +2455,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_modified_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_modified_gmt;
 	else
 		$time = $post->post_modified;
@@ -2477,7 +2477,7 @@ 
 	 * @param string $d    The date format. Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to return the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_modified_time', $time, $d, $gmt );
+	return apply_filters('get_post_modified_time', $time, $d, $gmt);
 }
 
 /**
@@ -2489,7 +2489,7 @@ 
  */
 function the_weekday() {
 	global $wp_locale;
-	$the_weekday = $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+	$the_weekday = $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 
 	/**
 	 * Filters the weekday on which the post was written, for display.
@@ -2498,7 +2498,7 @@ 
 	 *
 	 * @param string $the_weekday
 	 */
-	echo apply_filters( 'the_weekday', $the_weekday );
+	echo apply_filters('the_weekday', $the_weekday);
 }
 
 /**
@@ -2516,12 +2516,12 @@ 
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
  */
-function the_weekday_date($before='',$after='') {
+function the_weekday_date($before = '', $after = '') {
 	global $wp_locale, $currentday, $previousweekday;
 	$the_weekday_date = '';
-	if ( $currentday != $previousweekday ) {
+	if ($currentday != $previousweekday) {
 		$the_weekday_date .= $before;
-		$the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+		$the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 		$the_weekday_date .= $after;
 		$previousweekday = $currentday;
 	}
@@ -2535,7 +2535,7 @@ 
 	 * @param string $before           The HTML to output before the date.
 	 * @param string $after            The HTML to output after the date.
 	 */
-	$the_weekday_date = apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
+	$the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
 	echo $the_weekday_date;
 }
 
@@ -2552,7 +2552,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_head' );
+	do_action('wp_head');
 }
 
 /**
@@ -2568,7 +2568,7 @@ 
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'wp_footer' );
+	do_action('wp_footer');
 }
 
 /**
@@ -2578,8 +2578,8 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
+function feed_links($args = array()) {
+	if ( ! current_theme_supports('automatic-feed-links'))
 		return;
 
 	$defaults = array(
@@ -2591,7 +2591,7 @@ 
 		'comstitle'	=> __('%1$s %2$s Comments Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters whether to display the posts feed link.
@@ -2600,8 +2600,8 @@ 
 	 *
 	 * @param bool $show Whether to display the posts feed link. Default true.
 	 */
-	if ( apply_filters( 'feed_links_show_posts_feed', true ) ) {
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['feedtitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link() ) . "\" />\n";
+	if (apply_filters('feed_links_show_posts_feed', true)) {
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['feedtitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link())."\" />\n";
 	}
 
 	/**
@@ -2611,8 +2611,8 @@ 
 	 *
 	 * @param bool $show Whether to display the comments feed link. Default true.
 	 */
-	if ( apply_filters( 'feed_links_show_comments_feed', true ) ) {
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['comstitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link( 'comments_' . get_default_feed() ) ) . "\" />\n";
+	if (apply_filters('feed_links_show_comments_feed', true)) {
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['comstitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link('comments_'.get_default_feed()))."\" />\n";
 	}
 }
 
@@ -2623,7 +2623,7 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links_extra( $args = array() ) {
+function feed_links_extra($args = array()) {
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
 		'separator'   => _x('&raquo;', 'feed link'),
@@ -2643,60 +2643,60 @@ 
 		'posttypetitle' => __('%1$s %2$s %3$s Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 		$id = 0;
-		$post = get_post( $id );
+		$post = get_post($id);
 
-		if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
-			$title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute( array( 'echo' => false ) ) );
-			$href = get_post_comments_feed_link( $post->ID );
+		if (comments_open() || pings_open() || $post->comment_count > 0) {
+			$title = sprintf($args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute(array('echo' => false)));
+			$href = get_post_comments_feed_link($post->ID);
 		}
-	} elseif ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-
-		$post_type_obj = get_post_type_object( $post_type );
-		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
-		$href = get_post_type_archive_feed_link( $post_type_obj->name );
-	} elseif ( is_category() ) {
+	} elseif (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+
+		$post_type_obj = get_post_type_object($post_type);
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], $post_type_obj->labels->name);
+		$href = get_post_type_archive_feed_link($post_type_obj->name);
+	} elseif (is_category()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_category_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_category_feed_link($term->term_id);
 		}
-	} elseif ( is_tag() ) {
+	} elseif (is_tag()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_tag_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_tag_feed_link($term->term_id);
 		}
-	} elseif ( is_tax() ) {
+	} elseif (is_tax()) {
  		$term = get_queried_object();
- 		$tax = get_taxonomy( $term->taxonomy );
- 		$title = sprintf( $args['taxtitle'], get_bloginfo('name'), $args['separator'], $term->name, $tax->labels->singular_name );
- 		$href = get_term_feed_link( $term->term_id, $term->taxonomy );
-	} elseif ( is_author() ) {
-		$author_id = intval( get_query_var('author') );
-
-		$title = sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
-		$href = get_author_feed_link( $author_id );
-	} elseif ( is_search() ) {
-		$title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
+ 		$tax = get_taxonomy($term->taxonomy);
+ 		$title = sprintf($args['taxtitle'], get_bloginfo('name'), $args['separator'], $term->name, $tax->labels->singular_name);
+ 		$href = get_term_feed_link($term->term_id, $term->taxonomy);
+	} elseif (is_author()) {
+		$author_id = intval(get_query_var('author'));
+
+		$title = sprintf($args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta('display_name', $author_id));
+		$href = get_author_feed_link($author_id);
+	} elseif (is_search()) {
+		$title = sprintf($args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query(false));
 		$href = get_search_feed_link();
-	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title('', false));
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
-			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		if ($post_type_obj)
+			$href = get_post_type_archive_feed_link($post_type_obj->name);
 	}
 
-	if ( isset($title) && isset($href) )
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	if (isset($title) && isset($href))
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr($title).'" href="'.esc_url($href).'" />'."\n";
 }
 
 /**
@@ -2706,7 +2706,7 @@ 
  * @since 2.0.0
  */
 function rsd_link() {
-	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . esc_url( site_url( 'xmlrpc.php?rsd', 'rpc' ) ) . '" />' . "\n";
+	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.esc_url(site_url('xmlrpc.php?rsd', 'rpc')).'" />'."\n";
 }
 
 /**
@@ -2717,7 +2717,7 @@ 
  */
 function wlwmanifest_link() {
 	echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="',
-		includes_url( 'wlwmanifest.xml' ), '" /> ', "\n";
+		includes_url('wlwmanifest.xml'), '" /> ', "\n";
 }
 
 /**
@@ -2737,7 +2737,7 @@ 
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
+	if ('0' == get_option('blog_public'))
 		wp_no_robots();
 }
 
@@ -2761,15 +2761,15 @@ 
  * @link https://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon HTML5 specification link icon.
  */
 function wp_site_icon() {
-	if ( ! has_site_icon() && ! is_customize_preview() ) {
+	if ( ! has_site_icon() && ! is_customize_preview()) {
 		return;
 	}
 
 	$meta_tags = array(
-		sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
-		sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
-		sprintf( '<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url( get_site_icon_url( 180 ) ) ),
-		sprintf( '<meta name="msapplication-TileImage" content="%s" />', esc_url( get_site_icon_url( 270 ) ) ),
+		sprintf('<link rel="icon" href="%s" sizes="32x32" />', esc_url(get_site_icon_url(32))),
+		sprintf('<link rel="icon" href="%s" sizes="192x192" />', esc_url(get_site_icon_url(192))),
+		sprintf('<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url(get_site_icon_url(180))),
+		sprintf('<meta name="msapplication-TileImage" content="%s" />', esc_url(get_site_icon_url(270))),
 	);
 
 	/**
@@ -2779,10 +2779,10 @@ 
 	 *
 	 * @param array $meta_tags Site Icon meta elements.
 	 */
-	$meta_tags = apply_filters( 'site_icon_meta_tags', $meta_tags );
-	$meta_tags = array_filter( $meta_tags );
+	$meta_tags = apply_filters('site_icon_meta_tags', $meta_tags);
+	$meta_tags = array_filter($meta_tags);
 
-	foreach ( $meta_tags as $meta_tag ) {
+	foreach ($meta_tags as $meta_tag) {
 		echo "$meta_tag\n";
 	}
 }
@@ -2812,9 +2812,9 @@ 
 	 * The path is removed in the foreach loop below.
 	 */
 	/** This filter is documented in wp-includes/formatting.php */
-	$hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/' );
+	$hints['dns-prefetch'][] = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/');
 
-	foreach ( $hints as $relation_type => $urls ) {
+	foreach ($hints as $relation_type => $urls) {
 		/**
 		 * Filters domains and URLs for resource hints of relation type.
 		 *
@@ -2823,38 +2823,38 @@ 
 		 * @param array  $urls          URLs to print for resource hints.
 		 * @param string $relation_type The relation type the URLs are printed for, e.g. 'preconnect' or 'prerender'.
 		 */
-		$urls = apply_filters( 'wp_resource_hints', $urls, $relation_type );
+		$urls = apply_filters('wp_resource_hints', $urls, $relation_type);
 
-		foreach ( $urls as $key => $url ) {
-			$url = esc_url( $url, array( 'http', 'https' ) );
-			if ( ! $url ) {
-				unset( $urls[ $key ] );
+		foreach ($urls as $key => $url) {
+			$url = esc_url($url, array('http', 'https'));
+			if ( ! $url) {
+				unset($urls[$key]);
 				continue;
 			}
 
-			if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
-				$parsed = wp_parse_url( $url );
-				if ( empty( $parsed['host'] ) ) {
-					unset( $urls[ $key ] );
+			if (in_array($relation_type, array('preconnect', 'dns-prefetch'))) {
+				$parsed = wp_parse_url($url);
+				if (empty($parsed['host'])) {
+					unset($urls[$key]);
 					continue;
 				}
 
-				if ( 'dns-prefetch' === $relation_type ) {
-					$url = '//' . $parsed['host'];
-				} else if ( ! empty( $parsed['scheme'] ) ) {
-					$url = $parsed['scheme'] . '://' . $parsed['host'];
+				if ('dns-prefetch' === $relation_type) {
+					$url = '//'.$parsed['host'];
+				} else if ( ! empty($parsed['scheme'])) {
+					$url = $parsed['scheme'].'://'.$parsed['host'];
 				} else {
 					$url = $parsed['host'];
 				}
 			}
 
-			$urls[ $key ] = $url;
+			$urls[$key] = $url;
 		}
 
-		$urls = array_unique( $urls );
+		$urls = array_unique($urls);
 
-		foreach ( $urls as $url ) {
-			printf( "<link rel='%s' href='%s'>\n", $relation_type, $url );
+		foreach ($urls as $url) {
+			printf("<link rel='%s' href='%s'>\n", $relation_type, $url);
 		}
 	}
 }
@@ -2871,18 +2871,18 @@ 
 
 	$unique_hosts = array();
 
-	foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
-		if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
-			foreach ( $dependencies->queue as $handle ) {
-				if ( ! isset( $dependencies->registered[ $handle ] ) ) {
+	foreach (array($wp_scripts, $wp_styles) as $dependencies) {
+		if ($dependencies instanceof WP_Dependencies && ! empty($dependencies->queue)) {
+			foreach ($dependencies->queue as $handle) {
+				if ( ! isset($dependencies->registered[$handle])) {
 					continue;
 				}
 
 				/* @var _WP_Dependency $dependency */
-				$dependency = $dependencies->registered[ $handle ];
-				$parsed     = wp_parse_url( $dependency->src );
+				$dependency = $dependencies->registered[$handle];
+				$parsed     = wp_parse_url($dependency->src);
 
-				if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
+				if ( ! empty($parsed['host']) && ! in_array($parsed['host'], $unique_hosts) && $parsed['host'] !== $_SERVER['SERVER_NAME']) {
 					$unique_hosts[] = $parsed['host'];
 				}
 			}
@@ -2912,13 +2912,13 @@ 
 function user_can_richedit() {
 	global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE, $is_edge;
 
-	if ( !isset($wp_rich_edit) ) {
+	if ( ! isset($wp_rich_edit)) {
 		$wp_rich_edit = false;
 
-		if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
-			if ( $is_safari ) {
-				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
-			} elseif ( $is_gecko || $is_chrome || $is_IE || $is_edge || ( $is_opera && !wp_is_mobile() ) ) {
+		if (get_user_option('rich_editing') == 'true' || ! is_user_logged_in()) { // default to 'true' for logged out users
+			if ($is_safari) {
+				$wp_rich_edit = ! wp_is_mobile() || (preg_match('!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match) && intval($match[1]) >= 534);
+			} elseif ($is_gecko || $is_chrome || $is_IE || $is_edge || ($is_opera && ! wp_is_mobile())) {
 				$wp_rich_edit = true;
 			}
 		}
@@ -2931,7 +2931,7 @@ 
 	 *
 	 * @param bool $wp_rich_edit Whether the user can access to the rich (Visual) editor.
 	 */
-	return apply_filters( 'user_can_richedit', $wp_rich_edit );
+	return apply_filters('user_can_richedit', $wp_rich_edit);
 }
 
 /**
@@ -2946,9 +2946,9 @@ 
  */
 function wp_default_editor() {
 	$r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
-	if ( wp_get_current_user() ) { // look for cookie
+	if (wp_get_current_user()) { // look for cookie
 		$ed = get_user_setting('editor', 'tinymce');
-		$r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
+		$r = (in_array($ed, array('tinymce', 'html', 'test'))) ? $ed : $r;
 	}
 
 	/**
@@ -2958,7 +2958,7 @@ 
 	 *
 	 * @param array $r An array of editors. Accepts 'tinymce', 'html', 'test'.
 	 */
-	return apply_filters( 'wp_default_editor', $r );
+	return apply_filters('wp_default_editor', $r);
 }
 
 /**
@@ -2980,9 +2980,9 @@ 
  * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE. Can only be /[a-z]+/.
  * @param array  $settings  See _WP_Editors::editor().
  */
-function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require( ABSPATH . WPINC . '/class-wp-editor.php' );
+function wp_editor($content, $editor_id, $settings = array()) {
+	if ( ! class_exists('_WP_Editors', false))
+		require(ABSPATH.WPINC.'/class-wp-editor.php');
 
 	_WP_Editors::editor($content, $editor_id, $settings);
 }
@@ -2999,7 +2999,7 @@ 
  * 	                    Only use when you are later escaping it. Do not use unescaped.
  * @return string
  */
-function get_search_query( $escaped = true ) {
+function get_search_query($escaped = true) {
 	/**
 	 * Filters the contents of the search query variable.
 	 *
@@ -3007,10 +3007,10 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
+	$query = apply_filters('get_search_query', get_query_var('s'));
 
-	if ( $escaped )
-		$query = esc_attr( $query );
+	if ($escaped)
+		$query = esc_attr($query);
 	return $query;
 }
 
@@ -3030,7 +3030,7 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	echo esc_attr( apply_filters( 'the_search_query', get_search_query( false ) ) );
+	echo esc_attr(apply_filters('the_search_query', get_search_query(false)));
 }
 
 /**
@@ -3043,17 +3043,17 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function get_language_attributes( $doctype = 'html' ) {
+function get_language_attributes($doctype = 'html') {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
+	if (function_exists('is_rtl') && is_rtl())
 		$attributes[] = 'dir="rtl"';
 
-	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
+	if ($lang = get_bloginfo('language')) {
+		if (get_option('html_type') == 'text/html' || $doctype == 'html')
 			$attributes[] = "lang=\"$lang\"";
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
+		if (get_option('html_type') != 'text/html' || $doctype == 'xhtml')
 			$attributes[] = "xml:lang=\"$lang\"";
 	}
 
@@ -3068,7 +3068,7 @@ 
 	 * @param string $output A space-separated list of language attributes.
 	 * @param string $doctype The type of html document (xhtml|html).
 	 */
-	return apply_filters( 'language_attributes', $output, $doctype );
+	return apply_filters('language_attributes', $output, $doctype);
 }
 
 /**
@@ -3082,8 +3082,8 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function language_attributes( $doctype = 'html' ) {
-	echo get_language_attributes( $doctype );
+function language_attributes($doctype = 'html') {
+	echo get_language_attributes($doctype);
 }
 
 /**
@@ -3161,23 +3161,23 @@ 
  * }
  * @return array|string|void String of page links or array of page links.
  */
-function paginate_links( $args = '' ) {
+function paginate_links($args = '') {
 	global $wp_query, $wp_rewrite;
 
 	// Setting up default values based on the current URL.
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
-	$url_parts    = explode( '?', $pagenum_link );
+	$pagenum_link = html_entity_decode(get_pagenum_link());
+	$url_parts    = explode('?', $pagenum_link);
 
 	// Get max pages and current page out of the current query, if available.
-	$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-	$current = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+	$total   = isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1;
+	$current = get_query_var('paged') ? intval(get_query_var('paged')) : 1;
 
 	// Append the format placeholder to the base URL.
-	$pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
+	$pagenum_link = trailingslashit($url_parts[0]).'%_%';
 
 	// URL base depends on permalink settings.
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+	$format  = $wp_rewrite->using_index_permalinks() && ! strpos($pagenum_link, 'index.php') ? 'index.php/' : '';
+	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit($wp_rewrite->pagination_base.'/%#%', 'paged') : '?paged=%#%';
 
 	$defaults = array(
 		'base' => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
@@ -3197,42 +3197,42 @@ 
 		'after_page_number' => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! is_array( $args['add_args'] ) ) {
+	if ( ! is_array($args['add_args'])) {
 		$args['add_args'] = array();
 	}
 
 	// Merge additional query vars found in the original URL into 'add_args' array.
-	if ( isset( $url_parts[1] ) ) {
+	if (isset($url_parts[1])) {
 		// Find the format argument.
-		$format = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
-		$format_query = isset( $format[1] ) ? $format[1] : '';
-		wp_parse_str( $format_query, $format_args );
+		$format = explode('?', str_replace('%_%', $args['format'], $args['base']));
+		$format_query = isset($format[1]) ? $format[1] : '';
+		wp_parse_str($format_query, $format_args);
 
 		// Find the query args of the requested URL.
-		wp_parse_str( $url_parts[1], $url_query_args );
+		wp_parse_str($url_parts[1], $url_query_args);
 
 		// Remove the format argument from the array of query arguments, to avoid overwriting custom format.
-		foreach ( $format_args as $format_arg => $format_arg_value ) {
-			unset( $url_query_args[ $format_arg ] );
+		foreach ($format_args as $format_arg => $format_arg_value) {
+			unset($url_query_args[$format_arg]);
 		}
 
-		$args['add_args'] = array_merge( $args['add_args'], urlencode_deep( $url_query_args ) );
+		$args['add_args'] = array_merge($args['add_args'], urlencode_deep($url_query_args));
 	}
 
 	// Who knows what else people pass in $args
 	$total = (int) $args['total'];
-	if ( $total < 2 ) {
+	if ($total < 2) {
 		return;
 	}
 	$current  = (int) $args['current'];
 	$end_size = (int) $args['end_size']; // Out of bounds?  Make it the default.
-	if ( $end_size < 1 ) {
+	if ($end_size < 1) {
 		$end_size = 1;
 	}
 	$mid_size = (int) $args['mid_size'];
-	if ( $mid_size < 0 ) {
+	if ($mid_size < 0) {
 		$mid_size = 2;
 	}
 	$add_args = $args['add_args'];
@@ -3240,11 +3240,11 @@ 
 	$page_links = array();
 	$dots = false;
 
-	if ( $args['prev_next'] && $current && 1 < $current ) :
-		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && 1 < $current) :
+		$link = str_replace('%_%', 2 == $current ? '' : $args['format'], $args['base']);
+		$link = str_replace('%#%', $current - 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/**
@@ -3254,40 +3254,40 @@ 
 		 *
 		 * @param string $link The paginated link URL.
 		 */
-		$page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
+		$page_links[] = '<a class="prev page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['prev_text'].'</a>';
 	endif;
-	for ( $n = 1; $n <= $total; $n++ ) :
-		if ( $n == $current ) :
-			$page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
+	for ($n = 1; $n <= $total; $n++) :
+		if ($n == $current) :
+			$page_links[] = "<span class='page-numbers current'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</span>";
 			$dots = true;
 		else :
-			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
-					$link = add_query_arg( $add_args, $link );
+			if ($args['show_all'] || ($n <= $end_size || ($current && $n >= $current - $mid_size && $n <= $current + $mid_size) || $n > $total - $end_size)) :
+				$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+				$link = str_replace('%#%', $n, $link);
+				if ($add_args)
+					$link = add_query_arg($add_args, $link);
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
-				$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
+				$page_links[] = "<a class='page-numbers' href='".esc_url(apply_filters('paginate_links', $link))."'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</a>";
 				$dots = true;
-			elseif ( $dots && ! $args['show_all'] ) :
-				$page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
+			elseif ($dots && ! $args['show_all']) :
+				$page_links[] = '<span class="page-numbers dots">'.__('&hellip;').'</span>';
 				$dots = false;
 			endif;
 		endif;
 	endfor;
-	if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
-		$link = str_replace( '%_%', $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && ($current < $total || -1 == $total)) :
+		$link = str_replace('%_%', $args['format'], $args['base']);
+		$link = str_replace('%#%', $current + 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
-		$page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
+		$page_links[] = '<a class="next page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['next_text'].'</a>';
 	endif;
-	switch ( $args['type'] ) {
+	switch ($args['type']) {
 		case 'array' :
 			return $page_links;
 
@@ -3330,10 +3330,10 @@ 
  *     @type string $current SVG icon color of current admin menu link.
  * }
  */
-function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
+function wp_admin_css_color($key, $name, $url, $colors = array(), $icons = array()) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
+	if ( ! isset($_wp_admin_css_colors))
 		$_wp_admin_css_colors = array();
 
 	$_wp_admin_css_colors[$key] = (object) array(
@@ -3355,56 +3355,56 @@ 
 	$suffix = is_rtl() ? '-rtl' : '';
 	$suffix .= SCRIPT_DEBUG ? '' : '.min';
 
-	wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
+	wp_admin_css_color('fresh', _x('Default', 'admin color scheme'),
 		false,
-		array( '#222', '#333', '#0073aa', '#00a0d2' ),
-		array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' )
+		array('#222', '#333', '#0073aa', '#00a0d2'),
+		array('base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff')
 	);
 
 	// Other color schemes are not available when running out of src
-	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
+	if (false !== strpos($GLOBALS['wp_version'], '-src'))
 		return;
 
-	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-		admin_url( "css/colors/light/colors$suffix.css" ),
-		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
-		array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
+	wp_admin_css_color('light', _x('Light', 'admin color scheme'),
+		admin_url("css/colors/light/colors$suffix.css"),
+		array('#e5e5e5', '#999', '#d64e07', '#04a4cc'),
+		array('base' => '#999', 'focus' => '#ccc', 'current' => '#ccc')
 	);
 
-	wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
-		admin_url( "css/colors/blue/colors$suffix.css" ),
-		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
-		array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('blue', _x('Blue', 'admin color scheme'),
+		admin_url("css/colors/blue/colors$suffix.css"),
+		array('#096484', '#4796b3', '#52accc', '#74B6CE'),
+		array('base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
-		admin_url( "css/colors/midnight/colors$suffix.css" ),
-		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
-		array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('midnight', _x('Midnight', 'admin color scheme'),
+		admin_url("css/colors/midnight/colors$suffix.css"),
+		array('#25282b', '#363b3f', '#69a8bb', '#e14d43'),
+		array('base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
-		admin_url( "css/colors/sunrise/colors$suffix.css" ),
-		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
-		array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('sunrise', _x('Sunrise', 'admin color scheme'),
+		admin_url("css/colors/sunrise/colors$suffix.css"),
+		array('#b43c38', '#cf4944', '#dd823b', '#ccaf0b'),
+		array('base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
-		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
-		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
-		array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ectoplasm', _x('Ectoplasm', 'admin color scheme'),
+		admin_url("css/colors/ectoplasm/colors$suffix.css"),
+		array('#413256', '#523f6d', '#a3b745', '#d46f15'),
+		array('base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
-		admin_url( "css/colors/ocean/colors$suffix.css" ),
-		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
-		array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ocean', _x('Ocean', 'admin color scheme'),
+		admin_url("css/colors/ocean/colors$suffix.css"),
+		array('#627c83', '#738e96', '#9ebaa0', '#aa9d88'),
+		array('base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
-		admin_url( "css/colors/coffee/colors$suffix.css" ),
-		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
-		array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('coffee', _x('Coffee', 'admin color scheme'),
+		admin_url("css/colors/coffee/colors$suffix.css"),
+		array('#46403c', '#59524c', '#c7a589', '#9ea476'),
+		array('base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
 }
@@ -3419,13 +3419,13 @@ 
  * @param string $file file relative to wp-admin/ without its ".css" extension.
  * @return string
  */
-function wp_admin_css_uri( $file = 'wp-admin' ) {
-	if ( defined('WP_INSTALLING') ) {
+function wp_admin_css_uri($file = 'wp-admin') {
+	if (defined('WP_INSTALLING')) {
 		$_file = "./$file.css";
 	} else {
 		$_file = admin_url("$file.css");
 	}
-	$_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
+	$_file = add_query_arg('version', get_bloginfo('version'), $_file);
 
 	/**
 	 * Filters the URI of a WordPress admin CSS file.
@@ -3435,7 +3435,7 @@ 
 	 * @param string $_file Relative path to the file with query arguments attached.
 	 * @param string $file  Relative path to the file, minus its ".css" extension.
 	 */
-	return apply_filters( 'wp_admin_css_uri', $_file, $file );
+	return apply_filters('wp_admin_css_uri', $_file, $file);
 }
 
 /**
@@ -3458,15 +3458,15 @@ 
  * 	                         to wp-admin/. Defaults to 'wp-admin'.
  * @param bool   $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
  */
-function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
+function wp_admin_css($file = 'wp-admin', $force_echo = false) {
 	// For backward compatibility
-	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
+	$handle = 0 === strpos($file, 'css/') ? substr($file, 4) : $file;
 
-	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
-			wp_print_styles( $handle );
+	if (wp_styles()->query($handle)) {
+		if ($force_echo || did_action('wp_print_styles')) // we already printed the style queue. Print this one immediately
+			wp_print_styles($handle);
 		else // Add to style queue
-			wp_enqueue_style( $handle );
+			wp_enqueue_style($handle);
 		return;
 	}
 
@@ -3481,11 +3481,11 @@ 
 	 * @param string $file Style handle name or filename (without ".css" extension)
 	 *                     relative to wp-admin/. Defaults to 'wp-admin'.
 	 */
-	echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
+	echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri($file))."' type='text/css' />\n", $file);
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+	if (function_exists('is_rtl') && is_rtl()) {
 		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
+		echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri("$file-rtl"))."' type='text/css' />\n", "$file-rtl");
 	}
 }
 
@@ -3499,11 +3499,11 @@ 
  * @since 2.5.0
  */
 function add_thickbox() {
-	wp_enqueue_script( 'thickbox' );
-	wp_enqueue_style( 'thickbox' );
+	wp_enqueue_script('thickbox');
+	wp_enqueue_style('thickbox');
 
-	if ( is_network_admin() )
-		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	if (is_network_admin())
+		add_action('admin_head', '_thickbox_path_admin_subfolder');
 }
 
 /**
@@ -3521,7 +3521,7 @@ 
 	 *
 	 * @param string $generator_type The XHTML generator.
 	 */
-	the_generator( apply_filters( 'wp_generator_type', 'xhtml' ) );
+	the_generator(apply_filters('wp_generator_type', 'xhtml'));
 }
 
 /**
@@ -3534,7 +3534,7 @@ 
  *
  * @param string $type The type of generator to output - (html|xhtml|atom|rss2|rdf|comment|export).
  */
-function the_generator( $type ) {
+function the_generator($type) {
 	/**
 	 * Filters the output of the XHTML generator tag for display.
 	 *
@@ -3544,7 +3544,7 @@ 
 	 * @param string $type           The type of generator to output. Accepts 'html',
 	 *                               'xhtml', 'atom', 'rss2', 'rdf', 'comment', 'export'.
 	 */
-	echo apply_filters( 'the_generator', get_the_generator($type), $type ) . "\n";
+	echo apply_filters('the_generator', get_the_generator($type), $type)."\n";
 }
 
 /**
@@ -3559,14 +3559,14 @@ 
  * @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
  * @return string|void The HTML content for the generator.
  */
-function get_the_generator( $type = '' ) {
-	if ( empty( $type ) ) {
+function get_the_generator($type = '') {
+	if (empty($type)) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
+		if (empty($current_filter))
 			return;
 
-		switch ( $current_filter ) {
+		switch ($current_filter) {
 			case 'rss2_head' :
 			case 'commentsrss2_head' :
 				$type = 'rss2';
@@ -3586,27 +3586,27 @@ 
 		}
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'html':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'">';
 			break;
 		case 'xhtml':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'" />';
 			break;
 		case 'atom':
-			$gen = '<generator uri="https://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
+			$gen = '<generator uri="https://wordpress.org/" version="'.get_bloginfo_rss('version').'">WordPress</generator>';
 			break;
 		case 'rss2':
-			$gen = '<generator>https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
+			$gen = '<generator>https://wordpress.org/?v='.get_bloginfo_rss('version').'</generator>';
 			break;
 		case 'rdf':
-			$gen = '<admin:generatorAgent rdf:resource="https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
+			$gen = '<admin:generatorAgent rdf:resource="https://wordpress.org/?v='.get_bloginfo_rss('version').'" />';
 			break;
 		case 'comment':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo('version').'" -->';
 			break;
 		case 'export':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo_rss('version').'" created="'.date('Y-m-d H:i').'" -->';
 			break;
 	}
 
@@ -3621,7 +3621,7 @@ 
 	 * @param string $type The type of generator. Accepts 'html', 'xhtml', 'atom',
 	 *                     'rss2', 'rdf', 'comment', 'export'.
 	 */
-	return apply_filters( "get_the_generator_{$type}", $gen, $type );
+	return apply_filters("get_the_generator_{$type}", $gen, $type);
 }
 
 /**
@@ -3636,8 +3636,8 @@ 
  * @param bool  $echo    Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function checked( $checked, $current = true, $echo = true ) {
-	return __checked_selected_helper( $checked, $current, $echo, 'checked' );
+function checked($checked, $current = true, $echo = true) {
+	return __checked_selected_helper($checked, $current, $echo, 'checked');
 }
 
 /**
@@ -3652,8 +3652,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function selected( $selected, $current = true, $echo = true ) {
-	return __checked_selected_helper( $selected, $current, $echo, 'selected' );
+function selected($selected, $current = true, $echo = true) {
+	return __checked_selected_helper($selected, $current, $echo, 'selected');
 }
 
 /**
@@ -3668,8 +3668,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function disabled( $disabled, $current = true, $echo = true ) {
-	return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
+function disabled($disabled, $current = true, $echo = true) {
+	return __checked_selected_helper($disabled, $current, $echo, 'disabled');
 }
 
 /**
@@ -3686,13 +3686,13 @@ 
  * @param string $type    The type of checked|selected|disabled we are doing
  * @return string html attribute or empty string
  */
-function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
+function __checked_selected_helper($helper, $current, $echo, $type) {
+	if ((string) $helper === (string) $current)
 		$result = " $type='$type'";
 	else
 		$result = '';
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 
 	return $result;
@@ -3708,12 +3708,12 @@ 
  * @param array $settings
  * @return array $settings
  */
-function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
-		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+function wp_heartbeat_settings($settings) {
+	if ( ! is_admin())
+		$settings['ajaxurl'] = admin_url('admin-ajax.php', 'relative');
 
-	if ( is_user_logged_in() )
-		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	if (is_user_logged_in())
+		$settings['nonce'] = wp_create_nonce('heartbeat-nonce');
 
 	return $settings;
 }

src/wp-includes/pluggable-deprecated.php

Spacing +26 added lines, -26 removed lines

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