ntwb / wordpress

src/wp-admin/includes/template.php

Doc Comments +5 added lines, -5 removed lines

@@ -675,10 +675,10 @@ 
  *
  * @global WP_Locale  $wp_locale
  *
- * @param int|bool $edit      Accepts 1|true for editing the date, 0|false for adding the date.
- * @param int|bool $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
+ * @param integer $edit      Accepts 1|true for editing the date, 0|false for adding the date.
+ * @param integer $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
  * @param int      $tab_index The tabindex attribute to add. Default 0.
- * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
+ * @param integer $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
@@ -984,7 +984,7 @@ 
  * @staticvar bool $already_sorted
  * @param string|WP_Screen $screen  Screen identifier
  * @param string           $context box context
- * @param mixed            $object  gets passed to the box callback function as first parameter
+ * @param string            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
 function do_meta_boxes( $screen, $context, $object ) {
@@ -1533,7 +1533,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
 function _draft_or_post_title( $post = 0 ) {

Spacing +467 added lines, -467 removed lines

@@ -9,10 +9,10 @@ 
  */
 
 /** Walker_Category_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-category-checklist.php');
 
 /** WP_Internal_Pointers class */
-require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
+require_once(ABSPATH.'wp-admin/includes/class-wp-internal-pointers.php');
 
 //
 // Category Checklists
@@ -37,15 +37,15 @@ 
  * @param bool   $checked_ontop        Optional. Whether to move checked items out of the hierarchy and to
  *                                     the top of the list. Default true.
  */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
-	wp_terms_checklist( $post_id, array(
+function wp_category_checklist($post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true) {
+	wp_terms_checklist($post_id, array(
 		'taxonomy' => 'category',
 		'descendants_and_self' => $descendants_and_self,
 		'selected_cats' => $selected_cats,
 		'popular_cats' => $popular_cats,
 		'walker' => $walker,
 		'checked_ontop' => $checked_ontop
-	) );
+	));
 }
 
 /**
@@ -74,7 +74,7 @@ 
  *                                        of echoing it. Default true.
  * }
  */
-function wp_terms_checklist( $post_id = 0, $args = array() ) {
+function wp_terms_checklist($post_id = 0, $args = array()) {
  	$defaults = array(
 		'descendants_and_self' => 0,
 		'selected_cats' => false,
@@ -95,11 +95,11 @@ 
 	 * @param array $args    An array of arguments.
 	 * @param int   $post_id The post ID.
 	 */
-	$params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+	$params = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-	$r = wp_parse_args( $params, $defaults );
+	$r = wp_parse_args($params, $defaults);
 
-	if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
+	if (empty($r['walker']) || ! ($r['walker'] instanceof Walker)) {
 		$walker = new Walker_Category_Checklist;
 	} else {
 		$walker = $r['walker'];
@@ -108,64 +108,64 @@ 
 	$taxonomy = $r['taxonomy'];
 	$descendants_and_self = (int) $r['descendants_and_self'];
 
-	$args = array( 'taxonomy' => $taxonomy );
+	$args = array('taxonomy' => $taxonomy);
 
-	$tax = get_taxonomy( $taxonomy );
-	$args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
+	$tax = get_taxonomy($taxonomy);
+	$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-	$args['list_only'] = ! empty( $r['list_only'] );
+	$args['list_only'] = ! empty($r['list_only']);
 
-	if ( is_array( $r['selected_cats'] ) ) {
+	if (is_array($r['selected_cats'])) {
 		$args['selected_cats'] = $r['selected_cats'];
-	} elseif ( $post_id ) {
-		$args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
+	} elseif ($post_id) {
+		$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 	} else {
 		$args['selected_cats'] = array();
 	}
-	if ( is_array( $r['popular_cats'] ) ) {
+	if (is_array($r['popular_cats'])) {
 		$args['popular_cats'] = $r['popular_cats'];
 	} else {
-		$args['popular_cats'] = get_terms( $taxonomy, array(
+		$args['popular_cats'] = get_terms($taxonomy, array(
 			'fields' => 'ids',
 			'orderby' => 'count',
 			'order' => 'DESC',
 			'number' => 10,
 			'hierarchical' => false
-		) );
+		));
 	}
-	if ( $descendants_and_self ) {
-		$categories = (array) get_terms( $taxonomy, array(
+	if ($descendants_and_self) {
+		$categories = (array) get_terms($taxonomy, array(
 			'child_of' => $descendants_and_self,
 			'hierarchical' => 0,
 			'hide_empty' => 0
-		) );
-		$self = get_term( $descendants_and_self, $taxonomy );
-		array_unshift( $categories, $self );
+		));
+		$self = get_term($descendants_and_self, $taxonomy);
+		array_unshift($categories, $self);
 	} else {
-		$categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
+		$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 	}
 
 	$output = '';
 
-	if ( $r['checked_ontop'] ) {
+	if ($r['checked_ontop']) {
 		// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 		$checked_categories = array();
-		$keys = array_keys( $categories );
+		$keys = array_keys($categories);
 
-		foreach ( $keys as $k ) {
-			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+		foreach ($keys as $k) {
+			if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 				$checked_categories[] = $categories[$k];
-				unset( $categories[$k] );
+				unset($categories[$k]);
 			}
 		}
 
 		// Put checked cats on top
-		$output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+		$output .= call_user_func_array(array($walker, 'walk'), array($checked_categories, 0, $args));
 	}
 	// Then the rest of them
-	$output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	$output .= call_user_func_array(array($walker, 'walk'), array($categories, 0, $args));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -188,33 +188,33 @@ 
  * @param bool $echo Optionally output the list as well. Defaults to true.
  * @return array List of popular term IDs.
  */
-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
+function wp_popular_terms_checklist($taxonomy, $default = 0, $number = 10, $echo = true) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
+	if ($post && $post->ID)
 		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
 	else
 		$checked_terms = array();
 
-	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+	$terms = get_terms($taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false));
 
 	$tax = get_taxonomy($taxonomy);
 
 	$popular_ids = array();
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // Hack for Ajax use.
+		if ( ! $echo) // Hack for Ajax use.
 			continue;
 		$id = "popular-$taxonomy-$term->term_id";
-		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
+		$checked = in_array($term->term_id, $checked_terms) ? 'checked="checked"' : '';
 		?>
 
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
-				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can( $tax->cap->assign_terms ) ); ?> />
+				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can($tax->cap->assign_terms)); ?> />
 				<?php
 				/** This filter is documented in wp-includes/category-template.php */
-				echo esc_html( apply_filters( 'the_category', $term->name ) );
+				echo esc_html(apply_filters('the_category', $term->name));
 				?>
 			</label>
 		</li>
@@ -231,32 +231,32 @@ 
  *
  * @param int $link_id
  */
-function wp_link_category_checklist( $link_id = 0 ) {
+function wp_link_category_checklist($link_id = 0) {
 	$default = 1;
 
 	$checked_categories = array();
 
-	if ( $link_id ) {
-		$checked_categories = wp_get_link_cats( $link_id );
+	if ($link_id) {
+		$checked_categories = wp_get_link_cats($link_id);
 		// No selected categories, strange
-		if ( ! count( $checked_categories ) ) {
+		if ( ! count($checked_categories)) {
 			$checked_categories[] = $default;
 		}
 	} else {
 		$checked_categories[] = $default;
 	}
 
-	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
+	$categories = get_terms('link_category', array('orderby' => 'name', 'hide_empty' => 0));
 
-	if ( empty( $categories ) )
+	if (empty($categories))
 		return;
 
-	foreach ( $categories as $category ) {
+	foreach ($categories as $category) {
 		$cat_id = $category->term_id;
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$name = esc_html( apply_filters( 'the_category', $category->name ) );
-		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+		$name = esc_html(apply_filters('the_category', $category->name));
+		$checked = in_array($cat_id, $checked_categories) ? ' checked="checked"' : '';
 		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
 	}
 }
@@ -270,72 +270,72 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	$title = esc_textarea( trim( $post->post_title ) );
+	$title = esc_textarea(trim($post->post_title));
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	echo '
-<div class="hidden" id="inline_' . $post->ID . '">
-	<div class="post_title">' . $title . '</div>' .
+<div class="hidden" id="inline_' . $post->ID.'">
+	<div class="post_title">' . $title.'</div>'.
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	'<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name, $post ) . '</div>
-	<div class="post_author">' . $post->post_author . '</div>
-	<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
-	<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
-	<div class="_status">' . esc_html( $post->post_status ) . '</div>
-	<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
-	<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
-	<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
-	<div class="hh">' . mysql2date( 'H', $post->post_date, false ) . '</div>
-	<div class="mn">' . mysql2date( 'i', $post->post_date, false ) . '</div>
-	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
-	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
-
-	if ( $post_type_object->hierarchical ) {
-		echo '<div class="post_parent">' . $post->post_parent . '</div>';
+	'<div class="post_name">'.apply_filters('editable_slug', $post->post_name, $post).'</div>
+	<div class="post_author">' . $post->post_author.'</div>
+	<div class="comment_status">' . esc_html($post->comment_status).'</div>
+	<div class="ping_status">' . esc_html($post->ping_status).'</div>
+	<div class="_status">' . esc_html($post->post_status).'</div>
+	<div class="jj">' . mysql2date('d', $post->post_date, false).'</div>
+	<div class="mm">' . mysql2date('m', $post->post_date, false).'</div>
+	<div class="aa">' . mysql2date('Y', $post->post_date, false).'</div>
+	<div class="hh">' . mysql2date('H', $post->post_date, false).'</div>
+	<div class="mn">' . mysql2date('i', $post->post_date, false).'</div>
+	<div class="ss">' . mysql2date('s', $post->post_date, false).'</div>
+	<div class="post_password">' . esc_html($post->post_password).'</div>';
+
+	if ($post_type_object->hierarchical) {
+		echo '<div class="post_parent">'.$post->post_parent.'</div>';
 	}
 
-	echo '<div class="page_template">' . ( $post->page_template ? esc_html( $post->page_template ) : 'default' ) . '</div>';
+	echo '<div class="page_template">'.($post->page_template ? esc_html($post->page_template) : 'default').'</div>';
 
-	if ( post_type_supports( $post->post_type, 'page-attributes' ) ) {
-		echo '<div class="menu_order">' . $post->menu_order . '</div>';
+	if (post_type_supports($post->post_type, 'page-attributes')) {
+		echo '<div class="menu_order">'.$post->menu_order.'</div>';
 	}
 
-	$taxonomy_names = get_object_taxonomies( $post->post_type );
-	foreach ( $taxonomy_names as $taxonomy_name) {
-		$taxonomy = get_taxonomy( $taxonomy_name );
+	$taxonomy_names = get_object_taxonomies($post->post_type);
+	foreach ($taxonomy_names as $taxonomy_name) {
+		$taxonomy = get_taxonomy($taxonomy_name);
 
-		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
+		if ($taxonomy->hierarchical && $taxonomy->show_ui) {
 
-			$terms = get_object_term_cache( $post->ID, $taxonomy_name );
-			if ( false === $terms ) {
-				$terms = wp_get_object_terms( $post->ID, $taxonomy_name );
-				wp_cache_add( $post->ID, wp_list_pluck( $terms, 'term_id' ), $taxonomy_name . '_relationships' );
+			$terms = get_object_term_cache($post->ID, $taxonomy_name);
+			if (false === $terms) {
+				$terms = wp_get_object_terms($post->ID, $taxonomy_name);
+				wp_cache_add($post->ID, wp_list_pluck($terms, 'term_id'), $taxonomy_name.'_relationships');
 			}
-			$term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
+			$term_ids = empty($terms) ? array() : wp_list_pluck($terms, 'term_id');
 
-			echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
+			echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">'.implode(',', $term_ids).'</div>';
 
-		} elseif ( $taxonomy->show_ui ) {
+		} elseif ($taxonomy->show_ui) {
 
-			$terms_to_edit = get_terms_to_edit( $post->ID, $taxonomy_name );
-			if ( ! is_string( $terms_to_edit ) ) {
+			$terms_to_edit = get_terms_to_edit($post->ID, $taxonomy_name);
+			if ( ! is_string($terms_to_edit)) {
 				$terms_to_edit = '';
 			}
 
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-				. esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
+				. esc_html(str_replace(',', ', ', $terms_to_edit)).'</div>';
 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( ! $post_type_object->hierarchical)
+		echo '<div class="sticky">'.(is_sticky($post->ID) ? 'sticky' : '').'</div>';
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if (post_type_supports($post->post_type, 'post-formats'))
+		echo '<div class="post_format">'.esc_html(get_post_format($post->ID)).'</div>';
 
 	echo '</div>';
 }
@@ -352,7 +352,7 @@ 
  * @param string $mode
  * @param bool   $table_row
  */
-function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
+function wp_comment_reply($position = 1, $checkbox = false, $mode = 'single', $table_row = true) {
 	global $wp_list_table;
 	/**
 	 * Filters the in-line comment reply-to form output in the Comments
@@ -369,15 +369,15 @@ 
 	 * @param string $content The reply-to form content.
 	 * @param array  $args    An array of default args.
 	 */
-	$content = apply_filters( 'wp_comment_reply', '', array( 'position' => $position, 'checkbox' => $checkbox, 'mode' => $mode ) );
+	$content = apply_filters('wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode));
 
-	if ( ! empty($content) ) {
+	if ( ! empty($content)) {
 		echo $content;
 		return;
 	}
 
-	if ( ! $wp_list_table ) {
-		if ( $mode == 'single' ) {
+	if ( ! $wp_list_table) {
+		if ($mode == 'single') {
 			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
 		} else {
 			$wp_list_table = _get_list_table('WP_Comments_List_Table');
@@ -386,29 +386,29 @@ 
 
 ?>
 <form method="get">
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
 	<fieldset class="comment-reply">
 	<legend>
-		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
-		<span class="hidden" id="replyhead"><?php _e( 'Reply to Comment' ); ?></span>
-		<span class="hidden" id="addhead"><?php _e( 'Add new Comment' ); ?></span>
+		<span class="hidden" id="editlegend"><?php _e('Edit Comment'); ?></span>
+		<span class="hidden" id="replyhead"><?php _e('Reply to Comment'); ?></span>
+		<span class="hidden" id="addhead"><?php _e('Add new Comment'); ?></span>
 	</legend>
 
 	<div id="replycontainer">
-	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
+	<label for="replycontent" class="screen-reader-text"><?php _e('Comment'); ?></label>
 	<?php
-	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+	$quicktags_settings = array('buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close');
+	wp_editor('', 'replycontent', array('media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings));
 	?>
 	</div>
 
 	<div id="edithead" style="display:none;">
 		<div class="inside">
-		<label for="author-name"><?php _e( 'Name' ) ?></label>
+		<label for="author-name"><?php _e('Name') ?></label>
 		<input type="text" name="newcomment_author" size="50" value="" id="author-name" />
 		</div>
 
@@ -441,12 +441,12 @@ 
 	<input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
-		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		wp_nonce_field('replyto-comment', '_ajax_nonce-replyto-comment', false);
+		if (current_user_can('unfiltered_html'))
+			wp_nonce_field('unfiltered-html-comment', '_wp_unfiltered_html_comment', false);
 	?>
 	</fieldset>
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 </td></tr></tbody></table>
 <?php else : ?>
 </div></div>
@@ -478,15 +478,15 @@ 
  *
  * @param array $meta
  */
-function list_meta( $meta ) {
+function list_meta($meta) {
 	// Exit if no meta
-	if ( ! $meta ) {
+	if ( ! $meta) {
 		echo '
 <table id="list-table" style="display: none;">
 	<thead>
 	<tr>
-		<th class="left">' . _x( 'Name', 'meta name' ) . '</th>
-		<th>' . __( 'Value' ) . '</th>
+		<th class="left">' . _x('Name', 'meta name').'</th>
+		<th>' . __('Value').'</th>
 	</tr>
 	</thead>
 	<tbody id="the-list" data-wp-lists="list:meta">
@@ -500,14 +500,14 @@ 
 <table id="list-table">
 	<thead>
 	<tr>
-		<th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
-		<th><?php _e( 'Value' ) ?></th>
+		<th class="left"><?php _ex('Name', 'meta name') ?></th>
+		<th><?php _e('Value') ?></th>
 	</tr>
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
+	foreach ($meta as $entry)
+		echo _list_meta_row($entry, $count);
 ?>
 	</tbody>
 </table>
@@ -525,22 +525,22 @@ 
  * @param int   $count
  * @return string
  */
-function _list_meta_row( $entry, &$count ) {
+function _list_meta_row($entry, &$count) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
+	if (is_protected_meta($entry['meta_key'], 'post'))
 		return '';
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce)
+		$update_nonce = wp_create_nonce('add-meta');
 
 	$r = '';
-	++ $count;
+	++$count;
 
-	if ( is_serialized( $entry['meta_value'] ) ) {
-		if ( is_serialized_string( $entry['meta_value'] ) ) {
+	if (is_serialized($entry['meta_value'])) {
+		if (is_serialized_string($entry['meta_value'])) {
 			// This is a serialized string, so we should display it.
-			$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
+			$entry['meta_value'] = maybe_unserialize($entry['meta_value']);
 		} else {
 			// This is a serialized array/object so we should NOT display it.
 			--$count;
@@ -549,23 +549,23 @@ 
 	}
 
 	$entry['meta_key'] = esc_attr($entry['meta_key']);
-	$entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
+	$entry['meta_value'] = esc_textarea($entry['meta_value']); // using a <textarea />
 	$entry['meta_id'] = (int) $entry['meta_id'];
 
-	$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
+	$delete_nonce = wp_create_nonce('delete-meta_'.$entry['meta_id']);
 
 	$r .= "\n\t<tr id='meta-{$entry['meta_id']}'>";
-	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
+	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>".__('Key')."</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
 
 	$r .= "\n\t\t<div class='submit'>";
-	$r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
+	$r .= get_submit_button(__('Delete'), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array('data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce"));
 	$r .= "\n\t\t";
-	$r .= get_submit_button( __( 'Update' ), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ) );
+	$r .= get_submit_button(__('Update'), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array('data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce"));
 	$r .= "</div>";
-	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
+	$r .= wp_nonce_field('change-meta', '_ajax_nonce', false, false);
 	$r .= "</td>";
 
-	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
+	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>".__('Value')."</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
 	return $r;
 }
 
@@ -578,9 +578,9 @@ 
  *
  * @param WP_Post $post Optional. The post being edited.
  */
-function meta_form( $post = null ) {
+function meta_form($post = null) {
 	global $wpdb;
-	$post = get_post( $post );
+	$post = get_post($post);
 
 	/**
 	 * Filters values for the meta key dropdown in the Custom Fields meta box.
@@ -593,9 +593,9 @@ 
 	 * @param array|null $keys Pre-defined meta keys to be used in place of a postmeta query. Default null.
 	 * @param WP_Post    $post The current post object.
 	 */
-	$keys = apply_filters( 'postmeta_form_keys', null, $post );
+	$keys = apply_filters('postmeta_form_keys', null, $post);
 
-	if ( null === $keys ) {
+	if (null === $keys) {
 		/**
 		 * Filters the number of custom fields to retrieve for the drop-down
 		 * in the Custom Fields meta box.
@@ -604,44 +604,44 @@ 
 		 *
 		 * @param int $limit Number of custom fields to retrieve. Default 30.
 		 */
-		$limit = apply_filters( 'postmeta_form_limit', 30 );
+		$limit = apply_filters('postmeta_form_limit', 30);
 		$sql = "SELECT DISTINCT meta_key
 			FROM $wpdb->postmeta
 			WHERE meta_key NOT BETWEEN '_' AND '_z'
 			HAVING meta_key NOT LIKE %s
 			ORDER BY meta_key
 			LIMIT %d";
-		$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
+		$keys = $wpdb->get_col($wpdb->prepare($sql, $wpdb->esc_like('_').'%', $limit));
 	}
 
-	if ( $keys ) {
-		natcasesort( $keys );
+	if ($keys) {
+		natcasesort($keys);
 		$meta_key_input_id = 'metakeyselect';
 	} else {
 		$meta_key_input_id = 'metakeyinput';
 	}
 ?>
-<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
+<p><strong><?php _e('Add New Custom Field:') ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ) ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
+<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex('Name', 'meta name') ?></label></th>
+<th><label for="metavalue"><?php _e('Value') ?></label></th>
 </tr>
 </thead>
 
 <tbody>
 <tr>
 <td id="newmetaleft" class="left">
-<?php if ( $keys ) { ?>
+<?php if ($keys) { ?>
 <select id="metakeyselect" name="metakeyselect">
-<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+<option value="#NONE#"><?php _e('&mdash; Select &mdash;'); ?></option>
 <?php
 
-	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
+	foreach ($keys as $key) {
+		if (is_protected_meta($key, 'post') || ! current_user_can('add_post_meta', $post->ID, $key))
 			continue;
-		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
+		echo "\n<option value='".esc_attr($key)."'>".esc_html($key)."</option>";
 	}
 ?>
 </select>
@@ -658,9 +658,9 @@ 
 
 <tr><td colspan="2">
 <div class="submit">
-<?php submit_button( __( 'Add Custom Field' ), '', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
+<?php submit_button(__('Add Custom Field'), '', 'addmeta', false, array('id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta')); ?>
 </div>
-<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
+<?php wp_nonce_field('add-meta', '_ajax_nonce-add-meta', false); ?>
 </td></tr>
 </tbody>
 </table>
@@ -682,15 +682,15 @@ 
  * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
-function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
+function touch_time($edit = 1, $for_post = 1, $tab_index = 0, $multi = 0) {
 	global $wp_locale;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ($for_post)
+		$edit = ! (in_array($post->post_status, array('draft', 'pending')) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt));
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
+	if ((int) $tab_index > 0)
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 
 	// todo: Remove this?
@@ -698,56 +698,56 @@ 
 
 	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : get_comment()->comment_date;
-	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
-	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
-	$aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-	$hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-	$mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-	$ss = ($edit) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
-
-	$cur_jj = gmdate( 'd', $time_adj );
-	$cur_mm = gmdate( 'm', $time_adj );
-	$cur_aa = gmdate( 'Y', $time_adj );
-	$cur_hh = gmdate( 'H', $time_adj );
-	$cur_mn = gmdate( 'i', $time_adj );
-
-	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
-	for ( $i = 1; $i < 13; $i = $i +1 ) {
+	$jj = ($edit) ? mysql2date('d', $post_date, false) : gmdate('d', $time_adj);
+	$mm = ($edit) ? mysql2date('m', $post_date, false) : gmdate('m', $time_adj);
+	$aa = ($edit) ? mysql2date('Y', $post_date, false) : gmdate('Y', $time_adj);
+	$hh = ($edit) ? mysql2date('H', $post_date, false) : gmdate('H', $time_adj);
+	$mn = ($edit) ? mysql2date('i', $post_date, false) : gmdate('i', $time_adj);
+	$ss = ($edit) ? mysql2date('s', $post_date, false) : gmdate('s', $time_adj);
+
+	$cur_jj = gmdate('d', $time_adj);
+	$cur_mm = gmdate('m', $time_adj);
+	$cur_aa = gmdate('Y', $time_adj);
+	$cur_hh = gmdate('H', $time_adj);
+	$cur_mn = gmdate('i', $time_adj);
+
+	$month = '<label><span class="screen-reader-text">'.__('Month').'</span><select '.($multi ? '' : 'id="mm" ').'name="mm"'.$tab_index_attribute.">\n";
+	for ($i = 1; $i < 13; $i = $i + 1) {
 		$monthnum = zeroise($i, 2);
-		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
-		$month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
+		$monthtext = $wp_locale->get_month_abbrev($wp_locale->get_month($i));
+		$month .= "\t\t\t".'<option value="'.$monthnum.'" data-text="'.$monthtext.'" '.selected($monthnum, $mm, false).'>';
 		/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
+		$month .= sprintf(__('%1$s-%2$s'), $monthnum, $monthtext)."</option>\n";
 	}
 	$month .= '</select></label>';
 
-	$day = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$year = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$hour = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$day = '<label><span class="screen-reader-text">'.__('Day').'</span><input type="text" '.($multi ? '' : 'id="jj" ').'name="jj" value="'.$jj.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$year = '<label><span class="screen-reader-text">'.__('Year').'</span><input type="text" '.($multi ? '' : 'id="aa" ').'name="aa" value="'.$aa.'" size="4" maxlength="4"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$hour = '<label><span class="screen-reader-text">'.__('Hour').'</span><input type="text" '.($multi ? '' : 'id="hh" ').'name="hh" value="'.$hh.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$minute = '<label><span class="screen-reader-text">'.__('Minute').'</span><input type="text" '.($multi ? '' : 'id="mn" ').'name="mn" value="'.$mn.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
 
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-	printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
+	printf(__('%1$s %2$s, %3$s @ %4$s:%5$s'), $month, $day, $year, $hour, $minute);
 
-	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
+	echo '</div><input type="hidden" id="ss" name="ss" value="'.$ss.'" />';
 
-	if ( $multi ) return;
+	if ($multi) return;
 
 	echo "\n\n";
 	$map = array(
-		'mm' => array( $mm, $cur_mm ),
-		'jj' => array( $jj, $cur_jj ),
-		'aa' => array( $aa, $cur_aa ),
-		'hh' => array( $hh, $cur_hh ),
-		'mn' => array( $mn, $cur_mn ),
+		'mm' => array($mm, $cur_mm),
+		'jj' => array($jj, $cur_jj),
+		'aa' => array($aa, $cur_aa),
+		'hh' => array($hh, $cur_hh),
+		'mn' => array($mn, $cur_mn),
 	);
-	foreach ( $map as $timeunit => $value ) {
-		list( $unit, $curr ) = $value;
+	foreach ($map as $timeunit => $value) {
+		list($unit, $curr) = $value;
 
-		echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $unit . '" />' . "\n";
-		$cur_timeunit = 'cur_' . $timeunit;
-		echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $curr . '" />' . "\n";
+		echo '<input type="hidden" id="hidden_'.$timeunit.'" name="hidden_'.$timeunit.'" value="'.$unit.'" />'."\n";
+		$cur_timeunit = 'cur_'.$timeunit;
+		echo '<input type="hidden" id="'.$cur_timeunit.'" name="'.$cur_timeunit.'" value="'.$curr.'" />'."\n";
 	}
 ?>
 
@@ -767,12 +767,12 @@ 
  * @param string $default   Optional. The template file name. Default empty.
  * @param string $post_type Optional. Post type to get templates for. Default 'post'.
  */
-function page_template_dropdown( $default = '', $post_type = 'page' ) {
-	$templates = get_page_templates( null, $post_type );
-	ksort( $templates );
-	foreach ( array_keys( $templates ) as $template ) {
-		$selected = selected( $default, $templates[ $template ], false );
-		echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+function page_template_dropdown($default = '', $post_type = 'page') {
+	$templates = get_page_templates(null, $post_type);
+	ksort($templates);
+	foreach (array_keys($templates) as $template) {
+		$selected = selected($default, $templates[$template], false);
+		echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
 	}
 }
 
@@ -791,22 +791,22 @@ 
  *
  * @return null|false Boolean False if page has no children, otherwise print out html elements
  */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
+function parent_dropdown($default = 0, $parent = 0, $level = 0, $post = null) {
 	global $wpdb;
-	$post = get_post( $post );
-	$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
+	$post = get_post($post);
+	$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent));
 
-	if ( $items ) {
-		foreach ( $items as $item ) {
+	if ($items) {
+		foreach ($items as $item) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
+			if ($post && $post->ID && $item->ID == $post->ID)
 				continue;
 
-			$pad = str_repeat( '&nbsp;', $level * 3 );
-			$selected = selected( $default, $item->ID, false );
+			$pad = str_repeat('&nbsp;', $level * 3);
+			$selected = selected($default, $item->ID, false);
 
-			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html($item->post_title) . "</option>";
-			parent_dropdown( $default, $item->ID, $level +1 );
+			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad ".esc_html($item->post_title)."</option>";
+			parent_dropdown($default, $item->ID, $level + 1);
 		}
 	} else {
 		return false;
@@ -820,20 +820,20 @@ 
  *
  * @param string $selected Slug for the role that should be already selected.
  */
-function wp_dropdown_roles( $selected = '' ) {
+function wp_dropdown_roles($selected = '') {
 	$p = '';
 	$r = '';
 
-	$editable_roles = array_reverse( get_editable_roles() );
+	$editable_roles = array_reverse(get_editable_roles());
 
-	foreach ( $editable_roles as $role => $details ) {
-		$name = translate_user_role($details['name'] );
-		if ( $selected == $role ) // preselect specified role
-			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
+	foreach ($editable_roles as $role => $details) {
+		$name = translate_user_role($details['name']);
+		if ($selected == $role) // preselect specified role
+			$p = "\n\t<option selected='selected' value='".esc_attr($role)."'>$name</option>";
 		else
-			$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+			$r .= "\n\t<option value='".esc_attr($role)."'>$name</option>";
 	}
-	echo $p . $r;
+	echo $p.$r;
 }
 
 /**
@@ -843,7 +843,7 @@ 
  *
  * @param string $action The action attribute for the form.
  */
-function wp_import_upload_form( $action ) {
+function wp_import_upload_form($action) {
 
 	/**
 	 * Filters the maximum allowed upload size for import files.
@@ -854,22 +854,22 @@ 
 	 *
 	 * @param int $max_upload_size Allowed upload size. Default 1 MB.
 	 */
-	$bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-	$size = size_format( $bytes );
+	$bytes = apply_filters('import_upload_size_limit', wp_max_upload_size());
+	$size = size_format($bytes);
 	$upload_dir = wp_upload_dir();
-	if ( ! empty( $upload_dir['error'] ) ) :
+	if ( ! empty($upload_dir['error'])) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
 	else :
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url(wp_nonce_url($action, 'import-upload')); ?>">
 <p>
-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
+<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf(__('Maximum size: %s'), $size); ?>)
 <input type="file" id="upload" name="import" size="25" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __('Upload file and import'), 'primary' ); ?>
+<?php submit_button(__('Upload file and import'), 'primary'); ?>
 </form>
 <?php
 	endif;
@@ -903,75 +903,75 @@ 
  *                                              of the box array (which is the second parameter passed
  *                                              to your callback). Default null.
  */
-function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
+function add_meta_box($id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) ) {
+	if (empty($screen)) {
 		$screen = get_current_screen();
-	} elseif ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
-	} elseif ( is_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			add_meta_box( $id, $title, $callback, $single_screen, $context, $priority, $callback_args );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			add_meta_box($id, $title, $callback, $single_screen, $context, $priority, $callback_args);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+	foreach (array_keys($wp_meta_boxes[$page]) as $a_context) {
+		foreach (array('high', 'core', 'default', 'low') as $a_priority) {
+			if ( ! isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]))
 				continue;
 
 			// If a core box was previously added or removed by a plugin, don't add.
-			if ( 'core' == $priority ) {
+			if ('core' == $priority) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+				if (false === $wp_meta_boxes[$page][$a_context][$a_priority][$id])
 					return;
 
 				/*
 				 * If box was added with default priority, give it core priority to
 				 * maintain sort order.
 				 */
-				if ( 'default' == $a_priority ) {
+				if ('default' == $a_priority) {
 					$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
 					unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
 				}
 				return;
 			}
 			// If no priority given and id already present, use existing priority.
-			if ( empty($priority) ) {
+			if (empty($priority)) {
 				$priority = $a_priority;
 			/*
 			 * Else, if we're adding to the sorted priority, we don't know the title
 			 * or callback. Grab them from the previously added context/priority.
 			 */
-			} elseif ( 'sorted' == $priority ) {
+			} elseif ('sorted' == $priority) {
 				$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
 				$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
+			if ($priority != $a_priority || $context != $a_context)
 				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
 		}
 	}
 
-	if ( empty($priority) )
+	if (empty($priority))
 		$priority = 'low';
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
+	if ( ! isset($wp_meta_boxes[$page][$context][$priority]))
 		$wp_meta_boxes[$page][$context][$priority] = array();
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
@@ -990,27 +990,27 @@ 
  * @param mixed            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
-function do_meta_boxes( $screen, $context, $object ) {
+function do_meta_boxes($screen, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 
 	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-		foreach ( $sorted as $box_context => $ids ) {
-			foreach ( explode( ',', $ids ) as $id ) {
-				if ( $id && 'dashboard_browser_nag' !== $id ) {
-					add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+	if ( ! $already_sorted && $sorted = get_user_option("meta-box-order_$page")) {
+		foreach ($sorted as $box_context => $ids) {
+			foreach (explode(',', $ids) as $id) {
+				if ($id && 'dashboard_browser_nag' !== $id) {
+					add_meta_box($id, null, null, $screen, $box_context, 'sorted');
 				}
 			}
 		}
@@ -1020,31 +1020,31 @@ 
 
 	$i = 0;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
-				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'sorted', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ((array) $wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
-					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-					if ( 'dashboard_browser_nag' != $box['id'] ) {
-						$widget_title = $box[ 'title' ];
+					echo '<div id="'.$box['id'].'" class="postbox '.postbox_classes($box['id'], $page).$hidden_class.'" '.'>'."\n";
+					if ('dashboard_browser_nag' != $box['id']) {
+						$widget_title = $box['title'];
 
-						if ( is_array( $box[ 'args' ] ) && isset( $box[ 'args' ][ '__widget_basename' ] ) ) {
-							$widget_title = $box[ 'args' ][ '__widget_basename' ];
+						if (is_array($box['args']) && isset($box['args']['__widget_basename'])) {
+							$widget_title = $box['args']['__widget_basename'];
 							// Do not pass this parameter to the user callback function.
-							unset( $box[ 'args' ][ '__widget_basename' ] );
+							unset($box['args']['__widget_basename']);
 						}
 
 						echo '<button type="button" class="handlediv button-link" aria-expanded="true">';
-						echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $widget_title ) . '</span>';
+						echo '<span class="screen-reader-text">'.sprintf(__('Toggle panel: %s'), $widget_title).'</span>';
 						echo '<span class="toggle-indicator" aria-hidden="true"></span>';
 						echo '</button>';
 					}
 					echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
-					echo '<div class="inside">' . "\n";
+					echo '<div class="inside">'."\n";
 					call_user_func($box['callback'], $object, $box);
 					echo "</div>\n";
 					echo "</div>\n";
@@ -1077,33 +1077,33 @@ 
  *                                        include 'normal' and 'side'. Menus meta boxes (accordion sections)
  *                                        all use the 'side' context.
  */
-function remove_meta_box( $id, $screen, $context ) {
+function remove_meta_box($id, $screen, $context) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) ) {
+	if (empty($screen)) {
 		$screen = get_current_screen();
-	} elseif ( is_string( $screen ) ) {
-		$screen = convert_to_screen( $screen );
-	} elseif ( is_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			remove_meta_box( $id, $single_screen, $context );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			remove_meta_box($id, $single_screen, $context);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
+	foreach (array('high', 'core', 'default', 'low') as $priority)
 		$wp_meta_boxes[$page][$context][$priority][$id] = false;
 }
 
@@ -1123,19 +1123,19 @@ 
  * @param mixed         $object  gets passed to the section callback function as first parameter.
  * @return int number of meta boxes as accordion sections.
  */
-function do_accordion_sections( $screen, $context, $object ) {
+function do_accordion_sections($screen, $context, $object) {
 	global $wp_meta_boxes;
 
-	wp_enqueue_script( 'accordion' );
+	wp_enqueue_script('accordion');
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 	?>
 	<div id="side-sortables" class="accordion-container">
 		<ul class="outer-border">
@@ -1143,29 +1143,29 @@ 
 	$i = 0;
 	$first_open = false;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ($wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
-					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
+					$hidden_class = in_array($box['id'], $hidden) ? 'hide-if-js' : '';
 
 					$open_class = '';
-					if ( ! $first_open && empty( $hidden_class ) ) {
+					if ( ! $first_open && empty($hidden_class)) {
 						$first_open = true;
 						$open_class = 'open';
 					}
 					?>
-					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
+					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr($box['id']); ?>" id="<?php echo esc_attr($box['id']); ?>">
 						<h3 class="accordion-section-title hndle" tabindex="0">
-							<?php echo esc_html( $box['title'] ); ?>
-							<span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
+							<?php echo esc_html($box['title']); ?>
+							<span class="screen-reader-text"><?php _e('Press return or enter to open this section'); ?></span>
 						</h3>
-						<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
+						<div class="accordion-section-content <?php postbox_classes($box['id'], $page); ?>">
 							<div class="inside">
-								<?php call_user_func( $box['callback'], $object, $box ); ?>
+								<?php call_user_func($box['callback'], $object, $box); ?>
 							</div><!-- .inside -->
 						</div><!-- .accordion-section-content -->
 					</li><!-- .accordion-section -->
@@ -1206,13 +1206,13 @@ 
 function add_settings_section($id, $title, $callback, $page) {
 	global $wp_settings_sections;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$page = 'reading';
 	}
 
@@ -1257,13 +1257,13 @@ 
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
 	global $wp_settings_fields;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0.0', __('The miscellaneous options group has been removed. Use another settings group.'));
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0', __( 'The privacy options group has been removed. Use another settings group.' ) );
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5.0', __('The privacy options group has been removed. Use another settings group.'));
 		$page = 'reading';
 	}
 
@@ -1283,23 +1283,23 @@ 
  *
  * @param string $page The slug name of the page whose settings sections you want to output
  */
-function do_settings_sections( $page ) {
+function do_settings_sections($page) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
+	if ( ! isset($wp_settings_sections[$page]))
 		return;
 
-	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
+	foreach ((array) $wp_settings_sections[$page] as $section) {
+		if ($section['title'])
 			echo "<h2>{$section['title']}</h2>\n";
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ($section['callback'])
+			call_user_func($section['callback'], $section);
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
+		if ( ! isset($wp_settings_fields) || ! isset($wp_settings_fields[$page]) || ! isset($wp_settings_fields[$page][$section['id']]))
 			continue;
 		echo '<table class="form-table">';
-		do_settings_fields( $page, $section['id'] );
+		do_settings_fields($page, $section['id']);
 		echo '</table>';
 	}
 }
@@ -1321,22 +1321,22 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
+	if ( ! isset($wp_settings_fields[$page][$section]))
 		return;
 
-	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+	foreach ((array) $wp_settings_fields[$page][$section] as $field) {
 		$class = '';
 
-		if ( ! empty( $field['args']['class'] ) ) {
-			$class = ' class="' . esc_attr( $field['args']['class'] ) . '"';
+		if ( ! empty($field['args']['class'])) {
+			$class = ' class="'.esc_attr($field['args']['class']).'"';
 		}
 
 		echo "<tr{$class}>";
 
-		if ( ! empty( $field['args']['label_for'] ) ) {
-			echo '<th scope="row"><label for="' . esc_attr( $field['args']['label_for'] ) . '">' . $field['title'] . '</label></th>';
+		if ( ! empty($field['args']['label_for'])) {
+			echo '<th scope="row"><label for="'.esc_attr($field['args']['label_for']).'">'.$field['title'].'</label></th>';
 		} else {
-			echo '<th scope="row">' . $field['title'] . '</th>';
+			echo '<th scope="row">'.$field['title'].'</th>';
 		}
 
 		echo '<td>';
@@ -1370,7 +1370,7 @@ 
  * @param string $type    Optional. Message type, controls HTML class. Accepts 'error' or 'updated'.
  *                        Default 'error'.
  */
-function add_settings_error( $setting, $code, $message, $type = 'error' ) {
+function add_settings_error($setting, $code, $message, $type = 'error') {
 	global $wp_settings_errors;
 
 	$wp_settings_errors[] = array(
@@ -1404,7 +1404,7 @@ 
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = false ) {
+function get_settings_errors($setting = '', $sanitize = false) {
 	global $wp_settings_errors;
 
 	/*
@@ -1412,24 +1412,24 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ($sanitize)
+		sanitize_option($setting, get_option($setting));
 
 	// If settings were passed back from options.php then use them.
-	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
-		$wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
-		delete_transient( 'settings_errors' );
+	if (isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors')) {
+		$wp_settings_errors = array_merge((array) $wp_settings_errors, get_transient('settings_errors'));
+		delete_transient('settings_errors');
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
+	if ( ! count($wp_settings_errors))
 		return array();
 
 	// Filter the results to those of a specific setting if one was set.
-	if ( $setting ) {
+	if ($setting) {
 		$setting_errors = array();
-		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
+		foreach ((array) $wp_settings_errors as $key => $details) {
+			if ($setting == $details['setting'])
 				$setting_errors[] = $wp_settings_errors[$key];
 		}
 		return $setting_errors;
@@ -1465,20 +1465,20 @@ 
  * @param bool   $hide_on_update If set to true errors will not be shown if the settings page has
  *                               already been submitted.
  */
-function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
+function settings_errors($setting = '', $sanitize = false, $hide_on_update = false) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
+	if ($hide_on_update && ! empty($_GET['settings-updated']))
 		return;
 
-	$settings_errors = get_settings_errors( $setting, $sanitize );
+	$settings_errors = get_settings_errors($setting, $sanitize);
 
-	if ( empty( $settings_errors ) )
+	if (empty($settings_errors))
 		return;
 
 	$output = '';
-	foreach ( $settings_errors as $key => $details ) {
-		$css_id = 'setting-error-' . $details['code'];
-		$css_class = $details['type'] . ' settings-error notice is-dismissible';
+	foreach ($settings_errors as $key => $details) {
+		$css_id = 'setting-error-'.$details['code'];
+		$css_class = $details['type'].' settings-error notice is-dismissible';
 		$output .= "<div id='$css_id' class='$css_class'> \n";
 		$output .= "<p><strong>{$details['message']}</strong></p>";
 		$output .= "</div> \n";
@@ -1497,26 +1497,26 @@ 
 ?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
-			<?php _e( 'Attach to existing content' ); ?>
-			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e( 'Close media attachment panel' ); ?></button>
+			<?php _e('Attach to existing content'); ?>
+			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e('Close media attachment panel'); ?></button>
 		</div>
 		<div class="find-box-inside">
 			<div class="find-box-search">
-				<?php if ( $found_action ) { ?>
+				<?php if ($found_action) { ?>
 					<input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
 				<?php } ?>
 				<input type="hidden" name="affected" id="affected" value="" />
-				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-				<label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
+				<?php wp_nonce_field('find-posts', '_ajax_nonce', false); ?>
+				<label class="screen-reader-text" for="find-posts-input"><?php _e('Search'); ?></label>
 				<input type="text" id="find-posts-input" name="ps" value="" />
 				<span class="spinner"></span>
-				<input type="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" />
+				<input type="button" id="find-posts-search" value="<?php esc_attr_e('Search'); ?>" class="button" />
 				<div class="clear"></div>
 			</div>
 			<div id="find-posts-response"></div>
 		</div>
 		<div class="find-box-buttons">
-			<?php submit_button( __( 'Select' ), 'primary alignright', 'find-posts-submit', false ); ?>
+			<?php submit_button(__('Select'), 'primary alignright', 'find-posts-submit', false); ?>
 			<div class="clear"></div>
 		</div>
 	</div>
@@ -1532,8 +1532,8 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
+	if (isset($post->post_password))
+		echo esc_attr($post->post_password);
 }
 
 /**
@@ -1547,11 +1547,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
-function _draft_or_post_title( $post = 0 ) {
-	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
-	return esc_html( $title );
+function _draft_or_post_title($post = 0) {
+	$title = get_the_title($post);
+	if (empty($title))
+		$title = __('(no title)');
+	return esc_html($title);
 }
 
 /**
@@ -1563,7 +1563,7 @@ 
  * @since 2.7.0
  */
 function _admin_search_query() {
-	echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	echo isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 }
 
 /**
@@ -1578,69 +1578,69 @@ 
  * @param string $title      Optional. Title of the Iframe page. Default empty.
  * @param bool   $deprecated Not used.
  */
-function iframe_header( $title = '', $deprecated = false ) {
-	show_admin_bar( false );
+function iframe_header($title = '', $deprecated = false) {
+	show_admin_bar(false);
 	global $hook_suffix, $admin_body_class, $wp_locale;
 	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 
 	$current_screen = get_current_screen();
 
-	@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+	@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 	_wp_admin_html_begin();
 ?>
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-wp_enqueue_style( 'colors' );
+wp_enqueue_style('colors');
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>',
 	pagenow = '<?php echo $current_screen->id; ?>',
 	typenow = '<?php echo $current_screen->post_type; ?>',
 	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+	decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <?php
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
+do_action('admin_enqueue_scripts', $hook_suffix);
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action("admin_print_styles-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_styles' );
+do_action('admin_print_styles');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action("admin_print_scripts-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_scripts' );
+do_action('admin_print_scripts');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_head-$hook_suffix" );
+do_action("admin_head-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_head' );
+do_action('admin_head');
 
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_user_locale())));
 
-if ( is_rtl() )
+if (is_rtl())
 	$admin_body_class .= ' rtl';
 
 ?>
 </head>
 <?php
 /** This filter is documented in wp-admin/admin-header.php */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = apply_filters('admin_body_class', '');
 ?>
 <body<?php
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if (isset($GLOBALS['body_id'])) echo ' id="'.$GLOBALS['body_id'].'"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1671,13 +1671,13 @@ 
 	<div class="hidden">
 <?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer', $hook_suffix );
+	do_action('admin_footer', $hook_suffix);
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( "admin_print_footer_scripts-$hook_suffix" );
+	do_action("admin_print_footer_scripts-$hook_suffix");
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 ?>
 	</div>
 <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
@@ -1692,33 +1692,33 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
+	if (isset($_REQUEST['post_status']))
 		$post_status = $_REQUEST['post_status'];
 	else
 		$post_status = '';
 
-	if ( !empty($post->post_password) )
+	if ( ! empty($post->post_password))
 		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
+	if ('private' == $post->post_status && 'private' != $post_status)
 		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
+	if ('draft' == $post->post_status && 'draft' != $post_status)
 		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
+	if ('pending' == $post->post_status && 'pending' != $post_status)
 		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
+	if (is_sticky($post->ID))
 		$post_states['sticky'] = __('Sticky');
 
-	if ( 'future' === $post->post_status ) {
-		$post_states['scheduled'] = __( 'Scheduled' );
+	if ('future' === $post->post_status) {
+		$post_states['scheduled'] = __('Scheduled');
 	}
 
-	if ( 'page' === get_option( 'show_on_front' ) ) {
-		if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
-			$post_states['page_on_front'] = __( 'Front Page' );
+	if ('page' === get_option('show_on_front')) {
+		if (intval(get_option('page_on_front')) === $post->ID) {
+			$post_states['page_on_front'] = __('Front Page');
 		}
 
-		if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
-			$post_states['page_for_posts'] = __( 'Posts Page' );
+		if (intval(get_option('page_for_posts')) === $post->ID) {
+			$post_states['page_for_posts'] = __('Posts Page');
 		}
 	}
 
@@ -1730,15 +1730,15 @@ 
 	 * @param array   $post_states An array of post display states.
 	 * @param WP_Post $post        The current post object.
 	 */
-	$post_states = apply_filters( 'display_post_states', $post_states, $post );
+	$post_states = apply_filters('display_post_states', $post_states, $post);
 
-	if ( ! empty($post_states) ) {
+	if ( ! empty($post_states)) {
 		$state_count = count($post_states);
 		$i = 0;
 		echo ' &mdash; ';
-		foreach ( $post_states as $state ) {
+		foreach ($post_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1749,53 +1749,53 @@ 
  *
  * @param WP_Post $post
  */
-function _media_states( $post ) {
+function _media_states($post) {
 	$media_states = array();
 	$stylesheet = get_option('stylesheet');
 
-	if ( current_theme_supports( 'custom-header') ) {
-		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
+	if (current_theme_supports('custom-header')) {
+		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true);
 
-		if ( is_random_header_image() ) {
-			$header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
+		if (is_random_header_image()) {
+			$header_images = wp_list_pluck(get_uploaded_header_images(), 'attachment_id');
 
-			if ( $meta_header == $stylesheet && in_array( $post->ID, $header_images ) ) {
-				$media_states[] = __( 'Header Image' );
+			if ($meta_header == $stylesheet && in_array($post->ID, $header_images)) {
+				$media_states[] = __('Header Image');
 			}
 		} else {
 			$header_image = get_header_image();
 
 			// Display "Header Image" if the image was ever used as a header image
-			if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Header Image' );
+			if ( ! empty($meta_header) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Header Image');
 			}
 
 			// Display "Current Header Image" if the image is currently the header image
-			if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Current Header Image' );
+			if ($header_image && $header_image == wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Current Header Image');
 			}
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background') ) {
-		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
+	if (current_theme_supports('custom-background')) {
+		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true);
 
-		if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
-			$media_states[] = __( 'Background Image' );
+		if ( ! empty($meta_background) && $meta_background == $stylesheet) {
+			$media_states[] = __('Background Image');
 
 			$background_image = get_background_image();
-			if ( $background_image && $background_image == wp_get_attachment_url( $post->ID ) ) {
-				$media_states[] = __( 'Current Background Image' );
+			if ($background_image && $background_image == wp_get_attachment_url($post->ID)) {
+				$media_states[] = __('Current Background Image');
 			}
 		}
 	}
 
-	if ( $post->ID == get_option( 'site_icon' ) ) {
-		$media_states[] = __( 'Site Icon' );
+	if ($post->ID == get_option('site_icon')) {
+		$media_states[] = __('Site Icon');
 	}
 
-	if ( $post->ID == get_theme_mod( 'site_logo' ) ) {
-		$media_states[] = __( 'Logo' );
+	if ($post->ID == get_theme_mod('site_logo')) {
+		$media_states[] = __('Logo');
 	}
 
 	/**
@@ -1806,15 +1806,15 @@ 
 	 * @param array $media_states An array of media states. Default 'Header Image',
 	 *                            'Background Image', 'Site Icon', 'Logo'.
 	 */
-	$media_states = apply_filters( 'display_media_states', $media_states );
+	$media_states = apply_filters('display_media_states', $media_states);
 
-	if ( ! empty( $media_states ) ) {
-		$state_count = count( $media_states );
+	if ( ! empty($media_states)) {
+		$state_count = count($media_states);
 		$i = 0;
 		echo ' &mdash; ';
-		foreach ( $media_states as $state ) {
+		foreach ($media_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1833,7 +1833,7 @@ 
 function compression_test() {
 ?>
 	<script type="text/javascript">
-	var compressionNonce = <?php echo wp_json_encode( wp_create_nonce( 'update_can_compress_scripts' ) ); ?>;
+	var compressionNonce = <?php echo wp_json_encode(wp_create_nonce('update_can_compress_scripts')); ?>;
 	var testCompression = {
 		get : function(test) {
 			var x;
@@ -1906,8 +1906,8 @@ 
  *                                       as a string such as 'tabindex="1"', though the array format is
  *                                       preferred. Default null.
  */
-function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
-	echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
+function submit_button($text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null) {
+	echo get_submit_button($text, $type, $name, $wrap, $other_attributes);
 }
 
 /**
@@ -1931,47 +1931,47 @@ 
  *                                       Default empty.
  * @return string Submit button HTML.
  */
-function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
-
-	$button_shorthand = array( 'primary', 'small', 'large' );
-	$classes = array( 'button' );
-	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
+function get_submit_button($text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '') {
+	if ( ! is_array($type))
+		$type = explode(' ', $type);
+
+	$button_shorthand = array('primary', 'small', 'large');
+	$classes = array('button');
+	foreach ($type as $t) {
+		if ('secondary' === $t || 'button-secondary' === $t)
 			continue;
-		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
+		$classes[] = in_array($t, $button_shorthand) ? 'button-'.$t : $t;
 	}
 	// Remove empty items, remove duplicate items, and finally build a string.
-	$class = implode( ' ', array_unique( array_filter( $classes ) ) );
+	$class = implode(' ', array_unique(array_filter($classes)));
 
-	$text = $text ? $text : __( 'Save Changes' );
+	$text = $text ? $text : __('Save Changes');
 
 	// Default the id attribute to $name unless an id was specifically provided in $other_attributes
 	$id = $name;
-	if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
+	if (is_array($other_attributes) && isset($other_attributes['id'])) {
 		$id = $other_attributes['id'];
-		unset( $other_attributes['id'] );
+		unset($other_attributes['id']);
 	}
 
 	$attributes = '';
-	if ( is_array( $other_attributes ) ) {
-		foreach ( $other_attributes as $attribute => $value ) {
-			$attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
+	if (is_array($other_attributes)) {
+		foreach ($other_attributes as $attribute => $value) {
+			$attributes .= $attribute.'="'.esc_attr($value).'" '; // Trailing space is important
 		}
-	} elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string
+	} elseif ( ! empty($other_attributes)) { // Attributes provided as a string
 		$attributes = $other_attributes;
 	}
 
 	// Don't output empty name and id attributes.
-	$name_attr = $name ? ' name="' . esc_attr( $name ) . '"' : '';
-	$id_attr = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+	$name_attr = $name ? ' name="'.esc_attr($name).'"' : '';
+	$id_attr = $id ? ' id="'.esc_attr($id).'"' : '';
 
-	$button = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
-	$button	.= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+	$button = '<input type="submit"'.$name_attr.$id_attr.' class="'.esc_attr($class);
+	$button	.= '" value="'.esc_attr($text).'" '.$attributes.' />';
 
-	if ( $wrap ) {
-		$button = '<p class="submit">' . $button . '</p>';
+	if ($wrap) {
+		$button = '<p class="submit">'.$button.'</p>';
 	}
 
 	return $button;
@@ -1984,9 +1984,9 @@ 
 function _wp_admin_html_begin() {
 	global $is_IE;
 
-	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
+	$admin_html_class = (is_admin_bar_showing()) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
+	if ($is_IE)
 		@header('X-UA-Compatible: IE=edge');
 
 ?>
@@ -1998,13 +1998,13 @@ 
 	 *
 	 * @since 2.2.0
 	 */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <![endif]-->
 <!--[if !(IE 8) ]><!-->
 <html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
 	/** This action is documented in wp-admin/includes/template.php */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
@@ -2020,13 +2020,13 @@ 
  * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
  * @return WP_Screen Screen object.
  */
-function convert_to_screen( $hook_name ) {
-	if ( ! class_exists( 'WP_Screen' ) ) {
-		_doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3.0' );
-		return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
+function convert_to_screen($hook_name) {
+	if ( ! class_exists('WP_Screen')) {
+		_doing_it_wrong('convert_to_screen(), add_meta_box()', __("Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead."), '3.3.0');
+		return (object) array('id' => '_invalid', 'base' => '_are_belong_to_us');
 	}
 
-	return WP_Screen::get( $hook_name );
+	return WP_Screen::get($hook_name);
 }
 
 /**
@@ -2039,11 +2039,11 @@ 
 	?>
 	<div id="local-storage-notice" class="hidden notice is-dismissible">
 	<p class="local-restore">
-		<?php _e( 'The backup of this post in your browser is different from the version below.' ); ?>
+		<?php _e('The backup of this post in your browser is different from the version below.'); ?>
 		<button type="button" class="button restore-backup"><?php _e('Restore the backup'); ?></button>
 	</p>
 	<p class="help">
-		<?php _e( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' ); ?>
+		<?php _e('This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.'); ?>
 	</p>
 	</div>
 	<?php
@@ -2071,45 +2071,45 @@ 
  *                          of echoing it. Default true.
  * }
  */
-function wp_star_rating( $args = array() ) {
+function wp_star_rating($args = array()) {
 	$defaults = array(
 		'rating' => 0,
 		'type'   => 'rating',
 		'number' => 0,
 		'echo'   => true,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	// Non-english decimal places when the $rating is coming from a string
-	$rating = str_replace( ',', '.', $r['rating'] );
+	$rating = str_replace(',', '.', $r['rating']);
 
 	// Convert Percentage to star rating, 0..5 in .5 increments
-	if ( 'percent' == $r['type'] ) {
-		$rating = round( $rating / 10, 0 ) / 2;
+	if ('percent' == $r['type']) {
+		$rating = round($rating / 10, 0) / 2;
 	}
 
 	// Calculate the number of each type of star needed
-	$full_stars = floor( $rating );
-	$half_stars = ceil( $rating - $full_stars );
+	$full_stars = floor($rating);
+	$half_stars = ceil($rating - $full_stars);
 	$empty_stars = 5 - $full_stars - $half_stars;
 
-	if ( $r['number'] ) {
+	if ($r['number']) {
 		/* translators: 1: The rating, 2: The number of ratings */
-		$format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
-		$title = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
+		$format = _n('%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number']);
+		$title = sprintf($format, number_format_i18n($rating, 1), number_format_i18n($r['number']));
 	} else {
 		/* translators: 1: The rating */
-		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
+		$title = sprintf(__('%s rating'), number_format_i18n($rating, 1));
 	}
 
 	$output = '<div class="star-rating">';
-	$output .= '<span class="screen-reader-text">' . $title . '</span>';
-	$output .= str_repeat( '<div class="star star-full" aria-hidden="true"></div>', $full_stars );
-	$output .= str_repeat( '<div class="star star-half" aria-hidden="true"></div>', $half_stars );
-	$output .= str_repeat( '<div class="star star-empty" aria-hidden="true"></div>', $empty_stars );
+	$output .= '<span class="screen-reader-text">'.$title.'</span>';
+	$output .= str_repeat('<div class="star star-full" aria-hidden="true"></div>', $full_stars);
+	$output .= str_repeat('<div class="star star-half" aria-hidden="true"></div>', $half_stars);
+	$output .= str_repeat('<div class="star star-empty" aria-hidden="true"></div>', $empty_stars);
 	$output .= '</div>';
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -2123,5 +2123,5 @@ 
  * @since 4.2.0
  */
 function _wp_posts_page_notice() {
-	echo '<div class="notice notice-warning inline"><p>' . __( 'You are currently editing the page that shows your latest posts.' ) . '</p></div>';
+	echo '<div class="notice notice-warning inline"><p>'.__('You are currently editing the page that shows your latest posts.').'</p></div>';
 }

Braces +194 added lines, -125 removed lines

@@ -191,10 +191,11 @@ 
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
-		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
-	else
-		$checked_terms = array();
+	if ( $post && $post->ID ) {
+			$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
+	} else {
+			$checked_terms = array();
+	}
 
 	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
 
@@ -203,8 +204,10 @@ 
 	$popular_ids = array();
 	foreach ( (array) $terms as $term ) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // Hack for Ajax use.
+		if ( !$echo ) {
+			// Hack for Ajax use.
 			continue;
+		}
 		$id = "popular-$taxonomy-$term->term_id";
 		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
@@ -248,8 +251,9 @@ 
 
 	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
 
-	if ( empty( $categories ) )
-		return;
+	if ( empty( $categories ) ) {
+			return;
+	}
 
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
@@ -270,8 +274,9 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	$title = esc_textarea( trim( $post->post_title ) );
 
@@ -331,11 +336,13 @@ 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( !$post_type_object->hierarchical ) {
+			echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	}
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+			echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	}
 
 	echo '</div>';
 }
@@ -388,9 +395,12 @@ 
 <form method="get">
 <?php if ( $table_row ) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
-<?php else : ?>
+<?php else {
+	: ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<fieldset class="comment-reply">
 	<legend>
 		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
@@ -442,15 +452,19 @@ 
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
 		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		if ( current_user_can( 'unfiltered_html' ) ) {
+					wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		}
 	?>
 	</fieldset>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
-<?php else : ?>
+<?php else {
+	: ?>
 </div></div>
-<?php endif; ?>
+<?php endif;
+}
+?>
 </form>
 <?php
 }
@@ -506,9 +520,10 @@ 
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
-?>
+	foreach ( $meta as $entry ) {
+			echo _list_meta_row( $entry, $count );
+	}
+	?>
 	</tbody>
 </table>
 <?php
@@ -528,11 +543,13 @@ 
 function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
-		return '';
+	if ( is_protected_meta( $entry['meta_key'], 'post' ) ) {
+			return '';
+	}
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce ) {
+			$update_nonce = wp_create_nonce( 'add-meta' );
+	}
 
 	$r = '';
 	++ $count;
@@ -639,8 +656,9 @@ 
 <?php
 
 	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
-			continue;
+		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
+					continue;
+		}
 		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
 	}
 ?>
@@ -686,12 +704,14 @@ 
 	global $wp_locale;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ( $for_post ) {
+			$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	}
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
-		$tab_index_attribute = " tabindex=\"$tab_index\"";
+	if ( (int) $tab_index > 0 ) {
+			$tab_index_attribute = " tabindex=\"$tab_index\"";
+	}
 
 	// todo: Remove this?
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
@@ -732,7 +752,9 @@ 
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
-	if ( $multi ) return;
+	if ( $multi ) {
+		return;
+	}
 
 	echo "\n\n";
 	$map = array(
@@ -799,8 +821,9 @@ 
 	if ( $items ) {
 		foreach ( $items as $item ) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
-				continue;
+			if ( $post && $post->ID && $item->ID == $post->ID ) {
+							continue;
+			}
 
 			$pad = str_repeat( '&nbsp;', $level * 3 );
 			$selected = selected( $default, $item->ID, false );
@@ -828,10 +851,12 @@ 
 
 	foreach ( $editable_roles as $role => $details ) {
 		$name = translate_user_role($details['name'] );
-		if ( $selected == $role ) // preselect specified role
+		if ( $selected == $role ) {
+			// preselect specified role
 			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
-		else
-			$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+		} else {
+					$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+		}
 	}
 	echo $p . $r;
 }
@@ -860,9 +885,12 @@ 
 	if ( ! empty( $upload_dir['error'] ) ) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
-	else :
+	else {
+		:
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) );
+	}
+	?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />
@@ -922,23 +950,28 @@ 
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
 	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
 		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
-				continue;
+			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) {
+							continue;
+			}
 
 			// If a core box was previously added or removed by a plugin, don't add.
 			if ( 'core' == $priority ) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
-					return;
+				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) {
+									return;
+				}
 
 				/*
 				 * If box was added with default priority, give it core priority to
@@ -963,16 +996,19 @@ 
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
-				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			if ( $priority != $a_priority || $context != $a_context ) {
+							unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			}
 		}
 	}
 
-	if ( empty($priority) )
-		$priority = 'low';
+	if ( empty($priority) ) {
+			$priority = 'low';
+	}
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
-		$wp_meta_boxes[$page][$context][$priority] = array();
+	if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) {
+			$wp_meta_boxes[$page][$context][$priority] = array();
+	}
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
 }
@@ -994,10 +1030,11 @@ 
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1024,8 +1061,9 @@ 
 		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
 				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
 					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
@@ -1096,16 +1134,20 @@ 
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
-		$wp_meta_boxes[$page][$context][$priority][$id] = false;
-}
+	foreach ( array('high', 'core', 'default', 'low') as $priority ) {
+			$wp_meta_boxes[$page][$context][$priority][$id] = false;
+	}
+	}
 
 /**
  * Meta Box Accordion Template Function
@@ -1128,10 +1170,11 @@ 
 
 	wp_enqueue_script( 'accordion' );
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1147,8 +1190,9 @@ 
 		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
 				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
@@ -1286,18 +1330,22 @@ 
 function do_settings_sections( $page ) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
-		return;
+	if ( ! isset( $wp_settings_sections[$page] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
-			echo "<h2>{$section['title']}</h2>\n";
+		if ( $section['title'] ) {
+					echo "<h2>{$section['title']}</h2>\n";
+		}
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ( $section['callback'] ) {
+					call_user_func( $section['callback'], $section );
+		}
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
-			continue;
+		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) ) {
+					continue;
+		}
 		echo '<table class="form-table">';
 		do_settings_fields( $page, $section['id'] );
 		echo '</table>';
@@ -1321,8 +1369,9 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
-		return;
+	if ( ! isset( $wp_settings_fields[$page][$section] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
 		$class = '';
@@ -1412,8 +1461,9 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ( $sanitize ) {
+			sanitize_option( $setting, get_option( $setting ) );
+	}
 
 	// If settings were passed back from options.php then use them.
 	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
@@ -1422,15 +1472,17 @@ 
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
-		return array();
+	if ( ! count( $wp_settings_errors ) ) {
+			return array();
+	}
 
 	// Filter the results to those of a specific setting if one was set.
 	if ( $setting ) {
 		$setting_errors = array();
 		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
-				$setting_errors[] = $wp_settings_errors[$key];
+			if ( $setting == $details['setting'] ) {
+							$setting_errors[] = $wp_settings_errors[$key];
+			}
 		}
 		return $setting_errors;
 	}
@@ -1467,13 +1519,15 @@ 
  */
 function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
-		return;
+	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) ) {
+			return;
+	}
 
 	$settings_errors = get_settings_errors( $setting, $sanitize );
 
-	if ( empty( $settings_errors ) )
-		return;
+	if ( empty( $settings_errors ) ) {
+			return;
+	}
 
 	$output = '';
 	foreach ( $settings_errors as $key => $details ) {
@@ -1532,9 +1586,10 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
-}
+	if ( isset( $post->post_password ) ) {
+			echo esc_attr( $post->post_password );
+	}
+	}
 
 /**
  * Get the post title.
@@ -1549,8 +1604,9 @@ 
  */
 function _draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
+	if ( empty( $title ) ) {
+			$title = __( '(no title)' );
+	}
 	return esc_html( $title );
 }
 
@@ -1627,8 +1683,9 @@ 
 
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
 ?>
 </head>
@@ -1640,7 +1697,10 @@ 
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if ( isset($GLOBALS['body_id']) ) {
+	echo ' id="' . $GLOBALS['body_id'] . '"';
+}
+?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1692,21 +1752,27 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
-		$post_status = $_REQUEST['post_status'];
-	else
-		$post_status = '';
-
-	if ( !empty($post->post_password) )
-		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
-		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
-		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
-		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
-		$post_states['sticky'] = __('Sticky');
+	if ( isset( $_REQUEST['post_status'] ) ) {
+			$post_status = $_REQUEST['post_status'];
+	} else {
+			$post_status = '';
+	}
+
+	if ( !empty($post->post_password) ) {
+			$post_states['protected'] = __('Password protected');
+	}
+	if ( 'private' == $post->post_status && 'private' != $post_status ) {
+			$post_states['private'] = __('Private');
+	}
+	if ( 'draft' == $post->post_status && 'draft' != $post_status ) {
+			$post_states['draft'] = __('Draft');
+	}
+	if ( 'pending' == $post->post_status && 'pending' != $post_status ) {
+			$post_states['pending'] = _x('Pending', 'post status');
+	}
+	if ( is_sticky($post->ID) ) {
+			$post_states['sticky'] = __('Sticky');
+	}
 
 	if ( 'future' === $post->post_status ) {
 		$post_states['scheduled'] = __( 'Scheduled' );
@@ -1932,14 +1998,16 @@ 
  * @return string Submit button HTML.
  */
 function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
+	if ( ! is_array( $type ) ) {
+			$type = explode( ' ', $type );
+	}
 
 	$button_shorthand = array( 'primary', 'small', 'large' );
 	$classes = array( 'button' );
 	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
-			continue;
+		if ( 'secondary' === $t || 'button-secondary' === $t ) {
+					continue;
+		}
 		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
 	}
 	// Remove empty items, remove duplicate items, and finally build a string.
@@ -1986,8 +2054,9 @@ 
 
 	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
-		@header('X-UA-Compatible: IE=edge');
+	if ( $is_IE ) {
+			@header('X-UA-Compatible: IE=edge');
+	}
 
 ?>
 <!DOCTYPE html>

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

Doc Comments +3 added lines, -3 removed lines

@@ -440,7 +440,7 @@ 
 	 * and care should be taken to use `$theme::display( 'Name' )` to get a properly
 	 * translated header.
 	 *
-	 * @param mixed $offset
+	 * @param string $offset
 	 * @return mixed
 	 */
 	public function offsetGet( $offset ) {
@@ -976,7 +976,7 @@ 
 	 * @since 3.4.0
 	 * @access public
 	 *
-	 * @param mixed $type Optional. Array of extensions to return. Defaults to all files (null).
+	 * @param string $type Optional. Array of extensions to return. Defaults to all files (null).
 	 * @param int $depth Optional. How deep to search for files. Defaults to a flat scan (0 depth). -1 depth is infinite.
 	 * @param bool $search_parent Optional. Whether to return parent files. Defaults to false.
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
@@ -1352,7 +1352,7 @@ 
 	 * @static
 	 * @access public
 	 *
-	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
+	 * @param string $stylesheets Stylesheet name or array of stylesheet names.
 	 */
 	public static function network_disable_theme( $stylesheets ) {
 		if ( ! is_multisite() ) {

Indentation +1 added lines, -1 removed lines

@@ -707,7 +707,7 @@
 	/**
 	 * Mark up a theme header.
 	 *
-     * @since 3.4.0
+	 * @since 3.4.0
 	 * @access private
 	 *
 	 * @staticvar string $comma

Spacing +298 added lines, -298 removed lines

@@ -199,19 +199,19 @@ 
 	 * @param string $theme_root Theme root.
 	 * @param WP_Error|void $_child If this theme is a parent theme, the child may be passed for validation purposes.
 	 */
-	public function __construct( $theme_dir, $theme_root, $_child = null ) {
+	public function __construct($theme_dir, $theme_root, $_child = null) {
 		global $wp_theme_directories;
 
 		// Initialize caching on first run.
-		if ( ! isset( self::$persistently_cache ) ) {
+		if ( ! isset(self::$persistently_cache)) {
 			/** This action is documented in wp-includes/theme.php */
-			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
-			if ( self::$persistently_cache ) {
-				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
+			self::$persistently_cache = apply_filters('wp_cache_themes_persistently', false, 'WP_Theme');
+			if (self::$persistently_cache) {
+				wp_cache_add_global_groups('themes');
+				if (is_int(self::$persistently_cache))
 					self::$cache_expiration = self::$persistently_cache;
 			} else {
-				wp_cache_add_non_persistent_groups( 'themes' );
+				wp_cache_add_non_persistent_groups('themes');
 			}
 		}
 
@@ -219,114 +219,114 @@ 
 		$this->stylesheet = $theme_dir;
 
 		// Correct a situation where the theme is 'some-directory/some-theme' but 'some-directory' was passed in as part of the theme root instead.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) && in_array( dirname( $theme_root ), (array) $wp_theme_directories ) ) {
-			$this->stylesheet = basename( $this->theme_root ) . '/' . $this->stylesheet;
-			$this->theme_root = dirname( $theme_root );
+		if ( ! in_array($theme_root, (array) $wp_theme_directories) && in_array(dirname($theme_root), (array) $wp_theme_directories)) {
+			$this->stylesheet = basename($this->theme_root).'/'.$this->stylesheet;
+			$this->theme_root = dirname($theme_root);
 		}
 
-		$this->cache_hash = md5( $this->theme_root . '/' . $this->stylesheet );
-		$theme_file = $this->stylesheet . '/style.css';
+		$this->cache_hash = md5($this->theme_root.'/'.$this->stylesheet);
+		$theme_file = $this->stylesheet.'/style.css';
 
-		$cache = $this->cache_get( 'theme' );
+		$cache = $this->cache_get('theme');
 
-		if ( is_array( $cache ) ) {
-			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+		if (is_array($cache)) {
+			foreach (array('errors', 'headers', 'template') as $key) {
+				if (isset($cache[$key]))
+					$this->$key = $cache[$key];
 			}
-			if ( $this->errors )
+			if ($this->errors)
 				return;
-			if ( isset( $cache['theme_root_template'] ) )
+			if (isset($cache['theme_root_template']))
 				$theme_root_template = $cache['theme_root_template'];
-		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! file_exists($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet))
+				$this->errors = new WP_Error('theme_not_found', sprintf(__('The theme directory "%s" does not exist.'), esc_html($this->stylesheet)));
 			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+				$this->errors = new WP_Error('theme_no_stylesheet', __('Stylesheet is missing.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
-				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+			if ( ! file_exists($this->theme_root)) // Don't cache this one.
+				$this->errors->add('theme_root_missing', __('ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.'));
 			return;
-		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! is_readable($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			$this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
+			$this->errors = new WP_Error('theme_stylesheet_not_readable', __('Stylesheet is not readable.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 			return;
 		} else {
-			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
+			$this->headers = get_file_data($this->theme_root.'/'.$theme_file, self::$file_headers, 'theme');
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
-			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+			if ($default_theme_slug = array_search($this->headers['Name'], self::$default_themes)) {
+				if (basename($this->stylesheet) != $default_theme_slug)
+					$this->headers['Name'] .= '/'.$this->stylesheet;
 			}
 		}
 
 		// (If template is set from cache [and there are no errors], we know it's good.)
-		if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
+		if ( ! $this->template && ! ($this->template = $this->headers['Template'])) {
 			$this->template = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet.'/index.php')) {
 				$error_message = sprintf(
 					/* translators: 1: index.php, 2: Codex URL, 3: style.css */
-					__( 'Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.' ),
+					__('Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.'),
 					'<code>index.php</code>',
-					__( 'https://codex.wordpress.org/Child_Themes' ),
+					__('https://codex.wordpress.org/Child_Themes'),
 					'<code>style.css</code>'
 				);
-				$this->errors = new WP_Error( 'theme_no_index', $error_message );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				$this->errors = new WP_Error('theme_no_index', $error_message);
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				return;
 			}
 		}
 
 		// If we got our data from cache, we can assume that 'template' is pointing to the right place.
-		if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) {
+		if ( ! is_array($cache) && $this->template != $this->stylesheet && ! file_exists($this->theme_root.'/'.$this->template.'/index.php')) {
 			// If we're in a directory of themes inside /themes, look for the parent nearby.
 			// wp-content/themes/directory-of-themes/*
-			$parent_dir = dirname( $this->stylesheet );
-			if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
-				$this->template = $parent_dir . '/' . $this->template;
-			} elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+			$parent_dir = dirname($this->stylesheet);
+			if ('.' != $parent_dir && file_exists($this->theme_root.'/'.$parent_dir.'/'.$this->template.'/index.php')) {
+				$this->template = $parent_dir.'/'.$this->template;
+			} elseif (($directories = search_theme_directories()) && isset($directories[$this->template])) {
 				// Look for the template in the search_theme_directories() results, in case it is in another theme root.
 				// We don't look into directories of themes, just the theme root.
-				$theme_root_template = $directories[ $this->template ]['theme_root'];
+				$theme_root_template = $directories[$this->template]['theme_root'];
 			} else {
 				// Parent theme is missing.
-				$this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
+				$this->errors = new WP_Error('theme_no_parent', sprintf(__('The parent theme is missing. Please install the "%s" parent theme.'), esc_html($this->template)));
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+				$this->parent = new WP_Theme($this->template, $this->theme_root, $this);
 				return;
 			}
 		}
 
 		// Set the parent, if we're a child theme.
-		if ( $this->template != $this->stylesheet ) {
+		if ($this->template != $this->stylesheet) {
 			// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
-			if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
+			if ($_child instanceof WP_Theme && $_child->template == $this->stylesheet) {
 				$_child->parent = null;
-				$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
-				$_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
+				$_child->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($_child->template)));
+				$_child->cache_add('theme', array('headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template));
 				// The two themes actually reference each other with the Template header.
-				if ( $_child->stylesheet == $this->template ) {
-					$this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
-					$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				if ($_child->stylesheet == $this->template) {
+					$this->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($this->template)));
+					$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				}
 				return;
 			}
 			// Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
-			$this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
+			$this->parent = new WP_Theme($this->template, isset($theme_root_template) ? $theme_root_template : $this->theme_root, $this);
 		}
 
 		// We're good. If we didn't retrieve from cache, set it.
-		if ( ! is_array( $cache ) ) {
-			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
+		if ( ! is_array($cache)) {
+			$cache = array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
+			if (isset($theme_root_template))
 				$cache['theme_root_template'] = $theme_root_template;
-			$this->cache_add( 'theme', $cache );
+			$this->cache_add('theme', $cache);
 		}
 	}
 
@@ -347,13 +347,13 @@ 
 	 * @param string $offset Property to check if set.
 	 * @return bool Whether the given property is set.
 	 */
-	public function __isset( $offset ) {
+	public function __isset($offset) {
 		static $properties = array(
 			'name', 'title', 'version', 'parent_theme', 'template_dir', 'stylesheet_dir', 'template', 'stylesheet',
 			'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
 		);
 
-		return in_array( $offset, $properties );
+		return in_array($offset, $properties);
 	}
 
 	/**
@@ -362,8 +362,8 @@ 
 	 * @param string $offset Property to get.
 	 * @return mixed Property value.
 	 */
-	public function __get( $offset ) {
-		switch ( $offset ) {
+	public function __get($offset) {
+		switch ($offset) {
 			case 'name' :
 			case 'title' :
 				return $this->get('Name');
@@ -380,21 +380,21 @@ 
 			case 'stylesheet' :
 				return $this->get_stylesheet();
 			case 'screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			// 'author' and 'description' did not previously return translated data.
 			case 'description' :
 				return $this->display('Description');
 			case 'author' :
 				return $this->display('Author');
 			case 'tags' :
-				return $this->get( 'Tags' );
+				return $this->get('Tags');
 			case 'theme_root' :
 				return $this->get_theme_root();
 			case 'theme_root_uri' :
 				return $this->get_theme_root_uri();
 			// For cases where the array was converted to an object.
 			default :
-				return $this->offsetGet( $offset );
+				return $this->offsetGet($offset);
 		}
 	}
 
@@ -404,14 +404,14 @@ 
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet( $offset, $value ) {}
+	public function offsetSet($offset, $value) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
 	 *
 	 * @param mixed $offset
 	 */
-	public function offsetUnset( $offset ) {}
+	public function offsetUnset($offset) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
@@ -421,14 +421,14 @@ 
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		static $keys = array(
 			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
 			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
 			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
 		);
 
-		return in_array( $offset, $keys );
+		return in_array($offset, $keys);
 	}
 
 	/**
@@ -444,8 +444,8 @@ 
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	public function offsetGet( $offset ) {
-		switch ( $offset ) {
+	public function offsetGet($offset) {
+		switch ($offset) {
 			case 'Name' :
 			case 'Title' :
 				/*
@@ -454,30 +454,30 @@ 
 				 */
 				return $this->get('Name');
 			case 'Author' :
-				return $this->display( 'Author');
+				return $this->display('Author');
 			case 'Author Name' :
-				return $this->display( 'Author', false);
+				return $this->display('Author', false);
 			case 'Author URI' :
 				return $this->display('AuthorURI');
 			case 'Description' :
-				return $this->display( 'Description');
+				return $this->display('Description');
 			case 'Version' :
 			case 'Status' :
-				return $this->get( $offset );
+				return $this->get($offset);
 			case 'Template' :
 				return $this->get_template();
 			case 'Stylesheet' :
 				return $this->get_stylesheet();
 			case 'Template Files' :
-				return $this->get_files( 'php', 1, true );
+				return $this->get_files('php', 1, true);
 			case 'Stylesheet Files' :
-				return $this->get_files( 'css', 0, false );
+				return $this->get_files('css', 0, false);
 			case 'Template Dir' :
 				return $this->get_template_directory();
 			case 'Stylesheet Dir' :
 				return $this->get_stylesheet_directory();
 			case 'Screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			case 'Tags' :
 				return $this->get('Tags');
 			case 'Theme Root' :
@@ -500,7 +500,7 @@ 
 	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
 	public function errors() {
-		return is_wp_error( $this->errors ) ? $this->errors : false;
+		return is_wp_error($this->errors) ? $this->errors : false;
 	}
 
 	/**
@@ -515,7 +515,7 @@ 
 	 * @return bool Whether the theme exists.
 	 */
 	public function exists() {
-		return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes() ) );
+		return ! ($this->errors() && in_array('theme_not_found', $this->errors()->get_error_codes()));
 	}
 
 	/**
@@ -527,7 +527,7 @@ 
 	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
 	public function parent() {
-		return isset( $this->parent ) ? $this->parent : false;
+		return isset($this->parent) ? $this->parent : false;
 	}
 
 	/**
@@ -542,8 +542,8 @@ 
 	 * @param string $data Data to store
 	 * @return bool Return value from wp_cache_add()
 	 */
-	private function cache_add( $key, $data ) {
-		return wp_cache_add( $key . '-' . $this->cache_hash, $data, 'themes', self::$cache_expiration );
+	private function cache_add($key, $data) {
+		return wp_cache_add($key.'-'.$this->cache_hash, $data, 'themes', self::$cache_expiration);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, post_templates)
 	 * @return mixed Retrieved data
 	 */
-	private function cache_get( $key ) {
-		return wp_cache_get( $key . '-' . $this->cache_hash, 'themes' );
+	private function cache_get($key) {
+		return wp_cache_get($key.'-'.$this->cache_hash, 'themes');
 	}
 
 	/**
@@ -568,11 +568,11 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach (array('theme', 'screenshot', 'headers', 'post_templates') as $key)
+			wp_cache_delete($key.'-'.$this->cache_hash, 'themes');
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
-		$this->__construct( $this->stylesheet, $this->theme_root );
+		$this->__construct($this->stylesheet, $this->theme_root);
 	}
 
 	/**
@@ -592,29 +592,29 @@ 
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @return string|false String on success, false on failure.
 	 */
-	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
+	public function get($header) {
+		if ( ! isset($this->headers[$header]))
 			return false;
 
-		if ( ! isset( $this->headers_sanitized ) ) {
-			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
+		if ( ! isset($this->headers_sanitized)) {
+			$this->headers_sanitized = $this->cache_get('headers');
+			if ( ! is_array($this->headers_sanitized))
 				$this->headers_sanitized = array();
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if (isset($this->headers_sanitized[$header]))
+			return $this->headers_sanitized[$header];
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
-		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
-			$this->cache_add( 'headers', $this->headers_sanitized );
+		if (self::$persistently_cache) {
+			foreach (array_keys($this->headers) as $_header)
+				$this->headers_sanitized[$_header] = $this->sanitize_header($_header, $this->headers[$_header]);
+			$this->cache_add('headers', $this->headers_sanitized);
 		} else {
-			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
+			$this->headers_sanitized[$header] = $this->sanitize_header($header, $this->headers[$header]);
 		}
 
-		return $this->headers_sanitized[ $header ];
+		return $this->headers_sanitized[$header];
 	}
 
 	/**
@@ -628,20 +628,20 @@ 
 	 * @param bool $translate Optional. Whether to translate the header. Defaults to true.
 	 * @return string|false Processed header, false on failure.
 	 */
-	public function display( $header, $markup = true, $translate = true ) {
-		$value = $this->get( $header );
-		if ( false === $value ) {
+	public function display($header, $markup = true, $translate = true) {
+		$value = $this->get($header);
+		if (false === $value) {
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
+		if ($translate && (empty($value) || ! $this->load_textdomain()))
 			$translate = false;
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ($translate)
+			$value = $this->translate_header($header, $value);
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ($markup)
+			$value = $this->markup_header($header, $value, $translate);
 
 		return $value;
 	}
@@ -659,46 +659,46 @@ 
 	 * @param string $value Value to sanitize.
 	 * @return mixed
 	 */
-	private function sanitize_header( $header, $value ) {
-		switch ( $header ) {
+	private function sanitize_header($header, $value) {
+		switch ($header) {
 			case 'Status' :
-				if ( ! $value ) {
+				if ( ! $value) {
 					$value = 'publish';
 					break;
 				}
 				// Fall through otherwise.
 			case 'Name' :
 				static $header_tags = array(
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags );
+				$value = wp_kses($value, $header_tags);
 				break;
 			case 'Author' :
 				// There shouldn't be anchor tags in Author, but some themes like to be challenging.
 			case 'Description' :
 				static $header_tags_with_a = array(
-					'a'       => array( 'href' => true, 'title' => true ),
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'a'       => array('href' => true, 'title' => true),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags_with_a );
+				$value = wp_kses($value, $header_tags_with_a);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url_raw( $value );
+				$value = esc_url_raw($value);
 				break;
 			case 'Tags' :
-				$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
+				$value = array_filter(array_map('trim', explode(',', strip_tags($value))));
 				break;
 			case 'Version' :
-				$value = strip_tags( $value );
+				$value = strip_tags($value);
 				break;
 		}
 
@@ -718,33 +718,33 @@ 
 	 * @param string $translate Whether the header has been translated.
 	 * @return string Value, marked up.
 	 */
-	private function markup_header( $header, $value, $translate ) {
-		switch ( $header ) {
+	private function markup_header($header, $value, $translate) {
+		switch ($header) {
 			case 'Name' :
-				if ( empty( $value ) )
+				if (empty($value))
 					$value = $this->get_stylesheet();
 				break;
 			case 'Description' :
-				$value = wptexturize( $value );
+				$value = wptexturize($value);
 				break;
 			case 'Author' :
-				if ( $this->get('AuthorURI') ) {
-					$value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );
-				} elseif ( ! $value ) {
-					$value = __( 'Anonymous' );
+				if ($this->get('AuthorURI')) {
+					$value = sprintf('<a href="%1$s">%2$s</a>', $this->display('AuthorURI', true, $translate), $value);
+				} elseif ( ! $value) {
+					$value = __('Anonymous');
 				}
 				break;
 			case 'Tags' :
 				static $comma = null;
-				if ( ! isset( $comma ) ) {
+				if ( ! isset($comma)) {
 					/* translators: used between list items, there is a space after the comma */
-					$comma = __( ', ' );
+					$comma = __(', ');
 				}
-				$value = implode( $comma, $value );
+				$value = implode($comma, $value);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url( $value );
+				$value = esc_url($value);
 				break;
 		}
 
@@ -763,51 +763,51 @@ 
 	 * @param string $value Value to translate.
 	 * @return string Translated value.
 	 */
-	private function translate_header( $header, $value ) {
-		switch ( $header ) {
+	private function translate_header($header, $value) {
+		switch ($header) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
+				if (isset($this->name_translated))
 					return $this->name_translated;
-				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
+				$this->name_translated = translate($value, $this->get('TextDomain'));
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) ) {
+				if (empty($value) || ! function_exists('get_theme_feature_list')) {
 					return $value;
 				}
 
 				static $tags_list;
-				if ( ! isset( $tags_list ) ) {
+				if ( ! isset($tags_list)) {
 					$tags_list = array(
 						// As of 4.6, deprecated tags which are only used to provide translation for older themes.
-						'black' => __( 'Black' ), 'blue' => __( 'Blue' ), 'brown'  => __( 'Brown' ),
-						'gray' => __( 'Gray' ), 'green'  => __( 'Green' ), 'orange' => __( 'Orange' ),
-						'pink' => __( 'Pink' ), 'purple' => __( 'Purple' ), 'red' => __( 'Red' ),
-						'silver' => __( 'Silver' ), 'tan' => __( 'Tan' ), 'white' => __( 'White' ),
-						'yellow' => __( 'Yellow' ), 'dark' => __( 'Dark' ), 'light' => __( 'Light' ),
-						'fixed-layout' => __( 'Fixed Layout' ), 'fluid-layout' => __( 'Fluid Layout' ),
-						'responsive-layout' => __( 'Responsive Layout' ), 'blavatar' => __( 'Blavatar' ),
-						'photoblogging' => __( 'Photoblogging' ), 'seasonal' => __( 'Seasonal' ),
+						'black' => __('Black'), 'blue' => __('Blue'), 'brown'  => __('Brown'),
+						'gray' => __('Gray'), 'green'  => __('Green'), 'orange' => __('Orange'),
+						'pink' => __('Pink'), 'purple' => __('Purple'), 'red' => __('Red'),
+						'silver' => __('Silver'), 'tan' => __('Tan'), 'white' => __('White'),
+						'yellow' => __('Yellow'), 'dark' => __('Dark'), 'light' => __('Light'),
+						'fixed-layout' => __('Fixed Layout'), 'fluid-layout' => __('Fluid Layout'),
+						'responsive-layout' => __('Responsive Layout'), 'blavatar' => __('Blavatar'),
+						'photoblogging' => __('Photoblogging'), 'seasonal' => __('Seasonal'),
 					);
 
-					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags ) {
+					$feature_list = get_theme_feature_list(false); // No API
+					foreach ($feature_list as $tags) {
 						$tags_list += $tags;
 					}
 				}
 
-				foreach ( $value as &$tag ) {
-					if ( isset( $tags_list[ $tag ] ) ) {
-						$tag = $tags_list[ $tag ];
-					} elseif ( isset( self::$tag_map[ $tag ] ) ) {
-						$tag = $tags_list[ self::$tag_map[ $tag ] ];
+				foreach ($value as &$tag) {
+					if (isset($tags_list[$tag])) {
+						$tag = $tags_list[$tag];
+					} elseif (isset(self::$tag_map[$tag])) {
+						$tag = $tags_list[self::$tag_map[$tag]];
 					}
 				}
 
 				return $value;
 
 			default :
-				$value = translate( $value, $this->get('TextDomain') );
+				$value = translate($value, $this->get('TextDomain'));
 		}
 		return $value;
 	}
@@ -854,10 +854,10 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
+		if ($this->errors() && in_array('theme_root_missing', $this->errors()->get_error_codes()))
 			return '';
 
-		return $this->theme_root . '/' . $this->stylesheet;
+		return $this->theme_root.'/'.$this->stylesheet;
 	}
 
 	/**
@@ -872,12 +872,12 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root = $this->parent()->theme_root;
 		else
 			$theme_root = $this->theme_root;
 
-		return $theme_root . '/' . $this->template;
+		return $theme_root.'/'.$this->template;
 	}
 
 	/**
@@ -892,7 +892,7 @@ 
 	 * @return string URL to the stylesheet directory.
 	 */
 	public function get_stylesheet_directory_uri() {
-		return $this->get_theme_root_uri() . '/' . str_replace( '%2F', '/', rawurlencode( $this->stylesheet ) );
+		return $this->get_theme_root_uri().'/'.str_replace('%2F', '/', rawurlencode($this->stylesheet));
 	}
 
 	/**
@@ -907,12 +907,12 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root_uri = $this->parent()->get_theme_root_uri();
 		else
 			$theme_root_uri = $this->get_theme_root_uri();
 
-		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
+		return $theme_root_uri.'/'.str_replace('%2F', '/', rawurlencode($this->template));
 	}
 
 	/**
@@ -942,8 +942,8 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset($this->theme_root_uri))
+			$this->theme_root_uri = get_theme_root_uri($this->stylesheet, $this->theme_root);
 		return $this->theme_root_uri;
 	}
 
@@ -961,26 +961,26 @@ 
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
 	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
 	 */
-	public function get_screenshot( $uri = 'uri' ) {
-		$screenshot = $this->cache_get( 'screenshot' );
-		if ( $screenshot ) {
-			if ( 'relative' == $uri )
+	public function get_screenshot($uri = 'uri') {
+		$screenshot = $this->cache_get('screenshot');
+		if ($screenshot) {
+			if ('relative' == $uri)
 				return $screenshot;
-			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
-		} elseif ( 0 === $screenshot ) {
+			return $this->get_stylesheet_directory_uri().'/'.$screenshot;
+		} elseif (0 === $screenshot) {
 			return false;
 		}
 
-		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
-			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
-				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
-				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
+		foreach (array('png', 'gif', 'jpg', 'jpeg') as $ext) {
+			if (file_exists($this->get_stylesheet_directory()."/screenshot.$ext")) {
+				$this->cache_add('screenshot', 'screenshot.'.$ext);
+				if ('relative' == $uri)
+					return 'screenshot.'.$ext;
+				return $this->get_stylesheet_directory_uri().'/'.'screenshot.'.$ext;
 			}
 		}
 
-		$this->cache_add( 'screenshot', 0 );
+		$this->cache_add('screenshot', 0);
 		return false;
 	}
 
@@ -996,11 +996,11 @@ 
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
 	 * 	             being absolute paths.
 	 */
-	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
+	public function get_files($type = null, $depth = 0, $search_parent = false) {
+		$files = (array) self::scandir($this->get_stylesheet_directory(), $type, $depth);
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ($search_parent && $this->parent())
+			$files += (array) self::scandir($this->get_template_directory(), $type, $depth);
 
 		return $files;
 	}
@@ -1016,44 +1016,44 @@ 
 	 */
 	public function get_post_templates() {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) {
+		if ($this->errors() && $this->errors()->get_error_codes() !== array('theme_parent_invalid')) {
 			return array();
 		}
 
-		$post_templates = $this->cache_get( 'post_templates' );
+		$post_templates = $this->cache_get('post_templates');
 
-		if ( ! is_array( $post_templates ) ) {
+		if ( ! is_array($post_templates)) {
 			$post_templates = array();
 
-			$files = (array) $this->get_files( 'php', 1 );
+			$files = (array) $this->get_files('php', 1);
 
-			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
+			foreach ($files as $file => $full_path) {
+				if ( ! preg_match('|Template Name:(.*)$|mi', file_get_contents($full_path), $header)) {
 					continue;
 				}
 
-				$types = array( 'page' );
-				if ( preg_match( '|Template Post Type:(.*)$|mi', file_get_contents( $full_path ), $type ) ) {
-					$types = explode( ',', _cleanup_header_comment( $type[1] ) );
+				$types = array('page');
+				if (preg_match('|Template Post Type:(.*)$|mi', file_get_contents($full_path), $type)) {
+					$types = explode(',', _cleanup_header_comment($type[1]));
 				}
 
-				foreach ( $types as $type ) {
-					$type = sanitize_key( $type );
-					if ( ! isset( $post_templates[ $type ] ) ) {
-						$post_templates[ $type ] = array();
+				foreach ($types as $type) {
+					$type = sanitize_key($type);
+					if ( ! isset($post_templates[$type])) {
+						$post_templates[$type] = array();
 					}
 
-					$post_templates[ $type ][ $file ] = _cleanup_header_comment( $header[1] );
+					$post_templates[$type][$file] = _cleanup_header_comment($header[1]);
 				}
 			}
 
-			$this->cache_add( 'post_templates', $post_templates );
+			$this->cache_add('post_templates', $post_templates);
 		}
 
-		if ( $this->load_textdomain() ) {
-			foreach ( $post_templates as &$post_type ) {
-				foreach ( $post_type as &$post_template ) {
-					$post_template = $this->translate_header( 'Template Name', $post_template );
+		if ($this->load_textdomain()) {
+			foreach ($post_templates as &$post_type) {
+				foreach ($post_type as &$post_template) {
+					$post_template = $this->translate_header('Template Name', $post_template);
 				}
 			}
 		}
@@ -1073,16 +1073,16 @@ 
 	 *                                If a post is provided, its post type is used.
 	 * @return array Array of page templates, keyed by filename, with the value of the translated header name.
 	 */
-	public function get_page_templates( $post = null, $post_type = 'page' ) {
-		if ( $post ) {
-			$post_type = get_post_type( $post );
+	public function get_page_templates($post = null, $post_type = 'page') {
+		if ($post) {
+			$post_type = get_post_type($post);
 		}
 
 		$post_templates = $this->get_post_templates();
-		$post_templates = isset( $post_templates[ $post_type ] ) ? $post_templates[ $post_type ] : array();
+		$post_templates = isset($post_templates[$post_type]) ? $post_templates[$post_type] : array();
 
-		if ( $this->parent() ) {
-			$post_templates += $this->parent()->get_page_templates( $post, $post_type );
+		if ($this->parent()) {
+			$post_templates += $this->parent()->get_page_templates($post, $post_type);
 		}
 
 		/**
@@ -1100,7 +1100,7 @@ 
 		 * @param WP_Post|null $post           The post being edited, provided for context, or null.
 		 * @param string       $post_type      Post type to get the templates for.
 		 */
-		return (array) apply_filters( "theme_{$post_type}_templates", $post_templates, $this, $post, $post_type );
+		return (array) apply_filters("theme_{$post_type}_templates", $post_templates, $this, $post, $post_type);
 	}
 
 	/**
@@ -1122,32 +1122,32 @@ 
 	 * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
-	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
+	private static function scandir($path, $extensions = null, $depth = 0, $relative_path = '') {
+		if ( ! is_dir($path))
 			return false;
 
-		if ( $extensions ) {
+		if ($extensions) {
 			$extensions = (array) $extensions;
-			$_extensions = implode( '|', $extensions );
+			$_extensions = implode('|', $extensions);
 		}
 
-		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
+		$relative_path = trailingslashit($relative_path);
+		if ('/' == $relative_path)
 			$relative_path = '';
 
-		$results = scandir( $path );
+		$results = scandir($path);
 		$files = array();
 
-		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
+		foreach ($results as $result) {
+			if ('.' == $result[0])
 				continue;
-			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
+			if (is_dir($path.'/'.$result)) {
+				if ( ! $depth || 'CVS' == $result)
 					continue;
-				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
-				$files = array_merge_recursive( $files, $found );
-			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
-				$files[ $relative_path . $result ] = $path . '/' . $result;
+				$found = self::scandir($path.'/'.$result, $extensions, $depth - 1, $relative_path.$result);
+				$files = array_merge_recursive($files, $found);
+			} elseif ( ! $extensions || preg_match('~\.('.$_extensions.')$~', $result)) {
+				$files[$relative_path.$result] = $path.'/'.$result;
 			}
 		}
 
@@ -1167,27 +1167,27 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
+		if (isset($this->textdomain_loaded))
 			return $this->textdomain_loaded;
 
 		$textdomain = $this->get('TextDomain');
-		if ( ! $textdomain ) {
+		if ( ! $textdomain) {
 			$this->textdomain_loaded = false;
 			return false;
 		}
 
-		if ( is_textdomain_loaded( $textdomain ) ) {
+		if (is_textdomain_loaded($textdomain)) {
 			$this->textdomain_loaded = true;
 			return true;
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
+		if ($domainpath = $this->get('DomainPath'))
 			$path .= $domainpath;
 		else
 			$path .= '/languages';
 
-		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
+		$this->textdomain_loaded = load_theme_textdomain($textdomain, $path);
 		return $this->textdomain_loaded;
 	}
 
@@ -1202,19 +1202,19 @@ 
 	 * @param int $blog_id Optional. Ignored if only network-wide settings are checked. Defaults to current site.
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
-	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
+	public function is_allowed($check = 'both', $blog_id = null) {
+		if ( ! is_multisite())
 			return true;
 
-		if ( 'both' == $check || 'network' == $check ) {
+		if ('both' == $check || 'network' == $check) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
-		if ( 'both' == $check || 'site' == $check ) {
-			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+		if ('both' == $check || 'site' == $check) {
+			$allowed = self::get_allowed_on_site($blog_id);
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
@@ -1229,9 +1229,9 @@ 
 	 * @return WP_Theme|false Object, or false if no theme is installed, which would be bad.
 	 */
 	public static function get_core_default_theme() {
-		foreach ( array_reverse( self::$default_themes ) as $slug => $name ) {
-			$theme = wp_get_theme( $slug );
-			if ( $theme->exists() ) {
+		foreach (array_reverse(self::$default_themes) as $slug => $name) {
+			$theme = wp_get_theme($slug);
+			if ($theme->exists()) {
 				return $theme;
 			}
 		}
@@ -1249,7 +1249,7 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed( $blog_id = null ) {
+	public static function get_allowed($blog_id = null) {
 		/**
 		 * Filters the array of themes allowed on the network.
 		 *
@@ -1261,8 +1261,8 @@ 
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 * @param int   $blog_id        ID of the site.
 		 */
-		$network = (array) apply_filters( 'network_allowed_themes', self::get_allowed_on_network(), $blog_id );
-		return $network + self::get_allowed_on_site( $blog_id );
+		$network = (array) apply_filters('network_allowed_themes', self::get_allowed_on_network(), $blog_id);
+		return $network + self::get_allowed_on_site($blog_id);
 	}
 
 	/**
@@ -1279,8 +1279,8 @@ 
 	 */
 	public static function get_allowed_on_network() {
 		static $allowed_themes;
-		if ( ! isset( $allowed_themes ) ) {
-			$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		if ( ! isset($allowed_themes)) {
+			$allowed_themes = (array) get_site_option('allowedthemes');
 		}
 
 		/**
@@ -1290,7 +1290,7 @@ 
 		 *
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 */
-		$allowed_themes = apply_filters( 'allowed_themes', $allowed_themes );
+		$allowed_themes = apply_filters('allowed_themes', $allowed_themes);
 
 		return $allowed_themes;
 	}
@@ -1308,13 +1308,13 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed_on_site( $blog_id = null ) {
+	public static function get_allowed_on_site($blog_id = null) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
+		if ( ! $blog_id || ! is_multisite())
 			$blog_id = get_current_blog_id();
 
-		if ( isset( $allowed_themes[ $blog_id ] ) ) {
+		if (isset($allowed_themes[$blog_id])) {
 			/**
 			 * Filters the array of themes allowed on the site.
 			 *
@@ -1323,57 +1323,57 @@ 
 			 * @param array $allowed_themes An array of theme stylesheet names.
 			 * @param int   $blog_id        ID of the site. Defaults to current site.
 			 */
-			return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+			return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 		}
 
 		$current = $blog_id == get_current_blog_id();
 
-		if ( $current ) {
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+		if ($current) {
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 		} else {
-			switch_to_blog( $blog_id );
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+			switch_to_blog($blog_id);
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 			restore_current_blog();
 		}
 
 		// This is all super old MU back compat joy.
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		if ( false === $allowed_themes[ $blog_id ] ) {
-			if ( $current ) {
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+		if (false === $allowed_themes[$blog_id]) {
+			if ($current) {
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 			} else {
-				switch_to_blog( $blog_id );
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+				switch_to_blog($blog_id);
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 				restore_current_blog();
 			}
 
-			if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
-				$allowed_themes[ $blog_id ] = array();
+			if ( ! is_array($allowed_themes[$blog_id]) || empty($allowed_themes[$blog_id])) {
+				$allowed_themes[$blog_id] = array();
 			} else {
 				$converted = array();
 				$themes = wp_get_themes();
-				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+				foreach ($themes as $stylesheet => $theme_data) {
+					if (isset($allowed_themes[$blog_id][$theme_data->get('Name')]))
+						$converted[$stylesheet] = true;
 				}
-				$allowed_themes[ $blog_id ] = $converted;
+				$allowed_themes[$blog_id] = $converted;
 			}
 			// Set the option so we never have to go through this pain again.
-			if ( is_admin() && $allowed_themes[ $blog_id ] ) {
-				if ( $current ) {
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+			if (is_admin() && $allowed_themes[$blog_id]) {
+				if ($current) {
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 				} else {
-					switch_to_blog( $blog_id );
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+					switch_to_blog($blog_id);
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 					restore_current_blog();
 				}
 			}
 		}
 
 		/** This filter is documented in wp-includes/class-wp-theme.php */
-		return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+		return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 	}
 
 	/**
@@ -1385,21 +1385,21 @@ 
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
 	 */
-	public static function network_enable_theme( $stylesheets ) {
-		if ( ! is_multisite() ) {
+	public static function network_enable_theme($stylesheets) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( ! is_array( $stylesheets ) ) {
-			$stylesheets = array( $stylesheets );
+		if ( ! is_array($stylesheets)) {
+			$stylesheets = array($stylesheets);
 		}
 
-		$allowed_themes = get_site_option( 'allowedthemes' );
-		foreach ( $stylesheets as $stylesheet ) {
-			$allowed_themes[ $stylesheet ] = true;
+		$allowed_themes = get_site_option('allowedthemes');
+		foreach ($stylesheets as $stylesheet) {
+			$allowed_themes[$stylesheet] = true;
 		}
 
-		update_site_option( 'allowedthemes', $allowed_themes );
+		update_site_option('allowedthemes', $allowed_themes);
 	}
 
 	/**
@@ -1411,23 +1411,23 @@ 
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
 	 */
-	public static function network_disable_theme( $stylesheets ) {
-		if ( ! is_multisite() ) {
+	public static function network_disable_theme($stylesheets) {
+		if ( ! is_multisite()) {
 			return;
 		}
 
-		if ( ! is_array( $stylesheets ) ) {
-			$stylesheets = array( $stylesheets );
+		if ( ! is_array($stylesheets)) {
+			$stylesheets = array($stylesheets);
 		}
 
-		$allowed_themes = get_site_option( 'allowedthemes' );
-		foreach ( $stylesheets as $stylesheet ) {
-			if ( isset( $allowed_themes[ $stylesheet ] ) ) {
-				unset( $allowed_themes[ $stylesheet ] );
+		$allowed_themes = get_site_option('allowedthemes');
+		foreach ($stylesheets as $stylesheet) {
+			if (isset($allowed_themes[$stylesheet])) {
+				unset($allowed_themes[$stylesheet]);
 			}
 		}
 
-		update_site_option( 'allowedthemes', $allowed_themes );
+		update_site_option('allowedthemes', $allowed_themes);
 	}
 
 	/**
@@ -1440,11 +1440,11 @@ 
 	 *
 	 * @param array $themes Array of themes to sort, passed by reference.
 	 */
-	public static function sort_by_name( &$themes ) {
-		if ( 0 === strpos( get_user_locale(), 'en_' ) ) {
-			uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
+	public static function sort_by_name(&$themes) {
+		if (0 === strpos(get_user_locale(), 'en_')) {
+			uasort($themes, array('WP_Theme', '_name_sort'));
 		} else {
-			uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );
+			uasort($themes, array('WP_Theme', '_name_sort_i18n'));
 		}
 	}
 
@@ -1464,8 +1464,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort( $a, $b ) {
-		return strnatcasecmp( $a->headers['Name'], $b->headers['Name'] );
+	private static function _name_sort($a, $b) {
+		return strnatcasecmp($a->headers['Name'], $b->headers['Name']);
 	}
 
 	/**
@@ -1481,8 +1481,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort_i18n( $a, $b ) {
+	private static function _name_sort_i18n($a, $b) {
 		// Don't mark up; Do translate.
-		return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
+		return strnatcasecmp($a->display('Name', false, true), $b->display('Name', false, true));
 	}
 }

Braces +116 added lines, -79 removed lines

@@ -208,8 +208,9 @@ 
 			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
 			if ( self::$persistently_cache ) {
 				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
-					self::$cache_expiration = self::$persistently_cache;
+				if ( is_int( self::$persistently_cache ) ) {
+									self::$cache_expiration = self::$persistently_cache;
+				}
 			} else {
 				wp_cache_add_non_persistent_groups( 'themes' );
 			}
@@ -231,23 +232,29 @@ 
 
 		if ( is_array( $cache ) ) {
 			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+				if ( isset( $cache[ $key ] ) ) {
+									$this->$key = $cache[ $key ];
+				}
+			}
+			if ( $this->errors ) {
+							return;
+			}
+			if ( isset( $cache['theme_root_template'] ) ) {
+							$theme_root_template = $cache['theme_root_template'];
 			}
-			if ( $this->errors )
-				return;
-			if ( isset( $cache['theme_root_template'] ) )
-				$theme_root_template = $cache['theme_root_template'];
 		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
-			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
+							$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			} else {
+							$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			}
 			$this->template = $this->stylesheet;
 			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
+			if ( ! file_exists( $this->theme_root ) ) {
+				// Don't cache this one.
 				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			}
 			return;
 		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
@@ -260,8 +267,9 @@ 
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
 			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
+									$this->headers['Name'] .= '/' . $this->stylesheet;
+				}
 			}
 		}
 
@@ -324,8 +332,9 @@ 
 		if ( ! is_array( $cache ) ) {
 			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
-				$cache['theme_root_template'] = $theme_root_template;
+			if ( isset( $theme_root_template ) ) {
+							$cache['theme_root_template'] = $theme_root_template;
+			}
 			$this->cache_add( 'theme', $cache );
 		}
 	}
@@ -568,8 +577,9 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key ) {
+					wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		}
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
@@ -593,22 +603,26 @@ 
 	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
-			return false;
+		if ( ! isset( $this->headers[ $header ] ) ) {
+					return false;
+		}
 
 		if ( ! isset( $this->headers_sanitized ) ) {
 			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
-				$this->headers_sanitized = array();
+			if ( ! is_array( $this->headers_sanitized ) ) {
+							$this->headers_sanitized = array();
+			}
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if ( isset( $this->headers_sanitized[ $header ] ) ) {
+					return $this->headers_sanitized[ $header ];
+		}
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
 		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			foreach ( array_keys( $this->headers ) as $_header ) {
+							$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			}
 			$this->cache_add( 'headers', $this->headers_sanitized );
 		} else {
 			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
@@ -634,14 +648,17 @@ 
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
-			$translate = false;
+		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) ) {
+					$translate = false;
+		}
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ( $translate ) {
+					$value = $this->translate_header( $header, $value );
+		}
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ( $markup ) {
+					$value = $this->markup_header( $header, $value, $translate );
+		}
 
 		return $value;
 	}
@@ -721,8 +738,9 @@ 
 	private function markup_header( $header, $value, $translate ) {
 		switch ( $header ) {
 			case 'Name' :
-				if ( empty( $value ) )
-					$value = $this->get_stylesheet();
+				if ( empty( $value ) ) {
+									$value = $this->get_stylesheet();
+				}
 				break;
 			case 'Description' :
 				$value = wptexturize( $value );
@@ -767,8 +785,9 @@ 
 		switch ( $header ) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
-					return $this->name_translated;
+				if ( isset( $this->name_translated ) ) {
+									return $this->name_translated;
+				}
 				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
 				return $this->name_translated;
 			case 'Tags' :
@@ -854,8 +873,9 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
-			return '';
+		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
+					return '';
+		}
 
 		return $this->theme_root . '/' . $this->stylesheet;
 	}
@@ -872,10 +892,11 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
-			$theme_root = $this->parent()->theme_root;
-		else
-			$theme_root = $this->theme_root;
+		if ( $this->parent() ) {
+					$theme_root = $this->parent()->theme_root;
+		} else {
+					$theme_root = $this->theme_root;
+		}
 
 		return $theme_root . '/' . $this->template;
 	}
@@ -907,10 +928,11 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
-			$theme_root_uri = $this->parent()->get_theme_root_uri();
-		else
-			$theme_root_uri = $this->get_theme_root_uri();
+		if ( $this->parent() ) {
+					$theme_root_uri = $this->parent()->get_theme_root_uri();
+		} else {
+					$theme_root_uri = $this->get_theme_root_uri();
+		}
 
 		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
 	}
@@ -942,8 +964,9 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset( $this->theme_root_uri ) ) {
+					$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		}
 		return $this->theme_root_uri;
 	}
 
@@ -964,8 +987,9 @@ 
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
 		if ( $screenshot ) {
-			if ( 'relative' == $uri )
-				return $screenshot;
+			if ( 'relative' == $uri ) {
+							return $screenshot;
+			}
 			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
 		} elseif ( 0 === $screenshot ) {
 			return false;
@@ -974,8 +998,9 @@ 
 		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
 			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
 				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
+				if ( 'relative' == $uri ) {
+									return 'screenshot.' . $ext;
+				}
 				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
 			}
 		}
@@ -999,8 +1024,9 @@ 
 	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
 		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ( $search_parent && $this->parent() ) {
+					$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		}
 
 		return $files;
 	}
@@ -1123,8 +1149,9 @@ 
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
 	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
-			return false;
+		if ( ! is_dir( $path ) ) {
+					return false;
+		}
 
 		if ( $extensions ) {
 			$extensions = (array) $extensions;
@@ -1132,18 +1159,21 @@ 
 		}
 
 		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
-			$relative_path = '';
+		if ( '/' == $relative_path ) {
+					$relative_path = '';
+		}
 
 		$results = scandir( $path );
 		$files = array();
 
 		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
-				continue;
+			if ( '.' == $result[0] ) {
+							continue;
+			}
 			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
-					continue;
+				if ( ! $depth || 'CVS' == $result ) {
+									continue;
+				}
 				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
 				$files = array_merge_recursive( $files, $found );
 			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
@@ -1167,8 +1197,9 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
-			return $this->textdomain_loaded;
+		if ( isset( $this->textdomain_loaded ) ) {
+					return $this->textdomain_loaded;
+		}
 
 		$textdomain = $this->get('TextDomain');
 		if ( ! $textdomain ) {
@@ -1182,10 +1213,11 @@ 
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
-			$path .= $domainpath;
-		else
-			$path .= '/languages';
+		if ( $domainpath = $this->get('DomainPath') ) {
+					$path .= $domainpath;
+		} else {
+					$path .= '/languages';
+		}
 
 		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
 		return $this->textdomain_loaded;
@@ -1203,19 +1235,22 @@ 
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
 	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
-			return true;
+		if ( ! is_multisite() ) {
+					return true;
+		}
 
 		if ( 'both' == $check || 'network' == $check ) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		if ( 'both' == $check || 'site' == $check ) {
 			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		return false;
@@ -1311,8 +1346,9 @@ 
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
-			$blog_id = get_current_blog_id();
+		if ( ! $blog_id || ! is_multisite() ) {
+					$blog_id = get_current_blog_id();
+		}
 
 		if ( isset( $allowed_themes[ $blog_id ] ) ) {
 			/**
@@ -1353,8 +1389,9 @@ 
 				$converted = array();
 				$themes = wp_get_themes();
 				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) ) {
+											$converted[ $stylesheet ] = true;
+					}
 				}
 				$allowed_themes[ $blog_id ] = $converted;
 			}

src/wp-includes/link-template.php

Doc Comments +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the `$post` parameter.
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post Optional. Post ID or post object. Default is the global `$post`.
  */
 function the_permalink( $post = 0 ) {
 	/**
@@ -97,7 +97,7 @@ 
  *
  * @see get_permalink()
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  *
  * @return string|false The permalink URL or false if post does not exist.
@@ -111,7 +111,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
@@ -1387,7 +1387,7 @@ 
  *
  * @since 2.3.0
  *
- * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
+ * @param integer $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
 function get_edit_comment_link( $comment_id = 0 ) {
@@ -1447,7 +1447,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|stdClass $link Optional. Bookmark ID. Default is the id of the current bookmark.
+ * @param integer $link Optional. Bookmark ID. Default is the id of the current bookmark.
  * @return string|void The edit bookmark link URL.
  */
 function get_edit_bookmark_link( $link = 0 ) {
@@ -1545,7 +1545,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
@@ -1560,7 +1560,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
@@ -1873,7 +1873,7 @@ 
  *
  * @param bool         $in_same_term   Optional. Whether returned post should be in a same taxonomy term.
  *                                     Default false.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  *                                     Default empty.
  * @param bool         $start          Optional. Whether to retrieve first or last post. Default true
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
@@ -2761,7 +2761,7 @@ 
  * @global WP_Rewrite $wp_rewrite
  *
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
- * @return string|void Markup for pagination links.
+ * @return string Markup for pagination links.
  */
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;

Spacing +826 added lines, -826 removed lines

@@ -14,7 +14,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
  */
-function the_permalink( $post = 0 ) {
+function the_permalink($post = 0) {
 	/**
 	 * Filters the display of the permalink for the current post.
 	 *
@@ -24,7 +24,7 @@ 
 	 * @param string      $permalink The permalink for the current post.
 	 * @param int|WP_Post $post      Post ID, WP_Post object, or 0. Default 0.
 	 */
-	echo esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) );
+	echo esc_url(apply_filters('the_permalink', get_permalink($post), $post));
 }
 
 /**
@@ -46,7 +46,7 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
+	if ($wp_rewrite->use_trailing_slashes)
 		$string = trailingslashit($string);
 	else
 		$string = untrailingslashit($string);
@@ -61,7 +61,7 @@ 
 	 *                            'single_feed', 'single_paged', 'commentpaged', 'paged', 'home', 'feed',
 	 *                            'category', 'page', 'year', 'month', 'day', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters('user_trailingslashit', $string, $type_of_url);
 }
 
 /**
@@ -74,16 +74,16 @@ 
  *
  * @param string $mode Optional. Permalink mode. Accepts 'title' or 'id'. Default 'id'.
  */
-function permalink_anchor( $mode = 'id' ) {
+function permalink_anchor($mode = 'id') {
 	$post = get_post();
-	switch ( strtolower( $mode ) ) {
+	switch (strtolower($mode)) {
 		case 'title':
-			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
+			$title = sanitize_title($post->post_title).'-'.$post->ID;
 			echo '<a id="'.$title.'"></a>';
 			break;
 		case 'id':
 		default:
-			echo '<a id="post-' . $post->ID . '"></a>';
+			echo '<a id="post-'.$post->ID.'"></a>';
 			break;
 	}
 }
@@ -102,8 +102,8 @@ 
  *
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_the_permalink( $post = 0, $leavename = false ) {
-	return get_permalink( $post, $leavename );
+function get_the_permalink($post = 0, $leavename = false) {
+	return get_permalink($post, $leavename);
 }
 
 /**
@@ -115,7 +115,7 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_permalink( $post = 0, $leavename = false ) {
+function get_permalink($post = 0, $leavename = false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -123,28 +123,28 @@ 
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
-	if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
+	if (is_object($post) && isset($post->filter) && 'sample' == $post->filter) {
 		$sample = true;
 	} else {
-		$post = get_post( $post );
+		$post = get_post($post);
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if (empty($post->ID))
 		return false;
 
-	if ( $post->post_type == 'page' )
+	if ($post->post_type == 'page')
 		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
+	elseif ($post->post_type == 'attachment')
+		return get_attachment_link($post, $leavename);
+	elseif (in_array($post->post_type, get_post_types(array('_builtin' => false))))
 		return get_post_permalink($post, $leavename, $sample);
 
 	$permalink = get_option('permalink_structure');
@@ -160,18 +160,18 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
+	$permalink = apply_filters('pre_post_link', $permalink, $post, $leavename);
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+	if ('' != $permalink && ! in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'))) {
 		$unixtime = strtotime($post->post_date);
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
+		if (strpos($permalink, '%category%') !== false) {
 			$cats = get_the_category($post->ID);
-			if ( $cats ) {
-				$cats = wp_list_sort( $cats, array(
+			if ($cats) {
+				$cats = wp_list_sort($cats, array(
 					'term_id' => 'ASC',
-				) );
+				));
 
 				/**
 				 * Filters the category that gets used in the %category% permalink token.
@@ -182,30 +182,30 @@ 
 				 * @param array    $cats Array of all categories (WP_Term objects) associated with the post.
 				 * @param WP_Post  $post The post in question.
 				 */
-				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
+				$category_object = apply_filters('post_link_category', $cats[0], $cats, $post);
 
-				$category_object = get_term( $category_object, 'category' );
+				$category_object = get_term($category_object, 'category');
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ($parent = $category_object->parent)
+					$category = get_category_parents($parent, false, '/', true).$category;
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
-				$default_category = get_term( get_option( 'default_category' ), 'category' );
-				if ( $default_category && ! is_wp_error( $default_category ) ) {
+			if (empty($category)) {
+				$default_category = get_term(get_option('default_category'), 'category');
+				if ($default_category && ! is_wp_error($default_category)) {
 					$category = $default_category->slug;
 				}
 			}
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
+		if (strpos($permalink, '%author%') !== false) {
 			$authordata = get_userdata($post->post_author);
 			$author = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date = explode(" ", date('Y m d H i s', $unixtime));
 		$rewritereplace =
 		array(
 			$date[0],
@@ -220,10 +220,10 @@ 
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
+		$permalink = home_url(str_replace($rewritecode, $rewritereplace, $permalink));
 		$permalink = user_trailingslashit($permalink, 'single');
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url('?p='.$post->ID);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	return apply_filters( 'post_link', $permalink, $post, $leavename );
+	return apply_filters('post_link', $permalink, $post, $leavename);
 }
 
 /**
@@ -252,33 +252,33 @@ 
  * @param bool $sample    Optional, defaults to false. Is it a sample permalink. Default false.
  * @return string|WP_Error The post permalink.
  */
-function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
+function get_post_permalink($id = 0, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
+	if (is_wp_error($post))
 		return $post;
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
 	$slug = $post->post_name;
 
-	$draft_or_pending = get_post_status( $id ) && in_array( get_post_status( $id ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
+	$draft_or_pending = get_post_status($id) && in_array(get_post_status($id), array('draft', 'pending', 'auto-draft', 'future'));
 
 	$post_type = get_post_type_object($post->post_type);
 
-	if ( $post_type->hierarchical ) {
-		$slug = get_page_uri( $id );
+	if ($post_type->hierarchical) {
+		$slug = get_page_uri($id);
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
+	if ( ! empty($post_link) && ( ! $draft_or_pending || $sample)) {
+		if ( ! $leavename) {
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url(user_trailingslashit($post_link));
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
+		if ($post_type->query_var && (isset($post->post_status) && ! $draft_or_pending))
 			$post_link = add_query_arg($post_type->query_var, $slug, '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
@@ -295,7 +295,7 @@ 
 	 * @param bool    $leavename Whether to keep the post name.
 	 * @param bool    $sample    Is it a sample permalink.
 	 */
-	return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample );
+	return apply_filters('post_type_link', $post_link, $post, $leavename, $sample);
 }
 
 /**
@@ -311,13 +311,13 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function get_page_link( $post = false, $leavename = false, $sample = false ) {
-	$post = get_post( $post );
+function get_page_link($post = false, $leavename = false, $sample = false) {
+	$post = get_post($post);
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
+	if ('page' == get_option('show_on_front') && $post->ID == get_option('page_on_front'))
 		$link = home_url('/');
 	else
-		$link = _get_page_link( $post, $leavename, $sample );
+		$link = _get_page_link($post, $leavename, $sample);
 
 	/**
 	 * Filters the permalink for a page.
@@ -328,7 +328,7 @@ 
 	 * @param int    $post_id The ID of the page.
 	 * @param bool   $sample  Is it a sample permalink.
 	 */
-	return apply_filters( 'page_link', $link, $post->ID, $sample );
+	return apply_filters('page_link', $link, $post->ID, $sample);
 }
 
 /**
@@ -347,24 +347,24 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function _get_page_link( $post = false, $leavename = false, $sample = false ) {
+function _get_page_link($post = false, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
+	$draft_or_pending = in_array($post->post_status, array('draft', 'pending', 'auto-draft'));
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+	if ( ! empty($link) && ((isset($post->post_status) && ! $draft_or_pending) || $sample)) {
+		if ( ! $leavename) {
+			$link = str_replace('%pagename%', get_page_uri($post), $link);
 		}
 
 		$link = home_url($link);
 		$link = user_trailingslashit($link, 'page');
 	} else {
-		$link = home_url( '?page_id=' . $post->ID );
+		$link = home_url('?page_id='.$post->ID);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 * @param string $link    The page's permalink.
 	 * @param int    $post_id The ID of the page.
 	 */
-	return apply_filters( '_get_page_link', $link, $post->ID );
+	return apply_filters('_get_page_link', $link, $post->ID);
 }
 
 /**
@@ -391,39 +391,39 @@ 
  * @param bool       $leavename Optional. Whether to keep the page name. Default false.
  * @return string The attachment permalink.
  */
-function get_attachment_link( $post = null, $leavename = false ) {
+function get_attachment_link($post = null, $leavename = false) {
 	global $wp_rewrite;
 
 	$link = false;
 
-	$post = get_post( $post );
-	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
-	if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
+	$post = get_post($post);
+	$parent = ($post->post_parent > 0 && $post->post_parent != $post->ID) ? get_post($post->post_parent) : false;
+	if ($parent && ! in_array($parent->post_type, get_post_types())) {
 		$parent = false;
 	}
 
-	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
+	if ($wp_rewrite->using_permalinks() && $parent) {
+		if ('page' == $parent->post_type)
+			$parentlink = _get_page_link($post->post_parent); // Ignores page_on_front
 		else
-			$parentlink = get_permalink( $post->post_parent );
+			$parentlink = get_permalink($post->post_parent);
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		if (is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%'))
+			$name = 'attachment/'.$post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
 		else
 			$name = $post->post_name;
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if (strpos($parentlink, '?') === false)
+			$link = user_trailingslashit(trailingslashit($parentlink).'%postname%');
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
-	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
-		$link = home_url( user_trailingslashit( $post->post_name ) );
+		if ( ! $leavename)
+			$link = str_replace('%postname%', $name, $link);
+	} elseif ($wp_rewrite->using_permalinks() && ! $leavename) {
+		$link = home_url(user_trailingslashit($post->post_name));
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link)
+		$link = home_url('/?attachment_id='.$post->ID);
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -433,7 +433,7 @@ 
 	 * @param string $link    The attachment's permalink.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'attachment_link', $link, $post->ID );
+	return apply_filters('attachment_link', $link, $post->ID);
 }
 
 /**
@@ -446,16 +446,16 @@ 
  * @param int|bool $year False for current year or year for permalink.
  * @return string The permalink for the specified year archive.
  */
-function get_year_link( $year ) {
+function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
+	if ( ! empty($yearlink)) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
-		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
+		$yearlink = home_url(user_trailingslashit($yearlink, 'year'));
 	} else {
-		$yearlink = home_url( '?m=' . $year );
+		$yearlink = home_url('?m='.$year);
 	}
 
 	/**
@@ -466,7 +466,7 @@ 
 	 * @param string $yearlink Permalink for the year archive.
 	 * @param int    $year     Year for the archive.
 	 */
-	return apply_filters( 'year_link', $yearlink, $year );
+	return apply_filters('year_link', $yearlink, $year);
 }
 
 /**
@@ -482,17 +482,17 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
+	if ( ! empty($monthlink)) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
 		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
+		$monthlink = home_url(user_trailingslashit($monthlink, 'month'));
 	} else {
-		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
+		$monthlink = home_url('?m='.$year.zeroise($month, 2));
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	 * @param int    $year      Year for the archive.
 	 * @param int    $month     The month for the archive.
 	 */
-	return apply_filters( 'month_link', $monthlink, $year, $month );
+	return apply_filters('month_link', $monthlink, $year, $month);
 }
 
 /**
@@ -521,21 +521,21 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
+	if ( ! $day)
 		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
+	if ( ! empty($daylink)) {
 		$daylink = str_replace('%year%', $year, $daylink);
 		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
 		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
+		$daylink = home_url(user_trailingslashit($daylink, 'day'));
 	} else {
-		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
+		$daylink = home_url('?m='.$year.zeroise($month, 2).zeroise($day, 2));
 	}
 
 	/**
@@ -548,7 +548,7 @@ 
 	 * @param int    $month   Month for the archive.
 	 * @param int    $day     The day for the archive.
 	 */
-	return apply_filters( 'day_link', $daylink, $year, $month, $day );
+	return apply_filters('day_link', $daylink, $year, $month, $day);
 }
 
 /**
@@ -559,8 +559,8 @@ 
  * @param string $anchor The link's anchor text.
  * @param string $feed   Optional. Feed type. Default empty.
  */
-function the_feed_link( $anchor, $feed = '' ) {
-	$link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>';
+function the_feed_link($anchor, $feed = '') {
+	$link = '<a href="'.esc_url(get_feed_link($feed)).'">'.$anchor.'</a>';
 
 	/**
 	 * Filters the feed link anchor tag.
@@ -571,7 +571,7 @@ 
 	 * @param string $feed The feed type, or an empty string for the
 	 *                     default feed type.
 	 */
-	echo apply_filters( 'the_feed_link', $link, $feed );
+	echo apply_filters('the_feed_link', $link, $feed);
 }
 
 /**
@@ -584,27 +584,27 @@ 
  * @param string $feed Optional. Feed type. Default empty.
  * @return string The feed permalink.
  */
-function get_feed_link( $feed = '' ) {
+function get_feed_link($feed = '') {
 	global $wp_rewrite;
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
-	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
+	if ('' != $permalink) {
+		if (false !== strpos($feed, 'comments_')) {
 			$feed = str_replace('comments_', '', $feed);
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if (get_default_feed() == $feed)
 			$feed = '';
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$output = home_url(user_trailingslashit($permalink, 'feed'));
 	} else {
-		if ( empty($feed) )
+		if (empty($feed))
 			$feed = get_default_feed();
 
-		if ( false !== strpos($feed, 'comments_') )
+		if (false !== strpos($feed, 'comments_'))
 			$feed = str_replace('comments_', 'comments-', $feed);
 
 		$output = home_url("?feed={$feed}");
@@ -618,7 +618,7 @@ 
 	 * @param string $output The feed permalink.
 	 * @param string $feed   Feed type.
 	 */
-	return apply_filters( 'feed_link', $output, $feed );
+	return apply_filters('feed_link', $output, $feed);
 }
 
 /**
@@ -630,43 +630,43 @@ 
  * @param string $feed    Optional. Feed type. Default empty.
  * @return string The permalink for the comments feed for the given post.
  */
-function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
-	$post_id = absint( $post_id );
+function get_post_comments_feed_link($post_id = 0, $feed = '') {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
+	if ('' != get_option('permalink_structure')) {
+		if ('page' == get_option('show_on_front') && $post_id == get_option('page_on_front'))
+			$url = _get_page_link($post_id);
 		else
 			$url = get_permalink($post_id);
 
-		if ( $unattached ) {
-			$url =  home_url( '/feed/' );
-			if ( $feed !== get_default_feed() ) {
+		if ($unattached) {
+			$url = home_url('/feed/');
+			if ($feed !== get_default_feed()) {
 				$url .= "$feed/";
 			}
-			$url = add_query_arg( 'attachment_id', $post_id, $url );
+			$url = add_query_arg('attachment_id', $post_id, $url);
 		} else {
-			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
+			$url = trailingslashit($url).'feed';
+			if ($feed != get_default_feed())
 				$url .= "/$feed";
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
-		if ( $unattached ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
-		} elseif ( 'page' == $post->post_type ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		if ($unattached) {
+			$url = add_query_arg(array('feed' => $feed, 'attachment_id' => $post_id), home_url('/'));
+		} elseif ('page' == $post->post_type) {
+			$url = add_query_arg(array('feed' => $feed, 'page_id' => $post_id), home_url('/'));
 		} else {
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(array('feed' => $feed, 'p' => $post_id), home_url('/'));
 		}
 	}
 
@@ -677,7 +677,7 @@ 
 	 *
 	 * @param string $url Post comments feed permalink.
 	 */
-	return apply_filters( 'post_comments_feed_link', $url );
+	return apply_filters('post_comments_feed_link', $url);
 }
 
 /**
@@ -693,13 +693,13 @@ 
  * @param int    $post_id   Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $feed      Optional. Feed format. Default empty.
  */
-function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-	$url = get_post_comments_feed_link( $post_id, $feed );
-	if ( empty( $link_text ) ) {
+function post_comments_feed_link($link_text = '', $post_id = '', $feed = '') {
+	$url = get_post_comments_feed_link($post_id, $feed);
+	if (empty($link_text)) {
 		$link_text = __('Comments Feed');
 	}
 
-	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
+	$link = '<a href="'.esc_url($url).'">'.$link_text.'</a>';
 	/**
 	 * Filters the post comment feed link anchor tag.
 	 *
@@ -709,7 +709,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $feed    The feed type, or an empty string for the default feed type.
 	 */
-	echo apply_filters( 'post_comments_feed_link_html', $link, $post_id, $feed );
+	echo apply_filters('post_comments_feed_link_html', $link, $post_id, $feed);
 }
 
 /**
@@ -724,23 +724,23 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string Link to the feed for the author specified by $author_id.
  */
-function get_author_feed_link( $author_id, $feed = '' ) {
+function get_author_feed_link($author_id, $feed = '') {
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+	if ('' == $permalink_structure) {
+		$link = home_url("?feed=$feed&amp;author=".$author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
 	/**
@@ -751,7 +751,7 @@ 
 	 * @param string $link The author feed link.
 	 * @param string $feed Feed type.
 	 */
-	$link = apply_filters( 'author_feed_link', $link, $feed );
+	$link = apply_filters('author_feed_link', $link, $feed);
 
 	return $link;
 }
@@ -768,8 +768,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string Link to the feed for the category specified by $cat_id.
  */
-function get_category_feed_link( $cat_id, $feed = '' ) {
-	return get_term_feed_link( $cat_id, 'category', $feed );
+function get_category_feed_link($cat_id, $feed = '') {
+	return get_term_feed_link($cat_id, 'category', $feed);
 }
 
 /**
@@ -785,40 +785,40 @@ 
  * @param string $feed     Optional. Feed type. Default empty.
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
  */
-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+function get_term_feed_link($term_id, $taxonomy = 'category', $feed = '') {
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if (empty($term) || is_wp_error($term))
 		return false;
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
-	if ( '' == $permalink_structure ) {
-		if ( 'category' == $taxonomy ) {
+	if ('' == $permalink_structure) {
+		if ('category' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
 		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		elseif ('post_tag' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
-			$t = get_taxonomy( $taxonomy );
+			$t = get_taxonomy($taxonomy);
 			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
 		}
 	} else {
-		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		$link = get_term_link($term_id, $term->taxonomy);
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
-	if ( 'category' == $taxonomy ) {
+	if ('category' == $taxonomy) {
 		/**
 		 * Filters the category feed link.
 		 *
@@ -827,8 +827,8 @@ 
 		 * @param string $link The category feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'category_feed_link', $link, $feed );
-	} elseif ( 'post_tag' == $taxonomy ) {
+		$link = apply_filters('category_feed_link', $link, $feed);
+	} elseif ('post_tag' == $taxonomy) {
 		/**
 		 * Filters the post tag feed link.
 		 *
@@ -837,7 +837,7 @@ 
 		 * @param string $link The tag feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'tag_feed_link', $link, $feed );
+		$link = apply_filters('tag_feed_link', $link, $feed);
 	} else {
 		/**
 		 * Filters the feed link for a taxonomy other than 'category' or 'post_tag'.
@@ -848,7 +848,7 @@ 
 		 * @param string $feed Feed type.
 		 * @param string $taxonomy The taxonomy name.
 		 */
-		$link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+		$link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
 	}
 
 	return $link;
@@ -863,8 +863,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string The feed permalink for the given tag.
  */
-function get_tag_feed_link( $tag_id, $feed = '' ) {
-	return get_term_feed_link( $tag_id, 'post_tag', $feed );
+function get_tag_feed_link($tag_id, $feed = '') {
+	return get_term_feed_link($tag_id, 'post_tag', $feed);
 }
 
 /**
@@ -876,7 +876,7 @@ 
  * @param string $taxonomy Optional. Taxonomy slug. Default 'post_tag'.
  * @return string The edit tag link URL for the given tag.
  */
-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
+function get_edit_tag_link($tag_id, $taxonomy = 'post_tag') {
 	/**
 	 * Filters the edit link for a tag (or term in another taxonomy).
 	 *
@@ -884,7 +884,7 @@ 
 	 *
 	 * @param string $link The term edit link.
 	 */
-	return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
+	return apply_filters('get_edit_tag_link', get_edit_term_link($tag_id, $taxonomy));
 }
 
 /**
@@ -898,8 +898,8 @@ 
  * @param WP_Term $tag    Optional. Term object. If null, the queried object will be inspected.
  *                        Default null.
  */
-function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
-	$link = edit_term_link( $link, '', '', $tag, false );
+function edit_tag_link($link = '', $before = '', $after = '', $tag = null) {
+	$link = edit_term_link($link, '', '', $tag, false);
 
 	/**
 	 * Filters the anchor tag for the edit link for a tag (or term in another taxonomy).
@@ -908,7 +908,7 @@ 
 	 *
 	 * @param string $link The anchor tag for the edit link.
 	 */
-	echo $before . apply_filters( 'edit_tag_link', $link ) . $after;
+	echo $before.apply_filters('edit_tag_link', $link).$after;
 }
 
 /**
@@ -925,14 +925,14 @@ 
  *                            with the taxonomy.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function get_edit_term_link($term_id, $taxonomy = '', $object_type = '') {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return;
 	}
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! $tax || ! current_user_can( 'edit_term', $term->term_id ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! $tax || ! current_user_can('edit_term', $term->term_id)) {
 		return;
 	}
 
@@ -941,14 +941,14 @@ 
 		'tag_ID'   => $term->term_id,
 	);
 
-	if ( $object_type ) {
+	if ($object_type) {
 		$args['post_type'] = $object_type;
-	} elseif ( ! empty( $tax->object_type ) ) {
-		$args['post_type'] = reset( $tax->object_type );
+	} elseif ( ! empty($tax->object_type)) {
+		$args['post_type'] = reset($tax->object_type);
 	}
 
-	if ( $tax->show_ui ) {
-		$location = add_query_arg( $args, admin_url( 'term.php' ) );
+	if ($tax->show_ui) {
+		$location = add_query_arg($args, admin_url('term.php'));
 	} else {
 		$location = '';
 	}
@@ -963,7 +963,7 @@ 
 	 * @param string $taxonomy    Taxonomy name.
 	 * @param string $object_type The object type (eg. the post type).
 	 */
-	return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
+	return apply_filters('get_edit_term_link', $location, $term_id, $taxonomy, $object_type);
 }
 
 /**
@@ -978,22 +978,22 @@ 
  * @param bool   $echo   Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+function edit_term_link($link = '', $before = '', $after = '', $term = null, $echo = true) {
+	if (is_null($term))
 		$term = get_queried_object();
 
-	if ( ! $term )
+	if ( ! $term)
 		return;
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! current_user_can('edit_term', $term->term_id)) {
 		return;
 	}
 
-	if ( empty( $link ) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_term_link($term->term_id, $term->taxonomy).'">'.$link.'</a>';
 
 	/**
 	 * Filters the anchor tag for the edit link of a term.
@@ -1003,9 +1003,9 @@ 
 	 * @param string $link    The anchor tag for the edit link.
 	 * @param int    $term_id Term ID.
 	 */
-	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
+	$link = $before.apply_filters('edit_term_link', $link, $term->term_id).$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	else
 		return $link;
@@ -1021,23 +1021,23 @@ 
  * @param string $query Optional. The query string to use. If empty the current query is used. Default empty.
  * @return string The search permalink.
  */
-function get_search_link( $query = '' ) {
+function get_search_link($query = '') {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
+	if (empty($query))
+		$search = get_search_query(false);
 	else
 		$search = stripslashes($query);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+	if (empty($permastruct)) {
+		$link = home_url('?s='.urlencode($search));
 	} else {
 		$search = urlencode($search);
 		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$link = str_replace('%search%', $search, $permastruct);
+		$link = home_url(user_trailingslashit($link, 'search'));
 	}
 
 	/**
@@ -1048,7 +1048,7 @@ 
 	 * @param string $link   Search permalink.
 	 * @param string $search The URL-encoded search term.
 	 */
-	return apply_filters( 'search_link', $link, $search );
+	return apply_filters('search_link', $link, $search);
 }
 
 /**
@@ -1066,12 +1066,12 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
+	if (empty($permastruct)) {
 		$link = add_query_arg('feed', $feed, $link);
 	} else {
 		$link = trailingslashit($link);
@@ -1087,7 +1087,7 @@ 
 	 * @param string $feed Feed type.
 	 * @param string $type The search type. One of 'posts' or 'comments'.
 	 */
-	return apply_filters( 'search_feed_link', $link, $feed, 'posts' );
+	return apply_filters('search_feed_link', $link, $feed, 'posts');
 }
 
 /**
@@ -1104,20 +1104,20 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	if (empty($permastruct))
+		$link = add_query_arg('feed', 'comments-'.$feed, $link);
 	else
 		$link = add_query_arg('withcomments', 1, $link);
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
+	return apply_filters('search_feed_link', $link, $feed, 'comments');
 }
 
 /**
@@ -1131,36 +1131,36 @@ 
  * @param string $post_type Post type.
  * @return string|false The post type archive permalink.
  */
-function get_post_type_archive_link( $post_type ) {
+function get_post_type_archive_link($post_type) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object($post_type))
 		return false;
 
-	if ( 'post' === $post_type ) {
-		$show_on_front = get_option( 'show_on_front' );
-		$page_for_posts  = get_option( 'page_for_posts' );
+	if ('post' === $post_type) {
+		$show_on_front = get_option('show_on_front');
+		$page_for_posts = get_option('page_for_posts');
 
-		if ( 'page' == $show_on_front && $page_for_posts ) {
-			$link = get_permalink( $page_for_posts );
+		if ('page' == $show_on_front && $page_for_posts) {
+			$link = get_permalink($page_for_posts);
 		} else {
 			$link = get_home_url();
 		}
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'post_type_archive_link', $link, $post_type );
+		return apply_filters('post_type_archive_link', $link, $post_type);
 	}
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive)
 		return false;
 
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite)) {
+		$struct = (true === $post_type_obj->has_archive) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
+		if ($post_type_obj->rewrite['with_front'])
+			$struct = $wp_rewrite->front.$struct;
 		else
-			$struct = $wp_rewrite->root . $struct;
-		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
+			$struct = $wp_rewrite->root.$struct;
+		$link = home_url(user_trailingslashit($struct, 'post_type_archive'));
 	} else {
-		$link = home_url( '?post_type=' . $post_type );
+		$link = home_url('?post_type='.$post_type);
 	}
 
 	/**
@@ -1171,7 +1171,7 @@ 
 	 * @param string $link      The post type archive permalink.
 	 * @param string $post_type Post type name.
 	 */
-	return apply_filters( 'post_type_archive_link', $link, $post_type );
+	return apply_filters('post_type_archive_link', $link, $post_type);
 }
 
 /**
@@ -1183,22 +1183,22 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string|false The post type feed permalink.
  */
-function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
+function get_post_type_archive_feed_link($post_type, $feed = '') {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = $default_feed;
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link($post_type))
 		return false;
 
-	$post_type_obj = get_post_type_object( $post_type );
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+	$post_type_obj = get_post_type_object($post_type);
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite) && $post_type_obj->rewrite['feeds']) {
+		$link = trailingslashit($link);
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ($feed != $default_feed)
 			$link .= "$feed/";
 	} else {
-		$link = add_query_arg( 'feed', $feed, $link );
+		$link = add_query_arg('feed', $feed, $link);
 	}
 
 	/**
@@ -1209,7 +1209,7 @@ 
 	 * @param string $link The post type archive feed link.
 	 * @param string $feed Feed type.
 	 */
-	return apply_filters( 'post_type_archive_feed_link', $link, $feed );
+	return apply_filters('post_type_archive_feed_link', $link, $feed);
 }
 
 /**
@@ -1226,20 +1226,20 @@ 
  *                                  post permalink. Default empty.
  * @return string|null URL used for the post preview, or null if the post does not exist.
  */
-function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_preview_post_link($post = null, $query_args = array(), $preview_link = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return;
 	}
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( is_post_type_viewable( $post_type_object ) ) {
-		if ( ! $preview_link ) {
-			$preview_link = set_url_scheme( get_permalink( $post ) );
+	$post_type_object = get_post_type_object($post->post_type);
+	if (is_post_type_viewable($post_type_object)) {
+		if ( ! $preview_link) {
+			$preview_link = set_url_scheme(get_permalink($post));
 		}
 
 		$query_args['preview'] = 'true';
-		$preview_link = add_query_arg( $query_args, $preview_link );
+		$preview_link = add_query_arg($query_args, $preview_link);
 	}
 
 	/**
@@ -1251,7 +1251,7 @@ 
 	 * @param string  $preview_link URL used for the post preview.
 	 * @param WP_Post $post         Post object.
 	 */
-	return apply_filters( 'preview_post_link', $preview_link, $post );
+	return apply_filters('preview_post_link', $preview_link, $post);
 }
 
 /**
@@ -1267,26 +1267,26 @@ 
  * @return string|null The edit post link for the given post. null if the post type is invalid or does
  *                     not allow an editing UI.
  */
-function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+function get_edit_post_link($id = 0, $context = 'display') {
+	if ( ! $post = get_post($id))
 		return;
 
-	if ( 'revision' === $post->post_type )
+	if ('revision' === $post->post_type)
 		$action = '';
-	elseif ( 'display' == $context )
+	elseif ('display' == $context)
 		$action = '&amp;action=edit';
 	else
 		$action = '&action=edit';
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	if ( $post_type_object->_edit_link ) {
-		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
+	if ($post_type_object->_edit_link) {
+		$link = admin_url(sprintf($post_type_object->_edit_link.$action, $post->ID));
 	} else {
 		$link = '';
 	}
@@ -1301,7 +1301,7 @@ 
 	 * @param string $context The link context. If set to 'display' then ampersands
 	 *                        are encoded.
 	 */
-	return apply_filters( 'get_edit_post_link', $link, $post->ID, $context );
+	return apply_filters('get_edit_post_link', $link, $post->ID, $context);
 }
 
 /**
@@ -1316,20 +1316,20 @@ 
  * @param int    $id     Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $class  Optional. Add custom class to link. Default 'post-edit-link'.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) {
-	if ( ! $post = get_post( $id ) ) {
+function edit_post_link($text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link') {
+	if ( ! $post = get_post($id)) {
 		return;
 	}
 
-	if ( ! $url = get_edit_post_link( $post->ID ) ) {
+	if ( ! $url = get_edit_post_link($post->ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
+	$link = '<a class="'.esc_attr($class).'" href="'.esc_url($url).'">'.$text.'</a>';
 
 	/**
 	 * Filters the post edit link anchor tag.
@@ -1340,7 +1340,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $text    Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
+	echo $before.apply_filters('edit_post_link', $link, $post->ID, $text).$after;
 }
 
 /**
@@ -1355,23 +1355,23 @@ 
  * @param bool   $force_delete Optional. Whether to bypass trash and force deletion. Default false.
  * @return string|void The delete post link URL for the given post.
  */
-function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		return;
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can('delete_post', $post->ID))
 		return;
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ($force_delete || ! EMPTY_TRASH_DAYS) ? 'delete' : 'trash';
 
-	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+	$delete_link = add_query_arg('action', $action, admin_url(sprintf($post_type_object->_edit_link, $post->ID)));
 
 	/**
 	 * Filters the post delete link.
@@ -1382,7 +1382,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
 	 */
-	return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
+	return apply_filters('get_delete_post_link', wp_nonce_url($delete_link, "$action-post_{$post->ID}"), $post->ID, $force_delete);
 }
 
 /**
@@ -1393,13 +1393,13 @@ 
  * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
-function get_edit_comment_link( $comment_id = 0 ) {
-	$comment = get_comment( $comment_id );
+function get_edit_comment_link($comment_id = 0) {
+	$comment = get_comment($comment_id);
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		return;
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url('comment.php?action=editcomment&amp;c=').$comment->comment_ID;
 
 	/**
 	 * Filters the comment edit link.
@@ -1408,7 +1408,7 @@ 
 	 *
 	 * @param string $location The edit link.
 	 */
-	return apply_filters( 'get_edit_comment_link', $location );
+	return apply_filters('get_edit_comment_link', $location);
 }
 
 /**
@@ -1420,18 +1420,18 @@ 
  * @param string $before Optional. Display before edit link. Default empty.
  * @param string $after  Optional. Display after edit link. Default empty.
  */
-function edit_comment_link( $text = null, $before = '', $after = '' ) {
+function edit_comment_link($text = null, $before = '', $after = '') {
 	$comment = get_comment();
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>';
+	$link = '<a class="comment-edit-link" href="'.esc_url(get_edit_comment_link($comment)).'">'.$text.'</a>';
 
 	/**
 	 * Filters the comment edit link anchor tag.
@@ -1442,7 +1442,7 @@ 
 	 * @param int    $comment_id Comment ID.
 	 * @param string $text       Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
+	echo $before.apply_filters('edit_comment_link', $link, $comment->comment_ID, $text).$after;
 }
 
 /**
@@ -1453,13 +1453,13 @@ 
  * @param int|stdClass $link Optional. Bookmark ID. Default is the id of the current bookmark.
  * @return string|void The edit bookmark link URL.
  */
-function get_edit_bookmark_link( $link = 0 ) {
-	$link = get_bookmark( $link );
+function get_edit_bookmark_link($link = 0) {
+	$link = get_bookmark($link);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url('link.php?action=edit&amp;link_id=').$link->link_id;
 
 	/**
 	 * Filters the bookmark edit link.
@@ -1469,7 +1469,7 @@ 
 	 * @param string $location The edit link.
 	 * @param int    $link_id  Bookmark ID.
 	 */
-	return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+	return apply_filters('get_edit_bookmark_link', $location, $link->link_id);
 }
 
 /**
@@ -1482,16 +1482,16 @@ 
  * @param string $after    Optional. Display after edit link. Default empty.
  * @param int    $bookmark Optional. Bookmark ID. Default is the current bookmark.
  */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+function edit_bookmark_link($link = '', $before = '', $after = '', $bookmark = null) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	if ( empty($link) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
+	$link = '<a href="'.esc_url(get_edit_bookmark_link($bookmark)).'">'.$link.'</a>';
 
 	/**
 	 * Filters the bookmark edit link anchor tag.
@@ -1501,7 +1501,7 @@ 
 	 * @param string $link    Anchor tag for the edit link.
 	 * @param int    $link_id Bookmark ID.
 	 */
-	echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+	echo $before.apply_filters('edit_bookmark_link', $link, $bookmark->link_id).$after;
 }
 
 /**
@@ -1512,22 +1512,22 @@ 
  * @param int $user_id Optional. User ID. Defaults to the current user.
  * @return string URL to edit user page or empty string.
  */
-function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+function get_edit_user_link($user_id = null) {
+	if ( ! $user_id)
 		$user_id = get_current_user_id();
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if (empty($user_id) || ! current_user_can('edit_user', $user_id))
 		return '';
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user )
+	if ( ! $user)
 		return '';
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
+	if (get_current_user_id() == $user->ID)
+		$link = get_edit_profile_url($user->ID);
 	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+		$link = add_query_arg('user_id', $user->ID, self_admin_url('user-edit.php'));
 
 	/**
 	 * Filters the user edit link.
@@ -1537,7 +1537,7 @@ 
 	 * @param string $link    The edit link.
 	 * @param int    $user_id User ID.
 	 */
-	return apply_filters( 'get_edit_user_link', $link, $user->ID );
+	return apply_filters('get_edit_user_link', $link, $user->ID);
 }
 
 // Navigation links
@@ -1553,8 +1553,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1568,8 +1568,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1588,10 +1588,10 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
+function get_adjacent_post($in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if (( ! $post = get_post()) || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$current_post_date = $post->post_date;
@@ -1600,35 +1600,35 @@ 
 	$where = '';
 	$adjacent = $previous ? 'previous' : 'next';
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ( ! empty($excluded_terms) && ! is_array($excluded_terms)) {
 			// back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-			if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-				_deprecated_argument( __FUNCTION__, '3.3.0', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-				$excluded_terms = explode( ' and ', $excluded_terms );
+			if (false !== strpos($excluded_terms, ' and ')) {
+				_deprecated_argument(__FUNCTION__, '3.3.0', sprintf(__('Use commas instead of %s to separate excluded terms.'), "'and'"));
+				$excluded_terms = explode(' and ', $excluded_terms);
 			} else {
-				$excluded_terms = explode( ',', $excluded_terms );
+				$excluded_terms = explode(',', $excluded_terms);
 			}
 
-			$excluded_terms = array_map( 'intval', $excluded_terms );
+			$excluded_terms = array_map('intval', $excluded_terms);
 		}
 
-		if ( $in_same_term ) {
+		if ($in_same_term) {
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+			$where .= $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+			if ( ! is_object_in_taxonomy($post->post_type, $taxonomy))
 				return '';
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
 			// Remove any exclusions from the term array to include.
-			$term_array = array_diff( $term_array, (array) $excluded_terms );
-			$term_array = array_map( 'intval', $term_array );
+			$term_array = array_diff($term_array, (array) $excluded_terms);
+			$term_array = array_map('intval', $term_array);
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error($term_array))
 				return '';
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= " AND tt.term_id IN (".implode(',', $term_array).")";
 		}
 
 		/**
@@ -1641,21 +1641,21 @@ 
 		 *
 		 * @param string $excluded_terms Array of excluded term IDs.
 		 */
-		$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
+		$excluded_terms = apply_filters("get_{$adjacent}_post_excluded_terms", $excluded_terms);
 
-		if ( ! empty( $excluded_terms ) ) {
-			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( ',', array_map( 'intval', $excluded_terms ) ) . ') )';
+		if ( ! empty($excluded_terms)) {
+			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (".implode(',', array_map('intval', $excluded_terms)).') )';
 		}
 	}
 
 	// 'post_status' clause depends on the current user.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user_id = get_current_user_id();
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		if ( empty( $post_type_object ) ) {
+		$post_type_object = get_post_type_object($post->post_type);
+		if (empty($post_type_object)) {
 			$post_type_cap    = $post->post_type;
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		} else {
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		}
@@ -1664,13 +1664,13 @@ 
 		 * Results should include private posts belonging to the current user, or private posts where the
 		 * current user has the 'read_private_posts' cap.
 		 */
-		$private_states = get_post_stati( array( 'private' => true ) );
+		$private_states = get_post_stati(array('private' => true));
 		$where .= " AND ( p.post_status = 'publish'";
-		foreach ( (array) $private_states as $state ) {
-			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+		foreach ((array) $private_states as $state) {
+			if (current_user_can($read_private_cap)) {
+				$where .= $wpdb->prepare(" OR p.post_status = %s", $state);
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare(" OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state);
 			}
 		}
 		$where .= " )";
@@ -1696,7 +1696,7 @@ 
 	 * @param string  $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post );
+	$join = apply_filters("get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the WHERE clause in the SQL for an adjacent post query.
@@ -1713,7 +1713,7 @@ 
 	 * @param string $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
+	$where = apply_filters("get_{$adjacent}_post_where", $wpdb->prepare("WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type), $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the ORDER BY clause in the SQL for an adjacent post query.
@@ -1727,25 +1727,25 @@ 
 	 * @param string $order_by The `ORDER BY` clause in the SQL.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post );
+	$sort  = apply_filters("get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post);
 
 	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
-	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+	$query_key = 'adjacent_post_'.md5($query);
+	$result = wp_cache_get($query_key, 'counts');
+	if (false !== $result) {
+		if ($result)
+			$result = get_post($result);
 		return $result;
 	}
 
-	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	$result = $wpdb->get_var($query);
+	if (null === $result)
 		$result = '';
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set($query_key, $result, 'counts');
 
-	if ( $result )
-		$result = get_post( $result );
+	if ($result)
+		$result = get_post($result);
 
 	return $result;
 }
@@ -1764,28 +1764,28 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
-function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
+function get_adjacent_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment() && $post = get_post())
+		$post = get_post($post->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( empty( $post ) )
+	if (empty($post))
 		return;
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(array('echo' => false, 'post' => $post));
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if (empty($post_title))
+		$post_title = $previous ? __('Previous Post') : __('Next Post');
 
-	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	$date = mysql2date(get_option('date_format'), $post->post_date);
 
-	$title = str_replace( '%title', $post_title, $title );
-	$title = str_replace( '%date', $date, $title );
+	$title = str_replace('%title', $post_title, $title);
+	$title = str_replace('%date', $date, $title);
 
 	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink( $post ) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$adjacent = $previous ? 'previous' : 'next';
 
@@ -1799,7 +1799,7 @@ 
 	 *
 	 * @param string $link The relational link.
 	 */
-	return apply_filters( "{$adjacent}_post_rel_link", $link );
+	return apply_filters("{$adjacent}_post_rel_link", $link);
 }
 
 /**
@@ -1812,9 +1812,9 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function adjacent_posts_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1828,7 +1828,7 @@ 
  * @see adjacent_posts_rel_link()
  */
 function adjacent_posts_rel_link_wp_head() {
-	if ( ! is_single() || is_attachment() ) {
+	if ( ! is_single() || is_attachment()) {
 		return;
 	}
 	adjacent_posts_rel_link();
@@ -1846,8 +1846,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function next_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1862,8 +1862,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
+function prev_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1882,9 +1882,9 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
  */
-function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
+function get_boundary_post($in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category') {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$query_args = array(
@@ -1896,34 +1896,34 @@ 
 
 	$term_array = array();
 
-	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
+	if ( ! is_array($excluded_terms)) {
+		if ( ! empty($excluded_terms))
+			$excluded_terms = explode(',', $excluded_terms);
 		else
 			$excluded_terms = array();
 	}
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ($in_same_term)
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
-		if ( ! empty( $excluded_terms ) ) {
-			$excluded_terms = array_map( 'intval', $excluded_terms );
-			$excluded_terms = array_diff( $excluded_terms, $term_array );
+		if ( ! empty($excluded_terms)) {
+			$excluded_terms = array_map('intval', $excluded_terms);
+			$excluded_terms = array_diff($excluded_terms, $term_array);
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ($excluded_terms as $excluded_term)
 				$inverse_terms[] = $excluded_term * -1;
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
+		$query_args['tax_query'] = array(array(
 			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+			'terms' => array_merge($term_array, $excluded_terms)
+		));
 	}
 
-	return get_posts( $query_args );
+	return get_posts($query_args);
 }
 
 /**
@@ -1938,8 +1938,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
-function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1955,8 +1955,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_previous_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1971,8 +1971,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
-function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1987,8 +1987,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	 echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	 echo get_next_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -2006,32 +2006,32 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
-function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
+function get_adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment())
+		$post = get_post(get_post()->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if (empty($post->post_title))
+			$title = $previous ? __('Previous Post') : __('Next Post');
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $title, $post->ID );
+		$title = apply_filters('the_title', $title, $post->ID);
 
-		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		$date = mysql2date(get_option('date_format'), $post->post_date);
 		$rel = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
-		$inlink = str_replace( '%title', $title, $link );
-		$inlink = str_replace( '%date', $date, $inlink );
-		$inlink = $string . $inlink . '</a>';
+		$string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
+		$inlink = str_replace('%title', $title, $link);
+		$inlink = str_replace('%date', $date, $inlink);
+		$inlink = $string.$inlink.'</a>';
 
-		$output = str_replace( '%link', $inlink, $format );
+		$output = str_replace('%link', $inlink, $format);
 	}
 
 	$adjacent = $previous ? 'previous' : 'next';
@@ -2051,7 +2051,7 @@ 
 	 * @param WP_Post $post     The adjacent post.
 	 * @param string  $adjacent Whether the post is previous or next.
 	 */
-	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
+	return apply_filters("{$adjacent}_post_link", $output, $format, $link, $post, $adjacent);
 }
 
 /**
@@ -2068,8 +2068,8 @@ 
  * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
+function adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	echo get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy);
 }
 
 /**
@@ -2084,53 +2084,53 @@ 
  * 	                    Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link($pagenum = 1, $escape = true) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
-	$request = remove_query_arg( 'paged' );
+	$request = remove_query_arg('paged');
 
 	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
-	$home_root = preg_quote( $home_root, '|' );
+	$home_root = (isset($home_root['path'])) ? $home_root['path'] : '';
+	$home_root = preg_quote($home_root, '|');
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
+	$request = preg_replace('|^'.$home_root.'|i', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+	if ( ! $wp_rewrite->using_permalinks() || is_admin()) {
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $pagenum > 1 ) {
-			$result = add_query_arg( 'paged', $pagenum, $base . $request );
+		if ($pagenum > 1) {
+			$result = add_query_arg('paged', $pagenum, $base.$request);
 		} else {
-			$result = $base . $request;
+			$result = $base.$request;
 		}
 	} else {
 		$qs_regex = '|\?.*?$|';
-		preg_match( $qs_regex, $request, $qs_match );
+		preg_match($qs_regex, $request, $qs_match);
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty($qs_match[0])) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request = preg_replace($qs_regex, '', $request);
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
+		$request = preg_replace("|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
+		$request = preg_replace('|^'.preg_quote($wp_rewrite->index, '|').'|i', '', $request);
 		$request = ltrim($request, '/');
 
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ($wp_rewrite->using_index_permalinks() && ($pagenum > 1 || '' != $request))
+			$base .= $wp_rewrite->index.'/';
 
-		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+		if ($pagenum > 1) {
+			$request = (( ! empty($request)) ? trailingslashit($request) : $request).user_trailingslashit($wp_rewrite->pagination_base."/".$pagenum, 'paged');
 		}
 
-		$result = $base . $request . $query_string;
+		$result = $base.$request.$query_string;
 	}
 
 	/**
@@ -2140,12 +2140,12 @@ 
 	 *
 	 * @param string $result The page number link.
 	 */
-	$result = apply_filters( 'get_pagenum_link', $result );
+	$result = apply_filters('get_pagenum_link', $result);
 
-	if ( $escape )
-		return esc_url( $result );
+	if ($escape)
+		return esc_url($result);
 	else
-		return esc_url_raw( $result );
+		return esc_url_raw($result);
 }
 
 /**
@@ -2163,11 +2163,11 @@ 
 function get_next_posts_page_link($max_page = 0) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single()) {
+		if ( ! $paged)
 			$paged = 1;
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
+		if ( ! $max_page || $max_page >= $nextpage)
 			return get_pagenum_link($nextpage);
 	}
 }
@@ -2181,10 +2181,10 @@ 
  * @param bool  $echo     Optional. Whether to echo the link. Default true.
  * @return string|void The link URL for next posts page if `$echo = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
-	$output = esc_url( get_next_posts_page_link( $max_page ) );
+function next_posts($max_page = 0, $echo = true) {
+	$output = esc_url(get_next_posts_page_link($max_page));
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2202,21 +2202,21 @@ 
  * @param int    $max_page Optional. Max pages. Default 0.
  * @return string|void HTML-formatted next posts page link.
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link($label = null, $max_page = 0) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page)
 		$max_page = $wp_query->max_num_pages;
 
-	if ( !$paged )
+	if ( ! $paged)
 		$paged = 1;
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if (null === $label)
+		$label = __('Next Page &raquo;');
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ($nextpage <= $max_page)) {
 		/**
 		 * Filters the anchor tag attributes for the next posts page link.
 		 *
@@ -2224,9 +2224,9 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'next_posts_link_attributes', '' );
+		$attr = apply_filters('next_posts_link_attributes', '');
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="'.next_posts($max_page, false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2238,8 +2238,8 @@ 
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages. Default 0.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
-	echo get_next_posts_link( $label, $max_page );
+function next_posts_link($label = null, $max_page = 0) {
+	echo get_next_posts_link($label, $max_page);
 }
 
 /**
@@ -2258,9 +2258,9 @@ 
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
+	if ( ! is_single()) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+		if ($nextpage < 1)
 			$nextpage = 1;
 		return get_pagenum_link($nextpage);
 	}
@@ -2274,10 +2274,10 @@ 
  * @param bool $echo Optional. Whether to echo the link. Default true.
  * @return string|void The previous posts page link if `$echo = false`.
  */
-function previous_posts( $echo = true ) {
-	$output = esc_url( get_previous_posts_page_link() );
+function previous_posts($echo = true) {
+	$output = esc_url(get_previous_posts_page_link());
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2293,13 +2293,13 @@ 
  * @param string $label Optional. Previous page link text.
  * @return string|void HTML-formatted previous page link.
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link($label = null) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if (null === $label)
+		$label = __('&laquo; Previous Page');
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1) {
 		/**
 		 * Filters the anchor tag attributes for the previous posts page link.
 		 *
@@ -2307,8 +2307,8 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		$attr = apply_filters('previous_posts_link_attributes', '');
+		return '<a href="'.previous_posts(false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2319,8 +2319,8 @@ 
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
-	echo get_previous_posts_link( $label );
+function previous_posts_link($label = null) {
+	echo get_previous_posts_link($label);
 }
 
 /**
@@ -2341,18 +2341,18 @@ 
  * }
  * @return string The posts link navigation.
  */
-function get_posts_nav_link( $args = array() ) {
+function get_posts_nav_link($args = array()) {
 	global $wp_query;
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular()) {
 		$defaults = array(
 			'sep' => ' &#8212; ',
 			'prelabel' => __('&laquo; Previous Page'),
 			'nxtlabel' => __('Next Page &raquo;'),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$max_num_pages = $wp_query->max_num_pages;
 		$paged = get_query_var('paged');
@@ -2362,7 +2362,7 @@ 
 			$args['sep'] = '';
 		}
 
-		if ( $max_num_pages > 1 ) {
+		if ($max_num_pages > 1) {
 			$return = get_previous_posts_link($args['prelabel']);
 			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
 			$return .= get_next_posts_link($args['nxtlabel']);
@@ -2381,8 +2381,8 @@ 
  * @param string $prelabel Optional. Label for previous pages. Default empty.
  * @param string $nxtlabel Optional Label for next pages. Default empty.
  */
-function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
+function posts_nav_link($sep = '', $prelabel = '', $nxtlabel = '') {
+	$args = array_filter(compact('sep', 'prelabel', 'nxtlabel'));
 	echo get_posts_nav_link($args);
 }
 
@@ -2404,15 +2404,15 @@ 
  * }
  * @return string Markup for post links.
  */
-function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function get_the_post_navigation($args = array()) {
+	$args = wp_parse_args($args, array(
 		'prev_text'          => '%title',
 		'next_text'          => '%title',
 		'in_same_term'       => false,
 		'excluded_terms'     => '',
 		'taxonomy'           => 'category',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+		'screen_reader_text' => __('Post navigation'),
+	));
 
 	$navigation = '';
 
@@ -2433,8 +2433,8 @@ 
 	);
 
 	// Only add markup if there's somewhere to navigate to.
-	if ( $previous || $next ) {
-		$navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] );
+	if ($previous || $next) {
+		$navigation = _navigation_markup($previous.$next, 'post-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2448,8 +2448,8 @@ 
  * @param array $args Optional. See get_the_post_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_post_navigation( $args = array() ) {
-	echo get_the_post_navigation( $args );
+function the_post_navigation($args = array()) {
+	echo get_the_post_navigation($args);
 }
 
 /**
@@ -2471,29 +2471,29 @@ 
  * }
  * @return string Markup for posts links.
  */
-function get_the_posts_navigation( $args = array() ) {
+function get_the_posts_navigation($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
-
-		$next_link = get_previous_posts_link( $args['next_text'] );
-		$prev_link = get_next_posts_link( $args['prev_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older posts'),
+			'next_text'          => __('Newer posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
+
+		$next_link = get_previous_posts_link($args['next_text']);
+		$prev_link = get_next_posts_link($args['prev_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'posts-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2507,8 +2507,8 @@ 
  * @param array $args Optional. See get_the_posts_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_posts_navigation( $args = array() ) {
-	echo get_the_posts_navigation( $args );
+function the_posts_navigation($args = array()) {
+	echo get_the_posts_navigation($args);
 }
 
 /**
@@ -2524,28 +2524,28 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_posts_pagination( $args = array() ) {
+function get_the_posts_pagination($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
 			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous set of posts' ),
-			'next_text'          => _x( 'Next', 'next set of posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+			'prev_text'          => _x('Previous', 'previous set of posts'),
+			'next_text'          => _x('Next', 'next set of posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
 
 		// Make sure we get a string back. Plain is the next best thing.
-		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+		if (isset($args['type']) && 'array' == $args['type']) {
 			$args['type'] = 'plain';
 		}
 
 		// Set up paginated links.
-		$links = paginate_links( $args );
+		$links = paginate_links($args);
 
-		if ( $links ) {
-			$navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
+		if ($links) {
+			$navigation = _navigation_markup($links, 'pagination', $args['screen_reader_text']);
 		}
 	}
 
@@ -2560,8 +2560,8 @@ 
  * @param array $args Optional. See get_the_posts_pagination() for available arguments.
  *                    Default empty array.
  */
-function the_posts_pagination( $args = array() ) {
-	echo get_the_posts_pagination( $args );
+function the_posts_pagination($args = array()) {
+	echo get_the_posts_pagination($args);
 }
 
 /**
@@ -2575,9 +2575,9 @@ 
  * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
-	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+function _navigation_markup($links, $class = 'posts-navigation', $screen_reader_text = '') {
+	if (empty($screen_reader_text)) {
+		$screen_reader_text = __('Posts navigation');
 	}
 
 	$template = '
@@ -2604,9 +2604,9 @@ 
 	 * @param string $class    The class passed by the calling function.
 	 * @return string Navigation template.
 	 */
-	$template = apply_filters( 'navigation_markup_template', $template, $class );
+	$template = apply_filters('navigation_markup_template', $template, $class);
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
+	return sprintf($template, sanitize_html_class($class), esc_html($screen_reader_text), $links);
 }
 
 /**
@@ -2620,25 +2620,25 @@ 
  * @param int $max_page Optional. The maximum number of comment pages. Default 0.
  * @return string The comments page number link URL.
  */
-function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
+function get_comments_pagenum_link($pagenum = 1, $max_page = 0) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
-		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	if ('newest' == get_option('default_comments_page')) {
+		if ($pagenum != $max_page) {
+			if ($wp_rewrite->using_permalinks())
+				$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+				$result = add_query_arg('cpage', $pagenum, $result);
 		}
-	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	} elseif ($pagenum > 1) {
+		if ($wp_rewrite->using_permalinks())
+			$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+			$result = add_query_arg('cpage', $pagenum, $result);
 	}
 
 	$result .= '#comments';
@@ -2650,7 +2650,7 @@ 
 	 *
 	 * @param string $result The comments page number link.
 	 */
-	return apply_filters( 'get_comments_pagenum_link', $result );
+	return apply_filters('get_comments_pagenum_link', $result);
 }
 
 /**
@@ -2664,30 +2664,30 @@ 
  * @param int    $max_page Optional. Max page. Default 0.
  * @return string|void HTML-formatted link for the next page of comments.
  */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+function get_next_comments_link($label = '', $max_page = 0) {
 	global $wp_query;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( ! $page ) {
+	if ( ! $page) {
 		$page = 1;
 	}
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = $wp_query->max_num_comment_pages;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = get_comment_pages_count();
 
-	if ( $nextpage > $max_page )
+	if ($nextpage > $max_page)
 		return;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('Newer Comments &raquo;');
 
 	/**
@@ -2697,7 +2697,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($nextpage, $max_page)).'" '.apply_filters('next_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2708,8 +2708,8 @@ 
  * @param string $label    Optional. Label for link text. Default empty.
  * @param int    $max_page Optional. Max page. Default 0.
  */
-function next_comments_link( $label = '', $max_page = 0 ) {
-	echo get_next_comments_link( $label, $max_page );
+function next_comments_link($label = '', $max_page = 0) {
+	echo get_next_comments_link($label, $max_page);
 }
 
 /**
@@ -2720,18 +2720,18 @@ 
  * @param string $label Optional. Label for comments link text. Default empty.
  * @return string|void HTML-formatted link for the previous page of comments.
  */
-function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
+function get_previous_comments_link($label = '') {
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
+	if (intval($page) <= 1)
 		return;
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('&laquo; Older Comments');
 
 	/**
@@ -2741,7 +2741,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($prevpage)).'" '.apply_filters('previous_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2751,8 +2751,8 @@ 
  *
  * @param string $label Optional. Label for comments link text. Default empty.
  */
-function previous_comments_link( $label = '' ) {
-	echo get_previous_comments_link( $label );
+function previous_comments_link($label = '') {
+	echo get_previous_comments_link($label);
 }
 
 /**
@@ -2766,31 +2766,31 @@ 
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
  * @return string|void Markup for pagination links.
  */
-function paginate_comments_links( $args = array() ) {
+function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
-	if ( !$page )
+	if ( ! $page)
 		$page = 1;
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
+		'base' => add_query_arg('cpage', '%#%'),
 		'format' => '',
 		'total' => $max_page,
 		'current' => $page,
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ($wp_rewrite->using_permalinks())
+		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()).$wp_rewrite->comments_pagination_base.'-%#%', 'commentpaged');
 
-	$args = wp_parse_args( $args, $defaults );
-	$page_links = paginate_links( $args );
+	$args = wp_parse_args($args, $defaults);
+	$page_links = paginate_links($args);
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $page_links;
 	else
 		return $page_links;
@@ -2812,29 +2812,29 @@ 
  * }
  * @return string Markup for comments links.
  */
-function get_the_comments_navigation( $args = array() ) {
+function get_the_comments_navigation($args = array()) {
 	$navigation = '';
 
 	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older comments' ),
-			'next_text'          => __( 'Newer comments' ),
-			'screen_reader_text' => __( 'Comments navigation' ),
-		) );
-
-		$prev_link = get_previous_comments_link( $args['prev_text'] );
-		$next_link = get_next_comments_link( $args['next_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if (get_comment_pages_count() > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older comments'),
+			'next_text'          => __('Newer comments'),
+			'screen_reader_text' => __('Comments navigation'),
+		));
+
+		$prev_link = get_previous_comments_link($args['prev_text']);
+		$next_link = get_next_comments_link($args['next_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'comment-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2847,8 +2847,8 @@ 
  *
  * @param array $args See get_the_comments_navigation() for available arguments. Default empty array.
  */
-function the_comments_navigation( $args = array() ) {
-	echo get_the_comments_navigation( $args );
+function the_comments_navigation($args = array()) {
+	echo get_the_comments_navigation($args);
 }
 
 /**
@@ -2865,20 +2865,20 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_comments_pagination( $args = array() ) {
+function get_the_comments_pagination($args = array()) {
 	$navigation = '';
-	$args       = wp_parse_args( $args, array(
-		'screen_reader_text' => __( 'Comments navigation' ),
-	) );
+	$args       = wp_parse_args($args, array(
+		'screen_reader_text' => __('Comments navigation'),
+	));
 	$args['echo'] = false;
 
 	// Make sure we get plain links, so we get a string we can work with.
 	$args['type'] = 'plain';
 
-	$links = paginate_comments_links( $args );
+	$links = paginate_comments_links($args);
 
-	if ( $links ) {
-		$navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] );
+	if ($links) {
+		$navigation = _navigation_markup($links, 'comments-pagination', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2891,8 +2891,8 @@ 
  *
  * @param array $args See get_the_comments_pagination() for available arguments. Default empty array.
  */
-function the_comments_pagination( $args = array() ) {
-	echo get_the_comments_pagination( $args );
+function the_comments_pagination($args = array()) {
+	echo get_the_comments_pagination($args);
 }
 
 /**
@@ -2905,11 +2905,11 @@ 
 function get_shortcut_link() {
 	global $is_IE;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 
 	$link = '';
 
-	if ( $is_IE ) {
+	if ($is_IE) {
 		/*
 		 * Return the old/shorter bookmarklet code for MSIE 8 and lower,
 		 * since they only support a max length of ~2000 characters for
@@ -2919,27 +2919,27 @@ 
 		 */
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) );
+		if ( ! empty($ua) && preg_match('/\bMSIE (\d)/', $ua, $matches) && (int) $matches[1] <= 8) {
+			$url = wp_json_encode(admin_url('press-this.php'));
 
-			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' .
-				's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' .
-				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . WP_Press_This::VERSION . '";' .
-				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' .
+			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,'.
+				's=(e?e():(k)?k():(x?x.createRange().text:0)),f='.$url.',l=d.location,e=encodeURIComponent,'.
+				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v='.WP_Press_This::VERSION.'";'.
+				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};'.
 				'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)';
 		}
 	}
 
-	if ( empty( $link ) ) {
-		$src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' );
+	if (empty($link)) {
+		$src = @file_get_contents(ABSPATH.'wp-admin/js/bookmarklet.min.js');
 
-		if ( $src ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . WP_Press_This::VERSION );
-			$link = 'javascript:' . str_replace( 'window.pt_url', $url, $src );
+		if ($src) {
+			$url = wp_json_encode(admin_url('press-this.php').'?v='.WP_Press_This::VERSION);
+			$link = 'javascript:'.str_replace('window.pt_url', $url, $src);
 		}
 	}
 
-	$link = str_replace( array( "\r", "\n", "\t" ),  '', $link );
+	$link = str_replace(array("\r", "\n", "\t"), '', $link);
 
 	/**
 	 * Filters the Press This bookmarklet link.
@@ -2948,7 +2948,7 @@ 
 	 *
 	 * @param string $link The Press This bookmarklet link.
 	 */
-	return apply_filters( 'shortcut_link', $link );
+	return apply_filters('shortcut_link', $link);
 }
 
 /**
@@ -2965,8 +2965,8 @@ 
  *                             'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function home_url( $path = '', $scheme = null ) {
-	return get_home_url( null, $path, $scheme );
+function home_url($path = '', $scheme = null) {
+	return get_home_url(null, $path, $scheme);
 }
 
 /**
@@ -2986,30 +2986,30 @@ 
  *                              'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url($blog_id = null, $path = '', $scheme = null) {
 	global $pagenow;
 
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'home' );
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('home');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'home' );
+		switch_to_blog($blog_id);
+		$url = get_option('home');
 		restore_current_blog();
 	}
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
+	if ( ! in_array($scheme, array('http', 'https', 'relative'))) {
+		if (is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow)
 			$scheme = 'https';
 		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			$scheme = parse_url($url, PHP_URL_SCHEME);
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the home URL.
@@ -3022,7 +3022,7 @@ 
 	 *                                 'relative', 'rest', or null.
 	 * @param int|null    $blog_id     Site ID, or null for the current site.
 	 */
-	return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+	return apply_filters('home_url', $url, $path, $orig_scheme, $blog_id);
 }
 
 /**
@@ -3039,8 +3039,8 @@ 
  * @param string $scheme Optional. Scheme to give the site URL context. See set_url_scheme().
  * @return string Site URL link with optional path appended.
  */
-function site_url( $path = '', $scheme = null ) {
-	return get_site_url( null, $path, $scheme );
+function site_url($path = '', $scheme = null) {
+	return get_site_url(null, $path, $scheme);
 }
 
 /**
@@ -3060,19 +3060,19 @@ 
  *                        'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'siteurl' );
+function get_site_url($blog_id = null, $path = '', $scheme = null) {
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('siteurl');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'siteurl' );
+		switch_to_blog($blog_id);
+		$url = get_option('siteurl');
 		restore_current_blog();
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the site URL.
@@ -3085,7 +3085,7 @@ 
 	 *                             'login_post', 'admin', 'relative' or null.
 	 * @param int|null    $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
+	return apply_filters('site_url', $url, $path, $scheme, $blog_id);
 }
 
 /**
@@ -3098,8 +3098,8 @@ 
  *                       'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function admin_url( $path = '', $scheme = 'admin' ) {
-	return get_admin_url( null, $path, $scheme );
+function admin_url($path = '', $scheme = 'admin') {
+	return get_admin_url(null, $path, $scheme);
 }
 
 /**
@@ -3114,11 +3114,11 @@ 
  *                        force_ssl_admin() and is_ssl().
  * @return string Admin URL link with optional path appended.
  */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the admin area URL.
@@ -3129,7 +3129,7 @@ 
 	 * @param string   $path    Path relative to the admin area URL. Blank string if no path is specified.
 	 * @param int|null $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'admin_url', $url, $path, $blog_id );
+	return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
 /**
@@ -3142,10 +3142,10 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Includes URL link with optional path appended.
  */
-function includes_url( $path = '', $scheme = null ) {
-	$url = site_url( '/' . WPINC . '/', $scheme );
+function includes_url($path = '', $scheme = null) {
+	$url = site_url('/'.WPINC.'/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3157,7 +3157,7 @@ 
 	 * @param string $path Path relative to the URL to the wp-includes directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'includes_url', $url, $path );
+	return apply_filters('includes_url', $url, $path);
 }
 
 /**
@@ -3168,11 +3168,11 @@ 
  * @param string $path Optional. Path relative to the content URL. Default empty.
  * @return string Content URL link with optional path appended.
  */
-function content_url( $path = '' ) {
-	$url = set_url_scheme( WP_CONTENT_URL );
+function content_url($path = '') {
+	$url = set_url_scheme(WP_CONTENT_URL);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3183,7 +3183,7 @@ 
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters('content_url', $url, $path);
 }
 
 /**
@@ -3200,28 +3200,28 @@ 
  *                        Typically this is done by passing `__FILE__` as the argument.
  * @return string Plugins URL link with optional paths appended.
  */
-function plugins_url( $path = '', $plugin = '' ) {
+function plugins_url($path = '', $plugin = '') {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$path = wp_normalize_path($path);
+	$plugin = wp_normalize_path($plugin);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir))
 		$url = WPMU_PLUGIN_URL;
 	else
 		$url = WP_PLUGIN_URL;
 
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( !empty($plugin) && is_string($plugin) ) {
+	if ( ! empty($plugin) && is_string($plugin)) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ('.' != $folder)
+			$url .= '/'.ltrim($folder, '/');
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3234,7 +3234,7 @@ 
 	 * @param string $plugin The plugin file path to be relative to. Blank string if no plugin
 	 *                       is specified.
 	 */
-	return apply_filters( 'plugins_url', $url, $path, $plugin );
+	return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
 /**
@@ -3253,19 +3253,19 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_site_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return site_url($path, $scheme);
 
 	$current_network = get_network();
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_network->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+		$url = set_url_scheme('http://'.$current_network->domain.$current_network->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network site URL.
@@ -3278,7 +3278,7 @@ 
 	 * @param string|null $scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                            'relative' or null.
 	 */
-	return apply_filters( 'network_site_url', $url, $path, $scheme );
+	return apply_filters('network_site_url', $url, $path, $scheme);
 }
 
 /**
@@ -3295,23 +3295,23 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home URL link with optional path appended.
  */
-function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_home_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return home_url($path, $scheme);
 
 	$current_network = get_network();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array($scheme, array('http', 'https', 'relative')))
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_network->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+		$url = set_url_scheme('http://'.$current_network->domain.$current_network->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network home URL.
@@ -3324,7 +3324,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters('network_home_url', $url, $path, $orig_scheme);
 }
 
 /**
@@ -3337,13 +3337,13 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+function network_admin_url($path = '', $scheme = 'admin') {
+	if ( ! is_multisite())
+		return admin_url($path, $scheme);
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3355,7 +3355,7 @@ 
 	 * @param string $path Path relative to the network admin URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'network_admin_url', $url, $path );
+	return apply_filters('network_admin_url', $url, $path);
 }
 
 /**
@@ -3368,10 +3368,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function user_admin_url( $path = '', $scheme = 'admin' ) {
+function user_admin_url($path = '', $scheme = 'admin') {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3383,7 +3383,7 @@ 
 	 * @param string $path Path relative to the URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'user_admin_url', $url, $path );
+	return apply_filters('user_admin_url', $url, $path);
 }
 
 /**
@@ -3396,10 +3396,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
+function self_admin_url($path = '', $scheme = 'admin') {
+	if (is_network_admin())
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -3416,27 +3416,27 @@ 
  *                            'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
  * @return string $url URL with chosen scheme.
  */
-function set_url_scheme( $url, $scheme = null ) {
+function set_url_scheme($url, $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( ! $scheme ) {
+	if ( ! $scheme) {
 		$scheme = is_ssl() ? 'https' : 'http';
-	} elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+	} elseif ($scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc') {
 		$scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-	} elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+	} elseif ($scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative') {
 		$scheme = is_ssl() ? 'https' : 'http';
 	}
 
-	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	$url = trim($url);
+	if (substr($url, 0, 2) === '//')
+		$url = 'http:'.$url;
 
-	if ( 'relative' == $scheme ) {
-		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+	if ('relative' == $scheme) {
+		$url = ltrim(preg_replace('#^\w+://[^/]*#', '', $url));
+		if ($url !== '' && $url[0] === '/')
+			$url = '/'.ltrim($url, "/ \t\n\r\0\x0B");
 	} else {
-		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+		$url = preg_replace('#^\w+://#', $scheme.'://', $url);
 	}
 
 	/**
@@ -3449,7 +3449,7 @@ 
 	 * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
 	 *                                 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
 	 */
-	return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
+	return apply_filters('set_url_scheme', $url, $scheme, $orig_scheme);
 }
 
 /**
@@ -3468,24 +3468,24 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+function get_dashboard_url($user_id = 0, $path = '', $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	if ( is_multisite() && ! user_can( $user_id, 'manage_network' ) && empty($blogs) ) {
-		$url = user_admin_url( $path, $scheme );
-	} elseif ( ! is_multisite() ) {
-		$url = admin_url( $path, $scheme );
+	$blogs = get_blogs_of_user($user_id);
+	if (is_multisite() && ! user_can($user_id, 'manage_network') && empty($blogs)) {
+		$url = user_admin_url($path, $scheme);
+	} elseif ( ! is_multisite()) {
+		$url = admin_url($path, $scheme);
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
-			$url = admin_url( $path, $scheme );
+		if ($current_blog && (user_can($user_id, 'manage_network') || in_array($current_blog, array_keys($blogs)))) {
+			$url = admin_url($path, $scheme);
 		} else {
-			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
+			$active = get_active_blog_for_user($user_id);
+			if ($active)
+				$url = get_admin_url($active->blog_id, $path, $scheme);
 			else
-				$url = user_admin_url( $path, $scheme );
+				$url = user_admin_url($path, $scheme);
 		}
 	}
 
@@ -3500,7 +3500,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters('user_dashboard_url', $url, $user_id, $path, $scheme);
 }
 
 /**
@@ -3513,15 +3513,15 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+function get_edit_profile_url($user_id = 0, $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
+	if (is_user_admin())
+		$url = user_admin_url('profile.php', $scheme);
+	elseif (is_network_admin())
+		$url = network_admin_url('profile.php', $scheme);
 	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+		$url = get_dashboard_url($user_id, 'profile.php', $scheme);
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3533,7 +3533,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters('edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**
@@ -3548,33 +3548,33 @@ 
  * @return string|false The canonical URL, or false if the post does not exist or has not
  *                      been published yet.
  */
-function wp_get_canonical_url( $post = null ) {
-	$post = get_post( $post );
+function wp_get_canonical_url($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( 'publish' !== $post->post_status ) {
+	if ('publish' !== $post->post_status) {
 		return false;
 	}
 
-	$canonical_url = get_permalink( $post );
+	$canonical_url = get_permalink($post);
 
 	// If a canonical is being generated for the current page, make sure it has pagination if needed.
-	if ( $post->ID === get_queried_object_id() ) {
-		$page = get_query_var( 'page', 0 );
-		if ( $page >= 2 ) {
-			if ( '' == get_option( 'permalink_structure' ) ) {
-				$canonical_url = add_query_arg( 'page', $page, $canonical_url );
+	if ($post->ID === get_queried_object_id()) {
+		$page = get_query_var('page', 0);
+		if ($page >= 2) {
+			if ('' == get_option('permalink_structure')) {
+				$canonical_url = add_query_arg('page', $page, $canonical_url);
 			} else {
-				$canonical_url = trailingslashit( $canonical_url ) . user_trailingslashit( $page, 'single_paged' );
+				$canonical_url = trailingslashit($canonical_url).user_trailingslashit($page, 'single_paged');
 			}
 		}
 
-		$cpage = get_query_var( 'cpage', 0 );
-		if ( $cpage ) {
-			$canonical_url = get_comments_pagenum_link( $cpage );
+		$cpage = get_query_var('cpage', 0);
+		if ($cpage) {
+			$canonical_url = get_comments_pagenum_link($cpage);
 		}
 	}
 
@@ -3586,7 +3586,7 @@ 
 	 * @param string  $canonical_url The post's canonical URL.
 	 * @param WP_Post $post          Post object.
 	 */
-	return apply_filters( 'get_canonical_url', $canonical_url, $post );
+	return apply_filters('get_canonical_url', $canonical_url, $post);
 }
 
 /**
@@ -3596,20 +3596,20 @@ 
  * @since 4.6.0 Adjusted to use wp_get_canonical_url().
  */
 function rel_canonical() {
-	if ( ! is_singular() ) {
+	if ( ! is_singular()) {
 		return;
 	}
 
 	$id = get_queried_object_id();
 
-	if ( 0 === $id ) {
+	if (0 === $id) {
 		return;
 	}
 
-	$url = wp_get_canonical_url( $id );
+	$url = wp_get_canonical_url($id);
 
-	if ( ! empty( $url ) ) {
-		echo '<link rel="canonical" href="' . esc_url( $url ) . '" />' . "\n";
+	if ( ! empty($url)) {
+		echo '<link rel="canonical" href="'.esc_url($url).'" />'."\n";
 	}
 }
 
@@ -3633,7 +3633,7 @@ 
  * @return string A shortlink or an empty string if no shortlink exists for the requested resource or if shortlinks
  *                are not enabled.
  */
-function wp_get_shortlink( $id = 0, $context = 'post', $allow_slugs = true ) {
+function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 	/**
 	 * Filters whether to preempt generating a shortlink for the given post.
 	 *
@@ -3647,32 +3647,32 @@ 
 	 * @param string      $context     The context for the link. One of 'post' or 'query',
 	 * @param bool        $allow_slugs Whether to allow post slugs in the shortlink.
 	 */
-	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
+	$shortlink = apply_filters('pre_get_shortlink', false, $id, $context, $allow_slugs);
 
-	if ( false !== $shortlink ) {
+	if (false !== $shortlink) {
 		return $shortlink;
 	}
 
 	$post_id = 0;
-	if ( 'query' == $context && is_singular() ) {
+	if ('query' == $context && is_singular()) {
 		$post_id = get_queried_object_id();
-		$post = get_post( $post_id );
-	} elseif ( 'post' == $context ) {
-		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		$post = get_post($post_id);
+	} elseif ('post' == $context) {
+		$post = get_post($id);
+		if ( ! empty($post->ID))
 			$post_id = $post->ID;
 	}
 
 	$shortlink = '';
 
 	// Return p= link for all public post types.
-	if ( ! empty( $post_id ) ) {
-		$post_type = get_post_type_object( $post->post_type );
+	if ( ! empty($post_id)) {
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
-			$shortlink = home_url( '/' );
-		} elseif ( $post_type->public ) {
-			$shortlink = home_url( '?p=' . $post_id );
+		if ('page' === $post->post_type && $post->ID == get_option('page_on_front') && 'page' == get_option('show_on_front')) {
+			$shortlink = home_url('/');
+		} elseif ($post_type->public) {
+			$shortlink = home_url('?p='.$post_id);
 		}
 	}
 
@@ -3686,7 +3686,7 @@ 
 	 * @param string $context     The context for the link. One of 'post' or 'query',
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink. Not used by default.
 	 */
-	return apply_filters( 'get_shortlink', $shortlink, $id, $context, $allow_slugs );
+	return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);
 }
 
 /**
@@ -3697,12 +3697,12 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_wp_head() {
-	$shortlink = wp_get_shortlink( 0, 'query' );
+	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty( $shortlink ) )
+	if (empty($shortlink))
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='".esc_url($shortlink)."' />\n";
 }
 
 /**
@@ -3713,15 +3713,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if (headers_sent())
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
+	if (empty($shortlink))
 		return;
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header('Link: <'.$shortlink.'>; rel=shortlink', false);
 }
 
 /**
@@ -3738,19 +3738,19 @@ 
  * @param string $before Optional HTML to display before the link. Default empty.
  * @param string $after  Optional HTML to display after the link. Default empty.
  */
-function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
+function the_shortlink($text = '', $title = '', $before = '', $after = '') {
 	$post = get_post();
 
-	if ( empty( $text ) )
+	if (empty($text))
 		$text = __('This is the short link.');
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if (empty($title))
+		$title = the_title_attribute(array('echo' => false));
 
-	$shortlink = wp_get_shortlink( $post->ID );
+	$shortlink = wp_get_shortlink($post->ID);
 
-	if ( !empty( $shortlink ) ) {
-		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+	if ( ! empty($shortlink)) {
+		$link = '<a rel="shortlink" href="'.esc_url($shortlink).'" title="'.$title.'">'.$text.'</a>';
 
 		/**
 		 * Filters the short link anchor tag for a post.
@@ -3762,7 +3762,7 @@ 
 		 * @param string $text      Shortlink's text.
 		 * @param string $title     Shortlink's title attribute.
 		 */
-		$link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+		$link = apply_filters('the_shortlink', $link, $shortlink, $text, $title);
 		echo $before, $link, $after;
 	}
 }
@@ -3795,8 +3795,8 @@ 
  * }
  * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
  */
-function get_avatar_url( $id_or_email, $args = null ) {
-	$args = get_avatar_data( $id_or_email, $args );
+function get_avatar_url($id_or_email, $args = null) {
+	$args = get_avatar_data($id_or_email, $args);
 	return $args['url'];
 }
 
@@ -3836,51 +3836,51 @@ 
  *     @type string $url          The URL of the avatar we found.
  * }
  */
-function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
+function get_avatar_data($id_or_email, $args = null) {
+	$args = wp_parse_args($args, array(
 		'size'           => 96,
 		'height'         => null,
 		'width'          => null,
-		'default'        => get_option( 'avatar_default', 'mystery' ),
+		'default'        => get_option('avatar_default', 'mystery'),
 		'force_default'  => false,
-		'rating'         => get_option( 'avatar_rating' ),
+		'rating'         => get_option('avatar_rating'),
 		'scheme'         => null,
 		'processed_args' => null, // if used, should be a reference
 		'extra_attr'     => '',
-	) );
+	));
 
-	if ( is_numeric( $args['size'] ) ) {
-		$args['size'] = absint( $args['size'] );
-		if ( ! $args['size'] ) {
+	if (is_numeric($args['size'])) {
+		$args['size'] = absint($args['size']);
+		if ( ! $args['size']) {
 			$args['size'] = 96;
 		}
 	} else {
 		$args['size'] = 96;
 	}
 
-	if ( is_numeric( $args['height'] ) ) {
-		$args['height'] = absint( $args['height'] );
-		if ( ! $args['height'] ) {
+	if (is_numeric($args['height'])) {
+		$args['height'] = absint($args['height']);
+		if ( ! $args['height']) {
 			$args['height'] = $args['size'];
 		}
 	} else {
 		$args['height'] = $args['size'];
 	}
 
-	if ( is_numeric( $args['width'] ) ) {
-		$args['width'] = absint( $args['width'] );
-		if ( ! $args['width'] ) {
+	if (is_numeric($args['width'])) {
+		$args['width'] = absint($args['width']);
+		if ( ! $args['width']) {
 			$args['width'] = $args['size'];
 		}
 	} else {
 		$args['width'] = $args['size'];
 	}
 
-	if ( empty( $args['default'] ) ) {
-		$args['default'] = get_option( 'avatar_default', 'mystery' );
+	if (empty($args['default'])) {
+		$args['default'] = get_option('avatar_default', 'mystery');
 	}
 
-	switch ( $args['default'] ) {
+	switch ($args['default']) {
 		case 'mm' :
 		case 'mystery' :
 		case 'mysteryman' :
@@ -3893,7 +3893,7 @@ 
 
 	$args['force_default'] = (bool) $args['force_default'];
 
-	$args['rating'] = strtolower( $args['rating'] );
+	$args['rating'] = strtolower($args['rating']);
 
 	$args['found_avatar'] = false;
 
@@ -3910,38 +3910,38 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
+	$args = apply_filters('pre_get_avatar_data', $args, $id_or_email);
 
-	if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
+	if (isset($args['url']) && ! is_null($args['url'])) {
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'get_avatar_data', $args, $id_or_email );
+		return apply_filters('get_avatar_data', $args, $id_or_email);
 	}
 
 	$email_hash = '';
 	$user = $email = false;
 
-	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
-		$id_or_email = get_comment( $id_or_email );
+	if (is_object($id_or_email) && isset($id_or_email->comment_ID)) {
+		$id_or_email = get_comment($id_or_email);
 	}
 
 	// Process the user identifier.
-	if ( is_numeric( $id_or_email ) ) {
-		$user = get_user_by( 'id', absint( $id_or_email ) );
-	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+	if (is_numeric($id_or_email)) {
+		$user = get_user_by('id', absint($id_or_email));
+	} elseif (is_string($id_or_email)) {
+		if (strpos($id_or_email, '@md5.gravatar.com')) {
 			// md5 hash
-			list( $email_hash ) = explode( '@', $id_or_email );
+			list($email_hash) = explode('@', $id_or_email);
 		} else {
 			// email address
 			$email = $id_or_email;
 		}
-	} elseif ( $id_or_email instanceof WP_User ) {
+	} elseif ($id_or_email instanceof WP_User) {
 		// User Object
 		$user = $id_or_email;
-	} elseif ( $id_or_email instanceof WP_Post ) {
+	} elseif ($id_or_email instanceof WP_Post) {
 		// Post Object
-		$user = get_user_by( 'id', (int) $id_or_email->post_author );
-	} elseif ( $id_or_email instanceof WP_Comment ) {
+		$user = get_user_by('id', (int) $id_or_email->post_author);
+	} elseif ($id_or_email instanceof WP_Comment) {
 		/**
 		 * Filters the list of allowed comment types for retrieving avatars.
 		 *
@@ -3949,36 +3949,36 @@ 
 		 *
 		 * @param array $types An array of content types. Default only contains 'comment'.
 		 */
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+		$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+		if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
-			return apply_filters( 'get_avatar_data', $args, $id_or_email );
+			return apply_filters('get_avatar_data', $args, $id_or_email);
 		}
 
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$user = get_user_by( 'id', (int) $id_or_email->user_id );
+		if ( ! empty($id_or_email->user_id)) {
+			$user = get_user_by('id', (int) $id_or_email->user_id);
 		}
-		if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) {
+		if (( ! $user || is_wp_error($user)) && ! empty($id_or_email->comment_author_email)) {
 			$email = $id_or_email->comment_author_email;
 		}
 	}
 
-	if ( ! $email_hash ) {
-		if ( $user ) {
+	if ( ! $email_hash) {
+		if ($user) {
 			$email = $user->user_email;
 		}
 
-		if ( $email ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if ($email) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 	}
 
-	if ( $email_hash ) {
+	if ($email_hash) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server = hexdec($email_hash[0]) % 3;
 	} else {
-		$gravatar_server = rand( 0, 2 );
+		$gravatar_server = rand(0, 2);
 	}
 
 	$url_args = array(
@@ -3988,15 +3988,15 @@ 
 		'r' => $args['rating'],
 	);
 
-	if ( is_ssl() ) {
-		$url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+	if (is_ssl()) {
+		$url = 'https://secure.gravatar.com/avatar/'.$email_hash;
 	} else {
-		$url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+		$url = sprintf('http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash);
 	}
 
 	$url = add_query_arg(
-		rawurlencode_deep( array_filter( $url_args ) ),
-		set_url_scheme( $url, $args['scheme'] )
+		rawurlencode_deep(array_filter($url_args)),
+		set_url_scheme($url, $args['scheme'])
 	);
 
 	/**
@@ -4009,7 +4009,7 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
+	$args['url'] = apply_filters('get_avatar_url', $url, $id_or_email, $args);
 
 	/**
 	 * Filters the avatar data.
@@ -4020,7 +4020,7 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	return apply_filters( 'get_avatar_data', $args, $id_or_email );
+	return apply_filters('get_avatar_data', $args, $id_or_email);
 }
 
 /**
@@ -4034,15 +4034,15 @@ 
  * @param string $file Optional. File to search for in the stylesheet directory.
  * @return string The URL of the file.
  */
-function get_theme_file_uri( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_theme_file_uri($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$url = get_stylesheet_directory_uri();
-	} elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-		$url = get_stylesheet_directory_uri() . '/' . $file;
+	} elseif (file_exists(get_stylesheet_directory().'/'.$file)) {
+		$url = get_stylesheet_directory_uri().'/'.$file;
 	} else {
-		$url = get_template_directory_uri() . '/' . $file;
+		$url = get_template_directory_uri().'/'.$file;
 	}
 
 	/**
@@ -4053,7 +4053,7 @@ 
 	 * @param string $url  The file URL.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'theme_file_uri', $url, $file );
+	return apply_filters('theme_file_uri', $url, $file);
 }
 
 /**
@@ -4064,13 +4064,13 @@ 
  * @param string $file Optional. File to return the URL for in the template directory.
  * @return string The URL of the file.
  */
-function get_parent_theme_file_uri( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_parent_theme_file_uri($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$url = get_template_directory_uri();
 	} else {
-		$url = get_template_directory_uri() . '/' . $file;
+		$url = get_template_directory_uri().'/'.$file;
 	}
 
 	/**
@@ -4081,7 +4081,7 @@ 
 	 * @param string $url  The file URL.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'parent_theme_file_uri', $url, $file );
+	return apply_filters('parent_theme_file_uri', $url, $file);
 }
 
 /**
@@ -4095,15 +4095,15 @@ 
  * @param string $file Optional. File to search for in the stylesheet directory.
  * @return string The path of the file.
  */
-function get_theme_file_path( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_theme_file_path($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$path = get_stylesheet_directory();
-	} elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-		$path = get_stylesheet_directory() . '/' . $file;
+	} elseif (file_exists(get_stylesheet_directory().'/'.$file)) {
+		$path = get_stylesheet_directory().'/'.$file;
 	} else {
-		$path = get_template_directory() . '/' . $file;
+		$path = get_template_directory().'/'.$file;
 	}
 
 	/**
@@ -4114,7 +4114,7 @@ 
 	 * @param string $path The file path.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'theme_file_path', $path, $file );
+	return apply_filters('theme_file_path', $path, $file);
 }
 
 /**
@@ -4125,13 +4125,13 @@ 
  * @param string $file Optional. File to return the path for in the template directory.
  * @return string The path of the file.
  */
-function get_parent_theme_file_path( $file = '' ) {
-	$file = ltrim( $file, '/' );
+function get_parent_theme_file_path($file = '') {
+	$file = ltrim($file, '/');
 
-	if ( empty( $file ) ) {
+	if (empty($file)) {
 		$path = get_template_directory();
 	} else {
-		$path = get_template_directory() . '/' . $file;
+		$path = get_template_directory().'/'.$file;
 	}
 
 	/**
@@ -4142,5 +4142,5 @@ 
 	 * @param string $path The file path.
 	 * @param string $file The requested file to search for.
 	 */
-	return apply_filters( 'parent_theme_file_path', $path, $file );
+	return apply_filters('parent_theme_file_path', $path, $file);
 }

Braces +471 added lines, -338 removed lines

@@ -46,10 +46,11 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+			$string = trailingslashit($string);
+	} else {
+			$string = untrailingslashit($string);
+	}
 
 	/**
 	 * Filters the trailing-slashed string, depending on whether the site is set to use trailing slashes.
@@ -137,15 +138,17 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
-		return false;
+	if ( empty($post->ID) ) {
+			return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	if ( $post->post_type == 'page' ) {
+			return get_page_link($post, $leavename, $sample);
+	} elseif ( $post->post_type == 'attachment' ) {
+			return get_attachment_link( $post, $leavename );
+	} elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) {
+			return get_post_permalink($post, $leavename, $sample);
+	}
 
 	$permalink = get_option('permalink_structure');
 
@@ -186,8 +189,9 @@ 
 
 				$category_object = get_term( $category_object, 'category' );
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ( $parent = $category_object->parent ) {
+									$category = get_category_parents($parent, false, '/', true) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
@@ -257,8 +261,9 @@ 
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
-		return $post;
+	if ( is_wp_error( $post ) ) {
+			return $post;
+	}
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
@@ -278,10 +283,11 @@ 
 		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) ) {
+					$post_link = add_query_arg($post_type->query_var, $slug, '');
+		} else {
+					$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		}
 		$post_link = home_url($post_link);
 	}
 
@@ -314,10 +320,11 @@ 
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
-		$link = _get_page_link( $post, $leavename, $sample );
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+			$link = home_url('/');
+	} else {
+			$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filters the permalink for a page.
@@ -403,27 +410,36 @@ 
 	}
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
-			$parentlink = get_permalink( $post->post_parent );
+		if ( 'page' == $parent->post_type ) {
+					$parentlink = _get_page_link( $post->post_parent );
+		}
+		// Ignores page_on_front
+		else {
+					$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
-			$name = $post->post_name;
+		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') ) {
+					$name = 'attachment/' . $post->post_name;
+		}
+		// <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else {
+					$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos($parentlink, '?') === false ) {
+					$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		}
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename ) {
+					$link = str_replace( '%postname%', $name, $link );
+		}
 	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
 		$link = home_url( user_trailingslashit( $post->post_name ) );
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link ) {
+			$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -448,8 +464,9 @@ 
  */
 function get_year_link( $year ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -482,10 +499,12 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -521,12 +540,15 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
+	if ( !$day ) {
+			$day = gmdate('j', current_time('timestamp'));
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {
@@ -594,18 +616,21 @@ 
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
-			$feed = '';
+		if ( get_default_feed() == $feed ) {
+					$feed = '';
+		}
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
 		$output =  home_url( user_trailingslashit($permalink, 'feed') );
 	} else {
-		if ( empty($feed) )
-			$feed = get_default_feed();
+		if ( empty($feed) ) {
+					$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos($feed, 'comments_') ) {
+					$feed = str_replace('comments_', 'comments-', $feed);
+		}
 
 		$output = home_url("?feed={$feed}");
 	}
@@ -633,20 +658,23 @@ 
 function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$post = get_post( $post_id );
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
 	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) {
+					$url = _get_page_link( $post_id );
+		} else {
+					$url = get_permalink($post_id);
+		}
 
 		if ( $unattached ) {
 			$url =  home_url( '/feed/' );
@@ -656,8 +684,9 @@ 
 			$url = add_query_arg( 'attachment_id', $post_id, $url );
 		} else {
 			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
-				$url .= "/$feed";
+			if ( $feed != get_default_feed() ) {
+							$url .= "/$feed";
+			}
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
@@ -728,17 +757,19 @@ 
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
 		$link = home_url("?feed=$feed&amp;author=" . $author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
@@ -790,19 +821,20 @@ 
 
 	$term = get_term( $term_id, $taxonomy  );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
-		return false;
+	if ( empty( $term ) || is_wp_error( $term ) ) {
+			return false;
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		} elseif ( 'post_tag' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
 			$t = get_taxonomy( $taxonomy );
@@ -810,10 +842,11 @@ 
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -979,19 +1012,22 @@ 
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
-		$term = get_queried_object();
+	if ( is_null( $term ) ) {
+			$term = get_queried_object();
+	}
 
-	if ( ! $term )
-		return;
+	if ( ! $term ) {
+			return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
 	if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
 		return;
 	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -1005,11 +1041,12 @@ 
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
-		echo $link;
-	else
-		return $link;
-}
+	if ( $echo ) {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Retrieves the permalink for a search.
@@ -1024,10 +1061,11 @@ 
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	if ( empty($query) ) {
+			$search = get_search_query( false );
+	} else {
+			$search = stripslashes($query);
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1066,8 +1104,9 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1104,17 +1143,19 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty($permastruct) ) {
+			$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	} else {
+			$link = add_query_arg('withcomments', 1, $link);
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1133,8 +1174,9 @@ 
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
-		return false;
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
+			return false;
+	}
 
 	if ( 'post' === $post_type ) {
 		$show_on_front = get_option( 'show_on_front' );
@@ -1149,15 +1191,17 @@ 
 		return apply_filters( 'post_type_archive_link', $link, $post_type );
 	}
 
-	if ( ! $post_type_obj->has_archive )
-		return false;
+	if ( ! $post_type_obj->has_archive ) {
+			return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
-		else
-			$struct = $wp_rewrite->root . $struct;
+		if ( $post_type_obj->rewrite['with_front'] ) {
+					$struct = $wp_rewrite->front . $struct;
+		} else {
+					$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1185,18 +1229,21 @@ 
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
-		$feed = $default_feed;
+	if ( empty( $feed ) ) {
+			$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
-		return false;
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
+			return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
 		$link = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
-			$link .= "$feed/";
+		if ( $feed != $default_feed ) {
+					$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1268,22 +1315,26 @@ 
  *                     not allow an editing UI.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
-		return;
+	if ( ! $post = get_post( $id ) ) {
+			return;
+	}
 
-	if ( 'revision' === $post->post_type )
-		$action = '';
-	elseif ( 'display' == $context )
-		$action = '&amp;action=edit';
-	else
-		$action = '&action=edit';
+	if ( 'revision' === $post->post_type ) {
+			$action = '';
+	} elseif ( 'display' == $context ) {
+			$action = '&amp;action=edit';
+	} else {
+			$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	if ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
@@ -1356,18 +1407,22 @@ 
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
-		return;
+	if ( !$post = get_post( $id ) ) {
+			return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'delete_post', $post->ID ) ) {
+			return;
+	}
 
 	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
@@ -1396,8 +1451,9 @@ 
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		return;
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			return;
+	}
 
 	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
 
@@ -1456,8 +1512,9 @@ 
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
 	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
 
@@ -1485,11 +1542,13 @@ 
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty($link) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
@@ -1513,21 +1572,25 @@ 
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
-		$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
-		return '';
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
+			return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
-		return '';
+	if ( ! $user ) {
+			return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
-	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	if ( get_current_user_id() == $user->ID ) {
+			$link = get_edit_profile_url( $user->ID );
+	} else {
+			$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filters the user edit link.
@@ -1591,8 +1654,9 @@ 
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$current_post_date = $post->post_date;
 
@@ -1617,16 +1681,18 @@ 
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
 			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-				return '';
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+							return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
-				return '';
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
+							return '';
+			}
 
 			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
 		}
@@ -1733,19 +1799,22 @@ 
 	$query_key = 'adjacent_post_' . md5( $query );
 	$result = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+		if ( $result ) {
+					$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
-		$result = '';
+	if ( null === $result ) {
+			$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
-		$result = get_post( $result );
+	if ( $result ) {
+			$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1765,18 +1834,21 @@ 
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() && $post = get_post() ) {
+			$post = get_post( $post->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if ( empty( $post_title ) ) {
+			$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
@@ -1884,8 +1956,9 @@ 
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$query_args = array(
 		'posts_per_page' => 1,
@@ -1897,23 +1970,26 @@ 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
-		else
-			$excluded_terms = array();
+		if ( ! empty( $excluded_terms ) ) {
+					$excluded_terms = explode( ',', $excluded_terms );
+		} else {
+					$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( $in_same_term ) {
+					$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
-				$inverse_terms[] = $excluded_term * -1;
+			foreach ( $excluded_terms as $excluded_term ) {
+							$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
@@ -2007,18 +2083,20 @@ 
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() ) {
+			$post = get_post( get_post()->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if ( empty( $post->post_title ) ) {
+					$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
@@ -2123,8 +2201,9 @@ 
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
+					$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
@@ -2142,11 +2221,12 @@ 
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
-		return esc_url( $result );
-	else
-		return esc_url_raw( $result );
-}
+	if ( $escape ) {
+			return esc_url( $result );
+	} else {
+			return esc_url_raw( $result );
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2164,11 +2244,13 @@ 
 	global $paged;
 
 	if ( !is_single() ) {
-		if ( !$paged )
-			$paged = 1;
+		if ( !$paged ) {
+					$paged = 1;
+		}
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		if ( !$max_page || $max_page >= $nextpage ) {
+					return get_pagenum_link($nextpage);
+		}
 	}
 }
 
@@ -2184,11 +2266,12 @@ 
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2205,16 +2288,19 @@ 
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
-		$max_page = $wp_query->max_num_pages;
+	if ( !$max_page ) {
+			$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
-		$paged = 1;
+	if ( !$paged ) {
+			$paged = 1;
+	}
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if ( null === $label ) {
+			$label = __( 'Next Page &raquo;' );
+	}
 
 	if ( !is_single() && ( $nextpage <= $max_page ) ) {
 		/**
@@ -2260,8 +2346,9 @@ 
 
 	if ( !is_single() ) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
-			$nextpage = 1;
+		if ( $nextpage < 1 ) {
+					$nextpage = 1;
+		}
 		return get_pagenum_link($nextpage);
 	}
 }
@@ -2277,11 +2364,12 @@ 
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the previous posts page link.
@@ -2296,8 +2384,9 @@ 
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if ( null === $label ) {
+			$label = __( '&laquo; Previous Page' );
+	}
 
 	if ( !is_single() && $paged > 1 ) {
 		/**
@@ -2629,16 +2718,18 @@ 
 
 	if ( 'newest' == get_option('default_comments_page') ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+			if ( $wp_rewrite->using_permalinks() ) {
+							$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+			} else {
+							$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+		} else {
+					$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2667,8 +2758,9 @@ 
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
@@ -2678,17 +2770,21 @@ 
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
-		$max_page = $wp_query->max_num_comment_pages;
+	if ( empty($max_page) ) {
+			$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
-		$max_page = get_comment_pages_count();
+	if ( empty($max_page) ) {
+			$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
-		return;
+	if ( $nextpage > $max_page ) {
+			return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty($label) ) {
+			$label = __('Newer Comments &raquo;');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the next comments page link.
@@ -2721,18 +2817,21 @@ 
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
-		return;
+	if ( intval($page) <= 1 ) {
+			return;
+	}
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty($label) ) {
+			$label = __('&laquo; Older Comments');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the previous comments page link.
@@ -2769,12 +2868,14 @@ 
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
-	if ( !$page )
-		$page = 1;
+	if ( !$page ) {
+			$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
 		'base' => add_query_arg( 'cpage', '%#%' ),
@@ -2784,17 +2885,19 @@ 
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+			$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	}
 
 	$args = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
-		echo $page_links;
-	else
-		return $page_links;
-}
+	if ( $args['echo'] ) {
+			echo $page_links;
+	} else {
+			return $page_links;
+	}
+	}
 
 /**
  * Retrieves navigation to next/previous set of comments, when applicable.
@@ -3000,16 +3103,18 @@ 
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
-			$scheme = 'https';
-		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
+					$scheme = 'https';
+		} else {
+					$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the home URL.
@@ -3071,8 +3176,9 @@ 
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the site URL.
@@ -3117,8 +3223,9 @@ 
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the admin area URL.
@@ -3145,8 +3252,9 @@ 
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the includes directory.
@@ -3171,8 +3279,9 @@ 
 function content_url( $path = '' ) {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3206,22 +3315,25 @@ 
 	$plugin = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-		$url = WPMU_PLUGIN_URL;
-	else
-		$url = WP_PLUGIN_URL;
+	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) {
+			$url = WPMU_PLUGIN_URL;
+	} else {
+			$url = WP_PLUGIN_URL;
+	}
 
 
 	$url = set_url_scheme( $url );
 
 	if ( !empty($plugin) && is_string($plugin) ) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ( '.' != $folder ) {
+					$url .= '/' . ltrim($folder, '/');
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3254,18 +3366,21 @@ 
  * @return string Site URL link with optional path appended.
  */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return site_url($path, $scheme);
+	}
 
 	$current_network = get_network();
 
-	if ( 'relative' == $scheme )
-		$url = $current_network->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_network->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network site URL.
@@ -3296,22 +3411,26 @@ 
  * @return string Home URL link with optional path appended.
  */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return home_url($path, $scheme);
+	}
 
 	$current_network = get_network();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+			$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
-		$url = $current_network->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_network->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network home URL.
@@ -3338,13 +3457,15 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+	if ( ! is_multisite() ) {
+			return admin_url( $path, $scheme );
+	}
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the network admin URL.
@@ -3371,8 +3492,9 @@ 
 function user_admin_url( $path = '', $scheme = 'admin' ) {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the user admin URL for the current user.
@@ -3397,13 +3519,14 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
-		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
-		return user_admin_url($path, $scheme);
-	else
-		return admin_url($path, $scheme);
-}
+	if ( is_network_admin() ) {
+			return network_admin_url($path, $scheme);
+	} elseif ( is_user_admin() ) {
+			return user_admin_url($path, $scheme);
+	} else {
+			return admin_url($path, $scheme);
+	}
+	}
 
 /**
  * Sets the scheme for a URL.
@@ -3428,13 +3551,15 @@ 
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	if ( substr( $url, 0, 2 ) === '//' ) {
+			$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+					$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3482,10 +3607,11 @@ 
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
-				$url = user_admin_url( $path, $scheme );
+			if ( $active ) {
+							$url = get_admin_url( $active->blog_id, $path, $scheme );
+			} else {
+							$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3516,12 +3642,13 @@ 
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
-	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	if ( is_user_admin() ) {
+			$url = user_admin_url( 'profile.php', $scheme );
+	} elseif ( is_network_admin() ) {
+			$url = network_admin_url( 'profile.php', $scheme );
+	} else {
+			$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3659,8 +3786,9 @@ 
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3699,8 +3827,9 @@ 
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
-		return;
+	if ( empty( $shortlink ) ) {
+			return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3713,13 +3842,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
-		return;
+	if ( headers_sent() ) {
+			return;
+	}
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
-		return;
+	if ( empty($shortlink) ) {
+			return;
+	}
 
 	header('Link: <' . $shortlink . '>; rel=shortlink', false);
 }
@@ -3741,11 +3872,13 @@ 
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+			$text = __('This is the short link.');
+	}
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if ( empty( $title ) ) {
+			$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );
 

src/wp-includes/Requests/IDNAEncoder.php

Doc Comments +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 	 * @param int $delta
 	 * @param int $numpoints
 	 * @param bool $firsttime
-	 * @return int New bias
+	 * @return double New bias
 	 */
 	protected static function adapt($delta, $numpoints, $firsttime) {
 #	function adapt(delta,numpoints,firsttime):

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		$string = self::punycode_encode($string);
 
 		// Step 7: Prepend ACE prefix
-		$string = self::ACE_PREFIX . $string;
+		$string = self::ACE_PREFIX.$string;
 
 		// Step 8: Check size
 		if (strlen($string) < 64) {

Braces +2 added lines, -4 removed lines

@@ -291,11 +291,9 @@
 #								tmax if k >= bias + tmax, or k - bias otherwise
 						if ($k <= ($bias + self::BOOTSTRAP_TMIN)) {
 							$t = self::BOOTSTRAP_TMIN;
-						}
-						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
+						} elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
 							$t = self::BOOTSTRAP_TMAX;
-						}
-						else {
+						} else {
 							$t = $k - $bias;
 						}
 #						if q < t then break

src/wp-includes/Requests/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -249,7 +249,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param string $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -987,6 +987,7 @@ 
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
 	 * @param string|bool IRI to convert (or false from {@see get_iri})
+	 * @param false|string $string
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {

Spacing +43 added lines, -43 removed lines

@@ -153,8 +153,8 @@ 
 	 * @param mixed $value Property value
 	 */
 	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), $value);
+		if (method_exists($this, 'set_'.$name)) {
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -164,7 +164,7 @@ 
 			|| $name === 'iquery'
 			|| $name === 'ifragment'
 		) {
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -185,14 +185,14 @@ 
 			$name === 'iauthority' ||
 			$name === 'authority'
 		) {
-			$method = 'get_' . $name;
+			$method = 'get_'.$name;
 			$return = $this->$method();
 		}
 		elseif (array_key_exists($name, $props)) {
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
 		}
@@ -202,7 +202,7 @@ 
 			$return = $this->$prop;
 		}
 		else {
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -221,7 +221,7 @@ 
 	 * @return bool
 	 */
 	public function __isset($name) {
-		return (method_exists($this, 'get_' . $name) || isset($this->$name));
+		return (method_exists($this, 'get_'.$name) || isset($this->$name));
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @param string $name Property name
 	 */
 	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), '');
+		if (method_exists($this, 'set_'.$name)) {
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -254,20 +254,20 @@ 
 	 * @return IRI|false
 	 */
 	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
+		if ( ! ($relative instanceof Requests_IRI)) {
 			$relative = new Requests_IRI($relative);
 		}
-		if (!$relative->is_valid()) {
+		if ( ! $relative->is_valid()) {
 			return false;
 		}
 		elseif ($relative->scheme !== null) {
 			return clone $relative;
 		}
 
-		if (!($base instanceof Requests_IRI)) {
+		if ( ! ($base instanceof Requests_IRI)) {
 			$base = new Requests_IRI($base);
 		}
-		if ($base->scheme === null || !$base->is_valid()) {
+		if ($base->scheme === null || ! $base->is_valid()) {
 			return false;
 		}
 
@@ -287,10 +287,10 @@ 
 						$target->ipath = $relative->ipath;
 					}
 					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
-						$target->ipath = '/' . $relative->ipath;
+						$target->ipath = '/'.$relative->ipath;
 					}
 					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
-						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+						$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 					}
 					else {
 						$target->ipath = $relative->ipath;
@@ -327,23 +327,23 @@ 
 	protected function parse_iri($iri) {
 		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
 		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
-		if (!$has_match) {
+		if ( ! $has_match) {
 			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
 		}
 
 		if ($match[1] === '') {
 			$match['scheme'] = null;
 		}
-		if (!isset($match[3]) || $match[3] === '') {
+		if ( ! isset($match[3]) || $match[3] === '') {
 			$match['authority'] = null;
 		}
-		if (!isset($match[5])) {
+		if ( ! isset($match[5])) {
 			$match['path'] = '';
 		}
-		if (!isset($match[6]) || $match[6] === '') {
+		if ( ! isset($match[6]) || $match[6] === '') {
 			$match['query'] = null;
 		}
-		if (!isset($match[8]) || $match[8] === '') {
+		if ( ! isset($match[8]) || $match[8] === '') {
 			$match['fragment'] = null;
 		}
 		return $match;
@@ -405,7 +405,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -492,7 +492,7 @@ 
 			// Percent encode anything invalid or not in ucschar
 			if (
 				// Invalid sequences
-				!$valid
+				! $valid
 				// Non-shortest form sequences are invalid
 				|| $length > 1 && $character <= 0x7F
 				|| $length > 2 && $character <= 0x7FF
@@ -509,7 +509,7 @@ 
 				)
 				&& (
 					// Everything not in iprivate, if it applies
-					   !$iprivate
+					   ! $iprivate
 					|| $character < 0xE000
 					|| $character > 0x10FFFD
 				)
@@ -556,7 +556,7 @@ 
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining) {
+			if ( ! $remaining) {
 				// Start position
 				$start = $i;
 
@@ -608,11 +608,11 @@ 
 			}
 
 			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining) {
+			if ( ! $remaining) {
 				// Percent encode anything invalid or not in iunreserved
 				if (
 					// Invalid sequences
-					!$valid
+					! $valid
 					// Non-shortest form sequences are invalid
 					|| $length > 1 && $character <= 0x7F
 					|| $length > 2 && $character <= 0x7FF
@@ -632,7 +632,7 @@ 
 					|| $character > 0xD7FF && $character < 0xF900
 				) {
 					for ($j = $start; $j <= $i; $j++) {
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else {
@@ -647,7 +647,7 @@ 
 		// mid-way through a multi-byte sequence)
 		if ($remaining) {
 			for ($j = $start; $j < $len; $j++) {
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -694,7 +694,7 @@ 
 				) ||
 				(
 					$this->scheme === null &&
-					!$isauthority &&
+					! $isauthority &&
 					strpos($this->ipath, ':') !== false &&
 					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
 				)
@@ -715,7 +715,7 @@ 
 	 */
 	protected function set_iri($iri) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -764,7 +764,7 @@ 
 		if ($scheme === null) {
 			$this->scheme = null;
 		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+		elseif ( ! preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
 			$this->scheme = null;
 			return false;
 		}
@@ -783,7 +783,7 @@ 
 	 */
 	protected function set_authority($authority) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -865,7 +865,7 @@ 
 		}
 		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
 			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
-				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
+				$this->ihost = '['.Requests_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else {
 				$this->ihost = null;
@@ -929,7 +929,7 @@ 
 	 */
 	protected function set_path($ipath) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -990,12 +990,12 @@ 
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {
-		if (!is_string($string)) {
+		if ( ! is_string($string)) {
 			return false;
 		}
 
 		static $non_ascii;
-		if (!$non_ascii) {
+		if ( ! $non_ascii) {
 			$non_ascii = implode('', range("\x80", "\xFF"));
 		}
 
@@ -1016,23 +1016,23 @@ 
 	 * @return string
 	 */
 	protected function get_iri() {
-		if (!$this->is_valid()) {
+		if ( ! $this->is_valid()) {
 			return false;
 		}
 
 		$iri = '';
 		if ($this->scheme !== null) {
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null) {
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		$iri .= $this->ipath;
 		if ($this->iquery !== null) {
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null) {
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -1059,13 +1059,13 @@ 
 
 		$iauthority = '';
 		if ($this->iuserinfo !== null) {
-			$iauthority .= $this->iuserinfo . '@';
+			$iauthority .= $this->iuserinfo.'@';
 		}
 		if ($this->ihost !== null) {
 			$iauthority .= $this->ihost;
 		}
 		if ($this->port !== null) {
-			$iauthority .= ':' . $this->port;
+			$iauthority .= ':'.$this->port;
 		}
 		return $iauthority;
 	}

Braces +30 added lines, -60 removed lines

@@ -155,8 +155,7 @@ 
 	public function __set($name, $value) {
 		if (method_exists($this, 'set_' . $name)) {
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -187,8 +186,7 @@ 
 		) {
 			$method = 'get_' . $name;
 			$return = $this->$method();
-		}
-		elseif (array_key_exists($name, $props)) {
+		} elseif (array_key_exists($name, $props)) {
 			$return = $this->$name;
 		}
 		// host -> ihost
@@ -200,16 +198,14 @@ 
 		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else {
+		} else {
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
 		}
 
 		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
 			return $this->normalization[$this->scheme][$name];
-		}
-		else {
+		} else {
 			return $return;
 		}
 	}
@@ -259,8 +255,7 @@ 
 		}
 		if (!$relative->is_valid()) {
 			return false;
-		}
-		elseif ($relative->scheme !== null) {
+		} elseif ($relative->scheme !== null) {
 			return clone $relative;
 		}
 
@@ -275,8 +270,7 @@ 
 			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
 				$target = clone $relative;
 				$target->scheme = $base->scheme;
-			}
-			else {
+			} else {
 				$target = new Requests_IRI;
 				$target->scheme = $base->scheme;
 				$target->iuserinfo = $base->iuserinfo;
@@ -285,32 +279,26 @@ 
 				if ($relative->ipath !== '') {
 					if ($relative->ipath[0] === '/') {
 						$target->ipath = $relative->ipath;
-					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+					} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
 						$target->ipath = '/' . $relative->ipath;
-					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+					} elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
 						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-					}
-					else {
+					} else {
 						$target->ipath = $relative->ipath;
 					}
 					$target->ipath = $target->remove_dot_segments($target->ipath);
 					$target->iquery = $relative->iquery;
-				}
-				else {
+				} else {
 					$target->ipath = $base->ipath;
 					if ($relative->iquery !== null) {
 						$target->iquery = $relative->iquery;
-					}
-					elseif ($base->iquery !== null) {
+					} elseif ($base->iquery !== null) {
 						$target->iquery = $base->iquery;
 					}
 				}
 				$target->ifragment = $relative->ifragment;
 			}
-		}
-		else {
+		} else {
 			$target = clone $base;
 			$target->ifragment = null;
 		}
@@ -362,8 +350,7 @@ 
 			// then remove that prefix from the input buffer; otherwise,
 			if (strpos($input, '../') === 0) {
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0) {
+			} elseif (strpos($input, './') === 0) {
 				$input = substr($input, 2);
 			}
 			// B: if the input buffer begins with a prefix of "/./" or "/.",
@@ -371,8 +358,7 @@ 
 			// with "/" in the input buffer; otherwise,
 			elseif (strpos($input, '/./') === 0) {
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.') {
+			} elseif ($input === '/.') {
 				$input = '/';
 			}
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
@@ -382,8 +368,7 @@ 
 			elseif (strpos($input, '/../') === 0) {
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..') {
+			} elseif ($input === '/..') {
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
@@ -399,8 +384,7 @@ 
 			elseif (($pos = strpos($input, '/', 1)) !== false) {
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else {
+			} else {
 				$output .= $input;
 				$input = '';
 			}
@@ -482,8 +466,7 @@ 
 							break;
 						}
 					}
-				}
-				else {
+				} else {
 					$position = $strlen - 1;
 					$valid = false;
 				}
@@ -634,8 +617,7 @@ 
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else {
+				} else {
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= chr(hexdec($bytes[$j]));
 					}
@@ -763,12 +745,10 @@ 
 	protected function set_scheme($scheme) {
 		if ($scheme === null) {
 			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
 			$this->scheme = null;
 			return false;
-		}
-		else {
+		} else {
 			$this->scheme = strtolower($scheme);
 		}
 		return true;
@@ -806,8 +786,7 @@ 
 		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else {
+		} else {
 			$iuserinfo = null;
 		}
 		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
@@ -816,8 +795,7 @@ 
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
-		}
-		else {
+		} else {
 			$port = null;
 		}
 
@@ -842,8 +820,7 @@ 
 	protected function set_userinfo($iuserinfo) {
 		if ($iuserinfo === null) {
 			$this->iuserinfo = null;
-		}
-		else {
+		} else {
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
 		}
@@ -866,13 +843,11 @@ 
 		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
 			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
 				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else {
+			} else {
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else {
+		} else {
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
 			// Lowercase, but ignore pct-encoded sections (as they should
@@ -883,8 +858,7 @@ 
 			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
 				if ($ihost[$position] === '%') {
 					$position += 3;
-				}
-				else {
+				} else {
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
 				}
@@ -937,8 +911,7 @@ 
 
 		if (isset($cache[$ipath])) {
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else {
+		} else {
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
 
@@ -958,8 +931,7 @@ 
 	protected function set_query($iquery) {
 		if ($iquery === null) {
 			$this->iquery = null;
-		}
-		else {
+		} else {
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
 		}
@@ -975,8 +947,7 @@ 
 	protected function set_fragment($ifragment) {
 		if ($ifragment === null) {
 			$this->ifragment = null;
-		}
-		else {
+		} else {
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
 		}
@@ -1079,8 +1050,7 @@ 
 		$iauthority = $this->get_iauthority();
 		if (is_string($iauthority)) {
 			return $this->to_uri($iauthority);
-		}
-		else {
+		} else {
 			return $iauthority;
 		}
 	}

src/wp-includes/Requests/Session.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 	 *
 	 * @param array $request Request data (same form as {@see request_multiple})
 	 * @param boolean $merge_options Should we merge options as well?
-	 * @return array Request data
+	 * @return string Request data
 	 */
 	protected function merge_request($request, $merge_options = true) {
 		if ($this->url !== null) {

Braces +1 added lines, -2 removed lines

@@ -249,8 +249,7 @@
 			if (is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
-		}
-		elseif (is_array($request['data']) && is_array($this->data)) {
+		} elseif (is_array($request['data']) && is_array($this->data)) {
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 

src/wp-includes/theme.php

Doc Comments +1 added lines, -2 removed lines

@@ -1419,7 +1419,7 @@ 
  *
  * @global array $editor_styles
  *
- * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * @param string[] $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
@@ -1531,7 +1531,6 @@ 
  * @param string $feature  The feature being added. Likely core values include 'post-formats',
  *                         'post-thumbnails', 'html5', 'custom-logo', 'custom-header-uploads',
  *                         'custom-header', 'custom-background', 'title-tag', etc.
- * @param mixed  $args,... Optional extra arguments to pass along with certain features.
  * @return void|bool False on failure, void otherwise.
  */
 function add_theme_support( $feature ) {

Spacing +693 added lines, -693 removed lines

@@ -27,55 +27,55 @@ 
  *                      synonymous for the current blog.
  * @return array Array of WP_Theme objects.
  */
-function wp_get_themes( $args = array() ) {
+function wp_get_themes($args = array()) {
 	global $wp_theme_directories;
 
-	$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('errors' => false, 'allowed' => null, 'blog_id' => 0);
+	$args = wp_parse_args($args, $defaults);
 
 	$theme_directories = search_theme_directories();
 
-	if ( count( $wp_theme_directories ) > 1 ) {
+	if (count($wp_theme_directories) > 1) {
 		// Make sure the current theme wins out, in case search_theme_directories() picks the wrong
 		// one in the case of a conflict. (Normally, last registered theme root wins.)
 		$current_theme = get_stylesheet();
-		if ( isset( $theme_directories[ $current_theme ] ) ) {
-			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
-			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
+		if (isset($theme_directories[$current_theme])) {
+			$root_of_current_theme = get_raw_theme_root($current_theme);
+			if ( ! in_array($root_of_current_theme, $wp_theme_directories))
+				$root_of_current_theme = WP_CONTENT_DIR.$root_of_current_theme;
+			$theme_directories[$current_theme]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
+	if (empty($theme_directories))
 		return array();
 
-	if ( is_multisite() && null !== $args['allowed'] ) {
+	if (is_multisite() && null !== $args['allowed']) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ('network' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_network());
+		elseif ('site' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_site($args['blog_id']));
+		elseif ($allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+			$theme_directories = array_diff_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 	}
 
 	$themes = array();
 	static $_themes = array();
 
-	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+	foreach ($theme_directories as $theme => $theme_root) {
+		if (isset($_themes[$theme_root['theme_root'].'/'.$theme]))
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme];
 		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme] = new WP_Theme($theme, $theme_root['theme_root']);
 	}
 
-	if ( null !== $args['errors'] ) {
-		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+	if (null !== $args['errors']) {
+		foreach ($themes as $theme => $wp_theme) {
+			if ($wp_theme->errors() != $args['errors'])
+				unset($themes[$theme]);
 		}
 	}
 
@@ -94,21 +94,21 @@ 
  * 	                         is used to calculate the theme root for the $stylesheet provided (or current theme).
  * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
-function wp_get_theme( $stylesheet = null, $theme_root = null ) {
+function wp_get_theme($stylesheet = null, $theme_root = null) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
+	if (empty($stylesheet))
 		$stylesheet = get_stylesheet();
 
-	if ( empty( $theme_root ) ) {
-		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+	if (empty($theme_root)) {
+		$theme_root = get_raw_theme_root($stylesheet);
+		if (false === $theme_root)
+			$theme_root = WP_CONTENT_DIR.'/themes';
+		elseif ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	}
 
-	return new WP_Theme( $stylesheet, $theme_root );
+	return new WP_Theme($stylesheet, $theme_root);
 }
 
 /**
@@ -117,11 +117,11 @@ 
  * @since 3.5.0
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
-function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
-	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
+function wp_clean_themes_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_themes');
+	search_theme_directories(true);
+	foreach (wp_get_themes(array('errors' => null)) as $theme)
 		$theme->cache_delete();
 }
 
@@ -133,7 +133,7 @@ 
  * @return bool true if a child theme is in use, false otherwise.
  **/
 function is_child_theme() {
-	return ( TEMPLATEPATH !== STYLESHEETPATH );
+	return (TEMPLATEPATH !== STYLESHEETPATH);
 }
 
 /**
@@ -157,7 +157,7 @@ 
 	 *
 	 * @param string $stylesheet Name of the current stylesheet.
 	 */
-	return apply_filters( 'stylesheet', get_option( 'stylesheet' ) );
+	return apply_filters('stylesheet', get_option('stylesheet'));
 }
 
 /**
@@ -169,7 +169,7 @@ 
  */
 function get_stylesheet_directory() {
 	$stylesheet = get_stylesheet();
-	$theme_root = get_theme_root( $stylesheet );
+	$theme_root = get_theme_root($stylesheet);
 	$stylesheet_dir = "$theme_root/$stylesheet";
 
 	/**
@@ -181,7 +181,7 @@ 
 	 * @param string $stylesheet     Directory name of the current theme.
 	 * @param string $theme_root     Absolute path to themes directory.
 	 */
-	return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root );
+	return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  * @return string
  */
 function get_stylesheet_directory_uri() {
-	$stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
-	$theme_root_uri = get_theme_root_uri( $stylesheet );
+	$stylesheet = str_replace('%2F', '/', rawurlencode(get_stylesheet()));
+	$theme_root_uri = get_theme_root_uri($stylesheet);
 	$stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
 
 	/**
@@ -205,7 +205,7 @@ 
 	 * @param string $stylesheet         Name of the activated theme's directory.
 	 * @param string $theme_root_uri     Themes root URI.
 	 */
-	return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri );
+	return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri);
 }
 
 /**
@@ -220,7 +220,7 @@ 
  */
 function get_stylesheet_uri() {
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
+	$stylesheet_uri = $stylesheet_dir_uri.'/style.css';
 	/**
 	 * Filters the URI of the current theme stylesheet.
 	 *
@@ -229,7 +229,7 @@ 
 	 * @param string $stylesheet_uri     Stylesheet URI for the current theme/child theme.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI for the current theme/child theme.
 	 */
-	return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -258,9 +258,9 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
+	if (file_exists("$dir/$locale.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+	elseif ( ! empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
 	else
 		$stylesheet_uri = '';
@@ -272,7 +272,7 @@ 
 	 * @param string $stylesheet_uri     Localized stylesheet URI.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI.
 	 */
-	return apply_filters( 'locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -290,7 +290,7 @@ 
 	 *
 	 * @param string $template Current theme's directory name.
 	 */
-	return apply_filters( 'template', get_option( 'template' ) );
+	return apply_filters('template', get_option('template'));
 }
 
 /**
@@ -302,7 +302,7 @@ 
  */
 function get_template_directory() {
 	$template = get_template();
-	$theme_root = get_theme_root( $template );
+	$theme_root = get_theme_root($template);
 	$template_dir = "$theme_root/$template";
 
 	/**
@@ -314,7 +314,7 @@ 
 	 * @param string $template     Directory name of the current theme.
 	 * @param string $theme_root   Absolute path to the themes directory.
 	 */
-	return apply_filters( 'template_directory', $template_dir, $template, $theme_root );
+	return apply_filters('template_directory', $template_dir, $template, $theme_root);
 }
 
 /**
@@ -325,8 +325,8 @@ 
  * @return string Template directory URI.
  */
 function get_template_directory_uri() {
-	$template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
-	$theme_root_uri = get_theme_root_uri( $template );
+	$template = str_replace('%2F', '/', rawurlencode(get_template()));
+	$theme_root_uri = get_theme_root_uri($template);
 	$template_dir_uri = "$theme_root_uri/$template";
 
 	/**
@@ -338,7 +338,7 @@ 
 	 * @param string $template         Directory name of the current theme.
 	 * @param string $theme_root_uri   The themes root URI.
 	 */
-	return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri );
+	return apply_filters('template_directory_uri', $template_dir_uri, $template, $theme_root_uri);
 }
 
 /**
@@ -353,13 +353,13 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
-	$theme_roots = get_site_transient( 'theme_roots' );
-	if ( false === $theme_roots ) {
-		search_theme_directories( true ); // Regenerate the transient.
-		$theme_roots = get_site_transient( 'theme_roots' );
+	$theme_roots = get_site_transient('theme_roots');
+	if (false === $theme_roots) {
+		search_theme_directories(true); // Regenerate the transient.
+		$theme_roots = get_site_transient('theme_roots');
 	}
 	return $theme_roots;
 }
@@ -374,24 +374,24 @@ 
  * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
  * @return bool
  */
-function register_theme_directory( $directory ) {
+function register_theme_directory($directory) {
 	global $wp_theme_directories;
 
-	if ( ! file_exists( $directory ) ) {
+	if ( ! file_exists($directory)) {
 		// Try prepending as the theme directory could be relative to the content directory
-		$directory = WP_CONTENT_DIR . '/' . $directory;
+		$directory = WP_CONTENT_DIR.'/'.$directory;
 		// If this directory does not exist, return and do not register
-		if ( ! file_exists( $directory ) ) {
+		if ( ! file_exists($directory)) {
 			return false;
 		}
 	}
 
-	if ( ! is_array( $wp_theme_directories ) ) {
+	if ( ! is_array($wp_theme_directories)) {
 		$wp_theme_directories = array();
 	}
 
-	$untrailed = untrailingslashit( $directory );
-	if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+	$untrailed = untrailingslashit($directory);
+	if ( ! empty($untrailed) && ! in_array($untrailed, $wp_theme_directories)) {
 		$wp_theme_directories[] = $untrailed;
 	}
 
@@ -409,14 +409,14 @@ 
  * @param bool $force Optional. Whether to force a new directory scan. Defaults to false.
  * @return array|false Valid themes found
  */
-function search_theme_directories( $force = false ) {
+function search_theme_directories($force = false) {
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
+	if (empty($wp_theme_directories))
 		return false;
 
-	if ( ! $force && isset( $found_themes ) )
+	if ( ! $force && isset($found_themes))
 		return $found_themes;
 
 	$found_themes = array();
@@ -427,11 +427,11 @@ 
 	// Set up maybe-relative, maybe-absolute array of theme directories.
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
-	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+	foreach ($wp_theme_directories as $theme_root) {
+		if (0 === strpos($theme_root, WP_CONTENT_DIR))
+			$relative_theme_roots[str_replace(WP_CONTENT_DIR, '', $theme_root)] = $theme_root;
 		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+			$relative_theme_roots[$theme_root] = $theme_root;
 	}
 
 	/**
@@ -442,87 +442,87 @@ 
 	 * @param bool   $cache_expiration Whether to get the cache of the theme directories. Default false.
 	 * @param string $cache_directory  Directory to be searched for the cache.
 	 */
-	if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
-		$cached_roots = get_site_transient( 'theme_roots' );
-		if ( is_array( $cached_roots ) ) {
-			foreach ( $cached_roots as $theme_dir => $theme_root ) {
+	if ($cache_expiration = apply_filters('wp_cache_themes_persistently', false, 'search_theme_directories')) {
+		$cached_roots = get_site_transient('theme_roots');
+		if (is_array($cached_roots)) {
+			foreach ($cached_roots as $theme_dir => $theme_root) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
+				if ( ! isset($relative_theme_roots[$theme_root]))
 					continue;
-				$found_themes[ $theme_dir ] = array(
-					'theme_file' => $theme_dir . '/style.css',
-					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
+				$found_themes[$theme_dir] = array(
+					'theme_file' => $theme_dir.'/style.css',
+					'theme_root' => $relative_theme_roots[$theme_root], // Convert relative to absolute.
 				);
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
+		if ( ! is_int($cache_expiration))
 			$cache_expiration = 1800; // half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
 
 	/* Loop the registered theme directories and extract all themes */
-	foreach ( $wp_theme_directories as $theme_root ) {
+	foreach ($wp_theme_directories as $theme_root) {
 
 		// Start with directories in the root of the current theme directory.
-		$dirs = @ scandir( $theme_root );
-		if ( ! $dirs ) {
-			trigger_error( "$theme_root is not readable", E_USER_NOTICE );
+		$dirs = @ scandir($theme_root);
+		if ( ! $dirs) {
+			trigger_error("$theme_root is not readable", E_USER_NOTICE);
 			continue;
 		}
-		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
+		foreach ($dirs as $dir) {
+			if ( ! is_dir($theme_root.'/'.$dir) || $dir[0] == '.' || $dir == 'CVS')
 				continue;
-			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
+			if (file_exists($theme_root.'/'.$dir.'/style.css')) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
-				$found_themes[ $dir ] = array(
-					'theme_file' => $dir . '/style.css',
+				$found_themes[$dir] = array(
+					'theme_file' => $dir.'/style.css',
 					'theme_root' => $theme_root,
 				);
 			} else {
 				$found_theme = false;
 				// wp-content/themes/a-folder-of-themes/*
 				// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs
-				$sub_dirs = @ scandir( $theme_root . '/' . $dir );
-				if ( ! $sub_dirs ) {
-					trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
+				$sub_dirs = @ scandir($theme_root.'/'.$dir);
+				if ( ! $sub_dirs) {
+					trigger_error("$theme_root/$dir is not readable", E_USER_NOTICE);
 					continue;
 				}
-				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
+				foreach ($sub_dirs as $sub_dir) {
+					if ( ! is_dir($theme_root.'/'.$dir.'/'.$sub_dir) || $dir[0] == '.' || $dir == 'CVS')
 						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
+					if ( ! file_exists($theme_root.'/'.$dir.'/'.$sub_dir.'/style.css'))
 						continue;
-					$found_themes[ $dir . '/' . $sub_dir ] = array(
-						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
+					$found_themes[$dir.'/'.$sub_dir] = array(
+						'theme_file' => $dir.'/'.$sub_dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 					$found_theme = true;
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
-						'theme_file' => $dir . '/style.css',
+				if ( ! $found_theme)
+					$found_themes[$dir] = array(
+						'theme_file' => $dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 			}
 		}
 	}
 
-	asort( $found_themes );
+	asort($found_themes);
 
 	$theme_roots = array();
-	$relative_theme_roots = array_flip( $relative_theme_roots );
+	$relative_theme_roots = array_flip($relative_theme_roots);
 
-	foreach ( $found_themes as $theme_dir => $theme_data ) {
-		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
+	foreach ($found_themes as $theme_dir => $theme_data) {
+		$theme_roots[$theme_dir] = $relative_theme_roots[$theme_data['theme_root']]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ($theme_roots != get_site_transient('theme_roots'))
+		set_site_transient('theme_roots', $theme_roots, $cache_expiration);
 
 	return $found_themes;
 }
@@ -539,16 +539,16 @@ 
  * @param string $stylesheet_or_template The stylesheet or template name of the theme
  * @return string Theme path.
  */
-function get_theme_root( $stylesheet_or_template = false ) {
+function get_theme_root($stylesheet_or_template = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
+	if ($stylesheet_or_template && $theme_root = get_raw_theme_root($stylesheet_or_template)) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	} else {
-		$theme_root = WP_CONTENT_DIR . '/themes';
+		$theme_root = WP_CONTENT_DIR.'/themes';
 	}
 
 	/**
@@ -558,7 +558,7 @@ 
 	 *
 	 * @param string $theme_root Absolute path to themes directory.
 	 */
-	return apply_filters( 'theme_root', $theme_root );
+	return apply_filters('theme_root', $theme_root);
 }
 
 /**
@@ -576,28 +576,28 @@ 
  * 	                                     the need for a get_raw_theme_root() call.
  * @return string Themes URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
+function get_theme_root_uri($stylesheet_or_template = false, $theme_root = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ($stylesheet_or_template && ! $theme_root)
+		$theme_root = get_raw_theme_root($stylesheet_or_template);
 
-	if ( $stylesheet_or_template && $theme_root ) {
-		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
+	if ($stylesheet_or_template && $theme_root) {
+		if (in_array($theme_root, (array) $wp_theme_directories)) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			if (0 === strpos($theme_root, WP_CONTENT_DIR))
+				$theme_root_uri = content_url(str_replace(WP_CONTENT_DIR, '', $theme_root));
+			elseif (0 === strpos($theme_root, ABSPATH))
+				$theme_root_uri = site_url(str_replace(ABSPATH, '', $theme_root));
+			elseif (0 === strpos($theme_root, WP_PLUGIN_DIR) || 0 === strpos($theme_root, WPMU_PLUGIN_DIR))
+				$theme_root_uri = plugins_url(basename($theme_root), $theme_root);
 			else
 				$theme_root_uri = $theme_root;
 		} else {
-			$theme_root_uri = content_url( $theme_root );
+			$theme_root_uri = content_url($theme_root);
 		}
 	} else {
-		$theme_root_uri = content_url( 'themes' );
+		$theme_root_uri = content_url('themes');
 	}
 
 	/**
@@ -609,7 +609,7 @@ 
 	 * @param string $siteurl                WordPress web address which is set in General Options.
 	 * @param string $stylesheet_or_template Stylesheet or template name of the theme.
 	 */
-	return apply_filters( 'theme_root_uri', $theme_root_uri, get_option( 'siteurl' ), $stylesheet_or_template );
+	return apply_filters('theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template);
 }
 
 /**
@@ -624,25 +624,25 @@ 
  *                                       Defaults to false, meaning the cache is used.
  * @return string Theme root
  */
-function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
+function get_raw_theme_root($stylesheet_or_template, $skip_cache = false) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
-	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
+	if ( ! $skip_cache) {
+		if (get_option('stylesheet') == $stylesheet_or_template)
 			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
+		elseif (get_option('template') == $stylesheet_or_template)
 			$theme_root = get_option('template_root');
 	}
 
-	if ( empty($theme_root) ) {
+	if (empty($theme_root)) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
+		if ( ! empty($theme_roots[$stylesheet_or_template]))
 			$theme_root = $theme_roots[$stylesheet_or_template];
 	}
 
@@ -656,9 +656,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return;
-	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+	echo '<link rel="stylesheet" href="'.$stylesheet.'" type="text/css" media="screen" />';
 }
 
 /**
@@ -675,71 +675,71 @@ 
  *
  * @param string $stylesheet Stylesheet name
  */
-function switch_theme( $stylesheet ) {
+function switch_theme($stylesheet) {
 	global $wp_theme_directories, $wp_customize, $sidebars_widgets;
 
 	$_sidebars_widgets = null;
-	if ( 'wp_ajax_customize_save' === current_action() ) {
-		$_sidebars_widgets = $wp_customize->post_value( $wp_customize->get_setting( 'old_sidebars_widgets_data' ) );
-	} elseif ( is_array( $sidebars_widgets ) ) {
+	if ('wp_ajax_customize_save' === current_action()) {
+		$_sidebars_widgets = $wp_customize->post_value($wp_customize->get_setting('old_sidebars_widgets_data'));
+	} elseif (is_array($sidebars_widgets)) {
 		$_sidebars_widgets = $sidebars_widgets;
 	}
 
-	if ( is_array( $_sidebars_widgets ) ) {
-		set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+	if (is_array($_sidebars_widgets)) {
+		set_theme_mod('sidebars_widgets', array('time' => time(), 'data' => $_sidebars_widgets));
 	}
 
-	$nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
+	$nav_menu_locations = get_theme_mod('nav_menu_locations');
 
-	if ( func_num_args() > 1 ) {
-		$stylesheet = func_get_arg( 1 );
+	if (func_num_args() > 1) {
+		$stylesheet = func_get_arg(1);
 	}
 
 	$old_theme = wp_get_theme();
-	$new_theme = wp_get_theme( $stylesheet );
+	$new_theme = wp_get_theme($stylesheet);
 	$template  = $new_theme->get_template();
 
-	update_option( 'template', $template );
-	update_option( 'stylesheet', $stylesheet );
+	update_option('template', $template);
+	update_option('stylesheet', $stylesheet);
 
-	if ( count( $wp_theme_directories ) > 1 ) {
-		update_option( 'template_root', get_raw_theme_root( $template, true ) );
-		update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
+	if (count($wp_theme_directories) > 1) {
+		update_option('template_root', get_raw_theme_root($template, true));
+		update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
 	} else {
-		delete_option( 'template_root' );
-		delete_option( 'stylesheet_root' );
+		delete_option('template_root');
+		delete_option('stylesheet_root');
 	}
 
-	$new_name  = $new_theme->get('Name');
+	$new_name = $new_theme->get('Name');
 
-	update_option( 'current_theme', $new_name );
+	update_option('current_theme', $new_name);
 
 	// Migrate from the old mods_{name} option to theme_mods_{slug}.
-	if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
-		$default_theme_mods = (array) get_option( 'mods_' . $new_name );
-		if ( ! empty( $nav_menu_locations ) && empty( $default_theme_mods['nav_menu_locations'] ) ) {
+	if (is_admin() && false === get_option('theme_mods_'.$stylesheet)) {
+		$default_theme_mods = (array) get_option('mods_'.$new_name);
+		if ( ! empty($nav_menu_locations) && empty($default_theme_mods['nav_menu_locations'])) {
 			$default_theme_mods['nav_menu_locations'] = $nav_menu_locations;
 		}
-		add_option( "theme_mods_$stylesheet", $default_theme_mods );
+		add_option("theme_mods_$stylesheet", $default_theme_mods);
 	} else {
 		/*
 		 * Since retrieve_widgets() is called when initializing a theme in the Customizer,
 		 * we need to remove the theme mods to avoid overwriting changes made via
 		 * the Customizer when accessing wp-admin/widgets.php.
 		 */
-		if ( 'wp_ajax_customize_save' === current_action() ) {
-			remove_theme_mod( 'sidebars_widgets' );
+		if ('wp_ajax_customize_save' === current_action()) {
+			remove_theme_mod('sidebars_widgets');
 		}
 
-		if ( ! empty( $nav_menu_locations ) ) {
-			$nav_mods = get_theme_mod( 'nav_menu_locations' );
-			if ( empty( $nav_mods ) ) {
-				set_theme_mod( 'nav_menu_locations', $nav_menu_locations );
+		if ( ! empty($nav_menu_locations)) {
+			$nav_mods = get_theme_mod('nav_menu_locations');
+			if (empty($nav_mods)) {
+				set_theme_mod('nav_menu_locations', $nav_menu_locations);
 			}
 		}
 	}
 
-	update_option( 'theme_switched', $old_theme->get_stylesheet() );
+	update_option('theme_switched', $old_theme->get_stylesheet());
 
 	/**
 	 * Fires after the theme is switched.
@@ -751,7 +751,7 @@ 
 	 * @param WP_Theme $new_theme WP_Theme instance of the new theme.
 	 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 	 */
-	do_action( 'switch_theme', $new_name, $new_theme, $old_theme );
+	do_action('switch_theme', $new_name, $new_theme, $old_theme);
 }
 
 /**
@@ -777,23 +777,23 @@ 
 	 *
 	 * @param bool $validate Whether to validate the current theme. Default true.
 	 */
-	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
+	if (wp_installing() || ! apply_filters('validate_current_theme', true))
 		return true;
 
-	if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
+	if ( ! file_exists(get_template_directory().'/index.php')) {
 		// Invalid.
-	} elseif ( ! file_exists( get_template_directory() . '/style.css' ) ) {
+	} elseif ( ! file_exists(get_template_directory().'/style.css')) {
 		// Invalid.
-	} elseif ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
+	} elseif (is_child_theme() && ! file_exists(get_stylesheet_directory().'/style.css')) {
 		// Invalid.
 	} else {
 		// Valid.
 		return true;
 	}
 
-	$default = wp_get_theme( WP_DEFAULT_THEME );
-	if ( $default->exists() ) {
-		switch_theme( WP_DEFAULT_THEME );
+	$default = wp_get_theme(WP_DEFAULT_THEME);
+	if ($default->exists()) {
+		switch_theme(WP_DEFAULT_THEME);
 		return false;
 	}
 
@@ -807,11 +807,11 @@ 
 	 * if it turns out there is no default theme installed. (That's `false`.)
 	 */
 	$default = WP_Theme::get_core_default_theme();
-	if ( false === $default || get_stylesheet() == $default->get_stylesheet() ) {
+	if (false === $default || get_stylesheet() == $default->get_stylesheet()) {
 		return true;
 	}
 
-	switch_theme( $default->get_stylesheet() );
+	switch_theme($default->get_stylesheet());
 	return false;
 }
 
@@ -823,16 +823,16 @@ 
  * @return array|void Theme modifications.
  */
 function get_theme_mods() {
-	$theme_slug = get_option( 'stylesheet' );
-	$mods = get_option( "theme_mods_$theme_slug" );
-	if ( false === $mods ) {
-		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
+	$theme_slug = get_option('stylesheet');
+	$mods = get_option("theme_mods_$theme_slug");
+	if (false === $mods) {
+		$theme_name = get_option('current_theme');
+		if (false === $theme_name)
 			$theme_name = wp_get_theme()->get('Name');
-		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
-		if ( is_admin() && false !== $mods ) {
-			update_option( "theme_mods_$theme_slug", $mods );
-			delete_option( "mods_$theme_name" );
+		$mods = get_option("mods_$theme_name"); // Deprecated location.
+		if (is_admin() && false !== $mods) {
+			update_option("theme_mods_$theme_slug", $mods);
+			delete_option("mods_$theme_name");
 		}
 	}
 	return $mods;
@@ -852,10 +852,10 @@ 
  * @param bool|string $default
  * @return string
  */
-function get_theme_mod( $name, $default = false ) {
+function get_theme_mod($name, $default = false) {
 	$mods = get_theme_mods();
 
-	if ( isset( $mods[$name] ) ) {
+	if (isset($mods[$name])) {
 		/**
 		 * Filters the theme modification, or 'theme_mod', value.
 		 *
@@ -868,14 +868,14 @@ 
 		 *
 		 * @param string $current_mod The value of the current theme modification.
 		 */
-		return apply_filters( "theme_mod_{$name}", $mods[$name] );
+		return apply_filters("theme_mod_{$name}", $mods[$name]);
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if (is_string($default))
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 	/** This filter is documented in wp-includes/theme.php */
-	return apply_filters( "theme_mod_{$name}", $default );
+	return apply_filters("theme_mod_{$name}", $default);
 }
 
 /**
@@ -886,9 +886,9 @@ 
  * @param string $name  Theme modification name.
  * @param mixed  $value Theme modification value.
  */
-function set_theme_mod( $name, $value ) {
+function set_theme_mod($name, $value) {
 	$mods = get_theme_mods();
-	$old_value = isset( $mods[ $name ] ) ? $mods[ $name ] : false;
+	$old_value = isset($mods[$name]) ? $mods[$name] : false;
 
 	/**
 	 * Filters the theme mod value on save.
@@ -902,10 +902,10 @@ 
 	 * @param string $value     The new value of the theme mod.
 	 * @param string $old_value The current value of the theme mod.
 	 */
-	$mods[ $name ] = apply_filters( "pre_set_theme_mod_{$name}", $value, $old_value );
+	$mods[$name] = apply_filters("pre_set_theme_mod_{$name}", $value, $old_value);
 
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -918,20 +918,20 @@ 
  *
  * @param string $name Theme modification name.
  */
-function remove_theme_mod( $name ) {
+function remove_theme_mod($name) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
+	if ( ! isset($mods[$name]))
 		return;
 
-	unset( $mods[ $name ] );
+	unset($mods[$name]);
 
-	if ( empty( $mods ) ) {
+	if (empty($mods)) {
 		remove_theme_mods();
 		return;
 	}
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -940,13 +940,13 @@ 
  * @since 2.1.0
  */
 function remove_theme_mods() {
-	delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+	delete_option('theme_mods_'.get_option('stylesheet'));
 
 	// Old style.
-	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
+	$theme_name = get_option('current_theme');
+	if (false === $theme_name)
 		$theme_name = wp_get_theme()->get('Name');
-	delete_option( 'mods_' . $theme_name );
+	delete_option('mods_'.$theme_name);
 }
 
 /**
@@ -957,7 +957,7 @@ 
  * @return string Header text color in HEX format (minus the hash symbol).
  */
 function get_header_textcolor() {
-	return get_theme_mod('header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	return get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 }
 
 /**
@@ -977,10 +977,10 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
+	if ( ! current_theme_supports('custom-header', 'header-text'))
 		return false;
 
-	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	$text_color = get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 	return 'blank' !== $text_color;
 }
 
@@ -1005,15 +1005,15 @@ 
  * @return string|false
  */
 function get_header_image() {
-	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+	$url = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'remove-header' == $url )
+	if ('remove-header' == $url)
 		return false;
 
-	if ( is_random_header_image() )
+	if (is_random_header_image())
 		$url = get_random_header_image();
 
-	return esc_url_raw( set_url_scheme( $url ) );
+	return esc_url_raw(set_url_scheme($url));
 }
 
 /**
@@ -1025,16 +1025,16 @@ 
  *                              to override the default attributes. Default empty.
  * @return string HTML image element markup or empty string on failure.
  */
-function get_header_image_tag( $attr = array() ) {
+function get_header_image_tag($attr = array()) {
 	$header = get_custom_header();
 	$header->url = get_header_image();
 
-	if ( ! $header->url ) {
+	if ( ! $header->url) {
 		return '';
 	}
 
-	$width = absint( $header->width );
-	$height = absint( $header->height );
+	$width = absint($header->width);
+	$height = absint($header->height);
 
 	$attr = wp_parse_args(
 		$attr,
@@ -1042,31 +1042,31 @@ 
 			'src' => $header->url,
 			'width' => $width,
 			'height' => $height,
-			'alt' => get_bloginfo( 'name' ),
+			'alt' => get_bloginfo('name'),
 		)
 	);
 
 	// Generate 'srcset' and 'sizes' if not already present.
-	if ( empty( $attr['srcset'] ) && ! empty( $header->attachment_id ) ) {
-		$image_meta = get_post_meta( $header->attachment_id, '_wp_attachment_metadata', true );
-		$size_array = array( $width, $height );
+	if (empty($attr['srcset']) && ! empty($header->attachment_id)) {
+		$image_meta = get_post_meta($header->attachment_id, '_wp_attachment_metadata', true);
+		$size_array = array($width, $height);
 
-		if ( is_array( $image_meta ) ) {
-			$srcset = wp_calculate_image_srcset( $size_array, $header->url, $image_meta, $header->attachment_id );
-			$sizes = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id );
+		if (is_array($image_meta)) {
+			$srcset = wp_calculate_image_srcset($size_array, $header->url, $image_meta, $header->attachment_id);
+			$sizes = ! empty($attr['sizes']) ? $attr['sizes'] : wp_calculate_image_sizes($size_array, $header->url, $image_meta, $header->attachment_id);
 
-			if ( $srcset && $sizes ) {
+			if ($srcset && $sizes) {
 				$attr['srcset'] = $srcset;
 				$attr['sizes'] = $sizes;
 			}
 		}
 	}
 
-	$attr = array_map( 'esc_attr', $attr );
+	$attr = array_map('esc_attr', $attr);
 	$html = '<img';
 
-	foreach ( $attr as $name => $value ) {
-		$html .= ' ' . $name . '="' . $value . '"';
+	foreach ($attr as $name => $value) {
+		$html .= ' '.$name.'="'.$value.'"';
 	}
 
 	$html .= ' />';
@@ -1080,7 +1080,7 @@ 
 	 * @param object $header The custom header object returned by 'get_custom_header()'.
 	 * @param array  $attr   Array of the attributes for the image tag.
 	 */
-	return apply_filters( 'get_header_image_tag', $html, $header, $attr );
+	return apply_filters('get_header_image_tag', $html, $header, $attr);
 }
 
 /**
@@ -1090,8 +1090,8 @@ 
  *
  * @param array $attr Optional. Attributes for the image markup. Default empty.
  */
-function the_header_image_tag( $attr = array() ) {
-	echo get_header_image_tag( $attr );
+function the_header_image_tag($attr = array()) {
+	echo get_header_image_tag($attr);
 }
 
 /**
@@ -1109,29 +1109,29 @@ 
 function _get_random_header_data() {
 	static $_wp_random_header = null;
 
-	if ( empty( $_wp_random_header ) ) {
+	if (empty($_wp_random_header)) {
 		global $_wp_default_headers;
-		$header_image_mod = get_theme_mod( 'header_image', '' );
+		$header_image_mod = get_theme_mod('header_image', '');
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
+		if ('random-uploaded-image' == $header_image_mod)
 			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
-			if ( 'random-default-image' == $header_image_mod ) {
+		elseif ( ! empty($_wp_default_headers)) {
+			if ('random-default-image' == $header_image_mod) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
+				if (current_theme_supports('custom-header', 'random-default'))
 					$headers = $_wp_default_headers;
 			}
 		}
 
-		if ( empty( $headers ) )
+		if (empty($headers))
 			return new stdClass;
 
-		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
+		$_wp_random_header = (object) $headers[array_rand($headers)];
 
-		$_wp_random_header->url =  sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
-		$_wp_random_header->thumbnail_url =  sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$_wp_random_header->url = sprintf($_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri());
+		$_wp_random_header->thumbnail_url = sprintf($_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri());
 	}
 	return $_wp_random_header;
 }
@@ -1145,7 +1145,7 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
+	if (empty($random_image->url))
 		return '';
 	return $random_image->url;
 }
@@ -1162,16 +1162,16 @@ 
  * @param string $type The random pool to use. any|default|uploaded
  * @return bool
  */
-function is_random_header_image( $type = 'any' ) {
-	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+function is_random_header_image($type = 'any') {
+	$header_image_mod = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
+	if ('any' == $type) {
+		if ('random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ('' != get_random_header_image() && empty($header_image_mod)))
 			return true;
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
+		if ("random-$type-image" == $header_image_mod)
 			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+		elseif ('default' == $type && empty($header_image_mod) && '' != get_random_header_image())
 			return true;
 	}
 
@@ -1185,8 +1185,8 @@ 
  */
 function header_image() {
 	$image = get_header_image();
-	if ( $image ) {
-		echo esc_url( $image );
+	if ($image) {
+		echo esc_url($image);
 	}
 }
 
@@ -1201,25 +1201,25 @@ 
 	$header_images = array();
 
 	// @todo caching
-	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+	$headers = get_posts(array('post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true));
 
-	if ( empty( $headers ) )
+	if (empty($headers))
 		return array();
 
-	foreach ( (array) $headers as $header ) {
-		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
-		$header_data = wp_get_attachment_metadata( $header->ID );
+	foreach ((array) $headers as $header) {
+		$url = esc_url_raw(wp_get_attachment_url($header->ID));
+		$header_data = wp_get_attachment_metadata($header->ID);
 		$header_index = $header->ID;
 
 		$header_images[$header_index] = array();
 		$header_images[$header_index]['attachment_id'] = $header->ID;
-		$header_images[$header_index]['url'] =  $url;
+		$header_images[$header_index]['url'] = $url;
 		$header_images[$header_index]['thumbnail_url'] = $url;
-		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
+		$header_images[$header_index]['alt_text'] = get_post_meta($header->ID, '_wp_attachment_image_alt', true);
 
-		if ( isset( $header_data['width'] ) )
+		if (isset($header_data['width']))
 			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
+		if (isset($header_data['height']))
 			$header_images[$header_index]['height'] = $header_data['height'];
 	}
 
@@ -1238,21 +1238,21 @@ 
 function get_custom_header() {
 	global $_wp_default_headers;
 
-	if ( is_random_header_image() ) {
+	if (is_random_header_image()) {
 		$data = _get_random_header_data();
 	} else {
-		$data = get_theme_mod( 'header_image_data' );
-		if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
-			$directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$data = get_theme_mod('header_image_data');
+		if ( ! $data && current_theme_supports('custom-header', 'default-image')) {
+			$directory_args = array(get_template_directory_uri(), get_stylesheet_directory_uri());
 			$data = array();
-			$data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
-			if ( ! empty( $_wp_default_headers ) ) {
-				foreach ( (array) $_wp_default_headers as $default_header ) {
-					$url = vsprintf( $default_header['url'], $directory_args );
-					if ( $data['url'] == $url ) {
+			$data['url'] = $data['thumbnail_url'] = vsprintf(get_theme_support('custom-header', 'default-image'), $directory_args);
+			if ( ! empty($_wp_default_headers)) {
+				foreach ((array) $_wp_default_headers as $default_header) {
+					$url = vsprintf($default_header['url'], $directory_args);
+					if ($data['url'] == $url) {
 						$data = $default_header;
 						$data['url'] = $url;
-						$data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
+						$data['thumbnail_url'] = vsprintf($data['thumbnail_url'], $directory_args);
 						break;
 					}
 				}
@@ -1263,11 +1263,11 @@ 
 	$default = array(
 		'url'           => '',
 		'thumbnail_url' => '',
-		'width'         => get_theme_support( 'custom-header', 'width' ),
-		'height'        => get_theme_support( 'custom-header', 'height' ),
-		'video'         => get_theme_support( 'custom-header', 'video' ),
+		'width'         => get_theme_support('custom-header', 'width'),
+		'height'        => get_theme_support('custom-header', 'height'),
+		'video'         => get_theme_support('custom-header', 'video'),
 	);
-	return (object) wp_parse_args( $data, $default );
+	return (object) wp_parse_args($data, $default);
 }
 
 /**
@@ -1279,10 +1279,10 @@ 
  *
  * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys.
  */
-function register_default_headers( $headers ) {
+function register_default_headers($headers) {
 	global $_wp_default_headers;
 
-	$_wp_default_headers = array_merge( (array) $_wp_default_headers, (array) $headers );
+	$_wp_default_headers = array_merge((array) $_wp_default_headers, (array) $headers);
 }
 
 /**
@@ -1300,12 +1300,12 @@ 
  * @return bool|void A single header returns true on success, false on failure.
  *                   There is currently no return value for multiple headers.
  */
-function unregister_default_headers( $header ) {
+function unregister_default_headers($header) {
 	global $_wp_default_headers;
-	if ( is_array( $header ) ) {
-		array_map( 'unregister_default_headers', $header );
-	} elseif ( isset( $_wp_default_headers[ $header ] ) ) {
-		unset( $_wp_default_headers[ $header ] );
+	if (is_array($header)) {
+		array_map('unregister_default_headers', $header);
+	} elseif (isset($_wp_default_headers[$header])) {
+		unset($_wp_default_headers[$header]);
 		return true;
 	} else {
 		return false;
@@ -1335,19 +1335,19 @@ 
  * @return string|false Header video URL or false if there is no video.
  */
 function get_header_video_url() {
-	$id = absint( get_theme_mod( 'header_video' ) );
-	$url = esc_url( get_theme_mod( 'external_header_video' ) );
+	$id = absint(get_theme_mod('header_video'));
+	$url = esc_url(get_theme_mod('external_header_video'));
 
-	if ( ! $id && ! $url ) {
+	if ( ! $id && ! $url) {
 		return false;
 	}
 
-	if ( $id ) {
+	if ($id) {
 		// Get the file URL from the attachment ID.
-		$url = wp_get_attachment_url( $id );
+		$url = wp_get_attachment_url($id);
 	}
 
-	return esc_url_raw( set_url_scheme( $url ) );
+	return esc_url_raw(set_url_scheme($url));
 }
 
 /**
@@ -1357,8 +1357,8 @@ 
  */
 function the_header_video_url() {
 	$video = get_header_video_url();
-	if ( $video ) {
-		echo esc_url( $video );
+	if ($video) {
+		echo esc_url($video);
 	}
 }
 
@@ -1372,31 +1372,31 @@ 
 function get_header_video_settings() {
 	$header     = get_custom_header();
 	$video_url  = get_header_video_url();
-	$video_type = wp_check_filetype( $video_url, wp_get_mime_types() );
+	$video_type = wp_check_filetype($video_url, wp_get_mime_types());
 
 	$settings = array(
 		'mimeType'  => '',
 		'posterUrl' => get_header_image(),
 		'videoUrl'  => $video_url,
-		'width'     => absint( $header->width ),
-		'height'    => absint( $header->height ),
+		'width'     => absint($header->width),
+		'height'    => absint($header->height),
 		'minWidth'  => 900,
 		'minHeight' => 500,
 		'l10n'      => array(
-			'pause'      => __( 'Pause' ),
-			'play'       => __( 'Play' ),
-			'pauseSpeak' => __( 'Video is paused.'),
-			'playSpeak'  => __( 'Video is playing.'),
+			'pause'      => __('Pause'),
+			'play'       => __('Play'),
+			'pauseSpeak' => __('Video is paused.'),
+			'playSpeak'  => __('Video is playing.'),
 		),
 	);
 
-	if ( preg_match( '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#', $video_url ) ) {
+	if (preg_match('#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#', $video_url)) {
 		$settings['mimeType'] = 'video/x-youtube';
-	} elseif ( ! empty( $video_type['type'] ) ) {
+	} elseif ( ! empty($video_type['type'])) {
 		$settings['mimeType'] = $video_type['type'];
 	}
 
-	return apply_filters( 'header_video_settings', $settings );
+	return apply_filters('header_video_settings', $settings);
 }
 
 /**
@@ -1407,7 +1407,7 @@ 
  * @return bool True if a custom header is set. False if not.
  */
 function has_custom_header() {
-	if ( has_header_image() || ( has_header_video() && is_header_video_active() ) ) {
+	if (has_header_image() || (has_header_video() && is_header_video_active())) {
 		return true;
 	}
 
@@ -1422,16 +1422,16 @@ 
  * @return bool True if the custom header video should be shown. False if not.
  */
 function is_header_video_active() {
-	if ( ! get_theme_support( 'custom-header', 'video' ) ) {
+	if ( ! get_theme_support('custom-header', 'video')) {
 		return false;
 	}
 
-	$video_active_cb = get_theme_support( 'custom-header', 'video-active-callback' );
+	$video_active_cb = get_theme_support('custom-header', 'video-active-callback');
 
-	if ( empty( $video_active_cb ) || ! is_callable( $video_active_cb ) ) {
+	if (empty($video_active_cb) || ! is_callable($video_active_cb)) {
 		$show_video = true;
 	} else {
-		$show_video = call_user_func( $video_active_cb );
+		$show_video = call_user_func($video_active_cb);
 	}
 
 	/**
@@ -1443,7 +1443,7 @@ 
 	 *                         of the theme setting for the `custom-header`'s `video-active-callback`.
 	 *                         If no callback is set, the default value is that of `is_front_page()`.
 	 */
-	return apply_filters( 'is_header_video_active', $show_video );
+	return apply_filters('is_header_video_active', $show_video);
 }
 
 /**
@@ -1456,7 +1456,7 @@ 
  * @return string The markup for a custom header on success.
  */
 function get_custom_header_markup() {
-	if ( ! has_custom_header() && ! is_customize_preview() ) {
+	if ( ! has_custom_header() && ! is_customize_preview()) {
 		return '';
 	}
 
@@ -1475,15 +1475,15 @@ 
  */
 function the_custom_header_markup() {
 	$custom_header = get_custom_header_markup();
-	if ( empty( $custom_header ) ) {
+	if (empty($custom_header)) {
 		return;
 	}
 
 	echo $custom_header;
 
-	if ( is_header_video_active() && ( has_header_video() || is_customize_preview() ) ) {
-		wp_enqueue_script( 'wp-custom-header' );
-		wp_localize_script( 'wp-custom-header', '_wpCustomHeaderSettings', get_header_video_settings() );
+	if (is_header_video_active() && (has_header_video() || is_customize_preview())) {
+		wp_enqueue_script('wp-custom-header');
+		wp_localize_script('wp-custom-header', '_wpCustomHeaderSettings', get_header_video_settings());
 	}
 }
 
@@ -1495,7 +1495,7 @@ 
  * @return string
  */
 function get_background_image() {
-	return get_theme_mod('background_image', get_theme_support( 'custom-background', 'default-image' ) );
+	return get_theme_mod('background_image', get_theme_support('custom-background', 'default-image'));
 }
 
 /**
@@ -1515,7 +1515,7 @@ 
  * @return string
  */
 function get_background_color() {
-	return get_theme_mod('background_color', get_theme_support( 'custom-background', 'default-color' ) );
+	return get_theme_mod('background_color', get_theme_support('custom-background', 'default-color'));
 }
 
 /**
@@ -1535,18 +1535,18 @@ 
  */
 function _custom_background_cb() {
 	// $background is the saved custom image, or the default image.
-	$background = set_url_scheme( get_background_image() );
+	$background = set_url_scheme(get_background_image());
 
 	// $color is the saved custom color.
 	// A default has to be specified in style.css. It will not be printed here.
 	$color = get_background_color();
 
-	if ( $color === get_theme_support( 'custom-background', 'default-color' ) ) {
+	if ($color === get_theme_support('custom-background', 'default-color')) {
 		$color = false;
 	}
 
-	if ( ! $background && ! $color ) {
-		if ( is_customize_preview() ) {
+	if ( ! $background && ! $color) {
+		if (is_customize_preview()) {
 			echo '<style type="text/css" id="custom-background-css"></style>';
 		}
 		return;
@@ -1554,55 +1554,55 @@ 
 
 	$style = $color ? "background-color: #$color;" : '';
 
-	if ( $background ) {
-		$image = ' background-image: url("' . esc_url_raw( $background ) . '");';
+	if ($background) {
+		$image = ' background-image: url("'.esc_url_raw($background).'");';
 
 		// Background Position.
-		$position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-		$position_y = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
+		$position_x = get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'));
+		$position_y = get_theme_mod('background_position_y', get_theme_support('custom-background', 'default-position-y'));
 
-		if ( ! in_array( $position_x, array( 'left', 'center', 'right' ), true ) ) {
+		if ( ! in_array($position_x, array('left', 'center', 'right'), true)) {
 			$position_x = 'left';
 		}
 
-		if ( ! in_array( $position_y, array( 'top', 'center', 'bottom' ), true ) ) {
+		if ( ! in_array($position_y, array('top', 'center', 'bottom'), true)) {
 			$position_y = 'top';
 		}
 
 		$position = " background-position: $position_x $position_y;";
 
 		// Background Size.
-		$size = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
+		$size = get_theme_mod('background_size', get_theme_support('custom-background', 'default-size'));
 
-		if ( ! in_array( $size, array( 'auto', 'contain', 'cover' ), true ) ) {
+		if ( ! in_array($size, array('auto', 'contain', 'cover'), true)) {
 			$size = 'auto';
 		}
 
 		$size = " background-size: $size;";
 
 		// Background Repeat.
-		$repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
+		$repeat = get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'));
 
-		if ( ! in_array( $repeat, array( 'repeat-x', 'repeat-y', 'repeat', 'no-repeat' ), true ) ) {
+		if ( ! in_array($repeat, array('repeat-x', 'repeat-y', 'repeat', 'no-repeat'), true)) {
 			$repeat = 'repeat';
 		}
 
 		$repeat = " background-repeat: $repeat;";
 
 		// Background Scroll.
-		$attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
+		$attachment = get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'));
 
-		if ( 'fixed' !== $attachment ) {
+		if ('fixed' !== $attachment) {
 			$attachment = 'scroll';
 		}
 
 		$attachment = " background-attachment: $attachment;";
 
-		$style .= $image . $position . $size . $repeat . $attachment;
+		$style .= $image.$position.$size.$repeat.$attachment;
 	}
 ?>
 <style type="text/css" id="custom-background-css">
-body.custom-background { <?php echo trim( $style ); ?> }
+body.custom-background { <?php echo trim($style); ?> }
 </style>
 <?php
 }
@@ -1615,9 +1615,9 @@ 
  */
 function wp_custom_css_cb() {
 	$styles = wp_get_custom_css();
-	if ( $styles || is_customize_preview() ) : ?>
+	if ($styles || is_customize_preview()) : ?>
 		<style type="text/css" id="wp-custom-css">
-			<?php echo strip_tags( $styles ); // Note that esc_html() cannot be used because `div &gt; span` is not interpreted properly. ?>
+			<?php echo strip_tags($styles); // Note that esc_html() cannot be used because `div &gt; span` is not interpreted properly. ?>
 		</style>
 	<?php endif;
 }
@@ -1631,15 +1631,15 @@ 
  * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
  * @return WP_Post|null The custom_css post or null if none exists.
  */
-function wp_get_custom_css_post( $stylesheet = '' ) {
-	if ( empty( $stylesheet ) ) {
+function wp_get_custom_css_post($stylesheet = '') {
+	if (empty($stylesheet)) {
 		$stylesheet = get_stylesheet();
 	}
 
 	$custom_css_query_vars = array(
 		'post_type'              => 'custom_css',
 		'post_status'            => get_post_stati(),
-		'name'                   => sanitize_title( $stylesheet ),
+		'name'                   => sanitize_title($stylesheet),
 		'posts_per_page'         => 1,
 		'no_found_rows'          => true,
 		'cache_results'          => true,
@@ -1649,25 +1649,25 @@ 
 	);
 
 	$post = null;
-	if ( get_stylesheet() === $stylesheet ) {
-		$post_id = get_theme_mod( 'custom_css_post_id' );
+	if (get_stylesheet() === $stylesheet) {
+		$post_id = get_theme_mod('custom_css_post_id');
 
-		if ( $post_id > 0 && get_post( $post_id ) ) {
-			$post = get_post( $post_id );
+		if ($post_id > 0 && get_post($post_id)) {
+			$post = get_post($post_id);
 		}
 
 		// `-1` indicates no post exists; no query necessary.
-		if ( ! $post && -1 !== $post_id ) {
-			$query = new WP_Query( $custom_css_query_vars );
+		if ( ! $post && -1 !== $post_id) {
+			$query = new WP_Query($custom_css_query_vars);
 			$post = $query->post;
 			/*
 			 * Cache the lookup. See wp_update_custom_css_post().
 			 * @todo This should get cleared if a custom_css post is added/removed.
 			 */
-			set_theme_mod( 'custom_css_post_id', $post ? $post->ID : -1 );
+			set_theme_mod('custom_css_post_id', $post ? $post->ID : -1);
 		}
 	} else {
-		$query = new WP_Query( $custom_css_query_vars );
+		$query = new WP_Query($custom_css_query_vars);
 		$post = $query->post;
 	}
 
@@ -1683,15 +1683,15 @@ 
  * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
  * @return string The Custom CSS Post content.
  */
-function wp_get_custom_css( $stylesheet = '' ) {
+function wp_get_custom_css($stylesheet = '') {
 	$css = '';
 
-	if ( empty( $stylesheet ) ) {
+	if (empty($stylesheet)) {
 		$stylesheet = get_stylesheet();
 	}
 
-	$post = wp_get_custom_css_post( $stylesheet );
-	if ( $post ) {
+	$post = wp_get_custom_css_post($stylesheet);
+	if ($post) {
 		$css = $post->post_content;
 	}
 
@@ -1703,7 +1703,7 @@ 
 	 * @param string $css        CSS pulled in from the Custom CSS CPT.
 	 * @param string $stylesheet The theme stylesheet name.
 	 */
-	$css = apply_filters( 'wp_get_custom_css', $css, $stylesheet );
+	$css = apply_filters('wp_get_custom_css', $css, $stylesheet);
 
 	return $css;
 }
@@ -1725,11 +1725,11 @@ 
  * }
  * @return WP_Post|WP_Error Post on success, error on failure.
  */
-function wp_update_custom_css_post( $css, $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function wp_update_custom_css_post($css, $args = array()) {
+	$args = wp_parse_args($args, array(
 		'preprocessed' => '',
 		'stylesheet' => get_stylesheet(),
-	) );
+	));
 
 	$data = array(
 		'css' => $css,
@@ -1769,11 +1769,11 @@ 
 	 *     @type string $stylesheet   The stylesheet (theme) being updated.
 	 * }
 	 */
-	$data = apply_filters( 'update_custom_css_data', $data, array_merge( $args, compact( 'css' ) ) );
+	$data = apply_filters('update_custom_css_data', $data, array_merge($args, compact('css')));
 
 	$post_data = array(
 		'post_title' => $args['stylesheet'],
-		'post_name' => sanitize_title( $args['stylesheet'] ),
+		'post_name' => sanitize_title($args['stylesheet']),
 		'post_type' => 'custom_css',
 		'post_status' => 'publish',
 		'post_content' => $data['css'],
@@ -1781,29 +1781,29 @@ 
 	);
 
 	// Update post if it already exists, otherwise create a new one.
-	$post = wp_get_custom_css_post( $args['stylesheet'] );
-	if ( $post ) {
+	$post = wp_get_custom_css_post($args['stylesheet']);
+	if ($post) {
 		$post_data['ID'] = $post->ID;
-		$r = wp_update_post( wp_slash( $post_data ), true );
+		$r = wp_update_post(wp_slash($post_data), true);
 	} else {
-		$r = wp_insert_post( wp_slash( $post_data ), true );
+		$r = wp_insert_post(wp_slash($post_data), true);
 
-		if ( ! is_wp_error( $r ) ) {
-			if ( get_stylesheet() === $args['stylesheet'] ) {
-				set_theme_mod( 'custom_css_post_id', $r );
+		if ( ! is_wp_error($r)) {
+			if (get_stylesheet() === $args['stylesheet']) {
+				set_theme_mod('custom_css_post_id', $r);
 			}
 
 			// Trigger creation of a revision. This should be removed once #30854 is resolved.
-			if ( 0 === count( wp_get_post_revisions( $r ) ) ) {
-				wp_save_post_revision( $r );
+			if (0 === count(wp_get_post_revisions($r))) {
+				wp_save_post_revision($r);
 			}
 		}
 	}
 
-	if ( is_wp_error( $r ) ) {
+	if (is_wp_error($r)) {
 		return $r;
 	}
-	return get_post( $r );
+	return get_post($r);
 }
 
 /**
@@ -1828,21 +1828,21 @@ 
  * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
-function add_editor_style( $stylesheet = 'editor-style.css' ) {
-	add_theme_support( 'editor-style' );
+function add_editor_style($stylesheet = 'editor-style.css') {
+	add_theme_support('editor-style');
 
-	if ( ! is_admin() )
+	if ( ! is_admin())
 		return;
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
 	$stylesheet    = (array) $stylesheet;
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$rtl_stylesheet = str_replace('.css', '-rtl.css', $stylesheet[0]);
 		$stylesheet[] = $rtl_stylesheet;
 	}
 
-	$editor_styles = array_merge( $editor_styles, $stylesheet );
+	$editor_styles = array_merge($editor_styles, $stylesheet);
 }
 
 /**
@@ -1855,10 +1855,10 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
+	if ( ! current_theme_supports('editor-style'))
 		return false;
-	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
+	_remove_theme_support('editor-style');
+	if (is_admin())
 		$GLOBALS['editor_styles'] = array();
 	return true;
 }
@@ -1875,35 +1875,35 @@ 
 function get_editor_stylesheets() {
 	$stylesheets = array();
 	// load editor_style.css if the current theme supports it
-	if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
+	if ( ! empty($GLOBALS['editor_styles']) && is_array($GLOBALS['editor_styles'])) {
 		$editor_styles = $GLOBALS['editor_styles'];
 
-		$editor_styles = array_unique( array_filter( $editor_styles ) );
+		$editor_styles = array_unique(array_filter($editor_styles));
 		$style_uri = get_stylesheet_directory_uri();
 		$style_dir = get_stylesheet_directory();
 
 		// Support externally referenced styles (like, say, fonts).
-		foreach ( $editor_styles as $key => $file ) {
-			if ( preg_match( '~^(https?:)?//~', $file ) ) {
-				$stylesheets[] = esc_url_raw( $file );
-				unset( $editor_styles[ $key ] );
+		foreach ($editor_styles as $key => $file) {
+			if (preg_match('~^(https?:)?//~', $file)) {
+				$stylesheets[] = esc_url_raw($file);
+				unset($editor_styles[$key]);
 			}
 		}
 
 		// Look in a parent theme first, that way child theme CSS overrides.
-		if ( is_child_theme() ) {
+		if (is_child_theme()) {
 			$template_uri = get_template_directory_uri();
 			$template_dir = get_template_directory();
 
-			foreach ( $editor_styles as $key => $file ) {
-				if ( $file && file_exists( "$template_dir/$file" ) ) {
+			foreach ($editor_styles as $key => $file) {
+				if ($file && file_exists("$template_dir/$file")) {
 					$stylesheets[] = "$template_uri/$file";
 				}
 			}
 		}
 
-		foreach ( $editor_styles as $file ) {
-			if ( $file && file_exists( "$style_dir/$file" ) ) {
+		foreach ($editor_styles as $file) {
+			if ($file && file_exists("$style_dir/$file")) {
 				$stylesheets[] = "$style_uri/$file";
 			}
 		}
@@ -1916,7 +1916,7 @@ 
 	 *
 	 * @param array $stylesheets Array of stylesheets to be applied to the editor.
 	 */
-	return apply_filters( 'editor_stylesheets', $stylesheets );
+	return apply_filters('editor_stylesheets', $stylesheets);
 }
 
 /**
@@ -1927,8 +1927,8 @@ 
  * @return array Array of starter content.
  */
 function get_theme_starter_content() {
-	$theme_support = get_theme_support( 'starter-content' );
-	if ( is_array( $theme_support ) && ! empty( $theme_support[0] ) && is_array( $theme_support[0] ) ) {
+	$theme_support = get_theme_support('starter-content');
+	if (is_array($theme_support) && ! empty($theme_support[0]) && is_array($theme_support[0])) {
 		$config = $theme_support[0];
 	} else {
 		$config = array();
@@ -1936,45 +1936,45 @@ 
 
 	$core_content = array(
 		'widgets' => array(
-			'text_business_info' => array( 'text', array(
-				'title' => _x( 'Find Us', 'Theme starter content' ),
-				'text' => join( '', array(
-					'<p><strong>' . _x( 'Address', 'Theme starter content' ) . '</strong><br />',
-					_x( '123 Main Street', 'Theme starter content' ) . '<br />' . _x( 'New York, NY 10001', 'Theme starter content' ) . '</p>',
-					'<p><strong>' . _x( 'Hours', 'Theme starter content' ) . '</strong><br />',
-					_x( 'Monday&mdash;Friday: 9:00AM&ndash;5:00PM', 'Theme starter content' ) . '<br />' . _x( 'Saturday &amp; Sunday: 11:00AM&ndash;3:00PM', 'Theme starter content' ) . '</p>'
-				) ),
-			) ),
-			'text_about' => array( 'text', array(
-				'title' => _x( 'About This Site', 'Theme starter content' ),
-				'text' => _x( 'This may be a good place to introduce yourself and your site or include some credits.', 'Theme starter content' ),
-			) ),
-			'archives' => array( 'archives', array(
-				'title' => _x( 'Archives', 'Theme starter content' ),
-			) ),
-			'calendar' => array( 'calendar', array(
-				'title' => _x( 'Calendar', 'Theme starter content' ),
-			) ),
-			'categories' => array( 'categories', array(
-				'title' => _x( 'Categories', 'Theme starter content' ),
-			) ),
-			'meta' => array( 'meta', array(
-				'title' => _x( 'Meta', 'Theme starter content' ),
-			) ),
-			'recent-comments' => array( 'recent-comments', array(
-				'title' => _x( 'Recent Comments', 'Theme starter content' ),
-			) ),
-			'recent-posts' => array( 'recent-posts', array(
-				'title' => _x( 'Recent Posts', 'Theme starter content' ),
-			) ),
-			'search' => array( 'search', array(
-				'title' => _x( 'Search', 'Theme starter content' ),
-			) ),
+			'text_business_info' => array('text', array(
+				'title' => _x('Find Us', 'Theme starter content'),
+				'text' => join('', array(
+					'<p><strong>'._x('Address', 'Theme starter content').'</strong><br />',
+					_x('123 Main Street', 'Theme starter content').'<br />'._x('New York, NY 10001', 'Theme starter content').'</p>',
+					'<p><strong>'._x('Hours', 'Theme starter content').'</strong><br />',
+					_x('Monday&mdash;Friday: 9:00AM&ndash;5:00PM', 'Theme starter content').'<br />'._x('Saturday &amp; Sunday: 11:00AM&ndash;3:00PM', 'Theme starter content').'</p>'
+				)),
+			)),
+			'text_about' => array('text', array(
+				'title' => _x('About This Site', 'Theme starter content'),
+				'text' => _x('This may be a good place to introduce yourself and your site or include some credits.', 'Theme starter content'),
+			)),
+			'archives' => array('archives', array(
+				'title' => _x('Archives', 'Theme starter content'),
+			)),
+			'calendar' => array('calendar', array(
+				'title' => _x('Calendar', 'Theme starter content'),
+			)),
+			'categories' => array('categories', array(
+				'title' => _x('Categories', 'Theme starter content'),
+			)),
+			'meta' => array('meta', array(
+				'title' => _x('Meta', 'Theme starter content'),
+			)),
+			'recent-comments' => array('recent-comments', array(
+				'title' => _x('Recent Comments', 'Theme starter content'),
+			)),
+			'recent-posts' => array('recent-posts', array(
+				'title' => _x('Recent Posts', 'Theme starter content'),
+			)),
+			'search' => array('search', array(
+				'title' => _x('Search', 'Theme starter content'),
+			)),
 		),
 		'nav_menus' => array(
 			'link_home' => array(
 				'type' => 'custom',
-				'title' => _x( 'Home', 'Theme starter content' ),
+				'title' => _x('Home', 'Theme starter content'),
 				'url' => home_url(),
 			),
 			'page_home' => array( // Deprecated in favor of home_link.
@@ -2004,106 +2004,106 @@ 
 			),
 
 			'link_email' => array(
-				'title' => _x( 'Email', 'Theme starter content' ),
+				'title' => _x('Email', 'Theme starter content'),
 				'url' => 'mailto:wordpress@example.com',
 			),
 			'link_facebook' => array(
-				'title' => _x( 'Facebook', 'Theme starter content' ),
+				'title' => _x('Facebook', 'Theme starter content'),
 				'url' => 'https://www.facebook.com/wordpress',
 			),
 			'link_foursquare' => array(
-				'title' => _x( 'Foursquare', 'Theme starter content' ),
+				'title' => _x('Foursquare', 'Theme starter content'),
 				'url' => 'https://foursquare.com/',
 			),
 			'link_github' => array(
-				'title' => _x( 'GitHub', 'Theme starter content' ),
+				'title' => _x('GitHub', 'Theme starter content'),
 				'url' => 'https://github.com/wordpress/',
 			),
 			'link_instagram' => array(
-				'title' => _x( 'Instagram', 'Theme starter content' ),
+				'title' => _x('Instagram', 'Theme starter content'),
 				'url' => 'https://www.instagram.com/explore/tags/wordcamp/',
 			),
 			'link_linkedin' => array(
-				'title' => _x( 'LinkedIn', 'Theme starter content' ),
+				'title' => _x('LinkedIn', 'Theme starter content'),
 				'url' => 'https://www.linkedin.com/company/1089783',
 			),
 			'link_pinterest' => array(
-				'title' => _x( 'Pinterest', 'Theme starter content' ),
+				'title' => _x('Pinterest', 'Theme starter content'),
 				'url' => 'https://www.pinterest.com/',
 			),
 			'link_twitter' => array(
-				'title' => _x( 'Twitter', 'Theme starter content' ),
+				'title' => _x('Twitter', 'Theme starter content'),
 				'url' => 'https://twitter.com/wordpress',
 			),
 			'link_yelp' => array(
-				'title' => _x( 'Yelp', 'Theme starter content' ),
+				'title' => _x('Yelp', 'Theme starter content'),
 				'url' => 'https://www.yelp.com',
 			),
 			'link_youtube' => array(
-				'title' => _x( 'YouTube', 'Theme starter content' ),
+				'title' => _x('YouTube', 'Theme starter content'),
 				'url' => 'https://www.youtube.com/channel/UCdof4Ju7amm1chz1gi1T2ZA',
 			),
 		),
 		'posts' => array(
 			'home' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'Home', 'Theme starter content' ),
-				'post_content' => _x( 'Welcome to your site! This is your homepage, which is what most visitors will see when they come to your site for the first time.', 'Theme starter content' ),
+				'post_title' => _x('Home', 'Theme starter content'),
+				'post_content' => _x('Welcome to your site! This is your homepage, which is what most visitors will see when they come to your site for the first time.', 'Theme starter content'),
 			),
 			'about' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'About', 'Theme starter content' ),
-				'post_content' => _x( 'You might be an artist who would like to introduce yourself and your work here or maybe you&rsquo;re a business with a mission to describe.', 'Theme starter content' ),
+				'post_title' => _x('About', 'Theme starter content'),
+				'post_content' => _x('You might be an artist who would like to introduce yourself and your work here or maybe you&rsquo;re a business with a mission to describe.', 'Theme starter content'),
 			),
 			'contact' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'Contact', 'Theme starter content' ),
-				'post_content' => _x( 'This is a page with some basic contact information, such as an address and phone number. You might also try a plugin to add a contact form.', 'Theme starter content' ),
+				'post_title' => _x('Contact', 'Theme starter content'),
+				'post_content' => _x('This is a page with some basic contact information, such as an address and phone number. You might also try a plugin to add a contact form.', 'Theme starter content'),
 			),
 			'blog' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'Blog', 'Theme starter content' ),
+				'post_title' => _x('Blog', 'Theme starter content'),
 			),
 			'news' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'News', 'Theme starter content' ),
+				'post_title' => _x('News', 'Theme starter content'),
 			),
 
 			'homepage-section' => array(
 				'post_type' => 'page',
-				'post_title' => _x( 'A homepage section', 'Theme starter content' ),
-				'post_content' => _x( 'This is an example of a homepage section. Homepage sections can be any page other than the homepage itself, including the page that shows your latest blog posts.', 'Theme starter content' ),
+				'post_title' => _x('A homepage section', 'Theme starter content'),
+				'post_content' => _x('This is an example of a homepage section. Homepage sections can be any page other than the homepage itself, including the page that shows your latest blog posts.', 'Theme starter content'),
 			),
 		),
 	);
 
 	$content = array();
 
-	foreach ( $config as $type => $args ) {
-		switch( $type ) {
+	foreach ($config as $type => $args) {
+		switch ($type) {
 			// Use options and theme_mods as-is.
 			case 'options' :
 			case 'theme_mods' :
-				$content[ $type ] = $config[ $type ];
+				$content[$type] = $config[$type];
 				break;
 
 			// Widgets are grouped into sidebars.
 			case 'widgets' :
-				foreach ( $config[ $type ] as $sidebar_id => $widgets ) {
-					foreach ( $widgets as $id => $widget ) {
-						if ( is_array( $widget ) ) {
+				foreach ($config[$type] as $sidebar_id => $widgets) {
+					foreach ($widgets as $id => $widget) {
+						if (is_array($widget)) {
 
 							// Item extends core content.
-							if ( ! empty( $core_content[ $type ][ $id ] ) ) {
+							if ( ! empty($core_content[$type][$id])) {
 								$widget = array(
-									$core_content[ $type ][ $id ][0],
-									array_merge( $core_content[ $type ][ $id ][1], $widget ),
+									$core_content[$type][$id][0],
+									array_merge($core_content[$type][$id][1], $widget),
 								);
 							}
 
-							$content[ $type ][ $sidebar_id ][] = $widget;
-						} elseif ( is_string( $widget ) && ! empty( $core_content[ $type ] ) && ! empty( $core_content[ $type ][ $widget ] ) ) {
-							$content[ $type ][ $sidebar_id ][] = $core_content[ $type ][ $widget ];
+							$content[$type][$sidebar_id][] = $widget;
+						} elseif (is_string($widget) && ! empty($core_content[$type]) && ! empty($core_content[$type][$widget])) {
+							$content[$type][$sidebar_id][] = $core_content[$type][$widget];
 						}
 					}
 				}
@@ -2111,26 +2111,26 @@ 
 
 			// And nav menu items are grouped into nav menus.
 			case 'nav_menus' :
-				foreach ( $config[ $type ] as $nav_menu_location => $nav_menu ) {
+				foreach ($config[$type] as $nav_menu_location => $nav_menu) {
 
 					// Ensure nav menus get a name.
-					if ( empty( $nav_menu['name'] ) ) {
+					if (empty($nav_menu['name'])) {
 						$nav_menu['name'] = $nav_menu_location;
 					}
 
-					$content[ $type ][ $nav_menu_location ]['name'] = $nav_menu['name'];
+					$content[$type][$nav_menu_location]['name'] = $nav_menu['name'];
 
-					foreach ( $nav_menu['items'] as $id => $nav_menu_item ) {
-						if ( is_array( $nav_menu_item ) ) {
+					foreach ($nav_menu['items'] as $id => $nav_menu_item) {
+						if (is_array($nav_menu_item)) {
 
 							// Item extends core content.
-							if ( ! empty( $core_content[ $type ][ $id ] ) ) {
-								$nav_menu_item = array_merge( $core_content[ $type ][ $id ], $nav_menu_item );
+							if ( ! empty($core_content[$type][$id])) {
+								$nav_menu_item = array_merge($core_content[$type][$id], $nav_menu_item);
 							}
 
-							$content[ $type ][ $nav_menu_location ]['items'][] = $nav_menu_item;
-						} elseif ( is_string( $nav_menu_item ) && ! empty( $core_content[ $type ] ) && ! empty( $core_content[ $type ][ $nav_menu_item ] ) ) {
-							$content[ $type ][ $nav_menu_location ]['items'][] = $core_content[ $type ][ $nav_menu_item ];
+							$content[$type][$nav_menu_location]['items'][] = $nav_menu_item;
+						} elseif (is_string($nav_menu_item) && ! empty($core_content[$type]) && ! empty($core_content[$type][$nav_menu_item])) {
+							$content[$type][$nav_menu_location]['items'][] = $core_content[$type][$nav_menu_item];
 						}
 					}
 				}
@@ -2138,25 +2138,25 @@ 
 
 			// Attachments are posts but have special treatment.
 			case 'attachments' :
-				foreach ( $config[ $type ] as $id => $item ) {
-					if ( ! empty( $item['file'] ) ) {
-						$content[ $type ][ $id ] = $item;
+				foreach ($config[$type] as $id => $item) {
+					if ( ! empty($item['file'])) {
+						$content[$type][$id] = $item;
 					}
 				}
 				break;
 
 			// All that's left now are posts (besides attachments). Not a default case for the sake of clarity and future work.
 			case 'posts' :
-				foreach ( $config[ $type ] as $id => $item ) {
-					if ( is_array( $item ) ) {
+				foreach ($config[$type] as $id => $item) {
+					if (is_array($item)) {
 
 						// Item extends core content.
-						if ( ! empty( $core_content[ $type ][ $id ] ) ) {
-							$item = array_merge( $core_content[ $type ][ $id ], $item );
+						if ( ! empty($core_content[$type][$id])) {
+							$item = array_merge($core_content[$type][$id], $item);
 						}
 
 						// Enforce a subset of fields.
-						$content[ $type ][ $id ] = wp_array_slice_assoc(
+						$content[$type][$id] = wp_array_slice_assoc(
 							$item,
 							array(
 								'post_type',
@@ -2170,8 +2170,8 @@ 
 								'template',
 							)
 						);
-					} elseif ( is_string( $item ) && ! empty( $core_content[ $type ][ $item ] ) ) {
-						$content[ $type ][ $item ] = $core_content[ $type ][ $item ];
+					} elseif (is_string($item) && ! empty($core_content[$type][$item])) {
+						$content[$type][$item] = $core_content[$type][$item];
 					}
 				}
 				break;
@@ -2186,7 +2186,7 @@ 
 	 * @param array $content Array of starter content.
 	 * @param array $config  Array of theme-specific starter content configuration.
 	 */
-	return apply_filters( 'get_theme_starter_content', $content, $config );
+	return apply_filters('get_theme_starter_content', $content, $config);
 }
 
 /**
@@ -2211,18 +2211,18 @@ 
  * @param mixed  $args,... Optional extra arguments to pass along with certain features.
  * @return void|bool False on failure, void otherwise.
  */
-function add_theme_support( $feature ) {
+function add_theme_support($feature) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
+	if (func_num_args() == 1)
 		$args = true;
 	else
-		$args = array_slice( func_get_args(), 1 );
+		$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-thumbnails':
 			// All post types are already supported.
-			if ( true === get_theme_support( 'post-thumbnails' ) ) {
+			if (true === get_theme_support('post-thumbnails')) {
 				return;
 			}
 
@@ -2230,39 +2230,39 @@ 
 			 * Merge post types with any that already declared their support
 			 * for post thumbnails.
 			 */
-			if ( is_array( $args[0] ) && isset( $_wp_theme_features['post-thumbnails'] ) ) {
-				$args[0] = array_unique( array_merge( $_wp_theme_features['post-thumbnails'][0], $args[0] ) );
+			if (is_array($args[0]) && isset($_wp_theme_features['post-thumbnails'])) {
+				$args[0] = array_unique(array_merge($_wp_theme_features['post-thumbnails'][0], $args[0]));
 			}
 
 			break;
 
 		case 'post-formats' :
-			if ( is_array( $args[0] ) ) {
+			if (is_array($args[0])) {
 				$post_formats = get_post_format_slugs();
-				unset( $post_formats['standard'] );
+				unset($post_formats['standard']);
 
-				$args[0] = array_intersect( $args[0], array_keys( $post_formats ) );
+				$args[0] = array_intersect($args[0], array_keys($post_formats));
 			}
 			break;
 
 		case 'html5' :
 			// You can't just pass 'html5', you need to pass an array of types.
-			if ( empty( $args[0] ) ) {
+			if (empty($args[0])) {
 				// Build an array of types for back-compat.
-				$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
-			} elseif ( ! is_array( $args[0] ) ) {
-				_doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' );
+				$args = array(0 => array('comment-list', 'comment-form', 'search-form'));
+			} elseif ( ! is_array($args[0])) {
+				_doing_it_wrong("add_theme_support( 'html5' )", __('You need to pass an array of types.'), '3.6.1');
 				return false;
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if (isset($_wp_theme_features['html5']))
+				$args[0] = array_merge($_wp_theme_features['html5'][0], $args[0]);
 			break;
 
 		case 'custom-logo':
-			if ( ! is_array( $args ) ) {
-				$args = array( 0 => array() );
+			if ( ! is_array($args)) {
+				$args = array(0 => array());
 			}
 			$defaults = array(
 				'width'       => null,
@@ -2271,21 +2271,21 @@ 
 				'flex-height' => false,
 				'header-text' => '',
 			);
-			$args[0] = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );
+			$args[0] = wp_parse_args(array_intersect_key($args[0], $defaults), $defaults);
 
 			// Allow full flexibility if no size is specified.
-			if ( is_null( $args[0]['width'] ) && is_null( $args[0]['height'] ) ) {
+			if (is_null($args[0]['width']) && is_null($args[0]['height'])) {
 				$args[0]['flex-width']  = true;
 				$args[0]['flex-height'] = true;
 			}
 			break;
 
 		case 'custom-header-uploads' :
-			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
+			return add_theme_support('custom-header', array('uploads' => true));
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image' => '',
@@ -2304,18 +2304,18 @@ 
 				'video-active-callback' => 'is_front_page',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-header']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-header'][0], $args[0]);
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -2323,48 +2323,48 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backward compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
+			if (defined('NO_HEADER_TEXT'))
 				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			elseif (isset($args[0]['header-text']))
+				define('NO_HEADER_TEXT', empty($args[0]['header-text']));
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
+			if (defined('HEADER_IMAGE_WIDTH'))
 				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			elseif (isset($args[0]['width']))
+				define('HEADER_IMAGE_WIDTH', (int) $args[0]['width']);
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
+			if (defined('HEADER_IMAGE_HEIGHT'))
 				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			elseif (isset($args[0]['height']))
+				define('HEADER_IMAGE_HEIGHT', (int) $args[0]['height']);
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
+			if (defined('HEADER_TEXTCOLOR'))
 				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			elseif (isset($args[0]['default-text-color']))
+				define('HEADER_TEXTCOLOR', $args[0]['default-text-color']);
 
-			if ( defined( 'HEADER_IMAGE' ) )
+			if (defined('HEADER_IMAGE'))
 				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']))
+				define('HEADER_IMAGE', $args[0]['default-image']);
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
+			if ($jit && ! empty($args[0]['default-image']))
 				$args[0]['random-default'] = false;
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
-			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
+			if ($jit) {
+				if (empty($args[0]['width']) && empty($args[0]['flex-width']))
 					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
+				if (empty($args[0]['height']) && empty($args[0]['flex-height']))
 					$args[0]['flex-height'] = true;
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image'          => '',
@@ -2380,41 +2380,41 @@ 
 				'admin-preview-callback' => '',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-background']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-background'][0], $args[0]);
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
+			if (defined('BACKGROUND_COLOR'))
 				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			elseif (isset($args[0]['default-color']) || $jit)
+				define('BACKGROUND_COLOR', $args[0]['default-color']);
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
+			if (defined('BACKGROUND_IMAGE'))
 				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']) || $jit)
+				define('BACKGROUND_IMAGE', $args[0]['default-image']);
 
 			break;
 
 		// Ensure that 'title-tag' is accessible in the admin.
 		case 'title-tag' :
 			// Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
-			if ( did_action( 'wp_loaded' ) ) {
+			if (did_action('wp_loaded')) {
 				/* translators: 1: Theme support 2: hook name */
-				_doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
-					'<code>title-tag</code>', '<code>wp_loaded</code>' ), '4.1.0' );
+				_doing_it_wrong("add_theme_support( 'title-tag' )", sprintf(__('Theme support for %1$s should be registered before the %2$s hook.'),
+					'<code>title-tag</code>', '<code>wp_loaded</code>'), '4.1.0');
 
 				return false;
 			}
 	}
 
-	$_wp_theme_features[ $feature ] = $args;
+	$_wp_theme_features[$feature] = $args;
 }
 
 /**
@@ -2429,30 +2429,30 @@ 
 function _custom_header_background_just_in_time() {
 	global $custom_image_header, $custom_background;
 
-	if ( current_theme_supports( 'custom-header' ) ) {
+	if (current_theme_supports('custom-header')) {
 		// In case any constants were defined after an add_custom_image_header() call, re-run.
-		add_theme_support( 'custom-header', array( '__jit' => true ) );
+		add_theme_support('custom-header', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-header');
+		if ($args[0]['wp-head-callback'])
+			add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-header.php' );
-			$custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-header.php');
+			$custom_image_header = new Custom_Image_Header($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background' ) ) {
+	if (current_theme_supports('custom-background')) {
 		// In case any constants were defined after an add_custom_background() call, re-run.
-		add_theme_support( 'custom-background', array( '__jit' => true ) );
+		add_theme_support('custom-background', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-background' );
-		add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-background');
+		add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-background.php' );
-			$custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-background.php');
+			$custom_background = new Custom_Background($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 }
@@ -2464,10 +2464,10 @@ 
  * @access private
  */
 function _custom_logo_header_styles() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) && get_theme_support( 'custom-logo', 'header-text' ) && ! get_theme_mod( 'header_text', true ) ) {
-		$classes = (array) get_theme_support( 'custom-logo', 'header-text' );
-		$classes = array_map( 'sanitize_html_class', $classes );
-		$classes = '.' . implode( ', .', $classes );
+	if ( ! current_theme_supports('custom-header', 'header-text') && get_theme_support('custom-logo', 'header-text') && ! get_theme_mod('header_text', true)) {
+		$classes = (array) get_theme_support('custom-logo', 'header-text');
+		$classes = array_map('sanitize_html_class', $classes);
+		$classes = '.'.implode(', .', $classes);
 
 		?>
 		<!-- Custom Logo: hide header text -->
@@ -2491,25 +2491,25 @@ 
  * @param string $feature the feature to check
  * @return mixed The array of extra arguments or the value for the registered feature.
  */
-function get_theme_support( $feature ) {
+function get_theme_support($feature) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if (func_num_args() <= 1)
+		return $_wp_theme_features[$feature];
 
-	$args = array_slice( func_get_args(), 1 );
-	switch ( $feature ) {
+	$args = array_slice(func_get_args(), 1);
+	switch ($feature) {
 		case 'custom-logo' :
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if (isset($_wp_theme_features[$feature][0][$args[0]]))
+				return $_wp_theme_features[$feature][0][$args[0]];
 			return false;
 
 		default :
-			return $_wp_theme_features[ $feature ];
+			return $_wp_theme_features[$feature];
 	}
 }
 
@@ -2524,12 +2524,12 @@ 
  * @param string $feature the feature being added
  * @return bool|void Whether feature was removed.
  */
-function remove_theme_support( $feature ) {
+function remove_theme_support($feature) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
+	if (in_array($feature, array('editor-style', 'widgets', 'menus')))
 		return false;
 
-	return _remove_theme_support( $feature );
+	return _remove_theme_support($feature);
 }
 
 /**
@@ -2544,45 +2544,45 @@ 
  *
  * @param string $feature
  */
-function _remove_theme_support( $feature ) {
+function _remove_theme_support($feature) {
 	global $_wp_theme_features;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
+			if ( ! isset($_wp_theme_features['custom-header']))
 				return false;
-			add_theme_support( 'custom-header', array( 'uploads' => false ) );
+			add_theme_support('custom-header', array('uploads' => false));
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-header' );
-			if ( isset( $support[0]['wp-head-callback'] ) ) {
-				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+			$support = get_theme_support('custom-header');
+			if (isset($support[0]['wp-head-callback'])) {
+				remove_action('wp_head', $support[0]['wp-head-callback']);
 			}
-			if ( isset( $GLOBALS['custom_image_header'] ) ) {
-				remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
-				unset( $GLOBALS['custom_image_header'] );
+			if (isset($GLOBALS['custom_image_header'])) {
+				remove_action('admin_menu', array($GLOBALS['custom_image_header'], 'init'));
+				unset($GLOBALS['custom_image_header']);
 			}
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-background' );
-			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
-			unset( $GLOBALS['custom_background'] );
+			$support = get_theme_support('custom-background');
+			remove_action('wp_head', $support[0]['wp-head-callback']);
+			remove_action('admin_menu', array($GLOBALS['custom_background'], 'init'));
+			unset($GLOBALS['custom_background']);
 			break;
 	}
 
-	unset( $_wp_theme_features[ $feature ] );
+	unset($_wp_theme_features[$feature]);
 	return true;
 }
 
@@ -2596,30 +2596,30 @@ 
  * @param string $feature the feature being checked
  * @return bool
  */
-function current_theme_supports( $feature ) {
+function current_theme_supports($feature) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ('custom-header-uploads' == $feature)
+		return current_theme_supports('custom-header', 'uploads');
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
+	if (func_num_args() <= 1)
 		return true;
 
-	$args = array_slice( func_get_args(), 1 );
+	$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-thumbnails':
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if (true === $_wp_theme_features[$feature])  // Registered for all types
 				return true;
 			$content_type = $args[0];
-			return in_array( $content_type, $_wp_theme_features[$feature][0] );
+			return in_array($content_type, $_wp_theme_features[$feature][0]);
 
 		case 'html5':
 		case 'post-formats':
@@ -2629,13 +2629,13 @@ 
 			// Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
 
 			$type = $args[0];
-			return in_array( $type, $_wp_theme_features[$feature][0] );
+			return in_array($type, $_wp_theme_features[$feature][0]);
 
 		case 'custom-logo':
 		case 'custom-header':
 		case 'custom-background':
 			// Specific capabilities can be registered by passing an array to add_theme_support().
-			return ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) && $_wp_theme_features[ $feature ][0][ $args[0] ] );
+			return (isset($_wp_theme_features[$feature][0][$args[0]]) && $_wp_theme_features[$feature][0][$args[0]]);
 	}
 
 	/**
@@ -2652,7 +2652,7 @@ 
 	 * @param array  $args    Array of arguments for the feature.
 	 * @param string $feature The theme feature.
 	 */
-	return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature] );
+	return apply_filters("current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature]);
 }
 
 /**
@@ -2664,9 +2664,9 @@ 
  * @param string $include Path to the file.
  * @return bool True if the current theme supports the supplied feature, false otherwise.
  */
-function require_if_theme_supports( $feature, $include ) {
-	if ( current_theme_supports( $feature ) ) {
-		require ( $include );
+function require_if_theme_supports($feature, $include) {
+	if (current_theme_supports($feature)) {
+		require ($include);
 		return true;
 	}
 	return false;
@@ -2685,24 +2685,24 @@ 
  *
  * @param int $id The attachment id.
  */
-function _delete_attachment_theme_mod( $id ) {
-	$attachment_image = wp_get_attachment_url( $id );
+function _delete_attachment_theme_mod($id) {
+	$attachment_image = wp_get_attachment_url($id);
 	$header_image     = get_header_image();
 	$background_image = get_background_image();
-	$custom_logo_id   = get_theme_mod( 'custom_logo' );
+	$custom_logo_id   = get_theme_mod('custom_logo');
 
-	if ( $custom_logo_id && $custom_logo_id == $id ) {
-		remove_theme_mod( 'custom_logo' );
-		remove_theme_mod( 'header_text' );
+	if ($custom_logo_id && $custom_logo_id == $id) {
+		remove_theme_mod('custom_logo');
+		remove_theme_mod('header_text');
 	}
 
-	if ( $header_image && $header_image == $attachment_image ) {
-		remove_theme_mod( 'header_image' );
-		remove_theme_mod( 'header_image_data' );
+	if ($header_image && $header_image == $attachment_image) {
+		remove_theme_mod('header_image');
+		remove_theme_mod('header_image_data');
 	}
 
-	if ( $background_image && $background_image == $attachment_image ) {
-		remove_theme_mod( 'background_image' );
+	if ($background_image && $background_image == $attachment_image) {
+		remove_theme_mod('background_image');
 	}
 }
 
@@ -2714,16 +2714,16 @@ 
  * @since 3.3.0
  */
 function check_theme_switched() {
-	if ( $stylesheet = get_option( 'theme_switched' ) ) {
-		$old_theme = wp_get_theme( $stylesheet );
+	if ($stylesheet = get_option('theme_switched')) {
+		$old_theme = wp_get_theme($stylesheet);
 
 		// Prevent retrieve_widgets() from running since Customizer already called it up front
-		if ( get_option( 'theme_switched_via_customizer' ) ) {
-			remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
-			update_option( 'theme_switched_via_customizer', false );
+		if (get_option('theme_switched_via_customizer')) {
+			remove_action('after_switch_theme', '_wp_sidebars_changed');
+			update_option('theme_switched_via_customizer', false);
 		}
 
-		if ( $old_theme->exists() ) {
+		if ($old_theme->exists()) {
 			/**
 			 * Fires on the first WP load after a theme switch if the old theme still exists.
 			 *
@@ -2737,14 +2737,14 @@ 
 			 * @param string   $old_name  Old theme name.
 			 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 			 */
-			do_action( 'after_switch_theme', $old_theme->get( 'Name' ), $old_theme );
+			do_action('after_switch_theme', $old_theme->get('Name'), $old_theme);
 		} else {
 			/** This action is documented in wp-includes/theme.php */
-			do_action( 'after_switch_theme', $stylesheet );
+			do_action('after_switch_theme', $stylesheet);
 		}
 		flush_rewrite_rules();
 
-		update_option( 'theme_switched', false );
+		update_option('theme_switched', false);
 	}
 }
 
@@ -2763,16 +2763,16 @@ 
  */
 function _wp_customize_include() {
 
-	$is_customize_admin_page = ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) );
+	$is_customize_admin_page = (is_admin() && 'customize.php' == basename($_SERVER['PHP_SELF']));
 	$should_include = (
 		$is_customize_admin_page
 		||
-		( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
+		(isset($_REQUEST['wp_customize']) && 'on' == $_REQUEST['wp_customize'])
 		||
-		( ! empty( $_GET['customize_changeset_uuid'] ) || ! empty( $_POST['customize_changeset_uuid'] ) )
+		( ! empty($_GET['customize_changeset_uuid']) || ! empty($_POST['customize_changeset_uuid']))
 	);
 
-	if ( ! $should_include ) {
+	if ( ! $should_include) {
 		return;
 	}
 
@@ -2781,34 +2781,34 @@ 
 	 * called before wp_magic_quotes() gets called. Besides this fact, none of
 	 * the values should contain any characters needing slashes anyway.
 	 */
-	$keys = array( 'changeset_uuid', 'customize_changeset_uuid', 'customize_theme', 'theme', 'customize_messenger_channel' );
+	$keys = array('changeset_uuid', 'customize_changeset_uuid', 'customize_theme', 'theme', 'customize_messenger_channel');
 	$input_vars = array_merge(
-		wp_array_slice_assoc( $_GET, $keys ),
-		wp_array_slice_assoc( $_POST, $keys )
+		wp_array_slice_assoc($_GET, $keys),
+		wp_array_slice_assoc($_POST, $keys)
 	);
 
 	$theme = null;
 	$changeset_uuid = null;
 	$messenger_channel = null;
 
-	if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {
-		$changeset_uuid = sanitize_key( $input_vars['changeset_uuid'] );
-	} elseif ( ! empty( $input_vars['customize_changeset_uuid'] ) ) {
-		$changeset_uuid = sanitize_key( $input_vars['customize_changeset_uuid'] );
+	if ($is_customize_admin_page && isset($input_vars['changeset_uuid'])) {
+		$changeset_uuid = sanitize_key($input_vars['changeset_uuid']);
+	} elseif ( ! empty($input_vars['customize_changeset_uuid'])) {
+		$changeset_uuid = sanitize_key($input_vars['customize_changeset_uuid']);
 	}
 
 	// Note that theme will be sanitized via WP_Theme.
-	if ( $is_customize_admin_page && isset( $input_vars['theme'] ) ) {
+	if ($is_customize_admin_page && isset($input_vars['theme'])) {
 		$theme = $input_vars['theme'];
-	} elseif ( isset( $input_vars['customize_theme'] ) ) {
+	} elseif (isset($input_vars['customize_theme'])) {
 		$theme = $input_vars['customize_theme'];
 	}
-	if ( isset( $input_vars['customize_messenger_channel'] ) ) {
-		$messenger_channel = sanitize_key( $input_vars['customize_messenger_channel'] );
+	if (isset($input_vars['customize_messenger_channel'])) {
+		$messenger_channel = sanitize_key($input_vars['customize_messenger_channel']);
 	}
 
-	require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-	$GLOBALS['wp_customize'] = new WP_Customize_Manager( compact( 'changeset_uuid', 'theme', 'messenger_channel' ) );
+	require_once ABSPATH.WPINC.'/class-wp-customize-manager.php';
+	$GLOBALS['wp_customize'] = new WP_Customize_Manager(compact('changeset_uuid', 'theme', 'messenger_channel'));
 }
 
 /**
@@ -2818,7 +2818,7 @@ 
  * @param string  $old_status     Old post status.
  * @param WP_Post $changeset_post Changeset post object.
  */
-function _wp_customize_publish_changeset( $new_status, $old_status, $changeset_post ) {
+function _wp_customize_publish_changeset($new_status, $old_status, $changeset_post) {
 	global $wp_customize, $wpdb;
 
 	$is_publishing_changeset = (
@@ -2828,16 +2828,16 @@ 
 		&&
 		'publish' !== $old_status
 	);
-	if ( ! $is_publishing_changeset ) {
+	if ( ! $is_publishing_changeset) {
 		return;
 	}
 
-	if ( empty( $wp_customize ) ) {
-		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-		$wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $changeset_post->post_name ) );
+	if (empty($wp_customize)) {
+		require_once ABSPATH.WPINC.'/class-wp-customize-manager.php';
+		$wp_customize = new WP_Customize_Manager(array('changeset_uuid' => $changeset_post->post_name));
 	}
 
-	if ( ! did_action( 'customize_register' ) ) {
+	if ( ! did_action('customize_register')) {
 		/*
 		 * When running from CLI or Cron, the customize_register action will need
 		 * to be triggered in order for core, themes, and plugins to register their
@@ -2852,13 +2852,13 @@ 
 		 * So the following manually calls the method that registers the core
 		 * settings up front before doing the action.
 		 */
-		remove_action( 'customize_register', array( $wp_customize, 'register_controls' ) );
+		remove_action('customize_register', array($wp_customize, 'register_controls'));
 		$wp_customize->register_controls();
 
 		/** This filter is documented in /wp-includes/class-wp-customize-manager.php */
-		do_action( 'customize_register', $wp_customize );
+		do_action('customize_register', $wp_customize);
 	}
-	$wp_customize->_publish_changeset_values( $changeset_post->ID ) ;
+	$wp_customize->_publish_changeset_values($changeset_post->ID);
 
 	/*
 	 * Trash the changeset post if revisions are not enabled. Unpublished
@@ -2869,7 +2869,7 @@ 
 	 * feature to indicate whether or not a published changeset should get trashed
 	 * and thus garbage collected.
 	 */
-	if ( ! wp_revisions_enabled( $changeset_post ) ) {
+	if ( ! wp_revisions_enabled($changeset_post)) {
 		$post = $changeset_post;
 		$post_id = $changeset_post->ID;
 
@@ -2879,37 +2879,37 @@ 
 		 * will mutate the the post_content and the post_name when they should be
 		 * untouched.
 		 */
-		if ( ! EMPTY_TRASH_DAYS ) {
-			wp_delete_post( $post_id, true );
+		if ( ! EMPTY_TRASH_DAYS) {
+			wp_delete_post($post_id, true);
 		} else {
 			/** This action is documented in wp-includes/post.php */
-			do_action( 'wp_trash_post', $post_id );
+			do_action('wp_trash_post', $post_id);
 
-			add_post_meta( $post_id, '_wp_trash_meta_status', $post->post_status );
-			add_post_meta( $post_id, '_wp_trash_meta_time', time() );
+			add_post_meta($post_id, '_wp_trash_meta_status', $post->post_status);
+			add_post_meta($post_id, '_wp_trash_meta_time', time());
 
 			$old_status = $post->post_status;
 			$new_status = 'trash';
-			$wpdb->update( $wpdb->posts, array( 'post_status' => $new_status ), array( 'ID' => $post->ID ) );
-			clean_post_cache( $post->ID );
+			$wpdb->update($wpdb->posts, array('post_status' => $new_status), array('ID' => $post->ID));
+			clean_post_cache($post->ID);
 
 			$post->post_status = $new_status;
-			wp_transition_post_status( $new_status, $old_status, $post );
+			wp_transition_post_status($new_status, $old_status, $post);
 
 			/** This action is documented in wp-includes/post.php */
-			do_action( 'edit_post', $post->ID, $post );
+			do_action('edit_post', $post->ID, $post);
 
 			/** This action is documented in wp-includes/post.php */
-			do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+			do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 
 			/** This action is documented in wp-includes/post.php */
-			do_action( 'save_post', $post->ID, $post, true );
+			do_action('save_post', $post->ID, $post, true);
 
 			/** This action is documented in wp-includes/post.php */
-			do_action( 'wp_insert_post', $post->ID, $post, true );
+			do_action('wp_insert_post', $post->ID, $post, true);
 
 			/** This action is documented in wp-includes/post.php */
-			do_action( 'trashed_post', $post_id );
+			do_action('trashed_post', $post_id);
 		}
 	}
 }
@@ -2927,11 +2927,11 @@ 
  * @param array $supplied_post_data An array of sanitized, but otherwise unmodified post data.
  * @returns array Filtered data.
  */
-function _wp_customize_changeset_filter_insert_post_data( $post_data, $supplied_post_data ) {
-	if ( isset( $post_data['post_type'] ) && 'customize_changeset' === $post_data['post_type'] ) {
+function _wp_customize_changeset_filter_insert_post_data($post_data, $supplied_post_data) {
+	if (isset($post_data['post_type']) && 'customize_changeset' === $post_data['post_type']) {
 
 		// Prevent post_name from being dropped, such as when contributor saves a changeset post as pending.
-		if ( empty( $post_data['post_name'] ) && ! empty( $supplied_post_data['post_name'] ) ) {
+		if (empty($post_data['post_name']) && ! empty($supplied_post_data['post_name'])) {
 			$post_data['post_name'] = $supplied_post_data['post_name'];
 		}
 	}
@@ -2944,33 +2944,33 @@ 
  * @since 3.4.0
  */
 function _wp_customize_loader_settings() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	$browser = array(
 		'mobile' => wp_is_mobile(),
-		'ios'    => wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] ),
+		'ios'    => wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']),
 	);
 
 	$settings = array(
-		'url'           => esc_url( admin_url( 'customize.php' ) ),
+		'url'           => esc_url(admin_url('customize.php')),
 		'isCrossDomain' => $cross_domain,
 		'browser'       => $browser,
 		'l10n'          => array(
-			'saveAlert'       => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'mainIframeTitle' => __( 'Customizer' ),
+			'saveAlert'       => __('The changes you made will be lost if you navigate away from this page.'),
+			'mainIframeTitle' => __('Customizer'),
 		),
 	);
 
-	$script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpCustomizeLoaderSettings = '.wp_json_encode($settings).';';
 
 	$wp_scripts = wp_scripts();
-	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
+	$data = $wp_scripts->get_data('customize-loader', 'data');
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'customize-loader', 'data', $script );
+	$wp_scripts->add_data('customize-loader', 'data', $script);
 }
 
 /**
@@ -2982,11 +2982,11 @@ 
  * 	                         The theme's stylesheet will be urlencoded if necessary.
  * @return string
  */
-function wp_customize_url( $stylesheet = null ) {
-	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
-	return esc_url( $url );
+function wp_customize_url($stylesheet = null) {
+	$url = admin_url('customize.php');
+	if ($stylesheet)
+		$url .= '?theme='.urlencode($stylesheet);
+	return esc_url($url);
 }
 
 /**
@@ -3006,9 +3006,9 @@ 
  * @since 4.7.0 Support for IE8 and below is explicitly removed via conditional comments.
  */
 function wp_customize_support_script() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	?>
 	<!--[if lte IE 8]>
@@ -3021,7 +3021,7 @@ 
 			(function() {
 				var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
 
-		<?php	if ( $cross_domain ) : ?>
+		<?php	if ($cross_domain) : ?>
 				request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
 		<?php	else : ?>
 				request = true;
@@ -3048,5 +3048,5 @@ 
 function is_customize_preview() {
 	global $wp_customize;
 
-	return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+	return ($wp_customize instanceof WP_Customize_Manager) && $wp_customize->is_preview();
 }

Braces +292 added lines, -207 removed lines

@@ -41,41 +41,46 @@ 
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
+							$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			}
 			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
-		return array();
+	if ( empty( $theme_directories ) ) {
+			return array();
+	}
 
 	if ( is_multisite() && null !== $args['allowed'] ) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
-		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ( 'network' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
+		} elseif ( 'site' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
+		} elseif ( $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		} else {
+					$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		}
 	}
 
 	$themes = array();
 	static $_themes = array();
 
 	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
-		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) ) {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+		} else {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		}
 	}
 
 	if ( null !== $args['errors'] ) {
 		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+			if ( $wp_theme->errors() != $args['errors'] ) {
+							unset( $themes[ $theme ] );
+			}
 		}
 	}
 
@@ -97,15 +102,17 @@ 
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
-		$stylesheet = get_stylesheet();
+	if ( empty( $stylesheet ) ) {
+			$stylesheet = get_stylesheet();
+	}
 
 	if ( empty( $theme_root ) ) {
 		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( false === $theme_root ) {
+					$theme_root = WP_CONTENT_DIR . '/themes';
+		} elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	}
 
 	return new WP_Theme( $stylesheet, $theme_root );
@@ -118,12 +125,14 @@ 
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
 function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
+	if ( $clear_update_cache ) {
+			delete_site_transient( 'update_themes' );
+	}
 	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
-		$theme->cache_delete();
-}
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme ) {
+			$theme->cache_delete();
+	}
+	}
 
 /**
  * Whether a child theme is in use.
@@ -258,12 +267,13 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
-	else
-		$stylesheet_uri = '';
+	if ( file_exists("$dir/$locale.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
+	} elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
+	} else {
+			$stylesheet_uri = '';
+	}
 	/**
 	 * Filters the localized stylesheet URI.
 	 *
@@ -353,8 +363,9 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_roots = get_site_transient( 'theme_roots' );
 	if ( false === $theme_roots ) {
@@ -413,11 +424,13 @@ 
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
-		return false;
+	if ( empty( $wp_theme_directories ) ) {
+			return false;
+	}
 
-	if ( ! $force && isset( $found_themes ) )
-		return $found_themes;
+	if ( ! $force && isset( $found_themes ) ) {
+			return $found_themes;
+	}
 
 	$found_themes = array();
 
@@ -428,10 +441,11 @@ 
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
-		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+					$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+		} else {
+					$relative_theme_roots[ $theme_root ] = $theme_root;
+		}
 	}
 
 	/**
@@ -447,8 +461,9 @@ 
 		if ( is_array( $cached_roots ) ) {
 			foreach ( $cached_roots as $theme_dir => $theme_root ) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
-					continue;
+				if ( ! isset( $relative_theme_roots[ $theme_root ] ) ) {
+									continue;
+				}
 				$found_themes[ $theme_dir ] = array(
 					'theme_file' => $theme_dir . '/style.css',
 					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
@@ -456,8 +471,10 @@ 
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
-			$cache_expiration = 1800; // half hour
+		if ( ! is_int( $cache_expiration ) ) {
+					$cache_expiration = 1800;
+		}
+		// half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
@@ -472,8 +489,9 @@ 
 			continue;
 		}
 		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
-				continue;
+			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+							continue;
+			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
@@ -491,10 +509,12 @@ 
 					continue;
 				}
 				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
-						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
-						continue;
+					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+											continue;
+					}
+					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) ) {
+											continue;
+					}
 					$found_themes[ $dir . '/' . $sub_dir ] = array(
 						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
 						'theme_root' => $theme_root,
@@ -503,11 +523,12 @@ 
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
+				if ( ! $found_theme ) {
+									$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
+				}
 			}
 		}
 	}
@@ -521,8 +542,9 @@ 
 		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ( $theme_roots != get_site_transient( 'theme_roots' ) ) {
+			set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	}
 
 	return $found_themes;
 }
@@ -545,8 +567,9 @@ 
 	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	} else {
 		$theme_root = WP_CONTENT_DIR . '/themes';
 	}
@@ -579,20 +602,22 @@ 
 function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ( $stylesheet_or_template && ! $theme_root ) {
+			$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	}
 
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
-			else
-				$theme_root_uri = $theme_root;
+			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+							$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
+							$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
+							$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			} else {
+							$theme_root_uri = $theme_root;
+			}
 		} else {
 			$theme_root_uri = content_url( $theme_root );
 		}
@@ -627,23 +652,26 @@ 
 function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
 	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
-			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
-			$theme_root = get_option('template_root');
+		if ( get_option('stylesheet') == $stylesheet_or_template ) {
+					$theme_root = get_option('stylesheet_root');
+		} elseif ( get_option('template') == $stylesheet_or_template ) {
+					$theme_root = get_option('template_root');
+		}
 	}
 
 	if ( empty($theme_root) ) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
-			$theme_root = $theme_roots[$stylesheet_or_template];
+		if ( !empty($theme_roots[$stylesheet_or_template]) ) {
+					$theme_root = $theme_roots[$stylesheet_or_template];
+		}
 	}
 
 	return $theme_root;
@@ -656,8 +684,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
-		return;
+	if ( empty($stylesheet) ) {
+			return;
+	}
 	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
 }
 
@@ -777,8 +806,9 @@ 
 	 *
 	 * @param bool $validate Whether to validate the current theme. Default true.
 	 */
-	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
-		return true;
+	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) {
+			return true;
+	}
 
 	if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
 		// Invalid.
@@ -827,8 +857,9 @@ 
 	$mods = get_option( "theme_mods_$theme_slug" );
 	if ( false === $mods ) {
 		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
-			$theme_name = wp_get_theme()->get('Name');
+		if ( false === $theme_name ) {
+					$theme_name = wp_get_theme()->get('Name');
+		}
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
 		if ( is_admin() && false !== $mods ) {
 			update_option( "theme_mods_$theme_slug", $mods );
@@ -871,8 +902,9 @@ 
 		return apply_filters( "theme_mod_{$name}", $mods[$name] );
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if ( is_string( $default ) ) {
+			$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	}
 
 	/** This filter is documented in wp-includes/theme.php */
 	return apply_filters( "theme_mod_{$name}", $default );
@@ -921,8 +953,9 @@ 
 function remove_theme_mod( $name ) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
-		return;
+	if ( ! isset( $mods[ $name ] ) ) {
+			return;
+	}
 
 	unset( $mods[ $name ] );
 
@@ -944,8 +977,9 @@ 
 
 	// Old style.
 	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
-		$theme_name = wp_get_theme()->get('Name');
+	if ( false === $theme_name ) {
+			$theme_name = wp_get_theme()->get('Name');
+	}
 	delete_option( 'mods_' . $theme_name );
 }
 
@@ -977,8 +1011,9 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
-		return false;
+	if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
+			return false;
+	}
 
 	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
 	return 'blank' !== $text_color;
@@ -1007,11 +1042,13 @@ 
 function get_header_image() {
 	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
-	if ( 'remove-header' == $url )
-		return false;
+	if ( 'remove-header' == $url ) {
+			return false;
+	}
 
-	if ( is_random_header_image() )
-		$url = get_random_header_image();
+	if ( is_random_header_image() ) {
+			$url = get_random_header_image();
+	}
 
 	return esc_url_raw( set_url_scheme( $url ) );
 }
@@ -1114,19 +1151,21 @@ 
 		$header_image_mod = get_theme_mod( 'header_image', '' );
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
-			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
+		if ( 'random-uploaded-image' == $header_image_mod ) {
+					$headers = get_uploaded_header_images();
+		} elseif ( ! empty( $_wp_default_headers ) ) {
 			if ( 'random-default-image' == $header_image_mod ) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
-					$headers = $_wp_default_headers;
+				if ( current_theme_supports( 'custom-header', 'random-default' ) ) {
+									$headers = $_wp_default_headers;
+				}
 			}
 		}
 
-		if ( empty( $headers ) )
-			return new stdClass;
+		if ( empty( $headers ) ) {
+					return new stdClass;
+		}
 
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
 
@@ -1145,8 +1184,9 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
-		return '';
+	if ( empty( $random_image->url ) ) {
+			return '';
+	}
 	return $random_image->url;
 }
 
@@ -1166,13 +1206,15 @@ 
 	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
 	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
-			return true;
+		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) ) {
+					return true;
+		}
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
-			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
-			return true;
+		if ( "random-$type-image" == $header_image_mod ) {
+					return true;
+		} elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() ) {
+					return true;
+		}
 	}
 
 	return false;
@@ -1203,8 +1245,9 @@ 
 	// @todo caching
 	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
 
-	if ( empty( $headers ) )
-		return array();
+	if ( empty( $headers ) ) {
+			return array();
+	}
 
 	foreach ( (array) $headers as $header ) {
 		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
@@ -1217,10 +1260,12 @@ 
 		$header_images[$header_index]['thumbnail_url'] = $url;
 		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
 
-		if ( isset( $header_data['width'] ) )
-			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
-			$header_images[$header_index]['height'] = $header_data['height'];
+		if ( isset( $header_data['width'] ) ) {
+					$header_images[$header_index]['width'] = $header_data['width'];
+		}
+		if ( isset( $header_data['height'] ) ) {
+					$header_images[$header_index]['height'] = $header_data['height'];
+		}
 	}
 
 	return $header_images;
@@ -1831,8 +1876,9 @@ 
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
 	add_theme_support( 'editor-style' );
 
-	if ( ! is_admin() )
-		return;
+	if ( ! is_admin() ) {
+			return;
+	}
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
@@ -1855,11 +1901,13 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
-		return false;
+	if ( ! current_theme_supports( 'editor-style' ) ) {
+			return false;
+	}
 	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
-		$GLOBALS['editor_styles'] = array();
+	if ( is_admin() ) {
+			$GLOBALS['editor_styles'] = array();
+	}
 	return true;
 }
 
@@ -2214,10 +2262,11 @@ 
 function add_theme_support( $feature ) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
-		$args = true;
-	else
-		$args = array_slice( func_get_args(), 1 );
+	if ( func_num_args() == 1 ) {
+			$args = true;
+	} else {
+			$args = array_slice( func_get_args(), 1 );
+	}
 
 	switch ( $feature ) {
 		case 'post-thumbnails':
@@ -2256,8 +2305,9 @@ 
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if ( isset( $_wp_theme_features['html5'] ) ) {
+							$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			}
 			break;
 
 		case 'custom-logo':
@@ -2284,8 +2334,9 @@ 
 			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image' => '',
@@ -2309,13 +2360,15 @@ 
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-header'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			}
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -2323,48 +2376,57 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backward compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
-				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			if ( defined( 'NO_HEADER_TEXT' ) ) {
+							$args[0]['header-text'] = ! NO_HEADER_TEXT;
+			} elseif ( isset( $args[0]['header-text'] ) ) {
+							define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			}
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
-				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			if ( defined( 'HEADER_IMAGE_WIDTH' ) ) {
+							$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
+			} elseif ( isset( $args[0]['width'] ) ) {
+							define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
-				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			if ( defined( 'HEADER_IMAGE_HEIGHT' ) ) {
+							$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
+			} elseif ( isset( $args[0]['height'] ) ) {
+							define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			}
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
-				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			if ( defined( 'HEADER_TEXTCOLOR' ) ) {
+							$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
+			} elseif ( isset( $args[0]['default-text-color'] ) ) {
+							define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE' ) )
-				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'HEADER_IMAGE' ) ) {
+							$args[0]['default-image'] = HEADER_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) ) {
+							define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			}
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
-				$args[0]['random-default'] = false;
+			if ( $jit && ! empty( $args[0]['default-image'] ) ) {
+							$args[0]['random-default'] = false;
+			}
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
 			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
-					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
-					$args[0]['flex-height'] = true;
+				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
+									$args[0]['flex-width'] = true;
+				}
+				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) ) {
+									$args[0]['flex-height'] = true;
+				}
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image'          => '',
@@ -2384,21 +2446,25 @@ 
 			unset( $args[0]['__jit'] );
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-background'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			}
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
-				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			if ( defined( 'BACKGROUND_COLOR' ) ) {
+							$args[0]['default-color'] = BACKGROUND_COLOR;
+			} elseif ( isset( $args[0]['default-color'] ) || $jit ) {
+							define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			}
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
-				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'BACKGROUND_IMAGE' ) ) {
+							$args[0]['default-image'] = BACKGROUND_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) || $jit ) {
+							define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			}
 
 			break;
 
@@ -2434,8 +2500,9 @@ 
 		add_theme_support( 'custom-header', array( '__jit' => true ) );
 
 		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		if ( $args[0]['wp-head-callback'] ) {
+					add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		}
 
 		if ( is_admin() ) {
 			require_once( ABSPATH . 'wp-admin/custom-header.php' );
@@ -2493,19 +2560,22 @@ 
  */
 function get_theme_support( $feature ) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if ( func_num_args() <= 1 ) {
+			return $_wp_theme_features[ $feature ];
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	switch ( $feature ) {
 		case 'custom-logo' :
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) {
+							return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			}
 			return false;
 
 		default :
@@ -2526,8 +2596,9 @@ 
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
-		return false;
+	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
+			return false;
+	}
 
 	return _remove_theme_support( $feature );
 }
@@ -2549,19 +2620,22 @@ 
 
 	switch ( $feature ) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
-				return false;
+			if ( ! isset( $_wp_theme_features['custom-header'] ) ) {
+							return false;
+			}
 			add_theme_support( 'custom-header', array( 'uploads' => false ) );
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
 	switch ( $feature ) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-header' );
 			if ( isset( $support[0]['wp-head-callback'] ) ) {
 				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
@@ -2573,8 +2647,9 @@ 
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-background' );
 			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
 			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
@@ -2599,15 +2674,18 @@ 
 function current_theme_supports( $feature ) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ( 'custom-header-uploads' == $feature ) {
+			return current_theme_supports( 'custom-header', 'uploads' );
+	}
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
-		return false;
+	if ( !isset( $_wp_theme_features[$feature] ) ) {
+			return false;
+	}
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
-		return true;
+	if ( func_num_args() <= 1 ) {
+			return true;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 
@@ -2616,8 +2694,10 @@ 
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if ( true === $_wp_theme_features[$feature] ) {
+				// Registered for all types
 				return true;
+			}
 			$content_type = $args[0];
 			return in_array( $content_type, $_wp_theme_features[$feature][0] );
 
@@ -2967,8 +3047,9 @@ 
 
 	$wp_scripts = wp_scripts();
 	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'customize-loader', 'data', $script );
 }
@@ -2984,8 +3065,9 @@ 
  */
 function wp_customize_url( $stylesheet = null ) {
 	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
+	if ( $stylesheet ) {
+			$url .= '?theme=' . urlencode( $stylesheet );
+	}
 	return esc_url( $url );
 }
 
@@ -3023,9 +3105,12 @@ 
 
 		<?php	if ( $cross_domain ) : ?>
 				request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
-		<?php	else : ?>
+		<?php	else {
+	: ?>
 				request = true;
-		<?php	endif; ?>
+		<?php	endif;
+}
+?>
 
 				b[c] = b[c].replace( rcs, ' ' );
 				// The customizer requires postMessage and CORS (if the site is cross domain)

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

Braces +72 added lines, -50 removed lines

@@ -106,31 +106,36 @@ 
 
 		self::$this_quicktags = (bool) $set['quicktags'];
 
-		if ( self::$this_tinymce )
-			self::$has_tinymce = true;
+		if ( self::$this_tinymce ) {
+					self::$has_tinymce = true;
+		}
 
-		if ( self::$this_quicktags )
-			self::$has_quicktags = true;
+		if ( self::$this_quicktags ) {
+					self::$has_quicktags = true;
+		}
 
 		if ( $set['dfw'] ) {
 			self::$old_dfw_compat = true;
 		}
 
-		if ( empty( $set['editor_height'] ) )
-			return $set;
+		if ( empty( $set['editor_height'] ) ) {
+					return $set;
+		}
 
 		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
 			// A cookie (set when a user resizes the editor) overrides the height.
 			$cookie = (int) get_user_setting( 'ed_size' );
 
-			if ( $cookie )
-				$set['editor_height'] = $cookie;
+			if ( $cookie ) {
+							$set['editor_height'] = $cookie;
+			}
 		}
 
-		if ( $set['editor_height'] < 50 )
-			$set['editor_height'] = 50;
-		elseif ( $set['editor_height'] > 5000 )
-			$set['editor_height'] = 5000;
+		if ( $set['editor_height'] < 50 ) {
+					$set['editor_height'] = 50;
+		} elseif ( $set['editor_height'] > 5000 ) {
+					$set['editor_height'] = 5000;
+		}
 
 		return $set;
 	}
@@ -208,8 +213,9 @@ 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
 
-				if ( ! function_exists( 'media_buttons' ) )
-					include( ABSPATH . 'wp-admin/includes/media.php' );
+				if ( ! function_exists( 'media_buttons' ) ) {
+									include( ABSPATH . 'wp-admin/includes/media.php' );
+				}
 
 				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
 
@@ -322,11 +328,13 @@ 
 				'buttons' => ''
 			);
 
-			if ( is_array($set['quicktags']) )
-				$qtInit = array_merge($qtInit, $set['quicktags']);
+			if ( is_array($set['quicktags']) ) {
+							$qtInit = array_merge($qtInit, $set['quicktags']);
+			}
 
-			if ( empty($qtInit['buttons']) )
-				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			if ( empty($qtInit['buttons']) ) {
+							$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			}
 
 			if ( $set['_content_editor_dfw'] ) {
 				$qtInit['buttons'] .= ',dfw';
@@ -481,14 +489,17 @@ 
 								$path = str_replace( content_url(), '', $plugurl );
 								$path = WP_CONTENT_DIR . $path . '/langs/';
 
-								if ( function_exists('realpath') )
-									$path = trailingslashit( realpath($path) );
+								if ( function_exists('realpath') ) {
+																	$path = trailingslashit( realpath($path) );
+								}
 
-								if ( @is_file( $path . $mce_locale . '.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								if ( @is_file( $path . $mce_locale . '.js' ) ) {
+																	$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								}
 
-								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								if ( @is_file( $path . $mce_locale . '_dlg.js' ) ) {
+																	$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								}
 
 								if ( 'en' != $mce_locale && empty( $strings ) ) {
 									if ( @is_file( $path . 'en.js' ) ) {
@@ -502,8 +513,9 @@ 
 									}
 								}
 
-								if ( ! empty( $strings ) )
-									$ext_plugins .= "\n" . $strings . "\n";
+								if ( ! empty( $strings ) ) {
+																	$ext_plugins .= "\n" . $strings . "\n";
+								}
 							}
 
 							$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
@@ -584,8 +596,9 @@ 
 				 */
 				$mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
 
-				if ( ! empty($mce_css) )
-					self::$first_init['content_css'] = $mce_css;
+				if ( ! empty($mce_css) ) {
+									self::$first_init['content_css'] = $mce_css;
+				}
 			}
 
 			if ( $set['teeny'] ) {
@@ -666,10 +679,11 @@ 
 				$body_class .= ' post-type-' . sanitize_html_class( $post->post_type ) . ' post-status-' . sanitize_html_class( $post->post_status );
 				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 					$post_format = get_post_format( $post );
-					if ( $post_format && ! is_wp_error( $post_format ) )
-						$body_class .= ' post-format-' . sanitize_html_class( $post_format );
-					else
-						$body_class .= ' post-format-standard';
+					if ( $post_format && ! is_wp_error( $post_format ) ) {
+											$body_class .= ' post-format-' . sanitize_html_class( $post_format );
+					} else {
+											$body_class .= ' post-format-standard';
+					}
 				}
 			}
 
@@ -697,8 +711,9 @@ 
 			// Merge with the first part of the init array
 			$mceInit = array_merge( self::$first_init, $mceInit );
 
-			if ( is_array( $set['tinymce'] ) )
-				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			if ( is_array( $set['tinymce'] ) ) {
+							$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			}
 
 			/*
 			 * For people who really REALLY know what they're doing with TinyMCE
@@ -770,8 +785,9 @@ 
 	 * @static
 	 */
 	public static function enqueue_scripts() {
-		if ( self::$has_tinymce )
-			wp_enqueue_script('editor');
+		if ( self::$has_tinymce ) {
+					wp_enqueue_script('editor');
+		}
 
 		if ( self::$has_quicktags ) {
 			wp_enqueue_script( 'quicktags' );
@@ -1147,8 +1163,9 @@ 
 		$version = 'ver=' . $tinymce_version;
 		$tmce_on = !empty(self::$mce_settings);
 
-		if ( ! isset($concatenate_scripts) )
-			script_concat_settings();
+		if ( ! isset($concatenate_scripts) ) {
+					script_concat_settings();
+		}
 
 		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
 			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -1245,11 +1262,13 @@ 
 		<script type="text/javascript">
 		<?php
 
-		if ( self::$ext_plugins )
-			echo self::$ext_plugins . "\n";
+		if ( self::$ext_plugins ) {
+					echo self::$ext_plugins . "\n";
+		}
 
-		if ( ! is_admin() )
-			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		if ( ! is_admin() ) {
+					echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		}
 
 		?>
 
@@ -1337,8 +1356,9 @@ 
 
 		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
 
-		if ( isset( $args['s'] ) )
-			$query['s'] = $args['s'];
+		if ( isset( $args['s'] ) ) {
+					$query['s'] = $args['s'];
+		}
 
 		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
 
@@ -1359,16 +1379,18 @@ 
 		$get_posts = new WP_Query;
 		$posts = $get_posts->query( $query );
 		// Check if any posts were found.
-		if ( ! $get_posts->post_count )
-			return false;
+		if ( ! $get_posts->post_count ) {
+					return false;
+		}
 
 		// Build results.
 		$results = array();
 		foreach ( $posts as $post ) {
-			if ( 'post' == $post->post_type )
-				$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
-			else
-				$info = $pts[ $post->post_type ]->labels->singular_name;
+			if ( 'post' == $post->post_type ) {
+							$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+			} else {
+							$info = $pts[ $post->post_type ]->labels->singular_name;
+			}
 
 			$results[] = array(
 				'ID' => $post->ID,

Spacing +509 added lines, -509 removed lines

@@ -64,7 +64,7 @@ 
 	 * }
 	 * @return array Parsed arguments array.
 	 */
-	public static function parse_settings( $editor_id, $settings ) {
+	public static function parse_settings($editor_id, $settings) {
 
 		/**
 		 * Filters the wp_editor() settings.
@@ -76,9 +76,9 @@ 
 		 * @param array  $settings  Array of editor arguments.
 		 * @param string $editor_id ID for the current editor instance.
 		 */
-		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
+		$settings = apply_filters('wp_editor_settings', $settings, $editor_id);
 
-		$set = wp_parse_args( $settings, array(
+		$set = wp_parse_args($settings, array(
 			'wpautop'             => true,
 			'media_buttons'       => true,
 			'default_editor'      => '',
@@ -94,43 +94,43 @@ 
 			'_content_editor_dfw' => false,
 			'tinymce'             => true,
 			'quicktags'           => true
-		) );
+		));
 
-		self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
+		self::$this_tinymce = ($set['tinymce'] && user_can_richedit());
 
-		if ( self::$this_tinymce ) {
-			if ( false !== strpos( $editor_id, '[' ) ) {
+		if (self::$this_tinymce) {
+			if (false !== strpos($editor_id, '[')) {
 				self::$this_tinymce = false;
-				_deprecated_argument( 'wp_editor()', '3.9.0', 'TinyMCE editor IDs cannot have brackets.' );
+				_deprecated_argument('wp_editor()', '3.9.0', 'TinyMCE editor IDs cannot have brackets.');
 			}
 		}
 
 		self::$this_quicktags = (bool) $set['quicktags'];
 
-		if ( self::$this_tinymce )
+		if (self::$this_tinymce)
 			self::$has_tinymce = true;
 
-		if ( self::$this_quicktags )
+		if (self::$this_quicktags)
 			self::$has_quicktags = true;
 
-		if ( $set['dfw'] ) {
+		if ($set['dfw']) {
 			self::$old_dfw_compat = true;
 		}
 
-		if ( empty( $set['editor_height'] ) )
+		if (empty($set['editor_height']))
 			return $set;
 
-		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
+		if ('content' === $editor_id && empty($set['tinymce']['wp_autoresize_on'])) {
 			// A cookie (set when a user resizes the editor) overrides the height.
-			$cookie = (int) get_user_setting( 'ed_size' );
+			$cookie = (int) get_user_setting('ed_size');
 
-			if ( $cookie )
+			if ($cookie)
 				$set['editor_height'] = $cookie;
 		}
 
-		if ( $set['editor_height'] < 50 )
+		if ($set['editor_height'] < 50)
 			$set['editor_height'] = 50;
-		elseif ( $set['editor_height'] > 5000 )
+		elseif ($set['editor_height'] > 5000)
 			$set['editor_height'] = 5000;
 
 		return $set;
@@ -144,75 +144,75 @@ 
 	 * @param string $editor_id ID for the textarea and TinyMCE and Quicktags instances (can contain only ASCII letters and numbers).
 	 * @param array $settings See the _parse_settings() method for description.
 	 */
-	public static function editor( $content, $editor_id, $settings = array() ) {
-		$set = self::parse_settings( $editor_id, $settings );
-		$editor_class = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
-		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
+	public static function editor($content, $editor_id, $settings = array()) {
+		$set = self::parse_settings($editor_id, $settings);
+		$editor_class = ' class="'.trim(esc_attr($set['editor_class']).' wp-editor-area').'"';
+		$tabindex = $set['tabindex'] ? ' tabindex="'.(int) $set['tabindex'].'"' : '';
 		$default_editor = 'html';
 		$buttons = $autocomplete = '';
-		$editor_id_attr = esc_attr( $editor_id );
+		$editor_id_attr = esc_attr($editor_id);
 
-		if ( $set['drag_drop_upload'] ) {
+		if ($set['drag_drop_upload']) {
 			self::$drag_drop_upload = true;
 		}
 
-		if ( ! empty( $set['editor_height'] ) ) {
-			$height = ' style="height: ' . (int) $set['editor_height'] . 'px"';
+		if ( ! empty($set['editor_height'])) {
+			$height = ' style="height: '.(int) $set['editor_height'].'px"';
 		} else {
-			$height = ' rows="' . (int) $set['textarea_rows'] . '"';
+			$height = ' rows="'.(int) $set['textarea_rows'].'"';
 		}
 
-		if ( ! current_user_can( 'upload_files' ) ) {
+		if ( ! current_user_can('upload_files')) {
 			$set['media_buttons'] = false;
 		}
 
-		if ( self::$this_tinymce ) {
+		if (self::$this_tinymce) {
 			$autocomplete = ' autocomplete="off"';
 
-			if ( self::$this_quicktags ) {
+			if (self::$this_quicktags) {
 				$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
 				// 'html' is used for the "Text" editor tab.
-				if ( 'html' !== $default_editor ) {
+				if ('html' !== $default_editor) {
 					$default_editor = 'tinymce';
 				}
 
-				$buttons .= '<button type="button" id="' . $editor_id_attr . '-tmce" class="wp-switch-editor switch-tmce"' .
-					' data-wp-editor-id="' . $editor_id_attr . '">' . __('Visual') . "</button>\n";
-				$buttons .= '<button type="button" id="' . $editor_id_attr . '-html" class="wp-switch-editor switch-html"' .
-					' data-wp-editor-id="' . $editor_id_attr . '">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
+				$buttons .= '<button type="button" id="'.$editor_id_attr.'-tmce" class="wp-switch-editor switch-tmce"'.
+					' data-wp-editor-id="'.$editor_id_attr.'">'.__('Visual')."</button>\n";
+				$buttons .= '<button type="button" id="'.$editor_id_attr.'-html" class="wp-switch-editor switch-html"'.
+					' data-wp-editor-id="'.$editor_id_attr.'">'._x('Text', 'Name for the Text editor tab (formerly HTML)')."</button>\n";
 			} else {
 				$default_editor = 'tinymce';
 			}
 		}
 
 		$switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active';
-		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
+		$wrap_class = 'wp-core-ui wp-editor-wrap '.$switch_class;
 
-		if ( $set['_content_editor_dfw'] ) {
+		if ($set['_content_editor_dfw']) {
 			$wrap_class .= ' has-dfw';
 		}
 
-		echo '<div id="wp-' . $editor_id_attr . '-wrap" class="' . $wrap_class . '">';
+		echo '<div id="wp-'.$editor_id_attr.'-wrap" class="'.$wrap_class.'">';
 
-		if ( self::$editor_buttons_css ) {
-			wp_print_styles( 'editor-buttons' );
+		if (self::$editor_buttons_css) {
+			wp_print_styles('editor-buttons');
 			self::$editor_buttons_css = false;
 		}
 
-		if ( ! empty( $set['editor_css'] ) ) {
-			echo $set['editor_css'] . "\n";
+		if ( ! empty($set['editor_css'])) {
+			echo $set['editor_css']."\n";
 		}
 
-		if ( ! empty( $buttons ) || $set['media_buttons'] ) {
-			echo '<div id="wp-' . $editor_id_attr . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
+		if ( ! empty($buttons) || $set['media_buttons']) {
+			echo '<div id="wp-'.$editor_id_attr.'-editor-tools" class="wp-editor-tools hide-if-no-js">';
 
-			if ( $set['media_buttons'] ) {
+			if ($set['media_buttons']) {
 				self::$has_medialib = true;
 
-				if ( ! function_exists( 'media_buttons' ) )
-					include( ABSPATH . 'wp-admin/includes/media.php' );
+				if ( ! function_exists('media_buttons'))
+					include(ABSPATH.'wp-admin/includes/media.php');
 
-				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
+				echo '<div id="wp-'.$editor_id_attr.'-media-buttons" class="wp-media-buttons">';
 
 				/**
 				 * Fires after the default media button(s) are displayed.
@@ -221,24 +221,24 @@ 
 				 *
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				do_action( 'media_buttons', $editor_id );
+				do_action('media_buttons', $editor_id);
 				echo "</div>\n";
 			}
 
-			echo '<div class="wp-editor-tabs">' . $buttons . "</div>\n";
+			echo '<div class="wp-editor-tabs">'.$buttons."</div>\n";
 			echo "</div>\n";
 		}
 
 		$quicktags_toolbar = '';
 
-		if ( self::$this_quicktags ) {
-			if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
+		if (self::$this_quicktags) {
+			if ('content' === $editor_id && ! empty($GLOBALS['current_screen']) && $GLOBALS['current_screen']->base === 'post') {
 				$toolbar_id = 'ed_toolbar';
 			} else {
-				$toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
+				$toolbar_id = 'qt_'.$editor_id_attr.'_toolbar';
 			}
 
-			$quicktags_toolbar = '<div id="' . $toolbar_id . '" class="quicktags-toolbar"></div>';
+			$quicktags_toolbar = '<div id="'.$toolbar_id.'" class="quicktags-toolbar"></div>';
 		}
 
 		/**
@@ -248,14 +248,14 @@ 
 		 *
 		 * @param string $output Editor's HTML markup.
 		 */
-		$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
-			$quicktags_toolbar .
-			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
-			'id="' . $editor_id_attr . '">%s</textarea></div>' );
+		$the_editor = apply_filters('the_editor', '<div id="wp-'.$editor_id_attr.'-editor-container" class="wp-editor-container">'.
+			$quicktags_toolbar.
+			'<textarea'.$editor_class.$height.$tabindex.$autocomplete.' cols="40" name="'.esc_attr($set['textarea_name']).'" '.
+			'id="'.$editor_id_attr.'">%s</textarea></div>');
 
 		// Prepare the content for the Visual or Text editor, only when TinyMCE is used (back-compat).
-		if ( self::$this_tinymce ) {
-			add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+		if (self::$this_tinymce) {
+			add_filter('the_editor_content', 'format_for_editor', 10, 2);
 		}
 
 		/**
@@ -267,31 +267,31 @@ 
 		 * @param string $default_editor The default editor for the current user.
 		 *                               Either 'html' or 'tinymce'.
 		 */
-		$content = apply_filters( 'the_editor_content', $content, $default_editor );
+		$content = apply_filters('the_editor_content', $content, $default_editor);
 
 		// Remove the filter as the next editor on the same page may not need it.
-		if ( self::$this_tinymce ) {
-			remove_filter( 'the_editor_content', 'format_for_editor' );
+		if (self::$this_tinymce) {
+			remove_filter('the_editor_content', 'format_for_editor');
 		}
 
 		// Back-compat for the `htmledit_pre` and `richedit_pre` filters
-		if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
+		if ('html' === $default_editor && has_filter('htmledit_pre')) {
 			// TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
-			_deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-			$content = apply_filters( 'htmledit_pre', $content );
-		} elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
-			_deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-			$content = apply_filters( 'richedit_pre', $content );
+			_deprecated_function('add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )');
+			$content = apply_filters('htmledit_pre', $content);
+		} elseif ('tinymce' === $default_editor && has_filter('richedit_pre')) {
+			_deprecated_function('add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )');
+			$content = apply_filters('richedit_pre', $content);
 		}
 
-		if ( false !== stripos( $content, 'textarea' ) ) {
-			$content = preg_replace( '%</textarea%i', '&lt;/textarea', $content );
+		if (false !== stripos($content, 'textarea')) {
+			$content = preg_replace('%</textarea%i', '&lt;/textarea', $content);
 		}
 
-		printf( $the_editor, $content );
+		printf($the_editor, $content);
 		echo "\n</div>\n\n";
 
-		self::editor_settings( $editor_id, $set );
+		self::editor_settings($editor_id, $set);
 	}
 
 	/**
@@ -305,30 +305,30 @@ 
 	public static function editor_settings($editor_id, $set) {
 		global $tinymce_version;
 
-		if ( empty(self::$first_init) ) {
-			if ( is_admin() ) {
-				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
-				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
+		if (empty(self::$first_init)) {
+			if (is_admin()) {
+				add_action('admin_print_footer_scripts', array(__CLASS__, 'editor_js'), 50);
+				add_action('admin_print_footer_scripts', array(__CLASS__, 'enqueue_scripts'), 1);
 			} else {
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'editor_js'), 50);
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'enqueue_scripts'), 1);
 			}
 		}
 
-		if ( self::$this_quicktags ) {
+		if (self::$this_quicktags) {
 
 			$qtInit = array(
 				'id' => $editor_id,
 				'buttons' => ''
 			);
 
-			if ( is_array($set['quicktags']) )
+			if (is_array($set['quicktags']))
 				$qtInit = array_merge($qtInit, $set['quicktags']);
 
-			if ( empty($qtInit['buttons']) )
+			if (empty($qtInit['buttons']))
 				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
-			if ( $set['_content_editor_dfw'] ) {
+			if ($set['_content_editor_dfw']) {
 				$qtInit['buttons'] .= ',dfw';
 			}
 
@@ -340,33 +340,33 @@ 
 			 * @param array  $qtInit    Quicktags settings.
 			 * @param string $editor_id The unique editor ID, e.g. 'content'.
 			 */
-			$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
+			$qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
 
 			self::$qt_settings[$editor_id] = $qtInit;
 
-			self::$qt_buttons = array_merge( self::$qt_buttons, explode(',', $qtInit['buttons']) );
+			self::$qt_buttons = array_merge(self::$qt_buttons, explode(',', $qtInit['buttons']));
 		}
 
-		if ( self::$this_tinymce ) {
+		if (self::$this_tinymce) {
 
-			if ( empty( self::$first_init ) ) {
-				self::$baseurl = includes_url( 'js/tinymce' );
+			if (empty(self::$first_init)) {
+				self::$baseurl = includes_url('js/tinymce');
 
 				$mce_locale = get_user_locale();
-				self::$mce_locale = $mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
+				self::$mce_locale = $mce_locale = empty($mce_locale) ? 'en' : strtolower(substr($mce_locale, 0, 2)); // ISO 639-1
 
 				/** This filter is documented in wp-admin/includes/media.php */
-				$no_captions = (bool) apply_filters( 'disable_captions', '' );
+				$no_captions = (bool) apply_filters('disable_captions', '');
 				$ext_plugins = '';
 				$shortcut_labels = array();
 
-				foreach ( self::get_translation() as $name => $value ) {
-					if ( is_array( $value ) ) {
+				foreach (self::get_translation() as $name => $value) {
+					if (is_array($value)) {
 						$shortcut_labels[$name] = $value[1];
 					}
 				}
 
-				if ( $set['teeny'] ) {
+				if ($set['teeny']) {
 
 					/**
 					 * Filters the list of teenyMCE plugins.
@@ -376,7 +376,7 @@ 
 					 * @param array  $plugins   An array of teenyMCE plugins.
 					 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 					 */
-					self::$plugins = $plugins = apply_filters( 'teeny_mce_plugins', array( 'colorpicker', 'lists', 'fullscreen', 'image', 'wordpress', 'wpeditimage', 'wplink' ), $editor_id );
+					self::$plugins = $plugins = apply_filters('teeny_mce_plugins', array('colorpicker', 'lists', 'fullscreen', 'image', 'wordpress', 'wpeditimage', 'wplink'), $editor_id);
 				} else {
 
 					/**
@@ -396,7 +396,7 @@ 
 					 *
 					 * @param array $external_plugins An array of external TinyMCE plugins.
 					 */
-					$mce_external_plugins = apply_filters( 'mce_external_plugins', array() );
+					$mce_external_plugins = apply_filters('mce_external_plugins', array());
 
 					$plugins = array(
 						'charmap',
@@ -420,7 +420,7 @@ 
 						'wpembed',
 					);
 
-					if ( ! self::$has_medialib ) {
+					if ( ! self::$has_medialib) {
 						$plugins[] = 'image';
 					}
 
@@ -434,15 +434,15 @@ 
 					 *
 					 * @param array $plugins An array of default TinyMCE plugins.
 					 */
-					$plugins = array_unique( apply_filters( 'tiny_mce_plugins', $plugins ) );
+					$plugins = array_unique(apply_filters('tiny_mce_plugins', $plugins));
 
-					if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
+					if (($key = array_search('spellchecker', $plugins)) !== false) {
 						// Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
 						// It can be added with 'mce_external_plugins'.
-						unset( $plugins[$key] );
+						unset($plugins[$key]);
 					}
 
-					if ( ! empty( $mce_external_plugins ) ) {
+					if ( ! empty($mce_external_plugins)) {
 
 						/**
 						 * Filters the translations loaded for external TinyMCE 3.x plugins.
@@ -457,64 +457,64 @@ 
 						 *
 						 * @param array $translations Translations for external TinyMCE plugins.
 						 */
-						$mce_external_languages = apply_filters( 'mce_external_languages', array() );
+						$mce_external_languages = apply_filters('mce_external_languages', array());
 
 						$loaded_langs = array();
 						$strings = '';
 
-						if ( ! empty( $mce_external_languages ) ) {
-							foreach ( $mce_external_languages as $name => $path ) {
-								if ( @is_file( $path ) && @is_readable( $path ) ) {
-									include_once( $path );
-									$ext_plugins .= $strings . "\n";
+						if ( ! empty($mce_external_languages)) {
+							foreach ($mce_external_languages as $name => $path) {
+								if (@is_file($path) && @is_readable($path)) {
+									include_once($path);
+									$ext_plugins .= $strings."\n";
 									$loaded_langs[] = $name;
 								}
 							}
 						}
 
-						foreach ( $mce_external_plugins as $name => $url ) {
-							if ( in_array( $name, $plugins, true ) ) {
-								unset( $mce_external_plugins[ $name ] );
+						foreach ($mce_external_plugins as $name => $url) {
+							if (in_array($name, $plugins, true)) {
+								unset($mce_external_plugins[$name]);
 								continue;
 							}
 
-							$url = set_url_scheme( $url );
-							$mce_external_plugins[ $name ] = $url;
-							$plugurl = dirname( $url );
+							$url = set_url_scheme($url);
+							$mce_external_plugins[$name] = $url;
+							$plugurl = dirname($url);
 							$strings = '';
 
 							// Try to load langs/[locale].js and langs/[locale]_dlg.js
-							if ( ! in_array( $name, $loaded_langs, true ) ) {
-								$path = str_replace( content_url(), '', $plugurl );
-								$path = WP_CONTENT_DIR . $path . '/langs/';
+							if ( ! in_array($name, $loaded_langs, true)) {
+								$path = str_replace(content_url(), '', $plugurl);
+								$path = WP_CONTENT_DIR.$path.'/langs/';
 
-								if ( function_exists('realpath') )
-									$path = trailingslashit( realpath($path) );
+								if (function_exists('realpath'))
+									$path = trailingslashit(realpath($path));
 
-								if ( @is_file( $path . $mce_locale . '.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								if (@is_file($path.$mce_locale.'.js'))
+									$strings .= @file_get_contents($path.$mce_locale.'.js')."\n";
 
-								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
-									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								if (@is_file($path.$mce_locale.'_dlg.js'))
+									$strings .= @file_get_contents($path.$mce_locale.'_dlg.js')."\n";
 
-								if ( 'en' != $mce_locale && empty( $strings ) ) {
-									if ( @is_file( $path . 'en.js' ) ) {
-										$str1 = @file_get_contents( $path . 'en.js' );
-										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
+								if ('en' != $mce_locale && empty($strings)) {
+									if (@is_file($path.'en.js')) {
+										$str1 = @file_get_contents($path.'en.js');
+										$strings .= preg_replace('/([\'"])en\./', '$1'.$mce_locale.'.', $str1, 1)."\n";
 									}
 
-									if ( @is_file( $path . 'en_dlg.js' ) ) {
-										$str2 = @file_get_contents( $path . 'en_dlg.js' );
-										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
+									if (@is_file($path.'en_dlg.js')) {
+										$str2 = @file_get_contents($path.'en_dlg.js');
+										$strings .= preg_replace('/([\'"])en\./', '$1'.$mce_locale.'.', $str2, 1)."\n";
 									}
 								}
 
-								if ( ! empty( $strings ) )
-									$ext_plugins .= "\n" . $strings . "\n";
+								if ( ! empty($strings))
+									$ext_plugins .= "\n".$strings."\n";
 							}
 
-							$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
-							$ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n";
+							$ext_plugins .= 'tinyMCEPreInit.load_ext("'.$plugurl.'", "'.$mce_locale.'");'."\n";
+							$ext_plugins .= 'tinymce.PluginManager.load("'.$name.'", "'.$url.'");'."\n";
 						}
 					}
 				}
@@ -526,20 +526,20 @@ 
 					'theme' => 'modern',
 					'skin' => 'lightgray',
 					'language' => self::$mce_locale,
-					'formats' => '{' .
-						'alignleft: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
-						'],' .
-						'aligncenter: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
-						'],' .
-						'alignright: [' .
-							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
-							'{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
-						'],' .
-						'strikethrough: {inline: "del"}' .
+					'formats' => '{'.
+						'alignleft: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}'.
+						'],'.
+						'aligncenter: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}'.
+						'],'.
+						'alignright: ['.
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},'.
+							'{selector: "img,table,dl.wp-caption", classes: "alignright"}'.
+						'],'.
+						'strikethrough: {inline: "del"}'.
 					'}',
 					'relative_urls' => false,
 					'remove_script_host' => false,
@@ -549,36 +549,36 @@ 
 					'entities' => '38,amp,60,lt,62,gt',
 					'entity_encoding' => 'raw',
 					'keep_styles' => false,
-					'cache_suffix' => 'wp-mce-' . $tinymce_version,
+					'cache_suffix' => 'wp-mce-'.$tinymce_version,
 
 					// Limit the preview styles in the menu/toolbar
 					'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
 
 					'end_container_on_empty_block' => true,
 					'wpeditimage_disable_captions' => $no_captions,
-					'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
-					'plugins' => implode( ',', $plugins ),
-					'wp_lang_attr' => get_bloginfo( 'language' ),
-					'wp_shortcut_labels' => wp_json_encode( $shortcut_labels ),
+					'wpeditimage_html5_captions' => current_theme_supports('html5', 'caption'),
+					'plugins' => implode(',', $plugins),
+					'wp_lang_attr' => get_bloginfo('language'),
+					'wp_shortcut_labels' => wp_json_encode($shortcut_labels),
 				);
 
-				if ( ! empty( $mce_external_plugins ) ) {
-					self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
+				if ( ! empty($mce_external_plugins)) {
+					self::$first_init['external_plugins'] = wp_json_encode($mce_external_plugins);
 				}
 
 				$suffix = SCRIPT_DEBUG ? '' : '.min';
-				$version = 'ver=' . get_bloginfo( 'version' );
-				$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
+				$version = 'ver='.get_bloginfo('version');
+				$dashicons = includes_url("css/dashicons$suffix.css?$version");
 
 				// WordPress default stylesheet and dashicons
 				$mce_css = array(
 					$dashicons,
-					self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
+					self::$baseurl.'/skins/wordpress/wp-content.css?'.$version
 				);
 
 				$editor_styles = get_editor_stylesheets();
-				if ( ! empty( $editor_styles ) ) {
-					foreach ( $editor_styles as $style ) {
+				if ( ! empty($editor_styles)) {
+					foreach ($editor_styles as $style) {
 						$mce_css[] = $style;
 					}
 				}
@@ -590,13 +590,13 @@ 
 				 *
 				 * @param string $stylesheets Comma-delimited list of stylesheets.
 				 */
-				$mce_css = trim( apply_filters( 'mce_css', implode( ',', $mce_css ) ), ' ,' );
+				$mce_css = trim(apply_filters('mce_css', implode(',', $mce_css)), ' ,');
 
-				if ( ! empty($mce_css) )
+				if ( ! empty($mce_css))
 					self::$first_init['content_css'] = $mce_css;
 			}
 
-			if ( $set['teeny'] ) {
+			if ($set['teeny']) {
 
 				/**
 				 * Filters the list of teenyMCE buttons (Text tab).
@@ -606,13 +606,13 @@ 
 				 * @param array  $buttons   An array of teenyMCE buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
+				$mce_buttons = apply_filters('teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id);
 				$mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
 			} else {
-				$mce_buttons = array( 'formatselect', 'bold', 'italic', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+				$mce_buttons = array('formatselect', 'bold', 'italic', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker');
 
-				if ( ! wp_is_mobile() ) {
-					if ( $set['_content_editor_dfw'] ) {
+				if ( ! wp_is_mobile()) {
+					if ($set['_content_editor_dfw']) {
 						$mce_buttons[] = 'dfw';
 					} else {
 						$mce_buttons[] = 'fullscreen';
@@ -629,11 +629,11 @@ 
 				 * @param array  $buttons   First-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id );
+				$mce_buttons = apply_filters('mce_buttons', $mce_buttons, $editor_id);
 
-				$mce_buttons_2 = array( 'strikethrough', 'hr', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+				$mce_buttons_2 = array('strikethrough', 'hr', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo');
 
-				if ( ! wp_is_mobile() ) {
+				if ( ! wp_is_mobile()) {
 					$mce_buttons_2[] = 'wp_help';
 				}
 
@@ -645,7 +645,7 @@ 
 				 * @param array  $buttons   Second-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_2 = apply_filters( 'mce_buttons_2', $mce_buttons_2, $editor_id );
+				$mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2, $editor_id);
 
 				/**
 				 * Filters the third-row list of TinyMCE buttons (Visual tab).
@@ -655,7 +655,7 @@ 
 				 * @param array  $buttons   Third-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_3 = apply_filters( 'mce_buttons_3', array(), $editor_id );
+				$mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
 
 				/**
 				 * Filters the fourth-row list of TinyMCE buttons (Visual tab).
@@ -665,38 +665,38 @@ 
 				 * @param array  $buttons   Fourth-row list of buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons_4 = apply_filters( 'mce_buttons_4', array(), $editor_id );
+				$mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
 			}
 
 			$body_class = $editor_id;
 
-			if ( $post = get_post() ) {
-				$body_class .= ' post-type-' . sanitize_html_class( $post->post_type ) . ' post-status-' . sanitize_html_class( $post->post_status );
+			if ($post = get_post()) {
+				$body_class .= ' post-type-'.sanitize_html_class($post->post_type).' post-status-'.sanitize_html_class($post->post_status);
 
-				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-					$post_format = get_post_format( $post );
-					if ( $post_format && ! is_wp_error( $post_format ) )
-						$body_class .= ' post-format-' . sanitize_html_class( $post_format );
+				if (post_type_supports($post->post_type, 'post-formats')) {
+					$post_format = get_post_format($post);
+					if ($post_format && ! is_wp_error($post_format))
+						$body_class .= ' post-format-'.sanitize_html_class($post_format);
 					else
 						$body_class .= ' post-format-standard';
 				}
 
-				$page_template = get_page_template_slug( $post );
+				$page_template = get_page_template_slug($post);
 
-				if ( $page_template !== false ) {
-					$page_template = empty( $page_template ) ? 'default' : str_replace( '.', '-', basename( $page_template, '.php' ) );
-					$body_class .= ' page-template-' . sanitize_html_class( $page_template );
+				if ($page_template !== false) {
+					$page_template = empty($page_template) ? 'default' : str_replace('.', '-', basename($page_template, '.php'));
+					$body_class .= ' page-template-'.sanitize_html_class($page_template);
 				}
 			}
 
-			$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+			$body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_user_locale())));
 
-			if ( !empty($set['tinymce']['body_class']) ) {
-				$body_class .= ' ' . $set['tinymce']['body_class'];
+			if ( ! empty($set['tinymce']['body_class'])) {
+				$body_class .= ' '.$set['tinymce']['body_class'];
 				unset($set['tinymce']['body_class']);
 			}
 
-			$mceInit = array (
+			$mceInit = array(
 				'selector' => "#$editor_id",
 				'resize' => 'vertical',
 				'menubar' => false,
@@ -711,10 +711,10 @@ 
 			);
 
 			// Merge with the first part of the init array
-			$mceInit = array_merge( self::$first_init, $mceInit );
+			$mceInit = array_merge(self::$first_init, $mceInit);
 
-			if ( is_array( $set['tinymce'] ) )
-				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			if (is_array($set['tinymce']))
+				$mceInit = array_merge($mceInit, $set['tinymce']);
 
 			/*
 			 * For people who really REALLY know what they're doing with TinyMCE
@@ -724,7 +724,7 @@ 
 			 * is to use the default cleanup by not specifying valid_elements,
 			 * as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
 			 */
-			if ( $set['teeny'] ) {
+			if ($set['teeny']) {
 
 				/**
 				 * Filters the teenyMCE config before init.
@@ -734,7 +734,7 @@ 
 				 * @param array  $mceInit   An array with teenyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
+				$mceInit = apply_filters('teeny_mce_before_init', $mceInit, $editor_id);
 			} else {
 
 				/**
@@ -745,10 +745,10 @@ 
 				 * @param array  $mceInit   An array with TinyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
+				$mceInit = apply_filters('tiny_mce_before_init', $mceInit, $editor_id);
 			}
 
-			if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
+			if (empty($mceInit['toolbar3']) && ! empty($mceInit['toolbar4'])) {
 				$mceInit['toolbar3'] = $mceInit['toolbar4'];
 				$mceInit['toolbar4'] = '';
 			}
@@ -766,19 +766,19 @@ 
 	private static function _parse_init($init) {
 		$options = '';
 
-		foreach ( $init as $k => $v ) {
-			if ( is_bool($v) ) {
+		foreach ($init as $k => $v) {
+			if (is_bool($v)) {
 				$val = $v ? 'true' : 'false';
-				$options .= $k . ':' . $val . ',';
+				$options .= $k.':'.$val.',';
 				continue;
-			} elseif ( !empty($v) && is_string($v) && ( ('{' == $v{0} && '}' == $v{strlen($v) - 1}) || ('[' == $v{0} && ']' == $v{strlen($v) - 1}) || preg_match('/^\(?function ?\(/', $v) ) ) {
-				$options .= $k . ':' . $v . ',';
+			} elseif ( ! empty($v) && is_string($v) && (('{' == $v{0} && '}' == $v{strlen($v) - 1}) || ('[' == $v{0} && ']' == $v{strlen($v) - 1}) || preg_match('/^\(?function ?\(/', $v))) {
+				$options .= $k.':'.$v.',';
 				continue;
 			}
-			$options .= $k . ':"' . $v . '",';
+			$options .= $k.':"'.$v.'",';
 		}
 
-		return '{' . trim( $options, ' ,' ) . '}';
+		return '{'.trim($options, ' ,').'}';
 	}
 
 	/**
@@ -786,27 +786,27 @@ 
 	 * @static
 	 */
 	public static function enqueue_scripts() {
-		if ( self::$has_tinymce )
+		if (self::$has_tinymce)
 			wp_enqueue_script('editor');
 
-		if ( self::$has_quicktags ) {
-			wp_enqueue_script( 'quicktags' );
-			wp_enqueue_style( 'buttons' );
+		if (self::$has_quicktags) {
+			wp_enqueue_script('quicktags');
+			wp_enqueue_style('buttons');
 		}
 
-		if ( in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true) ) {
+		if (in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true)) {
 			wp_enqueue_script('wplink');
-			wp_enqueue_script( 'jquery-ui-autocomplete' );
+			wp_enqueue_script('jquery-ui-autocomplete');
 		}
 
-		if ( self::$old_dfw_compat ) {
+		if (self::$old_dfw_compat) {
 			wp_enqueue_script('wp-fullscreen-stub');
 		}
 
-		if ( self::$has_medialib ) {
+		if (self::$has_medialib) {
 			add_thickbox();
-			wp_enqueue_script( 'media-upload' );
-			wp_enqueue_script( 'wp-embed' );
+			wp_enqueue_script('media-upload');
+			wp_enqueue_script('wp-embed');
 		}
 
 		/**
@@ -817,270 +817,270 @@ 
 		 * @param array $to_load An array containing boolean values whether TinyMCE
 		 *                       and Quicktags are being loaded.
 		 */
-		do_action( 'wp_enqueue_editor', array(
+		do_action('wp_enqueue_editor', array(
 			'tinymce'   => self::$has_tinymce,
 			'quicktags' => self::$has_quicktags,
-		) );
+		));
 	}
 
 	private static function get_translation() {
-		if ( empty( self::$translation ) ) {
+		if (empty(self::$translation)) {
 			self::$translation = array(
 			// Default TinyMCE strings
-			'New document' => __( 'New document' ),
-			'Formats' => _x( 'Formats', 'TinyMCE' ),
+			'New document' => __('New document'),
+			'Formats' => _x('Formats', 'TinyMCE'),
 
-			'Headings' => _x( 'Headings', 'TinyMCE' ),
-			'Heading 1' => array( __( 'Heading 1' ), 'access1' ),
-			'Heading 2' => array( __( 'Heading 2' ), 'access2' ),
-			'Heading 3' => array( __( 'Heading 3' ), 'access3' ),
-			'Heading 4' => array( __( 'Heading 4' ), 'access4' ),
-			'Heading 5' => array( __( 'Heading 5' ), 'access5' ),
-			'Heading 6' => array( __( 'Heading 6' ), 'access6' ),
+			'Headings' => _x('Headings', 'TinyMCE'),
+			'Heading 1' => array(__('Heading 1'), 'access1'),
+			'Heading 2' => array(__('Heading 2'), 'access2'),
+			'Heading 3' => array(__('Heading 3'), 'access3'),
+			'Heading 4' => array(__('Heading 4'), 'access4'),
+			'Heading 5' => array(__('Heading 5'), 'access5'),
+			'Heading 6' => array(__('Heading 6'), 'access6'),
 
 			/* translators: block tags */
-			'Blocks' => _x( 'Blocks', 'TinyMCE' ),
-			'Paragraph' => array( __( 'Paragraph' ), 'access7' ),
-			'Blockquote' => array( __( 'Blockquote' ), 'accessQ' ),
-			'Div' => _x( 'Div', 'HTML tag' ),
-			'Pre' => _x( 'Pre', 'HTML tag' ),
-			'Preformatted' => _x( 'Preformatted', 'HTML tag' ),
-			'Address' => _x( 'Address', 'HTML tag' ),
-
-			'Inline' => _x( 'Inline', 'HTML elements' ),
-			'Underline' => array( __( 'Underline' ), 'metaU' ),
-			'Strikethrough' => array( __( 'Strikethrough' ), 'accessD' ),
-			'Subscript' => __( 'Subscript' ),
-			'Superscript' => __( 'Superscript' ),
-			'Clear formatting' => __( 'Clear formatting' ),
-			'Bold' => array( __( 'Bold' ), 'metaB' ),
-			'Italic' => array( __( 'Italic' ), 'metaI' ),
-			'Code' => array( __( 'Code' ), 'accessX' ),
-			'Source code' => __( 'Source code' ),
-			'Font Family' => __( 'Font Family' ),
-			'Font Sizes' => __( 'Font Sizes' ),
-
-			'Align center' => array( __( 'Align center' ), 'accessC' ),
-			'Align right' => array( __( 'Align right' ), 'accessR' ),
-			'Align left' => array( __( 'Align left' ), 'accessL' ),
-			'Justify' => array( __( 'Justify' ), 'accessJ' ),
-			'Increase indent' => __( 'Increase indent' ),
-			'Decrease indent' => __( 'Decrease indent' ),
-
-			'Cut' => array( __( 'Cut' ), 'metaX' ),
-			'Copy' => array( __( 'Copy' ), 'metaC' ),
-			'Paste' => array( __( 'Paste' ), 'metaV' ),
-			'Select all' => array( __( 'Select all' ), 'metaA' ),
-			'Undo' => array( __( 'Undo' ), 'metaZ' ),
-			'Redo' => array( __( 'Redo' ), 'metaY' ),
-
-			'Ok' => __( 'OK' ),
-			'Cancel' => __( 'Cancel' ),
-			'Close' => __( 'Close' ),
-			'Visual aids' => __( 'Visual aids' ),
-
-			'Bullet list' => array( __( 'Bulleted list' ), 'accessU' ),
-			'Numbered list' => array( __( 'Numbered list' ), 'accessO' ),
-			'Square' => _x( 'Square', 'list style' ),
-			'Default' => _x( 'Default', 'list style' ),
-			'Circle' => _x( 'Circle', 'list style' ),
-			'Disc' => _x('Disc', 'list style' ),
-			'Lower Greek' => _x( 'Lower Greek', 'list style' ),
-			'Lower Alpha' => _x( 'Lower Alpha', 'list style' ),
-			'Upper Alpha' => _x( 'Upper Alpha', 'list style' ),
-			'Upper Roman' => _x( 'Upper Roman', 'list style' ),
-			'Lower Roman' => _x( 'Lower Roman', 'list style' ),
+			'Blocks' => _x('Blocks', 'TinyMCE'),
+			'Paragraph' => array(__('Paragraph'), 'access7'),
+			'Blockquote' => array(__('Blockquote'), 'accessQ'),
+			'Div' => _x('Div', 'HTML tag'),
+			'Pre' => _x('Pre', 'HTML tag'),
+			'Preformatted' => _x('Preformatted', 'HTML tag'),
+			'Address' => _x('Address', 'HTML tag'),
+
+			'Inline' => _x('Inline', 'HTML elements'),
+			'Underline' => array(__('Underline'), 'metaU'),
+			'Strikethrough' => array(__('Strikethrough'), 'accessD'),
+			'Subscript' => __('Subscript'),
+			'Superscript' => __('Superscript'),
+			'Clear formatting' => __('Clear formatting'),
+			'Bold' => array(__('Bold'), 'metaB'),
+			'Italic' => array(__('Italic'), 'metaI'),
+			'Code' => array(__('Code'), 'accessX'),
+			'Source code' => __('Source code'),
+			'Font Family' => __('Font Family'),
+			'Font Sizes' => __('Font Sizes'),
+
+			'Align center' => array(__('Align center'), 'accessC'),
+			'Align right' => array(__('Align right'), 'accessR'),
+			'Align left' => array(__('Align left'), 'accessL'),
+			'Justify' => array(__('Justify'), 'accessJ'),
+			'Increase indent' => __('Increase indent'),
+			'Decrease indent' => __('Decrease indent'),
+
+			'Cut' => array(__('Cut'), 'metaX'),
+			'Copy' => array(__('Copy'), 'metaC'),
+			'Paste' => array(__('Paste'), 'metaV'),
+			'Select all' => array(__('Select all'), 'metaA'),
+			'Undo' => array(__('Undo'), 'metaZ'),
+			'Redo' => array(__('Redo'), 'metaY'),
+
+			'Ok' => __('OK'),
+			'Cancel' => __('Cancel'),
+			'Close' => __('Close'),
+			'Visual aids' => __('Visual aids'),
+
+			'Bullet list' => array(__('Bulleted list'), 'accessU'),
+			'Numbered list' => array(__('Numbered list'), 'accessO'),
+			'Square' => _x('Square', 'list style'),
+			'Default' => _x('Default', 'list style'),
+			'Circle' => _x('Circle', 'list style'),
+			'Disc' => _x('Disc', 'list style'),
+			'Lower Greek' => _x('Lower Greek', 'list style'),
+			'Lower Alpha' => _x('Lower Alpha', 'list style'),
+			'Upper Alpha' => _x('Upper Alpha', 'list style'),
+			'Upper Roman' => _x('Upper Roman', 'list style'),
+			'Lower Roman' => _x('Lower Roman', 'list style'),
 
 			// Anchor plugin
-			'Name' => _x( 'Name', 'Name of link anchor (TinyMCE)' ),
-			'Anchor' => _x( 'Anchor', 'Link anchor (TinyMCE)' ),
-			'Anchors' => _x( 'Anchors', 'Link anchors (TinyMCE)' ),
+			'Name' => _x('Name', 'Name of link anchor (TinyMCE)'),
+			'Anchor' => _x('Anchor', 'Link anchor (TinyMCE)'),
+			'Anchors' => _x('Anchors', 'Link anchors (TinyMCE)'),
 
 			// Fullpage plugin
-			'Document properties' => __( 'Document properties' ),
-			'Robots' => __( 'Robots' ),
-			'Title' => __( 'Title' ),
-			'Keywords' => __( 'Keywords' ),
-			'Encoding' => __( 'Encoding' ),
-			'Description' => __( 'Description' ),
-			'Author' => __( 'Author' ),
+			'Document properties' => __('Document properties'),
+			'Robots' => __('Robots'),
+			'Title' => __('Title'),
+			'Keywords' => __('Keywords'),
+			'Encoding' => __('Encoding'),
+			'Description' => __('Description'),
+			'Author' => __('Author'),
 
 			// Media, image plugins
-			'Insert/edit image' => array( __( 'Insert/edit image' ), 'accessM' ),
-			'General' => __( 'General' ),
-			'Advanced' => __( 'Advanced' ),
-			'Source' => __( 'Source' ),
-			'Border' => __( 'Border' ),
-			'Constrain proportions' => __( 'Constrain proportions' ),
-			'Vertical space' => __( 'Vertical space' ),
-			'Image description' => __( 'Image description' ),
-			'Style' => __( 'Style' ),
-			'Dimensions' => __( 'Dimensions' ),
-			'Insert image' => __( 'Insert image' ),
-			'Insert date/time' => __( 'Insert date/time' ),
-			'Insert/edit video' => __( 'Insert/edit video' ),
-			'Poster' => __( 'Poster' ),
-			'Alternative source' => __( 'Alternative source' ),
-			'Paste your embed code below:' => __( 'Paste your embed code below:' ),
-			'Insert video' => __( 'Insert video' ),
-			'Embed' => __( 'Embed' ),
+			'Insert/edit image' => array(__('Insert/edit image'), 'accessM'),
+			'General' => __('General'),
+			'Advanced' => __('Advanced'),
+			'Source' => __('Source'),
+			'Border' => __('Border'),
+			'Constrain proportions' => __('Constrain proportions'),
+			'Vertical space' => __('Vertical space'),
+			'Image description' => __('Image description'),
+			'Style' => __('Style'),
+			'Dimensions' => __('Dimensions'),
+			'Insert image' => __('Insert image'),
+			'Insert date/time' => __('Insert date/time'),
+			'Insert/edit video' => __('Insert/edit video'),
+			'Poster' => __('Poster'),
+			'Alternative source' => __('Alternative source'),
+			'Paste your embed code below:' => __('Paste your embed code below:'),
+			'Insert video' => __('Insert video'),
+			'Embed' => __('Embed'),
 
 			// Each of these have a corresponding plugin
-			'Special character' => __( 'Special character' ),
-			'Right to left' => _x( 'Right to left', 'editor button' ),
-			'Left to right' => _x( 'Left to right', 'editor button' ),
-			'Emoticons' => __( 'Emoticons' ),
-			'Nonbreaking space' => __( 'Nonbreaking space' ),
-			'Page break' => __( 'Page break' ),
-			'Paste as text' => __( 'Paste as text' ),
-			'Preview' => __( 'Preview' ),
-			'Print' => __( 'Print' ),
-			'Save' => __( 'Save' ),
-			'Fullscreen' => __( 'Fullscreen' ),
-			'Horizontal line' => __( 'Horizontal line' ),
-			'Horizontal space' => __( 'Horizontal space' ),
-			'Restore last draft' => __( 'Restore last draft' ),
-			'Insert/edit link' => array( __( 'Insert/edit link' ), 'metaK' ),
-			'Remove link' => array( __( 'Remove link' ), 'accessS' ),
-
-			'Color' => __( 'Color' ),
-			'Custom color' => __( 'Custom color' ),
-			'Custom...' => _x( 'Custom...', 'label for custom color' ), // no ellipsis
-			'No color' => __( 'No color' ),
+			'Special character' => __('Special character'),
+			'Right to left' => _x('Right to left', 'editor button'),
+			'Left to right' => _x('Left to right', 'editor button'),
+			'Emoticons' => __('Emoticons'),
+			'Nonbreaking space' => __('Nonbreaking space'),
+			'Page break' => __('Page break'),
+			'Paste as text' => __('Paste as text'),
+			'Preview' => __('Preview'),
+			'Print' => __('Print'),
+			'Save' => __('Save'),
+			'Fullscreen' => __('Fullscreen'),
+			'Horizontal line' => __('Horizontal line'),
+			'Horizontal space' => __('Horizontal space'),
+			'Restore last draft' => __('Restore last draft'),
+			'Insert/edit link' => array(__('Insert/edit link'), 'metaK'),
+			'Remove link' => array(__('Remove link'), 'accessS'),
+
+			'Color' => __('Color'),
+			'Custom color' => __('Custom color'),
+			'Custom...' => _x('Custom...', 'label for custom color'), // no ellipsis
+			'No color' => __('No color'),
 
 			// Spelling, search/replace plugins
-			'Could not find the specified string.' => __( 'Could not find the specified string.' ),
-			'Replace' => _x( 'Replace', 'find/replace' ),
-			'Next' => _x( 'Next', 'find/replace' ),
+			'Could not find the specified string.' => __('Could not find the specified string.'),
+			'Replace' => _x('Replace', 'find/replace'),
+			'Next' => _x('Next', 'find/replace'),
 			/* translators: previous */
-			'Prev' => _x( 'Prev', 'find/replace' ),
-			'Whole words' => _x( 'Whole words', 'find/replace' ),
-			'Find and replace' => __( 'Find and replace' ),
-			'Replace with' => _x('Replace with', 'find/replace' ),
-			'Find' => _x( 'Find', 'find/replace' ),
-			'Replace all' => _x( 'Replace all', 'find/replace' ),
-			'Match case' => __( 'Match case' ),
-			'Spellcheck' => __( 'Check Spelling' ),
-			'Finish' => _x( 'Finish', 'spellcheck' ),
-			'Ignore all' => _x( 'Ignore all', 'spellcheck' ),
-			'Ignore' => _x( 'Ignore', 'spellcheck' ),
-			'Add to Dictionary' => __( 'Add to Dictionary' ),
+			'Prev' => _x('Prev', 'find/replace'),
+			'Whole words' => _x('Whole words', 'find/replace'),
+			'Find and replace' => __('Find and replace'),
+			'Replace with' => _x('Replace with', 'find/replace'),
+			'Find' => _x('Find', 'find/replace'),
+			'Replace all' => _x('Replace all', 'find/replace'),
+			'Match case' => __('Match case'),
+			'Spellcheck' => __('Check Spelling'),
+			'Finish' => _x('Finish', 'spellcheck'),
+			'Ignore all' => _x('Ignore all', 'spellcheck'),
+			'Ignore' => _x('Ignore', 'spellcheck'),
+			'Add to Dictionary' => __('Add to Dictionary'),
 
 			// TinyMCE tables
-			'Insert table' => __( 'Insert table' ),
-			'Delete table' => __( 'Delete table' ),
-			'Table properties' => __( 'Table properties' ),
-			'Row properties' => __( 'Table row properties' ),
-			'Cell properties' => __( 'Table cell properties' ),
-			'Border color' => __( 'Border color' ),
-
-			'Row' => __( 'Row' ),
-			'Rows' => __( 'Rows' ),
-			'Column' => _x( 'Column', 'table column' ),
-			'Cols' => _x( 'Cols', 'table columns' ),
-			'Cell' => _x( 'Cell', 'table cell' ),
-			'Header cell' => __( 'Header cell' ),
-			'Header' => _x( 'Header', 'table header' ),
-			'Body' => _x( 'Body', 'table body' ),
-			'Footer' => _x( 'Footer', 'table footer' ),
-
-			'Insert row before' => __( 'Insert row before' ),
-			'Insert row after' => __( 'Insert row after' ),
-			'Insert column before' => __( 'Insert column before' ),
-			'Insert column after' => __( 'Insert column after' ),
-			'Paste row before' => __( 'Paste table row before' ),
-			'Paste row after' => __( 'Paste table row after' ),
-			'Delete row' => __( 'Delete row' ),
-			'Delete column' => __( 'Delete column' ),
-			'Cut row' => __( 'Cut table row' ),
-			'Copy row' => __( 'Copy table row' ),
-			'Merge cells' => __( 'Merge table cells' ),
-			'Split cell' => __( 'Split table cell' ),
-
-			'Height' => __( 'Height' ),
-			'Width' => __( 'Width' ),
-			'Caption' => __( 'Caption' ),
-			'Alignment' => __( 'Alignment' ),
-			'H Align' => _x( 'H Align', 'horizontal table cell alignment' ),
-			'Left' => __( 'Left' ),
-			'Center' => __( 'Center' ),
-			'Right' => __( 'Right' ),
-			'None' => _x( 'None', 'table cell alignment attribute' ),
-			'V Align' => _x( 'V Align', 'vertical table cell alignment' ),
-			'Top' => __( 'Top' ),
-			'Middle' => __( 'Middle' ),
-			'Bottom' => __( 'Bottom' ),
-
-			'Row group' => __( 'Row group' ),
-			'Column group' => __( 'Column group' ),
-			'Row type' => __( 'Row type' ),
-			'Cell type' => __( 'Cell type' ),
-			'Cell padding' => __( 'Cell padding' ),
-			'Cell spacing' => __( 'Cell spacing' ),
-			'Scope' => _x( 'Scope', 'table cell scope attribute' ),
-
-			'Insert template' => _x( 'Insert template', 'TinyMCE' ),
-			'Templates' => _x( 'Templates', 'TinyMCE' ),
-
-			'Background color' => __( 'Background color' ),
-			'Text color' => __( 'Text color' ),
-			'Show blocks' => _x( 'Show blocks', 'editor button' ),
-			'Show invisible characters' => __( 'Show invisible characters' ),
+			'Insert table' => __('Insert table'),
+			'Delete table' => __('Delete table'),
+			'Table properties' => __('Table properties'),
+			'Row properties' => __('Table row properties'),
+			'Cell properties' => __('Table cell properties'),
+			'Border color' => __('Border color'),
+
+			'Row' => __('Row'),
+			'Rows' => __('Rows'),
+			'Column' => _x('Column', 'table column'),
+			'Cols' => _x('Cols', 'table columns'),
+			'Cell' => _x('Cell', 'table cell'),
+			'Header cell' => __('Header cell'),
+			'Header' => _x('Header', 'table header'),
+			'Body' => _x('Body', 'table body'),
+			'Footer' => _x('Footer', 'table footer'),
+
+			'Insert row before' => __('Insert row before'),
+			'Insert row after' => __('Insert row after'),
+			'Insert column before' => __('Insert column before'),
+			'Insert column after' => __('Insert column after'),
+			'Paste row before' => __('Paste table row before'),
+			'Paste row after' => __('Paste table row after'),
+			'Delete row' => __('Delete row'),
+			'Delete column' => __('Delete column'),
+			'Cut row' => __('Cut table row'),
+			'Copy row' => __('Copy table row'),
+			'Merge cells' => __('Merge table cells'),
+			'Split cell' => __('Split table cell'),
+
+			'Height' => __('Height'),
+			'Width' => __('Width'),
+			'Caption' => __('Caption'),
+			'Alignment' => __('Alignment'),
+			'H Align' => _x('H Align', 'horizontal table cell alignment'),
+			'Left' => __('Left'),
+			'Center' => __('Center'),
+			'Right' => __('Right'),
+			'None' => _x('None', 'table cell alignment attribute'),
+			'V Align' => _x('V Align', 'vertical table cell alignment'),
+			'Top' => __('Top'),
+			'Middle' => __('Middle'),
+			'Bottom' => __('Bottom'),
+
+			'Row group' => __('Row group'),
+			'Column group' => __('Column group'),
+			'Row type' => __('Row type'),
+			'Cell type' => __('Cell type'),
+			'Cell padding' => __('Cell padding'),
+			'Cell spacing' => __('Cell spacing'),
+			'Scope' => _x('Scope', 'table cell scope attribute'),
+
+			'Insert template' => _x('Insert template', 'TinyMCE'),
+			'Templates' => _x('Templates', 'TinyMCE'),
+
+			'Background color' => __('Background color'),
+			'Text color' => __('Text color'),
+			'Show blocks' => _x('Show blocks', 'editor button'),
+			'Show invisible characters' => __('Show invisible characters'),
 
 			/* translators: word count */
-			'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
-			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" . __( 'If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ),
-			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __( 'Rich Text Area. Press Alt-Shift-H for help.' ),
-			'Rich Text Area. Press Control-Option-H for help.' => __( 'Rich Text Area. Press Control-Option-H for help.' ),
-			'You have unsaved changes are you sure you want to navigate away?' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),
+			'Words: {0}' => sprintf(__('Words: %s'), '{0}'),
+			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => __('Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.')."\n\n".__('If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.'),
+			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => __('Rich Text Area. Press Alt-Shift-H for help.'),
+			'Rich Text Area. Press Control-Option-H for help.' => __('Rich Text Area. Press Control-Option-H for help.'),
+			'You have unsaved changes are you sure you want to navigate away?' => __('The changes you made will be lost if you navigate away from this page.'),
+			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' => __('Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.'),
 
 			// TinyMCE menus
-			'Insert' => _x( 'Insert', 'TinyMCE menu' ),
-			'File' => _x( 'File', 'TinyMCE menu' ),
-			'Edit' => _x( 'Edit', 'TinyMCE menu' ),
-			'Tools' => _x( 'Tools', 'TinyMCE menu' ),
-			'View' => _x( 'View', 'TinyMCE menu' ),
-			'Table' => _x( 'Table', 'TinyMCE menu' ),
-			'Format' => _x( 'Format', 'TinyMCE menu' ),
+			'Insert' => _x('Insert', 'TinyMCE menu'),
+			'File' => _x('File', 'TinyMCE menu'),
+			'Edit' => _x('Edit', 'TinyMCE menu'),
+			'Tools' => _x('Tools', 'TinyMCE menu'),
+			'View' => _x('View', 'TinyMCE menu'),
+			'Table' => _x('Table', 'TinyMCE menu'),
+			'Format' => _x('Format', 'TinyMCE menu'),
 
 			// WordPress strings
-			'Toolbar Toggle' => array( __( 'Toolbar Toggle' ), 'accessZ' ),
-			'Insert Read More tag' => array( __( 'Insert Read More tag' ), 'accessT' ),
-			'Insert Page Break tag' => array( __( 'Insert Page Break tag' ), 'accessP' ),
-			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)
-			'Distraction-free writing mode' => array( __( 'Distraction-free writing mode' ), 'accessW' ),
-			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
-			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
-			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
-			'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
-			'Apply'  => __( 'Apply' ), // Tooltip for the 'apply' button in the inline link dialog
-			'Link options'  => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog
+			'Toolbar Toggle' => array(__('Toolbar Toggle'), 'accessZ'),
+			'Insert Read More tag' => array(__('Insert Read More tag'), 'accessT'),
+			'Insert Page Break tag' => array(__('Insert Page Break tag'), 'accessP'),
+			'Read more...' => __('Read more...'), // Title on the placeholder inside the editor (no ellipsis)
+			'Distraction-free writing mode' => array(__('Distraction-free writing mode'), 'accessW'),
+			'No alignment' => __('No alignment'), // Tooltip for the 'alignnone' button in the image toolbar
+			'Remove' => __('Remove'), // Tooltip for the 'remove' button in the image toolbar
+			'Edit ' => __('Edit'), // Tooltip for the 'edit' button in the image toolbar
+			'Paste URL or type to search' => __('Paste URL or type to search'), // Placeholder for the inline link dialog
+			'Apply'  => __('Apply'), // Tooltip for the 'apply' button in the inline link dialog
+			'Link options'  => __('Link options'), // Tooltip for the 'link options' button in the inline link dialog
 
 			// Shortcuts help modal
-			'Keyboard Shortcuts' => array( __( 'Keyboard Shortcuts' ), 'accessH' ),
-			'Default shortcuts,' => __( 'Default shortcuts,' ),
-			'Additional shortcuts,' => __( 'Additional shortcuts,' ),
-			'Focus shortcuts:' => __( 'Focus shortcuts:' ),
-			'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
-			'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
-			'Editor toolbar' => __( 'Editor toolbar' ),
-			'Elements path' => __( 'Elements path' ),
-			'Ctrl + Alt + letter:' => __( 'Ctrl + Alt + letter:' ),
-			'Shift + Alt + letter:' => __( 'Shift + Alt + letter:' ),
-			'Cmd + letter:' => __( 'Cmd + letter:' ),
-			'Ctrl + letter:' => __( 'Ctrl + letter:' ),
-			'Letter' => __( 'Letter' ),
-			'Action' => __( 'Action' ),
-			'Warning: the link has been inserted but may have errors. Please test it.' => __( 'Warning: the link has been inserted but may have errors. Please test it.' ),
+			'Keyboard Shortcuts' => array(__('Keyboard Shortcuts'), 'accessH'),
+			'Default shortcuts,' => __('Default shortcuts,'),
+			'Additional shortcuts,' => __('Additional shortcuts,'),
+			'Focus shortcuts:' => __('Focus shortcuts:'),
+			'Inline toolbar (when an image, link or preview is selected)' => __('Inline toolbar (when an image, link or preview is selected)'),
+			'Editor menu (when enabled)' => __('Editor menu (when enabled)'),
+			'Editor toolbar' => __('Editor toolbar'),
+			'Elements path' => __('Elements path'),
+			'Ctrl + Alt + letter:' => __('Ctrl + Alt + letter:'),
+			'Shift + Alt + letter:' => __('Shift + Alt + letter:'),
+			'Cmd + letter:' => __('Cmd + letter:'),
+			'Ctrl + letter:' => __('Ctrl + letter:'),
+			'Letter' => __('Letter'),
+			'Action' => __('Action'),
+			'Warning: the link has been inserted but may have errors. Please test it.' => __('Warning: the link has been inserted but may have errors. Please test it.'),
 			'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
-				__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+				__('To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.'),
 			'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
-				__( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+				__('When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.'),
 			'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
-				__( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
+				__('The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.'),
 			'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
-				__( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
+				__('The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.'),
 			);
 		}
 
@@ -1107,15 +1107,15 @@ 
 	 * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
 	 * @return string Translation object, JSON encoded.
 	 */
-	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
-		if ( ! $mce_locale ) {
+	public static function wp_mce_translation($mce_locale = '', $json_only = false) {
+		if ( ! $mce_locale) {
 			$mce_locale = self::$mce_locale;
 		}
 
 		$mce_translation = self::get_translation();
 		
-		foreach ( $mce_translation as $name => $value ) {
-			if ( is_array( $value ) ) {
+		foreach ($mce_translation as $name => $value) {
+			if (is_array($value)) {
 				$mce_translation[$name] = $value[0];
 			}
 		}
@@ -1128,32 +1128,32 @@ 
 		 * @param array  $mce_translation Key/value pairs of strings.
 		 * @param string $mce_locale      Locale.
 		 */
-		$mce_translation = apply_filters( 'wp_mce_translation', $mce_translation, $mce_locale );
+		$mce_translation = apply_filters('wp_mce_translation', $mce_translation, $mce_locale);
 
-		foreach ( $mce_translation as $key => $value ) {
+		foreach ($mce_translation as $key => $value) {
 			// Remove strings that are not translated.
-			if ( $key === $value ) {
-				unset( $mce_translation[$key] );
+			if ($key === $value) {
+				unset($mce_translation[$key]);
 				continue;
 			}
 
-			if ( false !== strpos( $value, '&' ) ) {
-				$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+			if (false !== strpos($value, '&')) {
+				$mce_translation[$key] = html_entity_decode($value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
 		// Set direction
-		if ( is_rtl() ) {
+		if (is_rtl()) {
 			$mce_translation['_dir'] = 'rtl';
 		}
 
-		if ( $json_only ) {
-			return wp_json_encode( $mce_translation );
+		if ($json_only) {
+			return wp_json_encode($mce_translation);
 		}
 
-		$baseurl = self::$baseurl ? self::$baseurl : includes_url( 'js/tinymce' );
+		$baseurl = self::$baseurl ? self::$baseurl : includes_url('js/tinymce');
 
-		return "tinymce.addI18n( '$mce_locale', " . wp_json_encode( $mce_translation ) . ");\n" .
+		return "tinymce.addI18n( '$mce_locale', ".wp_json_encode($mce_translation).");\n".
 			"tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
 	}
 
@@ -1174,38 +1174,38 @@ 
 		 * These plugins can be refreshed by appending query string to the URL passed to "mce_external_plugins" filter.
 		 * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
 		 */
-		$version = 'ver=' . $tinymce_version;
-		$tmce_on = !empty(self::$mce_settings);
+		$version = 'ver='.$tinymce_version;
+		$tmce_on = ! empty(self::$mce_settings);
 
-		if ( ! isset($concatenate_scripts) )
+		if ( ! isset($concatenate_scripts))
 			script_concat_settings();
 
 		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
 			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
 
 		$mceInit = $qtInit = '';
-		if ( $tmce_on ) {
-			foreach ( self::$mce_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
+		if ($tmce_on) {
+			foreach (self::$mce_settings as $editor_id => $init) {
+				$options = self::_parse_init($init);
 				$mceInit .= "'$editor_id':{$options},";
 			}
-			$mceInit = '{' . trim($mceInit, ',') . '}';
+			$mceInit = '{'.trim($mceInit, ',').'}';
 		} else {
 			$mceInit = '{}';
 		}
 
-		if ( !empty(self::$qt_settings) ) {
-			foreach ( self::$qt_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
+		if ( ! empty(self::$qt_settings)) {
+			foreach (self::$qt_settings as $editor_id => $init) {
+				$options = self::_parse_init($init);
 				$qtInit .= "'$editor_id':{$options},";
 			}
-			$qtInit = '{' . trim($qtInit, ',') . '}';
+			$qtInit = '{'.trim($qtInit, ',').'}';
 		} else {
 			$qtInit = '{}';
 		}
 
 		$ref = array(
-			'plugins' => implode( ',', self::$plugins ),
+			'plugins' => implode(',', self::$plugins),
 			'theme' => 'modern',
 			'language' => self::$mce_locale
 		);
@@ -1219,7 +1219,7 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'before_wp_tiny_mce', self::$mce_settings );
+		do_action('before_wp_tiny_mce', self::$mce_settings);
 		?>
 
 		<script type="text/javascript">
@@ -1228,14 +1228,14 @@ 
 			suffix: "<?php echo $suffix; ?>",
 			<?php
 
-			if ( self::$drag_drop_upload ) {
+			if (self::$drag_drop_upload) {
 				echo 'dragDropUpload: true,';
 			}
 
 			?>
 			mceInit: <?php echo $mceInit; ?>,
 			qtInit: <?php echo $qtInit; ?>,
-			ref: <?php echo self::_parse_init( $ref ); ?>,
+			ref: <?php echo self::_parse_init($ref); ?>,
 			load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
 		};
 		</script>
@@ -1243,19 +1243,19 @@ 
 
 		$baseurl = self::$baseurl;
 		// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
-		$mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
+		$mce_suffix = false !== strpos(get_bloginfo('version'), '-src') ? '' : '.min';
 
-		if ( $tmce_on ) {
-			if ( $compressed ) {
+		if ($tmce_on) {
+			if ($compressed) {
 				echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
 			} else {
 				echo "<script type='text/javascript' src='{$baseurl}/tinymce{$mce_suffix}.js?$version'></script>\n";
 				echo "<script type='text/javascript' src='{$baseurl}/plugins/compat3x/plugin{$suffix}.js?$version'></script>\n";
 			}
 
-			echo "<script type='text/javascript'>\n" . self::wp_mce_translation() . "</script>\n";
+			echo "<script type='text/javascript'>\n".self::wp_mce_translation()."</script>\n";
 
-			if ( self::$ext_plugins ) {
+			if (self::$ext_plugins) {
 				// Load the old-format English strings to prevent unsightly labels in old style popups
 				echo "<script type='text/javascript' src='{$baseurl}/langs/wp-langs-en.js?$version'></script>\n";
 			}
@@ -1269,17 +1269,17 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'wp_tiny_mce_init', self::$mce_settings );
+		do_action('wp_tiny_mce_init', self::$mce_settings);
 
 		?>
 		<script type="text/javascript">
 		<?php
 
-		if ( self::$ext_plugins )
-			echo self::$ext_plugins . "\n";
+		if (self::$ext_plugins)
+			echo self::$ext_plugins."\n";
 
-		if ( ! is_admin() )
-			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		if ( ! is_admin())
+			echo 'var ajaxurl = "'.admin_url('admin-ajax.php', 'relative').'";';
 
 		?>
 
@@ -1314,7 +1314,7 @@ 
 		</script>
 		<?php
 
-		if ( in_array( 'wplink', self::$plugins, true ) || in_array( 'link', self::$qt_buttons, true ) ) {
+		if (in_array('wplink', self::$plugins, true) || in_array('link', self::$qt_buttons, true)) {
 			self::wp_link_dialog();
 		}
 
@@ -1325,7 +1325,7 @@ 
 		 *
 		 * @param array $mce_settings TinyMCE settings array.
 		 */
-		do_action( 'after_wp_tiny_mce', self::$mce_settings );
+		do_action('after_wp_tiny_mce', self::$mce_settings);
 	}
 
 	/**
@@ -1334,7 +1334,7 @@ 
 	 * @global int $content_width
 	 */
 	public static function wp_fullscreen_html() {
-		_deprecated_function( __FUNCTION__, '4.3.0' );
+		_deprecated_function(__FUNCTION__, '4.3.0');
 	}
 
 	/**
@@ -1346,9 +1346,9 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return false|array Results.
 	 */
-	public static function wp_link_query( $args = array() ) {
-		$pts = get_post_types( array( 'public' => true ), 'objects' );
-		$pt_names = array_keys( $pts );
+	public static function wp_link_query($args = array()) {
+		$pts = get_post_types(array('public' => true), 'objects');
+		$pt_names = array_keys($pts);
 
 		$query = array(
 			'post_type' => $pt_names,
@@ -1359,12 +1359,12 @@ 
 			'posts_per_page' => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
 
-		if ( isset( $args['s'] ) )
+		if (isset($args['s']))
 			$query['s'] = $args['s'];
 
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
 		/**
 		 * Filters the link query arguments.
@@ -1377,27 +1377,27 @@ 
 		 *
 		 * @param array $query An array of WP_Query arguments.
 		 */
-		$query = apply_filters( 'wp_link_query_args', $query );
+		$query = apply_filters('wp_link_query_args', $query);
 
 		// Do main query.
 		$get_posts = new WP_Query;
-		$posts = $get_posts->query( $query );
+		$posts = $get_posts->query($query);
 		// Check if any posts were found.
-		if ( ! $get_posts->post_count )
+		if ( ! $get_posts->post_count)
 			return false;
 
 		// Build results.
 		$results = array();
-		foreach ( $posts as $post ) {
-			if ( 'post' == $post->post_type )
-				$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+		foreach ($posts as $post) {
+			if ('post' == $post->post_type)
+				$info = mysql2date(__('Y/m/d'), $post->post_date);
 			else
-				$info = $pts[ $post->post_type ]->labels->singular_name;
+				$info = $pts[$post->post_type]->labels->singular_name;
 
 			$results[] = array(
 				'ID' => $post->ID,
-				'title' => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
-				'permalink' => get_permalink( $post->ID ),
+				'title' => trim(esc_html(strip_tags(get_the_title($post)))),
+				'permalink' => get_permalink($post->ID),
 				'info' => $info,
 			);
 		}
@@ -1424,7 +1424,7 @@ 
 		 * }
 		 * @param array $query  An array of WP_Query arguments.
 		 */
-		return apply_filters( 'wp_link_query', $results, $query );
+		return apply_filters('wp_link_query', $results, $query);
 	}
 
 	/**
@@ -1440,30 +1440,30 @@ 
 		<div id="wp-link-backdrop" style="display: none"></div>
 		<div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">
 		<form id="wp-link" tabindex="-1">
-		<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
-		<h1 id="link-modal-title"><?php _e( 'Insert/edit link' ) ?></h1>
-		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+		<?php wp_nonce_field('internal-linking', '_ajax_linking_nonce', false); ?>
+		<h1 id="link-modal-title"><?php _e('Insert/edit link') ?></h1>
+		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e('Close'); ?></span></button>
 		<div id="link-selector">
 			<div id="link-options">
-				<p class="howto" id="wplink-enter-url"><?php _e( 'Enter the destination URL' ); ?></p>
+				<p class="howto" id="wplink-enter-url"><?php _e('Enter the destination URL'); ?></p>
 				<div>
-					<label><span><?php _e( 'URL' ); ?></span>
+					<label><span><?php _e('URL'); ?></span>
 					<input id="wp-link-url" type="text" aria-describedby="wplink-enter-url" /></label>
 				</div>
 				<div class="wp-link-text-field">
-					<label><span><?php _e( 'Link Text' ); ?></span>
+					<label><span><?php _e('Link Text'); ?></span>
 					<input id="wp-link-text" type="text" /></label>
 				</div>
 				<div class="link-target">
 					<label><span></span>
-					<input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
+					<input type="checkbox" id="wp-link-target" /> <?php _e('Open link in a new tab'); ?></label>
 				</div>
 			</div>
-			<p class="howto" id="wplink-link-existing-content"><?php _e( 'Or link to existing content' ); ?></p>
+			<p class="howto" id="wplink-link-existing-content"><?php _e('Or link to existing content'); ?></p>
 			<div id="search-panel">
 				<div class="link-search-wrapper">
 					<label>
-						<span class="search-label"><?php _e( 'Search' ); ?></span>
+						<span class="search-label"><?php _e('Search'); ?></span>
 						<input type="search" id="wp-link-search" class="link-search-field" autocomplete="off" aria-describedby="wplink-link-existing-content" />
 						<span class="spinner"></span>
 					</label>
@@ -1476,8 +1476,8 @@ 
 				</div>
 				<div id="most-recent-results" class="query-results" tabindex="0">
 					<div class="query-notice" id="query-notice-message">
-						<em class="query-notice-default"><?php _e( 'No search term specified. Showing recent items.' ); ?></em>
-						<em class="query-notice-hint screen-reader-text"><?php _e( 'Search or use up and down arrow keys to select an item.' ); ?></em>
+						<em class="query-notice-default"><?php _e('No search term specified. Showing recent items.'); ?></em>
+						<em class="query-notice-hint screen-reader-text"><?php _e('Search or use up and down arrow keys to select an item.'); ?></em>
 					</div>
 					<ul></ul>
 					<div class="river-waiting">
@@ -1488,10 +1488,10 @@ 
 		</div>
 		<div class="submitbox">
 			<div id="wp-link-cancel">
-				<button type="button" class="button"><?php _e( 'Cancel' ); ?></button>
+				<button type="button" class="button"><?php _e('Cancel'); ?></button>
 			</div>
 			<div id="wp-link-update">
-				<input type="submit" value="<?php esc_attr_e( 'Add Link' ); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
+				<input type="submit" value="<?php esc_attr_e('Add Link'); ?>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
 			</div>
 		</div>
 		</form>

src/wp-includes/class-oembed.php

Braces +58 added lines, -40 removed lines

@@ -225,8 +225,9 @@ 
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
-			$args['discover'] = true;
+		if ( !isset($args['discover']) ) {
+					$args['discover'] = true;
+		}
 
 		foreach ( $this->providers as $matchmask => $data ) {
 			list( $providerurl, $regex ) = $data;
@@ -243,8 +244,9 @@ 
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( !$provider && $args['discover'] ) {
+					$provider = $this->discover( $url );
+		}
 
 		return $provider;
 	}
@@ -425,20 +427,22 @@ 
 						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
-							break;
+						if ( 'json' == $linktypes[$atts['type']] ) {
+													break;
+						}
 					}
 				}
 			}
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
-			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
-			return $providers['xml'];
-		else
-			return false;
+		if ( !empty($providers['json']) ) {
+					return $providers['json'];
+		} elseif ( !empty($providers['xml']) ) {
+					return $providers['xml'];
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -472,8 +476,9 @@ 
 
 		foreach ( array( 'json', 'xml' ) as $format ) {
 			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
-				continue;
+			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) {
+							continue;
+			}
 			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
 		}
 		return false;
@@ -496,10 +501,12 @@ 
 		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
 
 		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
-			return false;
+		if ( 501 == wp_remote_retrieve_response_code( $response ) ) {
+					return new WP_Error( 'not-implemented' );
+		}
+		if ( ! $body = wp_remote_retrieve_body( $response ) ) {
+					return false;
+		}
 		$parse_method = "_parse_$format";
 		return $this->$parse_method( $body );
 	}
@@ -528,8 +535,9 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
-			return false;
+		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
+					return false;
+		}
 
 		$loader = libxml_disable_entity_loader( true );
 		$errors = libxml_use_internal_errors( true );
@@ -552,25 +560,30 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
-			return false;
+		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) ) {
+					return false;
+		}
 
 		$dom = new DOMDocument;
 		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
-			return false;
+		if ( ! $success ) {
+					return false;
+		}
 
-		if ( isset( $dom->doctype ) )
-			return false;
+		if ( isset( $dom->doctype ) ) {
+					return false;
+		}
 
 		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
-				return false;
+			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType ) {
+							return false;
+			}
 		}
 
 		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
-			return false;
+		if ( ! $xml ) {
+					return false;
+		}
 
 		$return = new stdClass;
 		foreach ( $xml as $key => $value ) {
@@ -591,17 +604,20 @@ 
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
 	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
-			return false;
+		if ( ! is_object( $data ) || empty( $data->type ) ) {
+					return false;
+		}
 
 		$return = false;
 
 		switch ( $data->type ) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
-					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
-					break;
+				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) ) {
+									break;
+				}
+				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) ) {
+									break;
+				}
 
 				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
 				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
@@ -609,13 +625,15 @@ 
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
-					$return = $data->html;
+				if ( ! empty( $data->html ) && is_string( $data->html ) ) {
+									$return = $data->html;
+				}
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty( $data->title ) && is_string( $data->title ) ) {
+									$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				}
 				break;
 
 			default:

Spacing +173 added lines, -173 removed lines

@@ -44,7 +44,7 @@ 
 	 * @access private
 	 * @var array
 	 */
-	private $compat_methods = array( '_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body' );
+	private $compat_methods = array('_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body');
 
 	/**
 	 * Constructor.
@@ -53,72 +53,72 @@ 
 	 * @access public
 	 */
 	public function __construct() {
-		$host = urlencode( home_url() );
+		$host = urlencode(home_url());
 		$providers = array(
-			'#https?://((m|www)\.)?youtube\.com/watch.*#i'             => array( 'https://www.youtube.com/oembed',                            true  ),
-			'#https?://((m|www)\.)?youtube\.com/playlist.*#i'          => array( 'https://www.youtube.com/oembed',                            true  ),
-			'#https?://youtu\.be/.*#i'                                 => array( 'https://www.youtube.com/oembed',                            true  ),
-			'#https?://(.+\.)?vimeo\.com/.*#i'                         => array( 'https://vimeo.com/api/oembed.{format}',                     true  ),
-			'#https?://(www\.)?dailymotion\.com/.*#i'                  => array( 'https://www.dailymotion.com/services/oembed',               true  ),
-			'#https?://dai\.ly/.*#i'                                   => array( 'https://www.dailymotion.com/services/oembed',               true  ),
-			'#https?://(www\.)?flickr\.com/.*#i'                       => array( 'https://www.flickr.com/services/oembed/',                   true  ),
-			'#https?://flic\.kr/.*#i'                                  => array( 'https://www.flickr.com/services/oembed/',                   true  ),
-			'#https?://(.+\.)?smugmug\.com/.*#i'                       => array( 'https://api.smugmug.com/services/oembed/',                  true  ),
-			'#https?://(www\.)?hulu\.com/watch/.*#i'                   => array( 'http://www.hulu.com/api/oembed.{format}',                   true  ),
-			'http://i*.photobucket.com/albums/*'                       => array( 'http://api.photobucket.com/oembed',                         false ),
-			'http://gi*.photobucket.com/groups/*'                      => array( 'http://api.photobucket.com/oembed',                         false ),
-			'#https?://(www\.)?scribd\.com/doc/.*#i'                   => array( 'https://www.scribd.com/services/oembed',                    true  ),
-			'#https?://wordpress\.tv/.*#i'                             => array( 'https://wordpress.tv/oembed/',                              true  ),
-			'#https?://(.+\.)?polldaddy\.com/.*#i'                     => array( 'https://polldaddy.com/oembed/',                             true  ),
-			'#https?://poll\.fm/.*#i'                                  => array( 'https://polldaddy.com/oembed/',                             true  ),
-			'#https?://(www\.)?funnyordie\.com/videos/.*#i'            => array( 'http://www.funnyordie.com/oembed',                          true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}$#i'               => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/likes$#i'         => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/lists/.*#i'       => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/timelines/.*#i'   => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/i/moments/.*#i'            => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://vine\.co/v/.*#i'                                => array( 'https://vine.co/oembed.{format}',                           true  ),
-			'#https?://(www\.)?soundcloud\.com/.*#i'                   => array( 'https://soundcloud.com/oembed',                             true  ),
-			'#https?://(.+?\.)?slideshare\.net/.*#i'                   => array( 'https://www.slideshare.net/api/oembed/2',                   true  ),
-			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'           => array( 'https://api.instagram.com/oembed',                          true  ),
-			'#https?://(open|play)\.spotify\.com/.*#i'                 => array( 'https://embed.spotify.com/oembed/',                         true  ),
-			'#https?://(.+\.)?imgur\.com/.*#i'                         => array( 'http://api.imgur.com/oembed',                               true  ),
-			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'                => array( 'https://api.meetup.com/oembed',                             true  ),
-			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'                => array( 'https://issuu.com/oembed_wp',                               true  ),
-			'#https?://(www\.)?collegehumor\.com/video/.*#i'           => array( 'http://www.collegehumor.com/oembed.{format}',               true  ),
-			'#https?://(www\.)?mixcloud\.com/.*#i'                     => array( 'https://www.mixcloud.com/oembed',                           true  ),
-			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'            => array( 'https://www.ted.com/services/v1/oembed.{format}',           true  ),
-			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i'      => array( 'https://animoto.com/oembeds/create',                        true  ),
-			'#https?://(.+)\.tumblr\.com/post/.*#i'                    => array( 'https://www.tumblr.com/oembed/1.0',                         true  ),
-			'#https?://(www\.)?kickstarter\.com/projects/.*#i'         => array( 'https://www.kickstarter.com/services/oembed',               true  ),
-			'#https?://kck\.st/.*#i'                                   => array( 'https://www.kickstarter.com/services/oembed',               true  ),
-			'#https?://cloudup\.com/.*#i'                              => array( 'https://cloudup.com/oembed',                                true  ),
-			'#https?://(www\.)?reverbnation\.com/.*#i'                 => array( 'https://www.reverbnation.com/oembed',                       true  ),
-			'#https?://videopress\.com/v/.*#'                          => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true  ),
-			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i'      => array( 'https://www.reddit.com/oembed',                             true  ),
-			'#https?://(www\.)?speakerdeck\.com/.*#i'                  => array( 'https://speakerdeck.com/oembed.{format}',                   true  ),
-			'#https?://www\.facebook\.com/.*/posts/.*#i'               => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/.*/activity/.*#i'            => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/.*/photos/.*#i'              => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/photo(s/|\.php).*#i'         => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/permalink\.php.*#i'          => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/media/.*#i'                  => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/questions/.*#i'              => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/notes/.*#i'                  => array( 'https://www.facebook.com/plugins/post/oembed.json/',        true  ),
-			'#https?://www\.facebook\.com/.*/videos/.*#i'              => array( 'https://www.facebook.com/plugins/video/oembed.json/',       true  ),
-			'#https?://www\.facebook\.com/video\.php.*#i'              => array( 'https://www.facebook.com/plugins/video/oembed.json/',       true  ),
+			'#https?://((m|www)\.)?youtube\.com/watch.*#i'             => array('https://www.youtube.com/oembed', true),
+			'#https?://((m|www)\.)?youtube\.com/playlist.*#i'          => array('https://www.youtube.com/oembed', true),
+			'#https?://youtu\.be/.*#i'                                 => array('https://www.youtube.com/oembed', true),
+			'#https?://(.+\.)?vimeo\.com/.*#i'                         => array('https://vimeo.com/api/oembed.{format}', true),
+			'#https?://(www\.)?dailymotion\.com/.*#i'                  => array('https://www.dailymotion.com/services/oembed', true),
+			'#https?://dai\.ly/.*#i'                                   => array('https://www.dailymotion.com/services/oembed', true),
+			'#https?://(www\.)?flickr\.com/.*#i'                       => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://flic\.kr/.*#i'                                  => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://(.+\.)?smugmug\.com/.*#i'                       => array('https://api.smugmug.com/services/oembed/', true),
+			'#https?://(www\.)?hulu\.com/watch/.*#i'                   => array('http://www.hulu.com/api/oembed.{format}', true),
+			'http://i*.photobucket.com/albums/*'                       => array('http://api.photobucket.com/oembed', false),
+			'http://gi*.photobucket.com/groups/*'                      => array('http://api.photobucket.com/oembed', false),
+			'#https?://(www\.)?scribd\.com/doc/.*#i'                   => array('https://www.scribd.com/services/oembed', true),
+			'#https?://wordpress\.tv/.*#i'                             => array('https://wordpress.tv/oembed/', true),
+			'#https?://(.+\.)?polldaddy\.com/.*#i'                     => array('https://polldaddy.com/oembed/', true),
+			'#https?://poll\.fm/.*#i'                                  => array('https://polldaddy.com/oembed/', true),
+			'#https?://(www\.)?funnyordie\.com/videos/.*#i'            => array('http://www.funnyordie.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/status(es)?/.*#i' => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/\w{1,15}$#i'               => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/likes$#i'         => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/lists/.*#i'       => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/timelines/.*#i'   => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/i/moments/.*#i'            => array('https://publish.twitter.com/oembed', true),
+			'#https?://vine\.co/v/.*#i'                                => array('https://vine.co/oembed.{format}', true),
+			'#https?://(www\.)?soundcloud\.com/.*#i'                   => array('https://soundcloud.com/oembed', true),
+			'#https?://(.+?\.)?slideshare\.net/.*#i'                   => array('https://www.slideshare.net/api/oembed/2', true),
+			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'           => array('https://api.instagram.com/oembed', true),
+			'#https?://(open|play)\.spotify\.com/.*#i'                 => array('https://embed.spotify.com/oembed/', true),
+			'#https?://(.+\.)?imgur\.com/.*#i'                         => array('http://api.imgur.com/oembed', true),
+			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'                => array('https://api.meetup.com/oembed', true),
+			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'                => array('https://issuu.com/oembed_wp', true),
+			'#https?://(www\.)?collegehumor\.com/video/.*#i'           => array('http://www.collegehumor.com/oembed.{format}', true),
+			'#https?://(www\.)?mixcloud\.com/.*#i'                     => array('https://www.mixcloud.com/oembed', true),
+			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'            => array('https://www.ted.com/services/v1/oembed.{format}', true),
+			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i'      => array('https://animoto.com/oembeds/create', true),
+			'#https?://(.+)\.tumblr\.com/post/.*#i'                    => array('https://www.tumblr.com/oembed/1.0', true),
+			'#https?://(www\.)?kickstarter\.com/projects/.*#i'         => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://kck\.st/.*#i'                                   => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://cloudup\.com/.*#i'                              => array('https://cloudup.com/oembed', true),
+			'#https?://(www\.)?reverbnation\.com/.*#i'                 => array('https://www.reverbnation.com/oembed', true),
+			'#https?://videopress\.com/v/.*#'                          => array('https://public-api.wordpress.com/oembed/1.0/?for='.$host, true),
+			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i'      => array('https://www.reddit.com/oembed', true),
+			'#https?://(www\.)?speakerdeck\.com/.*#i'                  => array('https://speakerdeck.com/oembed.{format}', true),
+			'#https?://www\.facebook\.com/.*/posts/.*#i'               => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/.*/activity/.*#i'            => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/.*/photos/.*#i'              => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/photo(s/|\.php).*#i'         => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/permalink\.php.*#i'          => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/media/.*#i'                  => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/questions/.*#i'              => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/notes/.*#i'                  => array('https://www.facebook.com/plugins/post/oembed.json/', true),
+			'#https?://www\.facebook\.com/.*/videos/.*#i'              => array('https://www.facebook.com/plugins/video/oembed.json/', true),
+			'#https?://www\.facebook\.com/video\.php.*#i'              => array('https://www.facebook.com/plugins/video/oembed.json/', true),
 		);
 
-		if ( ! empty( self::$early_providers['add'] ) ) {
-			foreach ( self::$early_providers['add'] as $format => $data ) {
-				$providers[ $format ] = $data;
+		if ( ! empty(self::$early_providers['add'])) {
+			foreach (self::$early_providers['add'] as $format => $data) {
+				$providers[$format] = $data;
 			}
 		}
 
-		if ( ! empty( self::$early_providers['remove'] ) ) {
-			foreach ( self::$early_providers['remove'] as $format ) {
-				unset( $providers[ $format ] );
+		if ( ! empty(self::$early_providers['remove'])) {
+			foreach (self::$early_providers['remove'] as $format) {
+				unset($providers[$format]);
 			}
 		}
 
@@ -199,10 +199,10 @@ 
 		 *
 		 * @param array $providers An array of popular oEmbed providers.
 		 */
-		$this->providers = apply_filters( 'oembed_providers', $providers );
+		$this->providers = apply_filters('oembed_providers', $providers);
 
 		// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-		add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
+		add_filter('oembed_dataparse', array($this, '_strip_newlines'), 10, 3);
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -234,31 +234,31 @@ 
 	 * @param string|array  $args Optional provider arguments.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function get_provider( $url, $args = '' ) {
-		$args = wp_parse_args( $args );
+	public function get_provider($url, $args = '') {
+		$args = wp_parse_args($args);
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
+		if ( ! isset($args['discover']))
 			$args['discover'] = true;
 
-		foreach ( $this->providers as $matchmask => $data ) {
-			list( $providerurl, $regex ) = $data;
+		foreach ($this->providers as $matchmask => $data) {
+			list($providerurl, $regex) = $data;
 
 			// Turn the asterisk-type provider URLs into regex
-			if ( !$regex ) {
-				$matchmask = '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $matchmask ), '#' ) ) . '#i';
-				$matchmask = preg_replace( '|^#http\\\://|', '#https?\://', $matchmask );
+			if ( ! $regex) {
+				$matchmask = '#'.str_replace('___wildcard___', '(.+)', preg_quote(str_replace('*', '___wildcard___', $matchmask), '#')).'#i';
+				$matchmask = preg_replace('|^#http\\\://|', '#https?\://', $matchmask);
 			}
 
-			if ( preg_match( $matchmask, $url ) ) {
-				$provider = str_replace( '{format}', 'json', $providerurl ); // JSON is easier to deal with than XML
+			if (preg_match($matchmask, $url)) {
+				$provider = str_replace('{format}', 'json', $providerurl); // JSON is easier to deal with than XML
 				break;
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( ! $provider && $args['discover'])
+			$provider = $this->discover($url);
 
 		return $provider;
 	}
@@ -283,12 +283,12 @@ 
 	 * @param bool   $regex    Optional. Whether the $format parameter is in a regex format.
 	 *                         Default false.
 	 */
-	public static function _add_provider_early( $format, $provider, $regex = false ) {
-		if ( empty( self::$early_providers['add'] ) ) {
+	public static function _add_provider_early($format, $provider, $regex = false) {
+		if (empty(self::$early_providers['add'])) {
 			self::$early_providers['add'] = array();
 		}
 
-		self::$early_providers['add'][ $format ] = array( $provider, $regex );
+		self::$early_providers['add'][$format] = array($provider, $regex);
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	 * @param string $format The format of URL that this provider can handle. You can use
 	 *                       asterisks as wildcards.
 	 */
-	public static function _remove_provider_early( $format ) {
-		if ( empty( self::$early_providers['remove'] ) ) {
+	public static function _remove_provider_early($format) {
+		if (empty(self::$early_providers['remove'])) {
 			self::$early_providers['remove'] = array();
 		}
 
@@ -329,8 +329,8 @@ 
 	 * @param array|string $args Optional. Arguments, usually passed from a shortcode. Default empty.
 	 * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
 	 */
-	public function get_html( $url, $args = '' ) {
-		$args = wp_parse_args( $args );
+	public function get_html($url, $args = '') {
+		$args = wp_parse_args($args);
 
 		/**
 		 * Filters the oEmbed result before any HTTP requests are made.
@@ -347,15 +347,15 @@ 
 		 * @param string      $url    The URL to the content that should be attempted to be embedded.
 		 * @param array       $args   Optional. Arguments, usually passed from a shortcode. Default empty.
 		 */
-		$pre = apply_filters( 'pre_oembed_result', null, $url, $args );
+		$pre = apply_filters('pre_oembed_result', null, $url, $args);
 
-		if ( null !== $pre ) {
+		if (null !== $pre) {
 			return $pre;
 		}
 
-		$provider = $this->get_provider( $url, $args );
+		$provider = $this->get_provider($url, $args);
 
-		if ( ! $provider || false === $data = $this->fetch( $provider, $url, $args ) ) {
+		if ( ! $provider || false === $data = $this->fetch($provider, $url, $args)) {
 			return false;
 		}
 
@@ -368,7 +368,7 @@ 
 		 * @param string $url  URL of the content to be embedded.
 		 * @param array  $args Optional arguments, usually passed from a shortcode.
 		 */
-		return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
+		return apply_filters('oembed_result', $this->data2html($data, $url), $url, $args);
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 * @param string $url The URL that should be inspected for discovery `<link>` tags.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function discover( $url ) {
+	public function discover($url) {
 		$providers = array();
 		$args = array(
 			'limit_response_size' => 153600, // 150 KB
@@ -396,11 +396,11 @@ 
 		 * @param array  $args oEmbed remote get arguments.
 		 * @param string $url  URL to be inspected.
 		 */
-		$args = apply_filters( 'oembed_remote_get_args', $args, $url );
+		$args = apply_filters('oembed_remote_get_args', $args, $url);
 
 		// Fetch URL content
-		$request = wp_safe_remote_get( $url, $args );
-		if ( $html = wp_remote_retrieve_body( $request ) ) {
+		$request = wp_safe_remote_get($url, $args);
+		if ($html = wp_remote_retrieve_body($request)) {
 
 			/**
 			 * Filters the link types that contain oEmbed provider URLs.
@@ -411,35 +411,35 @@ 
 			 *                      'text/xml+oembed', and 'application/xml+oembed' (incorrect,
 			 *                      used by at least Vimeo).
 			 */
-			$linktypes = apply_filters( 'oembed_linktypes', array(
+			$linktypes = apply_filters('oembed_linktypes', array(
 				'application/json+oembed' => 'json',
 				'text/xml+oembed' => 'xml',
 				'application/xml+oembed' => 'xml',
-			) );
+			));
 
 			// Strip <body>
-			if ( $html_head_end = stripos( $html, '</head>' ) ) {
-				$html = substr( $html, 0, $html_head_end );
+			if ($html_head_end = stripos($html, '</head>')) {
+				$html = substr($html, 0, $html_head_end);
 			}
 
 			// Do a quick check
 			$tagfound = false;
-			foreach ( $linktypes as $linktype => $format ) {
-				if ( stripos($html, $linktype) ) {
+			foreach ($linktypes as $linktype => $format) {
+				if (stripos($html, $linktype)) {
 					$tagfound = true;
 					break;
 				}
 			}
 
-			if ( $tagfound && preg_match_all( '#<link([^<>]+)/?>#iU', $html, $links ) ) {
-				foreach ( $links[1] as $link ) {
-					$atts = shortcode_parse_atts( $link );
+			if ($tagfound && preg_match_all('#<link([^<>]+)/?>#iU', $html, $links)) {
+				foreach ($links[1] as $link) {
+					$atts = shortcode_parse_atts($link);
 
-					if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) {
-						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
+					if ( ! empty($atts['type']) && ! empty($linktypes[$atts['type']]) && ! empty($atts['href'])) {
+						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode($atts['href']);
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
+						if ('json' == $linktypes[$atts['type']])
 							break;
 					}
 				}
@@ -447,9 +447,9 @@ 
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
+		if ( ! empty($providers['json']))
 			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
+		elseif ( ! empty($providers['xml']))
 			return $providers['xml'];
 		else
 			return false;
@@ -466,12 +466,12 @@ 
 	 * @param array|string $args     Optional. Arguments, usually passed from a shortcode. Default empty.
 	 * @return false|object False on failure, otherwise the result in the form of an object.
 	 */
-	public function fetch( $provider, $url, $args = '' ) {
-		$args = wp_parse_args( $args, wp_embed_defaults( $url ) );
+	public function fetch($provider, $url, $args = '') {
+		$args = wp_parse_args($args, wp_embed_defaults($url));
 
-		$provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
-		$provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
-		$provider = add_query_arg( 'url', urlencode($url), $provider );
+		$provider = add_query_arg('maxwidth', (int) $args['width'], $provider);
+		$provider = add_query_arg('maxheight', (int) $args['height'], $provider);
+		$provider = add_query_arg('url', urlencode($url), $provider);
 
 		/**
 		 * Filters the oEmbed URL to be fetched.
@@ -482,13 +482,13 @@ 
 		 * @param string $url      URL of the content to be embedded.
 		 * @param array  $args     Optional arguments, usually passed from a shortcode.
 		 */
-		$provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
+		$provider = apply_filters('oembed_fetch_url', $provider, $url, $args);
 
-		foreach ( array( 'json', 'xml' ) as $format ) {
-			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
+		foreach (array('json', 'xml') as $format) {
+			$result = $this->_fetch_with_format($provider, $format);
+			if (is_wp_error($result) && 'not-implemented' == $result->get_error_code())
 				continue;
-			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
+			return ($result && ! is_wp_error($result)) ? $result : false;
 		}
 		return false;
 	}
@@ -503,19 +503,19 @@ 
 	 * @param string $format Format to use
 	 * @return false|object|WP_Error False on failure, otherwise the result in the form of an object.
 	 */
-	private function _fetch_with_format( $provider_url_with_args, $format ) {
-		$provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
+	private function _fetch_with_format($provider_url_with_args, $format) {
+		$provider_url_with_args = add_query_arg('format', $format, $provider_url_with_args);
 
 		/** This filter is documented in wp-includes/class-oembed.php */
-		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
+		$args = apply_filters('oembed_remote_get_args', array(), $provider_url_with_args);
 
-		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
+		$response = wp_safe_remote_get($provider_url_with_args, $args);
+		if (501 == wp_remote_retrieve_response_code($response))
+			return new WP_Error('not-implemented');
+		if ( ! $body = wp_remote_retrieve_body($response))
 			return false;
 		$parse_method = "_parse_$format";
-		return $this->$parse_method( $body );
+		return $this->$parse_method($body);
 	}
 
 	/**
@@ -527,9 +527,9 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_json( $response_body ) {
-		$data = json_decode( trim( $response_body ) );
-		return ( $data && is_object( $data ) ) ? $data : false;
+	private function _parse_json($response_body) {
+		$data = json_decode(trim($response_body));
+		return ($data && is_object($data)) ? $data : false;
 	}
 
 	/**
@@ -541,17 +541,17 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
+	private function _parse_xml($response_body) {
+		if ( ! function_exists('libxml_disable_entity_loader'))
 			return false;
 
-		$loader = libxml_disable_entity_loader( true );
-		$errors = libxml_use_internal_errors( true );
+		$loader = libxml_disable_entity_loader(true);
+		$errors = libxml_use_internal_errors(true);
 
-		$return = $this->_parse_xml_body( $response_body );
+		$return = $this->_parse_xml_body($response_body);
 
-		libxml_use_internal_errors( $errors );
-		libxml_disable_entity_loader( $loader );
+		libxml_use_internal_errors($errors);
+		libxml_disable_entity_loader($loader);
 
 		return $return;
 	}
@@ -565,29 +565,29 @@ 
 	 * @param string $response_body
 	 * @return stdClass|false
 	 */
-	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
+	private function _parse_xml_body($response_body) {
+		if ( ! function_exists('simplexml_import_dom') || ! class_exists('DOMDocument', false))
 			return false;
 
 		$dom = new DOMDocument;
-		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
+		$success = $dom->loadXML($response_body);
+		if ( ! $success)
 			return false;
 
-		if ( isset( $dom->doctype ) )
+		if (isset($dom->doctype))
 			return false;
 
-		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
+		foreach ($dom->childNodes as $child) {
+			if (XML_DOCUMENT_TYPE_NODE === $child->nodeType)
 				return false;
 		}
 
-		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
+		$xml = simplexml_import_dom($dom);
+		if ( ! $xml)
 			return false;
 
 		$return = new stdClass;
-		foreach ( $xml as $key => $value ) {
+		foreach ($xml as $key => $value) {
 			$return->$key = (string) $value;
 		}
 
@@ -604,32 +604,32 @@ 
 	 * @param string $url The URL to the content that is desired to be embedded.
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
-	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
+	public function data2html($data, $url) {
+		if ( ! is_object($data) || empty($data->type))
 			return false;
 
 		$return = false;
 
-		switch ( $data->type ) {
+		switch ($data->type) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
+				if (empty($data->url) || empty($data->width) || empty($data->height))
 					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
+				if ( ! is_string($data->url) || ! is_numeric($data->width) || ! is_numeric($data->height))
 					break;
 
-				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
-				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
+				$title = ! empty($data->title) && is_string($data->title) ? $data->title : '';
+				$return = '<a href="'.esc_url($url).'"><img src="'.esc_url($data->url).'" alt="'.esc_attr($title).'" width="'.esc_attr($data->width).'" height="'.esc_attr($data->height).'" /></a>';
 				break;
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
+				if ( ! empty($data->html) && is_string($data->html))
 					$return = $data->html;
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty($data->title) && is_string($data->title))
+					$return = '<a href="'.esc_url($url).'">'.esc_html($data->title).'</a>';
 				break;
 
 			default:
@@ -647,7 +647,7 @@ 
 		 * @param object $data   A data object result from an oEmbed provider.
 		 * @param string $url    The URL of the content to be embedded.
 		 */
-		return apply_filters( 'oembed_dataparse', $return, $data, $url );
+		return apply_filters('oembed_dataparse', $return, $data, $url);
 	}
 
 	/**
@@ -662,32 +662,32 @@ 
 	 * @param string $url The original URL passed to oEmbed.
 	 * @return string Possibly modified $html
 	 */
-	public function _strip_newlines( $html, $data, $url ) {
-		if ( false === strpos( $html, "\n" ) ) {
+	public function _strip_newlines($html, $data, $url) {
+		if (false === strpos($html, "\n")) {
 			return $html;
 		}
 
 		$count = 1;
 		$found = array();
 		$token = '__PRE__';
-		$search = array( "\t", "\n", "\r", ' ' );
-		$replace = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' );
-		$tokenized = str_replace( $search, $replace, $html );
+		$search = array("\t", "\n", "\r", ' ');
+		$replace = array('__TAB__', '__NL__', '__CR__', '__SPACE__');
+		$tokenized = str_replace($search, $replace, $html);
 
-		preg_match_all( '#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER );
-		foreach ( $matches as $i => $match ) {
-			$tag_html = str_replace( $replace, $search, $match[0] );
-			$tag_token = $token . $i;
+		preg_match_all('#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER);
+		foreach ($matches as $i => $match) {
+			$tag_html = str_replace($replace, $search, $match[0]);
+			$tag_token = $token.$i;
 
-			$found[ $tag_token ] = $tag_html;
-			$html = str_replace( $tag_html, $tag_token, $html, $count );
+			$found[$tag_token] = $tag_html;
+			$html = str_replace($tag_html, $tag_token, $html, $count);
 		}
 
-		$replaced = str_replace( $replace, $search, $html );
-		$stripped = str_replace( array( "\r\n", "\n" ), '', $replaced );
-		$pre = array_values( $found );
-		$tokens = array_keys( $found );
+		$replaced = str_replace($replace, $search, $html);
+		$stripped = str_replace(array("\r\n", "\n"), '', $replaced);
+		$pre = array_values($found);
+		$tokens = array_keys($found);
 
-		return str_replace( $tokens, $pre, $stripped );
+		return str_replace($tokens, $pre, $stripped);
 	}
 }