ntwb / wordpress

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

Spacing +74 added lines, -74 removed lines

@@ -25,17 +25,17 @@ 
 	 */
 	public function __construct() {
 		// Hack to get the [embed] shortcode to run before wpautop()
-		add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
+		add_filter('the_content', array($this, 'run_shortcode'), 8);
 
 		// Shortcode placeholder for strip_shortcodes()
-		add_shortcode( 'embed', '__return_false' );
+		add_shortcode('embed', '__return_false');
 
 		// Attempts to embed all URLs in a post
-		add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
+		add_filter('the_content', array($this, 'autoembed'), 8);
 
 		// After a post is saved, cache oEmbed items via AJAX
-		add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
-		add_action( 'edit_page_form', array( $this, 'maybe_run_ajax_cache' ) );
+		add_action('edit_form_advanced', array($this, 'maybe_run_ajax_cache'));
+		add_action('edit_page_form', array($this, 'maybe_run_ajax_cache'));
 	}
 
 	/**
@@ -50,17 +50,17 @@ 
 	 * @param string $content Content to parse
 	 * @return string Content with shortcode parsed
 	 */
-	public function run_shortcode( $content ) {
+	public function run_shortcode($content) {
 		global $shortcode_tags;
 
 		// Back up current registered shortcodes and clear them all out
 		$orig_shortcode_tags = $shortcode_tags;
 		remove_all_shortcodes();
 
-		add_shortcode( 'embed', array( $this, 'shortcode' ) );
+		add_shortcode('embed', array($this, 'shortcode'));
 
 		// Do the shortcode (only the [embed] one is registered)
-		$content = do_shortcode( $content, true );
+		$content = do_shortcode($content, true);
 
 		// Put the original shortcodes back
 		$shortcode_tags = $orig_shortcode_tags;
@@ -75,13 +75,13 @@ 
 	public function maybe_run_ajax_cache() {
 		$post = get_post();
 
-		if ( ! $post || empty( $_GET['message'] ) )
+		if ( ! $post || empty($_GET['message']))
 			return;
 
 ?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
-		$.get("<?php echo admin_url( 'admin-ajax.php?action=oembed-cache&post=' . $post->ID, 'relative' ); ?>");
+		$.get("<?php echo admin_url('admin-ajax.php?action=oembed-cache&post='.$post->ID, 'relative'); ?>");
 	});
 </script>
 <?php
@@ -96,7 +96,7 @@ 
 	 * @param callable $callback The callback function that will be called if the regex is matched.
 	 * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
 	 */
-	public function register_handler( $id, $regex, $callback, $priority = 10 ) {
+	public function register_handler($id, $regex, $callback, $priority = 10) {
 		$this->handlers[$priority][$id] = array(
 			'regex'    => $regex,
 			'callback' => $callback,
@@ -109,8 +109,8 @@ 
 	 * @param string $id The handler ID that should be removed.
 	 * @param int $priority Optional. The priority of the handler to be removed (default: 10).
 	 */
-	public function unregister_handler( $id, $priority = 10 ) {
-		unset( $this->handlers[ $priority ][ $id ] );
+	public function unregister_handler($id, $priority = 10) {
+		unset($this->handlers[$priority][$id]);
 	}
 
 	/**
@@ -129,35 +129,35 @@ 
 	 * @return string|false The embed HTML on success, otherwise the original URL.
 	 *                      `->maybe_make_link()` can return false on failure.
 	 */
-	public function shortcode( $attr, $url = '' ) {
+	public function shortcode($attr, $url = '') {
 		$post = get_post();
 
-		if ( empty( $url ) && ! empty( $attr['src'] ) ) {
+		if (empty($url) && ! empty($attr['src'])) {
 			$url = $attr['src'];
 		}
 
 		$this->last_url = $url;
 
-		if ( empty( $url ) ) {
+		if (empty($url)) {
 			$this->last_attr = $attr;
 			return '';
 		}
 
 		$rawattr = $attr;
-		$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
+		$attr = wp_parse_args($attr, wp_embed_defaults($url));
 
 		$this->last_attr = $attr;
 
 		// kses converts & into &amp; and we need to undo this
 		// See https://core.trac.wordpress.org/ticket/11311
-		$url = str_replace( '&amp;', '&', $url );
+		$url = str_replace('&amp;', '&', $url);
 
 		// Look for known internal handlers
-		ksort( $this->handlers );
-		foreach ( $this->handlers as $priority => $handlers ) {
-			foreach ( $handlers as $id => $handler ) {
-				if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
-					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
+		ksort($this->handlers);
+		foreach ($this->handlers as $priority => $handlers) {
+			foreach ($handlers as $id => $handler) {
+				if (preg_match($handler['regex'], $url, $matches) && is_callable($handler['callback'])) {
+					if (false !== $return = call_user_func($handler['callback'], $matches, $attr, $url, $rawattr))
 						/**
 						 * Filter the returned embed handler.
 						 *
@@ -169,22 +169,22 @@ 
 						 * @param string $url    The attempted embed URL.
 						 * @param array  $attr   An array of shortcode attributes.
 						 */
-						return apply_filters( 'embed_handler_html', $return, $url, $attr );
+						return apply_filters('embed_handler_html', $return, $url, $attr);
 				}
 			}
 		}
 
-		$post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
-		if ( ! empty( $this->post_ID ) ) // Potentially set by WP_Embed::cache_oembed()
+		$post_ID = ( ! empty($post->ID)) ? $post->ID : null;
+		if ( ! empty($this->post_ID)) // Potentially set by WP_Embed::cache_oembed()
 			$post_ID = $this->post_ID;
 
 		// Unknown URL format. Let oEmbed have a go.
-		if ( $post_ID ) {
+		if ($post_ID) {
 
 			// Check for a cached result (stored in the post meta)
-			$key_suffix = md5( $url . serialize( $attr ) );
-			$cachekey = '_oembed_' . $key_suffix;
-			$cachekey_time = '_oembed_time_' . $key_suffix;
+			$key_suffix = md5($url.serialize($attr));
+			$cachekey = '_oembed_'.$key_suffix;
+			$cachekey_time = '_oembed_time_'.$key_suffix;
 
 			/**
 			 * Filter the oEmbed TTL value (time to live).
@@ -196,23 +196,23 @@ 
 			 * @param array  $attr    An array of shortcode attributes.
 			 * @param int    $post_ID Post ID.
 			 */
-			$ttl = apply_filters( 'oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_ID );
+			$ttl = apply_filters('oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_ID);
 
-			$cache = get_post_meta( $post_ID, $cachekey, true );
-			$cache_time = get_post_meta( $post_ID, $cachekey_time, true );
+			$cache = get_post_meta($post_ID, $cachekey, true);
+			$cache_time = get_post_meta($post_ID, $cachekey_time, true);
 
-			if ( ! $cache_time ) {
+			if ( ! $cache_time) {
 				$cache_time = 0;
 			}
 
-			$cached_recently = ( time() - $cache_time ) < $ttl;
+			$cached_recently = (time() - $cache_time) < $ttl;
 
-			if ( $this->usecache || $cached_recently ) {
+			if ($this->usecache || $cached_recently) {
 				// Failures are cached. Serve one if we're using the cache.
-				if ( '{{unknown}}' === $cache )
-					return $this->maybe_make_link( $url );
+				if ('{{unknown}}' === $cache)
+					return $this->maybe_make_link($url);
 
-				if ( ! empty( $cache ) ) {
+				if ( ! empty($cache)) {
 					/**
 					 * Filter the cached oEmbed HTML.
 					 *
@@ -225,7 +225,7 @@ 
 					 * @param array  $attr    An array of shortcode attributes.
 					 * @param int    $post_ID Post ID.
 					 */
-					return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
+					return apply_filters('embed_oembed_html', $cache, $url, $attr, $post_ID);
 				}
 			}
 
@@ -239,28 +239,28 @@ 
 			 *
 			 * @param bool $enable Whether to enable `<link>` tag discovery. Default true.
 			 */
-			$attr['discover'] = ( apply_filters( 'embed_oembed_discover', true ) );
+			$attr['discover'] = (apply_filters('embed_oembed_discover', true));
 
 			// Use oEmbed to get the HTML
-			$html = wp_oembed_get( $url, $attr );
+			$html = wp_oembed_get($url, $attr);
 
 			// Maybe cache the result
-			if ( $html ) {
-				update_post_meta( $post_ID, $cachekey, $html );
-				update_post_meta( $post_ID, $cachekey_time, time() );
-			} elseif ( ! $cache ) {
-				update_post_meta( $post_ID, $cachekey, '{{unknown}}' );
+			if ($html) {
+				update_post_meta($post_ID, $cachekey, $html);
+				update_post_meta($post_ID, $cachekey_time, time());
+			} elseif ( ! $cache) {
+				update_post_meta($post_ID, $cachekey, '{{unknown}}');
 			}
 
 			// If there was a result, return it
-			if ( $html ) {
+			if ($html) {
 				/** This filter is documented in wp-includes/class-wp-embed.php */
-				return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
+				return apply_filters('embed_oembed_html', $html, $url, $attr, $post_ID);
 			}
 		}
 
 		// Still unknown
-		return $this->maybe_make_link( $url );
+		return $this->maybe_make_link($url);
 	}
 
 	/**
@@ -268,14 +268,14 @@ 
 	 *
 	 * @param int $post_ID Post ID to delete the caches for.
 	 */
-	public function delete_oembed_caches( $post_ID ) {
-		$post_metas = get_post_custom_keys( $post_ID );
-		if ( empty($post_metas) )
+	public function delete_oembed_caches($post_ID) {
+		$post_metas = get_post_custom_keys($post_ID);
+		if (empty($post_metas))
 			return;
 
-		foreach ( $post_metas as $post_meta_key ) {
-			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
-				delete_post_meta( $post_ID, $post_meta_key );
+		foreach ($post_metas as $post_meta_key) {
+			if ('_oembed_' == substr($post_meta_key, 0, 8))
+				delete_post_meta($post_ID, $post_meta_key);
 		}
 	}
 
@@ -284,10 +284,10 @@ 
 	 *
 	 * @param int $post_ID Post ID to do the caching for.
 	 */
-	public function cache_oembed( $post_ID ) {
-		$post = get_post( $post_ID );
+	public function cache_oembed($post_ID) {
+		$post = get_post($post_ID);
 
-		$post_types = get_post_types( array( 'show_ui' => true ) );
+		$post_types = get_post_types(array('show_ui' => true));
 		/**
 		 * Filter the array of post types to cache oEmbed results for.
 		 *
@@ -295,17 +295,17 @@ 
 		 *
 		 * @param array $post_types Array of post types to cache oEmbed results for. Defaults to post types with `show_ui` set to true.
 		 */
-		if ( empty( $post->ID ) || ! in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', $post_types ) ) ){
+		if (empty($post->ID) || ! in_array($post->post_type, apply_filters('embed_cache_oembed_types', $post_types))) {
 			return;
 		}
 
 		// Trigger a caching
-		if ( ! empty( $post->post_content ) ) {
+		if ( ! empty($post->post_content)) {
 			$this->post_ID = $post->ID;
 			$this->usecache = false;
 
-			$content = $this->run_shortcode( $post->post_content );
-			$this->autoembed( $content );
+			$content = $this->run_shortcode($post->post_content);
+			$this->autoembed($content);
 
 			$this->usecache = true;
 		}
@@ -319,15 +319,15 @@ 
 	 * @param string $content The content to be searched.
 	 * @return string Potentially modified $content.
 	 */
-	public function autoembed( $content ) {
+	public function autoembed($content) {
 		// Replace line breaks from all HTML elements with placeholders.
-		$content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
+		$content = wp_replace_in_html_tags($content, array("\n" => '<!-- wp-line-break -->'));
 
 		// Find URLs that are on their own line.
-		$content = preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
+		$content = preg_replace_callback('|^(\s*)(https?://[^\s"]+)(\s*)$|im', array($this, 'autoembed_callback'), $content);
 
 		// Put the line breaks back.
-		return str_replace( '<!-- wp-line-break -->', "\n", $content );
+		return str_replace('<!-- wp-line-break -->', "\n", $content);
 	}
 
 	/**
@@ -336,13 +336,13 @@ 
 	 * @param array $match A regex match array.
 	 * @return string The embed HTML on success, otherwise the original URL.
 	 */
-	public function autoembed_callback( $match ) {
+	public function autoembed_callback($match) {
 		$oldval = $this->linkifunknown;
 		$this->linkifunknown = false;
-		$return = $this->shortcode( array(), $match[2] );
+		$return = $this->shortcode(array(), $match[2]);
 		$this->linkifunknown = $oldval;
 
-		return $match[1] . $return . $match[3];
+		return $match[1].$return.$match[3];
 	}
 
 	/**
@@ -351,12 +351,12 @@ 
 	 * @param string $url URL to potentially be linked.
 	 * @return false|string Linked URL or the original URL. False if 'return_false_on_fail' is true.
 	 */
-	public function maybe_make_link( $url ) {
-		if ( $this->return_false_on_fail ) {
+	public function maybe_make_link($url) {
+		if ($this->return_false_on_fail) {
 			return false;
 		}
 
-		$output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;
+		$output = ($this->linkifunknown) ? '<a href="'.esc_url($url).'">'.esc_html($url).'</a>' : $url;
 
 		/**
 		 * Filter the returned, maybe-linked embed URL.
@@ -366,7 +366,7 @@ 
 		 * @param string $output The linked or original URL.
 		 * @param string $url    The original URL.
 		 */
-		return apply_filters( 'embed_maybe_make_link', $output, $url );
+		return apply_filters('embed_maybe_make_link', $output, $url);
 	}
 }
 $GLOBALS['wp_embed'] = new WP_Embed();

src/wp-includes/class-wp-customize-nav-menus.php

Spacing +279 added lines, -279 removed lines

@@ -44,31 +44,31 @@ 
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->previewed_menus = array();
 		$this->manager         = $manager;
 
 		// Skip useless hooks when the user can't manage nav menus anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
-		add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
-		add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_filter('customize_refresh_nonces', array($this, 'filter_nonces'));
+		add_action('wp_ajax_load-available-menu-items-customizer', array($this, 'ajax_load_available_items'));
+		add_action('wp_ajax_search-available-menu-items-customizer', array($this, 'ajax_search_available_items'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Needs to run after core Navigation section is set up.
-		add_action( 'customize_register', array( $this, 'customize_register' ), 11 );
+		add_action('customize_register', array($this, 'customize_register'), 11);
 
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_dynamic_setting_args' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_dynamic_setting_class' ), 10, 3 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
-		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_dynamic_setting_args'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_dynamic_setting_class'), 10, 3);
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_templates'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'available_items_template'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
 
 		// Selective Refresh partials.
-		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
 	}
 
 	/**
@@ -80,8 +80,8 @@ 
 	 * @param array $nonces Array of nonces.
 	 * @return array $nonces Modified array of nonces.
 	 */
-	public function filter_nonces( $nonces ) {
-		$nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
+	public function filter_nonces($nonces) {
+		$nonces['customize-menus'] = wp_create_nonce('customize-menus');
 		return $nonces;
 	}
 
@@ -92,25 +92,25 @@ 
 	 * @access public
 	 */
 	public function ajax_load_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['type'] ) || empty( $_POST['object'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+		if (empty($_POST['type']) || empty($_POST['object'])) {
+			wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 		}
 
-		$type = sanitize_key( $_POST['type'] );
-		$object = sanitize_key( $_POST['object'] );
-		$page = empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] );
-		$items = $this->load_available_items_query( $type, $object, $page );
+		$type = sanitize_key($_POST['type']);
+		$object = sanitize_key($_POST['object']);
+		$page = empty($_POST['page']) ? 0 : absint($_POST['page']);
+		$items = $this->load_available_items_query($type, $object, $page);
 
-		if ( is_wp_error( $items ) ) {
-			wp_send_json_error( $items->get_error_code() );
+		if (is_wp_error($items)) {
+			wp_send_json_error($items->get_error_code());
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -126,62 +126,62 @@ 
 	 * @param int    $page   Optional. The page number used to generate the query offset. Default is '0'.
 	 * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
 	 */
-	public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
+	public function load_available_items_query($type = 'post_type', $object = 'page', $page = 0) {
 		$items = array();
 
-		if ( 'post_type' === $type ) {
-			$post_type = get_post_type_object( $object );
-			if ( ! $post_type ) {
-				return new WP_Error( 'nav_menus_invalid_post_type' );
+		if ('post_type' === $type) {
+			$post_type = get_post_type_object($object);
+			if ( ! $post_type) {
+				return new WP_Error('nav_menus_invalid_post_type');
 			}
 
-			if ( 0 === $page && 'page' === $object ) {
+			if (0 === $page && 'page' === $object) {
 				// Add "Home" link. Treat as a page, but switch to custom on add.
 				$items[] = array(
 					'id'         => 'home',
-					'title'      => _x( 'Home', 'nav menu home label' ),
+					'title'      => _x('Home', 'nav menu home label'),
 					'type'       => 'custom',
-					'type_label' => __( 'Custom Link' ),
+					'type_label' => __('Custom Link'),
 					'object'     => '',
 					'url'        => home_url(),
 				);
-			} elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
+			} elseif ('post' !== $object && 0 === $page && $post_type->has_archive) {
 				// Add a post type archive link.
 				$items[] = array(
-					'id'         => $object . '-archive',
+					'id'         => $object.'-archive',
 					'title'      => $post_type->labels->archives,
 					'type'       => 'post_type_archive',
-					'type_label' => __( 'Post Type Archive' ),
+					'type_label' => __('Post Type Archive'),
 					'object'     => $object,
-					'url'        => get_post_type_archive_link( $object ),
+					'url'        => get_post_type_archive_link($object),
 				);
 			}
 
-			$posts = get_posts( array(
+			$posts = get_posts(array(
 				'numberposts' => 10,
 				'offset'      => 10 * $page,
 				'orderby'     => 'date',
 				'order'       => 'DESC',
 				'post_type'   => $object,
-			) );
-			foreach ( $posts as $post ) {
+			));
+			foreach ($posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
 					'id'         => "post-{$post->ID}",
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+					'type_label' => get_post_type_object($post->post_type)->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
-		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
+		} elseif ('taxonomy' === $type) {
+			$terms = get_terms($object, array(
 				'child_of'     => 0,
 				'exclude'      => '',
 				'hide_empty'   => false,
@@ -192,20 +192,20 @@ 
 				'order'        => 'DESC',
 				'orderby'      => 'count',
 				'pad_counts'   => false,
-			) );
-			if ( is_wp_error( $terms ) ) {
+			));
+			if (is_wp_error($terms)) {
 				return $terms;
 			}
 
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				$items[] = array(
 					'id'         => "term-{$term->term_id}",
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -220,7 +220,7 @@ 
 		 * @param string $object The object name.
 		 * @param int    $page   The current page number.
 		 */
-		$items = apply_filters( 'customize_nav_menu_available_items', $items, $type, $object, $page );
+		$items = apply_filters('customize_nav_menu_available_items', $items, $type, $object, $page);
 
 		return $items;
 	}
@@ -232,28 +232,28 @@ 
 	 * @access public
 	 */
 	public function ajax_search_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['search'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_search_parameter' );
+		if (empty($_POST['search'])) {
+			wp_send_json_error('nav_menus_missing_search_parameter');
 		}
 
-		$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
-		if ( $p < 1 ) {
+		$p = isset($_POST['page']) ? absint($_POST['page']) : 0;
+		if ($p < 1) {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s = sanitize_text_field(wp_unslash($_POST['search']));
+		$items = $this->search_available_items_query(array('pagenum' => $p, 's' => $s));
 
-		if ( empty( $items ) ) {
-			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+		if (empty($items)) {
+			wp_send_json_error(array('message' => __('No results found.')));
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -268,12 +268,12 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
 	 */
-	public function search_available_items_query( $args = array() ) {
+	public function search_available_items_query($args = array()) {
 		$items = array();
 
-		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+		$post_type_objects = get_post_types(array('show_in_nav_menus' => true), 'objects');
 		$query = array(
-			'post_type'              => array_keys( $post_type_objects ),
+			'post_type'              => array_keys($post_type_objects),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
@@ -281,55 +281,55 @@ 
 			'posts_per_page'         => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
-		if ( isset( $args['s'] ) ) {
+		if (isset($args['s'])) {
 			$query['s'] = $args['s'];
 		}
 
 		// Query posts.
-		$get_posts = new WP_Query( $query );
+		$get_posts = new WP_Query($query);
 
 		// Check if any posts were found.
-		if ( $get_posts->post_count ) {
-			foreach ( $get_posts->posts as $post ) {
+		if ($get_posts->post_count) {
+			foreach ($get_posts->posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
-					'id'         => 'post-' . $post->ID,
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'post-'.$post->ID,
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+					'type_label' => $post_type_objects[$post->post_type]->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
 		}
 
 		// Query taxonomy terms.
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'names');
+		$terms = get_terms($taxonomies, array(
 			'name__like' => $args['s'],
 			'number'     => 20,
 			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		));
 
 		// Check if any taxonomies were found.
-		if ( ! empty( $terms ) ) {
-			foreach ( $terms as $term ) {
+		if ( ! empty($terms)) {
+			foreach ($terms as $term) {
 				$items[] = array(
-					'id'         => 'term-' . $term->term_id,
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'term-'.$term->term_id,
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -342,7 +342,7 @@ 
 		 * @param array $items The array of menu items.
 		 * @param array $args  Includes 'pagenum' and 's' (search) arguments.
 		 */
-		$items = apply_filters( 'customize_nav_menu_searched_items', $items, $args );
+		$items = apply_filters('customize_nav_menu_searched_items', $items, $args);
 
 		return $items;
 	}
@@ -354,46 +354,46 @@ 
 	 * @access public
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( 'customize-nav-menus' );
-		wp_enqueue_script( 'customize-nav-menus' );
+		wp_enqueue_style('customize-nav-menus');
+		wp_enqueue_script('customize-nav-menus');
 
-		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting( $this->manager, 'nav_menu[-1]' );
-		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->manager, 'nav_menu_item[-1]' );
+		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting($this->manager, 'nav_menu[-1]');
+		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting($this->manager, 'nav_menu_item[-1]');
 
 		// Pass data to JS.
 		$settings = array(
 			'allMenus'             => wp_get_nav_menus(),
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
-				'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
-				'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
-				'custom_label'      => __( 'Custom Link' ),
+				'untitled'          => _x('(no label)', 'missing menu item navigation label'),
+				'unnamed'           => _x('(unnamed)', 'Missing menu name.'),
+				'custom_label'      => __('Custom Link'),
 				/* translators: %s: menu location */
-				'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
-				'menuNameLabel'     => __( 'Menu Name' ),
-				'itemAdded'         => __( 'Menu item added' ),
-				'itemDeleted'       => __( 'Menu item deleted' ),
-				'menuAdded'         => __( 'Menu created' ),
-				'menuDeleted'       => __( 'Menu deleted' ),
-				'movedUp'           => __( 'Menu item moved up' ),
-				'movedDown'         => __( 'Menu item moved down' ),
-				'movedLeft'         => __( 'Menu item moved out of submenu' ),
-				'movedRight'        => __( 'Menu item is now a sub-item' ),
+				'menuLocation'      => _x('(Currently set to: %s)', 'menu'),
+				'menuNameLabel'     => __('Menu Name'),
+				'itemAdded'         => __('Menu item added'),
+				'itemDeleted'       => __('Menu item deleted'),
+				'menuAdded'         => __('Menu created'),
+				'menuDeleted'       => __('Menu deleted'),
+				'movedUp'           => __('Menu item moved up'),
+				'movedDown'         => __('Menu item moved down'),
+				'movedLeft'         => __('Menu item moved out of submenu'),
+				'movedRight'        => __('Menu item is now a sub-item'),
 				/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-				'customizingMenus'  => sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
+				'customizingMenus'  => sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title)),
 				/* translators: %s: title of menu item which is invalid */
-				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				'invalidTitleTpl'   => __('%s (Invalid)'),
 				/* translators: %s: title of menu item in draft status */
-				'pendingTitleTpl'   => __( '%s (Pending)' ),
-				'itemsFound'        => __( 'Number of items found: %d' ),
-				'itemsFoundMore'    => __( 'Additional items found: %d' ),
-				'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
-				'reorderModeOn'     => __( 'Reorder mode enabled' ),
-				'reorderModeOff'    => __( 'Reorder mode closed' ),
-				'reorderLabelOn'    => esc_attr__( 'Reorder menu items' ),
-				'reorderLabelOff'   => esc_attr__( 'Close reorder mode' ),
+				'pendingTitleTpl'   => __('%s (Pending)'),
+				'itemsFound'        => __('Number of items found: %d'),
+				'itemsFoundMore'    => __('Additional items found: %d'),
+				'itemsLoadingMore'  => __('Loading more results... please wait.'),
+				'reorderModeOn'     => __('Reorder mode enabled'),
+				'reorderModeOff'    => __('Reorder mode closed'),
+				'reorderLabelOn'    => esc_attr__('Reorder menu items'),
+				'reorderLabelOff'   => esc_attr__('Close reorder mode'),
 			),
-			'settingTransport'     => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+			'settingTransport'     => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 			'phpIntMax'            => PHP_INT_MAX,
 			'defaultSettingValues' => array(
 				'nav_menu'      => $temp_nav_menu_setting->default,
@@ -402,29 +402,29 @@ 
 			'locationSlugMappedToName' => get_registered_nav_menus(),
 		);
 
-		$data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );
-		wp_scripts()->add_data( 'customize-nav-menus', 'data', $data );
+		$data = sprintf('var _wpCustomizeNavMenusSettings = %s;', wp_json_encode($settings));
+		wp_scripts()->add_data('customize-nav-menus', 'data', $data);
 
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'       => __('Move up one'),
+			'moveDown'     => __('Move down one'),
+			'moveToTop'    => __('Move to the top'),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'    => __('Move under %s'),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'  => __('Move out from under %s'),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'        => __('Under %s'),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'      => __('Out from under %s'),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 		);
-		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+		wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 	}
 
 	/**
@@ -441,16 +441,16 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return array|false
 	 */
-	public function filter_dynamic_setting_args( $setting_args, $setting_id ) {
-		if ( preg_match( WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id ) ) {
+	public function filter_dynamic_setting_args($setting_args, $setting_id) {
+		if (preg_match(WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Setting::TYPE,
-				'transport' => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+				'transport' => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 			);
-		} elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+		} elseif (preg_match(WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Item_Setting::TYPE,
-				'transport' => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+				'transport' => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 			);
 		}
 		return $setting_args;
@@ -467,12 +467,12 @@ 
 	 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 	 * @return string
 	 */
-	public function filter_dynamic_setting_class( $setting_class, $setting_id, $setting_args ) {
-		unset( $setting_id );
+	public function filter_dynamic_setting_class($setting_class, $setting_id, $setting_args) {
+		unset($setting_id);
 
-		if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
+		if ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Setting';
-		} elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+		} elseif ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
 		}
 		return $setting_class;
@@ -487,140 +487,140 @@ 
 	public function customize_register() {
 
 		// Require JS-rendered control types.
-		$this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
+		$this->manager->register_panel_type('WP_Customize_Nav_Menus_Panel');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Name_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Auto_Add_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Item_Control');
 
 		// Create a panel for Menus.
-		$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
-		if ( current_theme_supports( 'widgets' ) ) {
-			$description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+		$description = '<p>'.__('This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.').'</p>';
+		if (current_theme_supports('widgets')) {
+			$description .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		} else {
-			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
+			$description .= '<p>'.__('Menus can be displayed in locations defined by your theme.').'</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
+		$this->manager->add_panel(new WP_Customize_Nav_Menus_Panel($this->manager, 'nav_menus', array(
+			'title'       => __('Menus'),
 			'description' => $description,
 			'priority'    => 100,
 			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		)));
 		$menus = wp_get_nav_menus();
 
 		// Menu locations.
 		$locations     = get_registered_nav_menus();
-		$num_locations = count( array_keys( $locations ) );
-		if ( 1 == $num_locations ) {
-			$description = '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' );
+		$num_locations = count(array_keys($locations));
+		if (1 == $num_locations) {
+			$description = '<p>'.__('Your theme supports one menu. Select which menu you would like to use.');
 		} else {
-			$description = '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) );
+			$description = '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations));
 		}
-		$description  .= '</p><p>' . __( 'You can also place menus in widget areas with the Custom Menu widget.' ) . '</p>';
+		$description .= '</p><p>'.__('You can also place menus in widget areas with the Custom Menu widget.').'</p>';
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => __( 'Menu Locations' ),
+		$this->manager->add_section('menu_locations', array(
+			'title'       => __('Menu Locations'),
 			'panel'       => 'nav_menus',
 			'priority'    => 5,
 			'description' => $description,
-		) );
+		));
 
-		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
-		foreach ( $menus as $menu ) {
-			$choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '&hellip;' );
+		$choices = array('0' => __('&mdash; Select &mdash;'));
+		foreach ($menus as $menu) {
+			$choices[$menu->term_id] = wp_html_excerpt($menu->name, 40, '&hellip;');
 		}
 
-		foreach ( $locations as $location => $description ) {
+		foreach ($locations as $location => $description) {
 			$setting_id = "nav_menu_locations[{$location}]";
 
-			$setting = $this->manager->get_setting( $setting_id );
-			if ( $setting ) {
-				$setting->transport = isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh';
-				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+			$setting = $this->manager->get_setting($setting_id);
+			if ($setting) {
+				$setting->transport = isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh';
+				remove_filter("customize_sanitize_{$setting_id}", 'absint');
+				add_filter("customize_sanitize_{$setting_id}", array($this, 'intval_base10'));
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
+				$this->manager->add_setting($setting_id, array(
+					'sanitize_callback' => array($this, 'intval_base10'),
 					'theme_supports'    => 'menus',
 					'type'              => 'theme_mod',
-					'transport'         => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
+					'transport'         => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
 					'default'           => 0,
-				) );
+				));
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+			$this->manager->add_control(new WP_Customize_Nav_Menu_Location_Control($this->manager, $setting_id, array(
 				'label'       => $description,
 				'location_id' => $location,
 				'section'     => 'menu_locations',
 				'choices'     => $choices,
-			) ) );
+			)));
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
-		foreach ( $menus as $menu ) {
+		foreach ($menus as $menu) {
 			$menu_id = $menu->term_id;
 
 			// Create a section for each menu.
-			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			$section_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_section(new WP_Customize_Nav_Menu_Section($this->manager, $section_id, array(
+				'title'     => html_entity_decode($menu->name, ENT_QUOTES, get_bloginfo('charset')),
 				'priority'  => 10,
 				'panel'     => 'nav_menus',
-			) ) );
+			)));
 
-			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_setting( new WP_Customize_Nav_Menu_Setting( $this->manager, $nav_menu_setting_id, array(
-				'transport' => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
-			) ) );
+			$nav_menu_setting_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_setting(new WP_Customize_Nav_Menu_Setting($this->manager, $nav_menu_setting_id, array(
+				'transport' => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
+			)));
 
 			// Add the menu contents.
-			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
+			$menu_items = (array) wp_get_nav_menu_items($menu_id);
 
-			foreach ( array_values( $menu_items ) as $i => $item ) {
+			foreach (array_values($menu_items) as $i => $item) {
 
 				// Create a setting for each menu item (which doesn't actually manage data, currently).
-				$menu_item_setting_id = 'nav_menu_item[' . $item->ID . ']';
+				$menu_item_setting_id = 'nav_menu_item['.$item->ID.']';
 
 				$value = (array) $item;
 				$value['nav_menu_term_id'] = $menu_id;
-				$this->manager->add_setting( new WP_Customize_Nav_Menu_Item_Setting( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_setting(new WP_Customize_Nav_Menu_Item_Setting($this->manager, $menu_item_setting_id, array(
 					'value'     => $value,
-					'transport' => isset( $this->manager->selective_refresh ) ? 'postMessage' : 'refresh',
-				) ) );
+					'transport' => isset($this->manager->selective_refresh) ? 'postMessage' : 'refresh',
+				)));
 
 				// Create a control for each menu item.
-				$this->manager->add_control( new WP_Customize_Nav_Menu_Item_Control( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_control(new WP_Customize_Nav_Menu_Item_Control($this->manager, $menu_item_setting_id, array(
 					'label'    => $item->title,
 					'section'  => $section_id,
 					'priority' => 10 + $i,
-				) ) );
+				)));
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( new WP_Customize_New_Menu_Section( $this->manager, 'add_menu', array(
-			'title'    => __( 'Add a Menu' ),
+		$this->manager->add_section(new WP_Customize_New_Menu_Section($this->manager, 'add_menu', array(
+			'title'    => __('Add a Menu'),
 			'panel'    => 'nav_menus',
 			'priority' => 999,
-		) ) );
+		)));
 
-		$this->manager->add_control( 'new_menu_name', array(
+		$this->manager->add_control('new_menu_name', array(
 			'label'       => '',
 			'section'     => 'add_menu',
 			'type'        => 'text',
 			'settings'    => array(),
 			'input_attrs' => array(
 				'class'       => 'menu-name-field',
-				'placeholder' => __( 'New menu name' ),
+				'placeholder' => __('New menu name'),
 			),
-		) );
+		));
 
-		$this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
+		$this->manager->add_control(new WP_Customize_New_Menu_Control($this->manager, 'create_new_menu', array(
 			'section'  => 'add_menu',
 			'settings' => array(),
-		) ) );
+		)));
 	}
 
 	/**
@@ -635,8 +635,8 @@ 
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
 	 */
-	public function intval_base10( $value ) {
-		return intval( $value, 10 );
+	public function intval_base10($value) {
+		return intval($value, 10);
 	}
 
 	/**
@@ -650,9 +650,9 @@ 
 	public function available_item_types() {
 		$item_types = array();
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $post_types ) {
-			foreach ( $post_types as $slug => $post_type ) {
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'objects');
+		if ($post_types) {
+			foreach ($post_types as $slug => $post_type) {
 				$item_types[] = array(
 					'title'  => $post_type->labels->name,
 					'type'   => 'post_type',
@@ -661,10 +661,10 @@ 
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $slug => $taxonomy ) {
-				if ( 'post_format' === $taxonomy && ! current_theme_supports( 'post-formats' ) ) {
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'objects');
+		if ($taxonomies) {
+			foreach ($taxonomies as $slug => $taxonomy) {
+				if ('post_format' === $taxonomy && ! current_theme_supports('post-formats')) {
 					continue;
 				}
 				$item_types[] = array(
@@ -682,7 +682,7 @@ 
 		 *
 		 * @param array $item_types Custom menu item types.
 		 */
-		$item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );
+		$item_types = apply_filters('customize_nav_menu_available_item_types', $item_types);
 
 		return $item_types;
 	}
@@ -708,7 +708,7 @@ 
 						<button type="button" class="button-link item-add">
 							<span class="screen-reader-text"><?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
-								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
+								printf(__('Add to menu: %1$s (%2$s)'), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}');
 							?></span>
 						</button>
 					</div>
@@ -721,10 +721,10 @@ 
 				<?php
 				printf(
 					'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-					__( 'Move up' ),
-					__( 'Move down' ),
-					__( 'Move one level up' ),
-					__( 'Move one level down' )
+					__('Move up'),
+					__('Move down'),
+					__('Move one level up'),
+					__('Move one level down')
 				);
 				?>
 			</div>
@@ -743,49 +743,49 @@ 
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action">
 						<?php
 							/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-							printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
+							printf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title));
 						?>
 					</span>
-					<?php _e( 'Add Menu Items' ); ?>
+					<?php _e('Add Menu Items'); ?>
 				</h3>
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<label class="screen-reader-text" for="menu-items-search"><?php _e('Search Menu Items'); ?></label>
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e('Search menu items&hellip;') ?>" aria-describedby="menu-items-search-desc" />
+					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 					<span class="spinner"></span>
-					<span class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></span>
+					<span class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></span>
 				</div>
 				<ul class="accordion-section-content" data-type="search"></ul>
 			</div>
 			<div id="new-custom-menu-item" class="accordion-section">
 				<h4 class="accordion-section-title" role="presentation">
-					<?php _e( 'Custom Links' ); ?>
+					<?php _e('Custom Links'); ?>
 					<button type="button" class="button-link" aria-expanded="false">
-						<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Toggle section: Custom Links'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				</h4>
 				<div class="accordion-section-content customlinkdiv">
 					<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
 					<p id="menu-item-url-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+						<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 						<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
 					</p>
 					<p id="menu-item-name-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+						<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 						<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
 					</p>
 					<p class="button-controls">
 						<span class="add-to-menu">
-							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
 							<span class="spinner"></span>
 						</span>
 					</p>
@@ -793,22 +793,22 @@ 
 			</div>
 			<?php
 			// Containers for per-post-type item browsing; items added with JS.
-			foreach ( $this->available_item_types() as $available_item_type ) {
-				$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+			foreach ($this->available_item_types() as $available_item_type) {
+				$id = sprintf('available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object']);
 				?>
-				<div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+				<div id="<?php echo esc_attr($id); ?>" class="accordion-section">
 					<h4 class="accordion-section-title" role="presentation">
-						<?php echo esc_html( $available_item_type['title'] ); ?>
+						<?php echo esc_html($available_item_type['title']); ?>
 						<span class="spinner"></span>
-						<span class="no-items"><?php _e( 'No items' ); ?></span>
+						<span class="no-items"><?php _e('No items'); ?></span>
 						<button type="button" class="button-link" aria-expanded="false">
 							<span class="screen-reader-text"><?php
 							/* translators: %s: Title of a section with menu items */
-							printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+							printf(__('Toggle section: %s'), esc_html($available_item_type['title'])); ?></span>
 							<span class="toggle-indicator" aria-hidden="true"></span>
 						</button>
 					</h4>
-					<ul class="accordion-section-content" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>"></ul>
+					<ul class="accordion-section-content" data-type="<?php echo esc_attr($available_item_type['type']); ?>" data-object="<?php echo esc_attr($available_item_type['object']); ?>"></ul>
 				</div>
 				<?php
 			}
@@ -840,17 +840,17 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array Partial args.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
 
-		if ( preg_match( '/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'nav_menu_instance',
-					'render_callback'     => array( $this, 'render_nav_menu_partial' ),
+					'render_callback'     => array($this, 'render_nav_menu_partial'),
 					'container_inclusive' => true,
 					'settings'            => array(), // Empty because the nav menu instance may relate to a menu or a location.
 					'capability'          => 'edit_theme_options',
@@ -868,11 +868,11 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
-		add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
-		add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
-		add_filter( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
-		add_filter( 'customize_render_partials_response', array( $this, 'export_partial_rendered_nav_menu_instances' ) );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
+		add_filter('wp_nav_menu_args', array($this, 'filter_wp_nav_menu_args'), 1000);
+		add_filter('wp_nav_menu', array($this, 'filter_wp_nav_menu'), 10, 2);
+		add_filter('wp_footer', array($this, 'export_preview_data'), 1);
+		add_filter('customize_render_partials_response', array($this, 'export_partial_rendered_nav_menu_instances'));
 	}
 
 	/**
@@ -886,7 +886,7 @@ 
 	 * @param array $args An array containing wp_nav_menu() arguments.
 	 * @return array Arguments.
 	 */
-	public function filter_wp_nav_menu_args( $args ) {
+	public function filter_wp_nav_menu_args($args) {
 		/*
 		 * The following conditions determine whether or not this instance of
 		 * wp_nav_menu() can use selective refreshed. A wp_nav_menu() can be
@@ -894,25 +894,25 @@ 
 		 */
 		$can_partial_refresh = (
 			// ...if wp_nav_menu() is directly echoing out the menu (and thus isn't manipulating the string after generated),
-			! empty( $args['echo'] )
+			! empty($args['echo'])
 			&&
 			// ...and if the fallback_cb can be serialized to JSON, since it will be included in the placement context data,
-			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			(empty($args['fallback_cb']) || is_string($args['fallback_cb']))
 			&&
 			// ...and if the walker can also be serialized to JSON, since it will be included in the placement context data as well,
-			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			(empty($args['walker']) || is_string($args['walker']))
 			// ...and if it has a theme location assigned or an assigned menu to display,
 			&& (
-				! empty( $args['theme_location'] )
+				! empty($args['theme_location'])
 				||
-				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+				( ! empty($args['menu']) && (is_numeric($args['menu']) || is_object($args['menu'])))
 			)
 			&&
 			// ...and if the nav menu would be rendered with a wrapper container element (upon which to attach data-* attributes).
 			(
-				! empty( $args['container'] )
+				! empty($args['container'])
 				||
-				( isset( $args['items_wrap'] ) && '<' === substr( $args['items_wrap'], 0, 1 ) )
+				(isset($args['items_wrap']) && '<' === substr($args['items_wrap'], 0, 1))
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
@@ -920,7 +920,7 @@ 
 		$exported_args = $args;
 
 		// Empty out args which may not be JSON-serializable.
-		if ( ! $can_partial_refresh ) {
+		if ( ! $can_partial_refresh) {
 			$exported_args['fallback_cb'] = '';
 			$exported_args['walker'] = '';
 		}
@@ -929,15 +929,15 @@ 
 		 * Replace object menu arg with a term_id menu arg, as this exports better
 		 * to JS and is easier to compare hashes.
 		 */
-		if ( ! empty( $exported_args['menu'] ) && is_object( $exported_args['menu'] ) ) {
+		if ( ! empty($exported_args['menu']) && is_object($exported_args['menu'])) {
 			$exported_args['menu'] = $exported_args['menu']->term_id;
 		}
 
-		ksort( $exported_args );
-		$exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
+		ksort($exported_args);
+		$exported_args['args_hmac'] = $this->hash_nav_menu_args($exported_args);
 
 		$args['customize_preview_nav_menus_args'] = $exported_args;
-		$this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+		$this->preview_nav_menu_instance_args[$exported_args['args_hmac']] = $exported_args;
 		return $args;
 	}
 
@@ -955,12 +955,12 @@ 
 	 * @param object $args             An object containing wp_nav_menu() arguments.
 	 * @return null
 	 */
-	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
-		if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
-			$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
+	public function filter_wp_nav_menu($nav_menu_content, $args) {
+		if (isset($args->customize_preview_nav_menus_args['can_partial_refresh']) && $args->customize_preview_nav_menus_args['can_partial_refresh']) {
+			$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('nav_menu_instance['.$args->customize_preview_nav_menus_args['args_hmac'].']'));
 			$attributes .= ' data-customize-partial-type="nav_menu_instance"';
-			$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
-			$nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $nav_menu_content, 1 );
+			$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($args->customize_preview_nav_menus_args)));
+			$nav_menu_content = preg_replace('#^(<\w+)#', '$1 '.$attributes, $nav_menu_content, 1);
 		}
 		return $nav_menu_content;
 	}
@@ -977,8 +977,8 @@ 
 	 * @param array $args The arguments to hash.
 	 * @return string Hashed nav menu arguments.
 	 */
-	public function hash_nav_menu_args( $args ) {
-		return wp_hash( serialize( $args ) );
+	public function hash_nav_menu_args($args) {
+		return wp_hash(serialize($args));
 	}
 
 	/**
@@ -988,13 +988,13 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		if ( isset( $this->manager->selective_refresh ) ) {
+		if (isset($this->manager->selective_refresh)) {
 			$script = wp_scripts()->registered['customize-preview-nav-menus'];
 			$script->deps[] = 'customize-selective-refresh';
 		}
 
-		wp_enqueue_script( 'customize-preview-nav-menus' ); // Note that we have overridden this.
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-nav-menus'); // Note that we have overridden this.
+		wp_enqueue_style('customize-preview');
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 		$exports = array(
 			'navMenuInstanceArgs' => $this->preview_nav_menu_instance_args,
 		);
-		printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
+		printf('<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -1021,7 +1021,7 @@ 
 	 * @param array $response Response.
 	 * @return array Response.
 	 */
-	public function export_partial_rendered_nav_menu_instances( $response ) {
+	public function export_partial_rendered_nav_menu_instances($response) {
 		$response['nav_menu_instance_args'] = $this->preview_nav_menu_instance_args;
 		return $response;
 	}
@@ -1038,25 +1038,25 @@ 
 	 * @param array                $nav_menu_args Nav menu args supplied as container context.
 	 * @return string|false
 	 */
-	public function render_nav_menu_partial( $partial, $nav_menu_args ) {
-		unset( $partial );
+	public function render_nav_menu_partial($partial, $nav_menu_args) {
+		unset($partial);
 
-		if ( ! isset( $nav_menu_args['args_hmac'] ) ) {
+		if ( ! isset($nav_menu_args['args_hmac'])) {
 			// Error: missing_args_hmac.
 			return false;
 		}
 
 		$nav_menu_args_hmac = $nav_menu_args['args_hmac'];
-		unset( $nav_menu_args['args_hmac'] );
+		unset($nav_menu_args['args_hmac']);
 
-		ksort( $nav_menu_args );
-		if ( ! hash_equals( $this->hash_nav_menu_args( $nav_menu_args ), $nav_menu_args_hmac ) ) {
+		ksort($nav_menu_args);
+		if ( ! hash_equals($this->hash_nav_menu_args($nav_menu_args), $nav_menu_args_hmac)) {
 			// Error: args_hmac_mismatch.
 			return false;
 		}
 
 		ob_start();
-		wp_nav_menu( $nav_menu_args );
+		wp_nav_menu($nav_menu_args);
 		$content = ob_get_clean();
 
 		return $content;

src/wp-includes/class-oembed.php

Spacing +160 added lines, -160 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public static $early_providers = 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
@@ -33,62 +33,62 @@ 
 	 * @since 2.9.0
 	 */
 	public function __construct() {
-		$host = urlencode( home_url() );
+		$host = urlencode(home_url());
 		$providers = array(
-			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://youtu\.be/.*#i'                             => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'http://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( 'http://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( 'http://www.scribd.com/services/oembed',                     true  ),
-			'#https?://wordpress.tv/.*#i'                         => array( 'http://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/.+?/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/.+?/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( 'http://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( 'http://api.meetup.com/oembed',                              true  ),
-			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array( 'http://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( 'http://www.mixcloud.com/oembed',                            true  ),
-			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array( 'http://www.ted.com/talks/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  ),
+			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://youtu\.be/.*#i'                              => array('http://www.youtube.com/oembed', true),
+			'#https://youtu\.be/.*#i'                             => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array('http://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('http://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('http://www.scribd.com/services/oembed', true),
+			'#https?://wordpress.tv/.*#i'                         => array('http://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/.+?/status(es)?/.*#i' => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/.+?/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('http://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('http://api.meetup.com/oembed', true),
+			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array('http://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('http://www.mixcloud.com/oembed', true),
+			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array('http://www.ted.com/talks/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),
 		);
 
-		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]);
 			}
 		}
 
@@ -163,10 +163,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);
 	}
 
 	/**
@@ -179,9 +179,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;
 	}
@@ -198,30 +198,30 @@ 
 	 * @param string|array  $args Optional provider arguments.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function get_provider( $url, $args = '' ) {
+	public function get_provider($url, $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;
 	}
@@ -244,12 +244,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);
 	}
 
 	/**
@@ -267,8 +267,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();
 		}
 
@@ -285,10 +285,10 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @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 = '' ) {
-		$provider = $this->get_provider( $url, $args );
+	public function get_html($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;
 
 		/**
@@ -300,7 +300,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);
 	}
 
 	/**
@@ -309,7 +309,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
@@ -325,11 +325,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)) {
 
 			/**
 			 * Filter the link types that contain oEmbed provider URLs.
@@ -340,35 +340,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;
 					}
 				}
@@ -376,9 +376,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;
@@ -392,12 +392,12 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @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);
 
 		/**
 		 * Filter the oEmbed URL to be fetched.
@@ -408,13 +408,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;
 	}
@@ -428,19 +428,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);
 	}
 
 	/**
@@ -452,9 +452,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;
 	}
 
 	/**
@@ -466,17 +466,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;
 	}
@@ -490,29 +490,29 @@ 
 	 * @param string $response_body
 	 * @return object|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;
 		}
 
@@ -526,32 +526,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:
@@ -569,7 +569,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);
 	}
 
 	/**
@@ -581,33 +581,33 @@ 
 	 * @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);
 	}
 }
 
@@ -624,7 +624,7 @@ 
 function _wp_oembed_get_object() {
 	static $wp_oembed = null;
 
-	if ( is_null( $wp_oembed ) ) {
+	if (is_null($wp_oembed)) {
 		$wp_oembed = new WP_oEmbed();
 	}
 	return $wp_oembed;

Braces +61 added lines, -42 removed lines

@@ -202,8 +202,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;
@@ -220,8 +221,9 @@ 
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( !$provider && $args['discover'] ) {
+					$provider = $this->discover( $url );
+		}
 
 		return $provider;
 	}
@@ -288,8 +290,9 @@ 
 	public function get_html( $url, $args = '' ) {
 		$provider = $this->get_provider( $url, $args );
 
-		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
-			return false;
+		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) ) {
+					return false;
+		}
 
 		/**
 		 * Filter the HTML returned by the oEmbed provider.
@@ -368,20 +371,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;
+		}
 	}
 
 	/**
@@ -412,8 +417,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;
@@ -435,10 +441,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 );
 	}
@@ -467,8 +475,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 );
@@ -491,25 +500,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 ) {
@@ -527,17 +541,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>';
@@ -545,13 +562,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:

src/wp-includes/class-wp.php

Indentation +21 added lines, -21 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress environment setup class.
- *
- * @package WordPress
- * @since 2.0.0
- */
+	 * WordPress environment setup class.
+	 *
+	 * @package WordPress
+	 * @since 2.0.0
+	 */
 class WP {
 	/**
 	 * Public query variables.
@@ -609,22 +609,22 @@ 
  	}
 
  	/**
-	 * Set the Headers for 404, if nothing is found for requested URL.
-	 *
-	 * Issue a 404 if a request doesn't match any posts and doesn't match
-	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
-	 * issued, and if the request was not a search or the homepage.
-	 *
-	 * Otherwise, issue a 200.
-	 *
-	 * This sets headers after posts have been queried. handle_404() really means "handle status."
-	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
-	 * a 404 so that canonical redirection logic can kick in.
-	 *
-	 * @since 2.0.0
-     * @access public
-	 *
-	 * @global WP_Query $wp_query
+ 	 * Set the Headers for 404, if nothing is found for requested URL.
+ 	 *
+ 	 * Issue a 404 if a request doesn't match any posts and doesn't match
+ 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
+ 	 * issued, and if the request was not a search or the homepage.
+ 	 *
+ 	 * Otherwise, issue a 200.
+ 	 *
+ 	 * This sets headers after posts have been queried. handle_404() really means "handle status."
+ 	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
+ 	 * a 404 so that canonical redirection logic can kick in.
+ 	 *
+ 	 * @since 2.0.0
+ 	 * @access public
+ 	 *
+ 	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
 		global $wp_query;

Spacing +142 added lines, -143 removed lines

@@ -15,7 +15,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
+	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed');
 
 	/**
 	 * Private query variables.
@@ -26,7 +26,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );
+	public $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title');
 
 	/**
 	 * Extra query variables set by the user.
@@ -100,7 +100,7 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
+		if ( ! in_array($qv, $this->public_query_vars))
 			$this->public_query_vars[] = $qv;
 	}
 
@@ -112,8 +112,8 @@ 
 	 *
 	 * @param string $name Query variable name.
 	 */
-	public function remove_query_var( $name ) {
-		$this->public_query_vars = array_diff( $this->public_query_vars, array( $name ) );
+	public function remove_query_var($name) {
+		$this->public_query_vars = array_diff($this->public_query_vars, array($name));
 	}
 
 	/**
@@ -154,35 +154,35 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+		if ( ! apply_filters('do_parse_request', true, $this, $extra_query_vars))
 			return;
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
 
-		if ( is_array( $extra_query_vars ) ) {
+		if (is_array($extra_query_vars)) {
 			$this->extra_query_vars = & $extra_query_vars;
-		} elseif ( ! empty( $extra_query_vars ) ) {
-			parse_str( $extra_query_vars, $this->extra_query_vars );
+		} elseif ( ! empty($extra_query_vars)) {
+			parse_str($extra_query_vars, $this->extra_query_vars);
 		}
 		// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 
-		if ( ! empty($rewrite) ) {
+		if ( ! empty($rewrite)) {
 			// If we match a rewrite rule, this will be cleared.
 			$error = '404';
 			$this->did_permalink = true;
 
-			$pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
-			list( $pathinfo ) = explode( '?', $pathinfo );
-			$pathinfo = str_replace( "%", "%25", $pathinfo );
+			$pathinfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
+			list($pathinfo) = explode('?', $pathinfo);
+			$pathinfo = str_replace("%", "%25", $pathinfo);
 
-			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
+			list($req_uri) = explode('?', $_SERVER['REQUEST_URI']);
 			$self = $_SERVER['PHP_SELF'];
-			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
-			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+			$home_path = trim(parse_url(home_url(), PHP_URL_PATH), '/');
+			$home_path_regex = sprintf('|^%s|i', preg_quote($home_path, '|'));
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
@@ -190,22 +190,22 @@ 
 			// requested permalink.
 			$req_uri = str_replace($pathinfo, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
+			$req_uri = preg_replace($home_path_regex, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
 			$pathinfo = trim($pathinfo, '/');
-			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
+			$pathinfo = preg_replace($home_path_regex, '', $pathinfo);
 			$pathinfo = trim($pathinfo, '/');
 			$self = trim($self, '/');
-			$self = preg_replace( $home_path_regex, '', $self );
+			$self = preg_replace($home_path_regex, '', $self);
 			$self = trim($self, '/');
 
 			// The requested permalink is in $pathinfo for path info requests and
 			//  $req_uri for other requests.
-			if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
+			if ( ! empty($pathinfo) && ! preg_match('|^.*'.$wp_rewrite->index.'$|', $pathinfo)) {
 				$request = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
+				if ($req_uri == $wp_rewrite->index)
 					$req_uri = '';
 				$request = $req_uri;
 			}
@@ -214,32 +214,32 @@ 
 
 			// Look for matches.
 			$request_match = $request;
-			if ( empty( $request_match ) ) {
+			if (empty($request_match)) {
 				// An empty request could only match against ^$ regex
-				if ( isset( $rewrite['$'] ) ) {
+				if (isset($rewrite['$'])) {
 					$this->matched_rule = '$';
 					$query = $rewrite['$'];
 					$matches = array('');
 				}
 			} else {
-				foreach ( (array) $rewrite as $match => $query ) {
+				foreach ((array) $rewrite as $match => $query) {
 					// If the requesting file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
-						$request_match = $req_uri . '/' . $request;
+					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request)
+						$request_match = $req_uri.'/'.$request;
 
-					if ( preg_match("#^$match#", $request_match, $matches) ||
-						preg_match("#^$match#", urldecode($request_match), $matches) ) {
+					if (preg_match("#^$match#", $request_match, $matches) ||
+						preg_match("#^$match#", urldecode($request_match), $matches)) {
 
-						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+						if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 							// This is a verbose page match, let's check to be sure about it.
-							$page = get_page_by_path( $matches[ $varmatch[1] ] );
-							if ( ! $page ) {
+							$page = get_page_by_path($matches[$varmatch[1]]);
+							if ( ! $page) {
 						 		continue;
 							}
 
-							$post_status_obj = get_post_status_object( $page->post_status );
+							$post_status_obj = get_post_status_object($page->post_status);
 							if ( ! $post_status_obj->public && ! $post_status_obj->protected
-								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search) {
 								continue;
 							}
 						}
@@ -251,7 +251,7 @@ 
 				}
 			}
 
-			if ( isset( $this->matched_rule ) ) {
+			if (isset($this->matched_rule)) {
 				// Trim the query of everything up to the '?'.
 				$query = preg_replace("!^.+\?!", '', $query);
 
@@ -264,16 +264,16 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ('404' == $error)
+					unset($error, $_GET['error']);
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
-				unset( $error, $_GET['error'] );
+			if (empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
+				unset($error, $_GET['error']);
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
+					unset($perma_query_vars);
 
 				$this->did_permalink = false;
 			}
@@ -290,36 +290,36 @@ 
 		 *
 		 * @param array $public_query_vars The array of whitelisted query variables.
 		 */
-		$this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
+		$this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
-		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
-			if ( is_post_type_viewable( $t ) && $t->query_var ) {
+		foreach (get_post_types(array(), 'objects') as $post_type => $t) {
+			if (is_post_type_viewable($t) && $t->query_var) {
 				$post_type_query_vars[$t->query_var] = $post_type;
 			}
 		}
 
-		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
+		foreach ($this->public_query_vars as $wpvar) {
+			if (isset($this->extra_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
+			elseif (isset($_POST[$wpvar]))
 				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
+			elseif (isset($_GET[$wpvar]))
 				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
+			elseif (isset($perma_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
 
-			if ( !empty( $this->query_vars[$wpvar] ) ) {
-				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
+			if ( ! empty($this->query_vars[$wpvar])) {
+				if ( ! is_array($this->query_vars[$wpvar])) {
 					$this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
 				} else {
-					foreach ( $this->query_vars[$wpvar] as $vkey => $v ) {
-						if ( !is_object( $v ) ) {
+					foreach ($this->query_vars[$wpvar] as $vkey => $v) {
+						if ( ! is_object($v)) {
 							$this->query_vars[$wpvar][$vkey] = (string) $v;
 						}
 					}
 				}
 
-				if ( isset($post_type_query_vars[$wpvar] ) ) {
+				if (isset($post_type_query_vars[$wpvar])) {
 					$this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
 					$this->query_vars['name'] = $this->query_vars[$wpvar];
 				}
@@ -327,43 +327,43 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
-				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t)
+			if ($t->query_var && isset($this->query_vars[$t->query_var]))
+				$this->query_vars[$t->query_var] = str_replace(' ', '+', $this->query_vars[$t->query_var]);
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
-		if ( ! is_admin() ) {
-			foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
+		if ( ! is_admin()) {
+			foreach (get_taxonomies(array('publicly_queryable' => false), 'objects') as $taxonomy => $t) {
 				/*
 				 * Disallow when set to the 'taxonomy' query var.
 				 * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().
 				 */
-				if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
-					unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
+				if (isset($this->query_vars['taxonomy']) && $taxonomy === $this->query_vars['taxonomy']) {
+					unset($this->query_vars['taxonomy'], $this->query_vars['term']);
 				}
 			}
 		}
 
 		// Limit publicly queried post_types to those that are publicly_queryable
-		if ( isset( $this->query_vars['post_type']) ) {
-			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
-			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+		if (isset($this->query_vars['post_type'])) {
+			$queryable_post_types = get_post_types(array('publicly_queryable' => true));
+			if ( ! is_array($this->query_vars['post_type'])) {
+				if ( ! in_array($this->query_vars['post_type'], $queryable_post_types))
+					unset($this->query_vars['post_type']);
 			} else {
-				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
+				$this->query_vars['post_type'] = array_intersect($this->query_vars['post_type'], $queryable_post_types);
 			}
 		}
 
 		// Resolve conflicts between posts with numeric slugs and date archive queries.
-		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+		$this->query_vars = wp_resolve_numeric_slug_conflicts($this->query_vars);
 
-		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
+		foreach ((array) $this->private_query_vars as $var) {
+			if (isset($this->extra_query_vars[$var]))
 				$this->query_vars[$var] = $this->extra_query_vars[$var];
 		}
 
-		if ( isset($error) )
+		if (isset($error))
 			$this->query_vars['error'] = $error;
 
 		/**
@@ -373,7 +373,7 @@ 
 		 *
 		 * @param array $query_vars The array of requested query variables.
 		 */
-		$this->query_vars = apply_filters( 'request', $this->query_vars );
+		$this->query_vars = apply_filters('request', $this->query_vars);
 
 		/**
 		 * Fires once all query variables for the current request have been parsed.
@@ -382,7 +382,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_request', array( &$this ) );
+		do_action_ref_array('parse_request', array(&$this));
 	}
 
 	/**
@@ -400,50 +400,50 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
+		if (is_user_logged_in())
 			$headers = array_merge($headers, wp_get_nocache_headers());
-		if ( ! empty( $this->query_vars['error'] ) ) {
+		if ( ! empty($this->query_vars['error'])) {
 			$status = (int) $this->query_vars['error'];
-			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
+			if (404 === $status) {
+				if ( ! is_user_logged_in())
 					$headers = array_merge($headers, wp_get_nocache_headers());
-				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
-			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
+				$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
+			} elseif (in_array($status, array(403, 500, 502, 503))) {
 				$exit_required = true;
 			}
-		} elseif ( empty( $this->query_vars['feed'] ) ) {
-			$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+		} elseif (empty($this->query_vars['feed'])) {
+			$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
 		} else {
 			// Set the correct content type for feeds
 			$type = $this->query_vars['feed'];
-			if ( 'feed' == $this->query_vars['feed'] ) {
+			if ('feed' == $this->query_vars['feed']) {
 				$type = get_default_feed();
 			}
-			$headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+			$headers['Content-Type'] = feed_content_type($type).'; charset='.get_option('blog_charset');
 
 			// We're showing a feed, so WP is indeed the only thing that last changed
-			if ( !empty($this->query_vars['withcomments'])
-				|| false !== strpos( $this->query_vars['feed'], 'comments-' )
-				|| ( empty($this->query_vars['withoutcomments'])
-					&& ( !empty($this->query_vars['p'])
-						|| !empty($this->query_vars['name'])
-						|| !empty($this->query_vars['page_id'])
-						|| !empty($this->query_vars['pagename'])
-						|| !empty($this->query_vars['attachment'])
-						|| !empty($this->query_vars['attachment_id'])
+			if ( ! empty($this->query_vars['withcomments'])
+				|| false !== strpos($this->query_vars['feed'], 'comments-')
+				|| (empty($this->query_vars['withoutcomments'])
+					&& ( ! empty($this->query_vars['p'])
+						|| ! empty($this->query_vars['name'])
+						|| ! empty($this->query_vars['page_id'])
+						|| ! empty($this->query_vars['pagename'])
+						|| ! empty($this->query_vars['attachment'])
+						|| ! empty($this->query_vars['attachment_id'])
 					)
 				)
 			)
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
 			else
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
-			$wp_etag = '"' . md5($wp_last_modified) . '"';
+			$wp_etag = '"'.md5($wp_last_modified).'"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+				$client_etag = wp_unslash($_SERVER['HTTP_IF_NONE_MATCH']);
 			else $client_etag = false;
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@@ -453,9 +453,8 @@ 
 			// Make a timestamp for our most recent modification...
 			$wp_modified_timestamp = strtotime($wp_last_modified);
 
-			if ( ($client_last_modified && $client_etag) ?
-					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
-					 (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
+			if (($client_last_modified && $client_etag) ?
+					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) : (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag))) {
 				$status = 304;
 				$exit_required = true;
 			}
@@ -469,23 +468,23 @@ 
 		 * @param array $headers The list of headers to be sent.
 		 * @param WP    $this    Current WordPress environment instance.
 		 */
-		$headers = apply_filters( 'wp_headers', $headers, $this );
+		$headers = apply_filters('wp_headers', $headers, $this);
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty($status))
+			status_header($status);
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
-		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
-			unset( $headers['Last-Modified'] );
+		if (isset($headers['Last-Modified']) && false === $headers['Last-Modified']) {
+			unset($headers['Last-Modified']);
 
 			// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-			if ( function_exists( 'header_remove' ) ) {
-				@header_remove( 'Last-Modified' );
+			if (function_exists('header_remove')) {
+				@header_remove('Last-Modified');
 			} else {
 				// In PHP 5.2, send an empty Last-Modified header, but only as a
 				// last resort to override a header already sent. #WP23021
-				foreach ( headers_list() as $header ) {
-					if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+				foreach (headers_list() as $header) {
+					if (0 === stripos($header, 'Last-Modified')) {
 						$headers['Last-Modified'] = '';
 						break;
 					}
@@ -493,10 +492,10 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
+		foreach ((array) $headers as $name => $field_value)
 			@header("{$name}: {$field_value}");
 
-		if ( $exit_required )
+		if ($exit_required)
 			exit();
 
 		/**
@@ -506,7 +505,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'send_headers', array( &$this ) );
+		do_action_ref_array('send_headers', array(&$this));
 	}
 
 	/**
@@ -520,16 +519,16 @@ 
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
-		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
-			if ( '' != $this->query_vars[$wpvar] ) {
+		foreach ((array) array_keys($this->query_vars) as $wpvar) {
+			if ('' != $this->query_vars[$wpvar]) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( ! is_scalar($this->query_vars[$wpvar])) // Discard non-scalars.
 					continue;
-				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
+				$this->query_string .= $wpvar.'='.rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
 
-		if ( has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+		if (has_filter('query_string')) {  // Don't bother filtering and parsing if no plugins are hooked in.
 			/**
 			 * Filter the query string before parsing.
 			 *
@@ -538,7 +537,7 @@ 
 			 *
 			 * @param string $query_string The query string to modify.
 			 */
-			$this->query_string = apply_filters( 'query_string', $this->query_string );
+			$this->query_string = apply_filters('query_string', $this->query_string);
 			parse_str($this->query_string, $this->query_vars);
 		}
 	}
@@ -566,22 +565,22 @@ 
 		global $wp_query;
 
 		// Extract updated query vars back into global namespace.
-		foreach ( (array) $wp_query->query_vars as $key => $value ) {
-			$GLOBALS[ $key ] = $value;
+		foreach ((array) $wp_query->query_vars as $key => $value) {
+			$GLOBALS[$key] = $value;
 		}
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
+		$GLOBALS['post'] = isset($wp_query->post) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
-		if ( $wp_query->is_single() || $wp_query->is_page() ) {
+		if ($wp_query->is_single() || $wp_query->is_page()) {
 			$GLOBALS['more']   = 1;
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ($wp_query->is_author() && isset($wp_query->post))
+			$GLOBALS['authordata'] = get_userdata($wp_query->post->post_author);
 	}
 
 	/**
@@ -640,70 +639,70 @@ 
 		 * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
 		 * @param WP_Query $wp_query WordPress Query object.
 		 */
-		if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+		if (false !== apply_filters('pre_handle_404', false, $wp_query)) {
 			return;
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
+		if (is_404())
 			return;
 
 		// Never 404 for the admin, robots, or if we found posts.
-		if ( is_admin() || is_robots() || $wp_query->posts ) {
+		if (is_admin() || is_robots() || $wp_query->posts) {
 
 			$success = true;
-			if ( is_singular() ) {
+			if (is_singular()) {
 				$p = false;
 
-				if ( $wp_query->post instanceof WP_Post ) {
+				if ($wp_query->post instanceof WP_Post) {
 					$p = clone $wp_query->post;
 				}
 
 				// Only set X-Pingback for single posts that allow pings.
-				if ( $p && pings_open( $p ) ) {
-					@header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
+				if ($p && pings_open($p)) {
+					@header('X-Pingback: '.get_bloginfo('pingback_url'));
 				}
 
 				// check for paged content that exceeds the max number of pages
 				$next = '<!--nextpage-->';
-				if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
-					$page = trim( $this->query_vars['page'], '/' );
-					$success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+				if ($p && false !== strpos($p->post_content, $next) && ! empty($this->query_vars['page'])) {
+					$page = trim($this->query_vars['page'], '/');
+					$success = (int) $page <= (substr_count($p->post_content, $next) + 1);
 				}
 			}
 
-			if ( $success ) {
-				status_header( 200 );
+			if ($success) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// We will 404 for paged queries, as no posts were found.
-		if ( ! is_paged() ) {
+		if ( ! is_paged()) {
 
 			// Don't 404 for authors without posts as long as they matched an author on this site.
-			$author = get_query_var( 'author' );
-			if ( is_author() && is_numeric( $author ) && $author > 0 && is_user_member_of_blog( $author ) ) {
-				status_header( 200 );
+			$author = get_query_var('author');
+			if (is_author() && is_numeric($author) && $author > 0 && is_user_member_of_blog($author)) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries if they matched an object.
-			if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
-				status_header( 200 );
+			if ((is_tag() || is_category() || is_tax() || is_post_type_archive()) && get_queried_object()) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries either.
-			if ( is_home() || is_search() || is_feed() ) {
-				status_header( 200 );
+			if (is_home() || is_search() || is_feed()) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// Guess it's time to 404.
 		$wp_query->set_404();
-		status_header( 404 );
+		status_header(404);
 		nocache_headers();
 	}
 
@@ -734,7 +733,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp', array( &$this ) );
+		do_action_ref_array('wp', array(&$this));
 	}
 }
 
@@ -824,6 +823,6 @@ 
 	 */
 	public function callback($matches) {
 		$index = intval(substr($matches[0], 9, -1));
-		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+		return (isset($this->_matches[$index]) ? urlencode($this->_matches[$index]) : '');
 	}
 }

Braces +73 added lines, -50 removed lines

@@ -100,8 +100,9 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
-			$this->public_query_vars[] = $qv;
+		if ( !in_array($qv, $this->public_query_vars) ) {
+					$this->public_query_vars[] = $qv;
+		}
 	}
 
 	/**
@@ -154,8 +155,9 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
-			return;
+		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
+					return;
+		}
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
@@ -205,8 +207,9 @@ 
 				$request = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
-					$req_uri = '';
+				if ( $req_uri == $wp_rewrite->index ) {
+									$req_uri = '';
+				}
 				$request = $req_uri;
 			}
 
@@ -224,8 +227,9 @@ 
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requesting file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
-						$request_match = $req_uri . '/' . $request;
+					if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request ) {
+											$request_match = $req_uri . '/' . $request;
+					}
 
 					if ( preg_match("#^$match#", $request_match, $matches) ||
 						preg_match("#^$match#", urldecode($request_match), $matches) ) {
@@ -264,16 +268,18 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ( '404' == $error ) {
+									unset( $error, $_GET['error'] );
+				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
 			if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+									unset( $perma_query_vars );
+				}
 
 				$this->did_permalink = false;
 			}
@@ -299,14 +305,15 @@ 
 		}
 
 		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			if ( isset( $this->extra_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
+			} elseif ( isset( $_POST[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_POST[$wpvar];
+			} elseif ( isset( $_GET[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_GET[$wpvar];
+			} elseif ( isset( $perma_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			}
 
 			if ( !empty( $this->query_vars[$wpvar] ) ) {
 				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
@@ -327,9 +334,10 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
+		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
+					if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
 				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		}
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
 		if ( ! is_admin() ) {
@@ -348,8 +356,9 @@ 
 		if ( isset( $this->query_vars['post_type']) ) {
 			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
+									unset( $this->query_vars['post_type'] );
+				}
 			} else {
 				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
 			}
@@ -359,12 +368,14 @@ 
 		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
 
 		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
-				$this->query_vars[$var] = $this->extra_query_vars[$var];
+			if ( isset($this->extra_query_vars[$var]) ) {
+							$this->query_vars[$var] = $this->extra_query_vars[$var];
+			}
 		}
 
-		if ( isset($error) )
-			$this->query_vars['error'] = $error;
+		if ( isset($error) ) {
+					$this->query_vars['error'] = $error;
+		}
 
 		/**
 		 * Filter the array of parsed query variables.
@@ -400,13 +411,15 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
-			$headers = array_merge($headers, wp_get_nocache_headers());
+		if ( is_user_logged_in() ) {
+					$headers = array_merge($headers, wp_get_nocache_headers());
+		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
 			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
-					$headers = array_merge($headers, wp_get_nocache_headers());
+				if ( ! is_user_logged_in() ) {
+									$headers = array_merge($headers, wp_get_nocache_headers());
+				}
 				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
 				$exit_required = true;
@@ -433,18 +446,21 @@ 
 						|| !empty($this->query_vars['attachment_id'])
 					)
 				)
-			)
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
-			else
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			) {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
+			} else {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			}
 			$wp_etag = '"' . md5($wp_last_modified) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
-			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
-			else $client_etag = false;
+			if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+							$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+			} else {
+				$client_etag = false;
+			}
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 			// If string is empty, return 0. If not, attempt to parse into a timestamp
@@ -471,8 +487,9 @@ 
 		 */
 		$headers = apply_filters( 'wp_headers', $headers, $this );
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty( $status ) ) {
+					status_header( $status );
+		}
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
 		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
@@ -493,11 +510,13 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
-			@header("{$name}: {$field_value}");
+		foreach ( (array) $headers as $name => $field_value ) {
+					@header("{$name}: {$field_value}");
+		}
 
-		if ( $exit_required )
-			exit();
+		if ( $exit_required ) {
+					exit();
+		}
 
 		/**
 		 * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
@@ -523,8 +542,10 @@ 
 		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
 			if ( '' != $this->query_vars[$wpvar] ) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( !is_scalar($this->query_vars[$wpvar]) ) {
+					// Discard non-scalars.
 					continue;
+				}
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
@@ -580,8 +601,9 @@ 
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
+					$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		}
 	}
 
 	/**
@@ -645,8 +667,9 @@ 
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
-			return;
+		if ( is_404() ) {
+					return;
+		}
 
 		// Never 404 for the admin, robots, or if we found posts.
 		if ( is_admin() || is_robots() || $wp_query->posts ) {

src/wp-includes/update.php

Indentation +9 added lines, -9 removed lines

@@ -615,15 +615,15 @@
 	wp_version_check();
 }
 /**
- * Check the last time plugins were run before checking plugin versions.
- *
- * This might have been backported to WordPress 2.6.1 for performance reasons.
- * This is used for the wp-admin to check only so often instead of every page
- * load.
- *
- * @since 2.7.0
- * @access private
- */
+	 * Check the last time plugins were run before checking plugin versions.
+	 *
+	 * This might have been backported to WordPress 2.6.1 for performance reasons.
+	 * This is used for the wp-admin to check only so often instead of every page
+	 * load.
+	 *
+	 * @since 2.7.0
+	 * @access private
+	 */
 function _maybe_update_plugins() {
 	$current = get_site_transient( 'update_plugins' );
 	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )

Spacing +210 added lines, -210 removed lines

@@ -21,36 +21,36 @@ 
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  * @param bool  $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set.
  */
-function wp_version_check( $extra_stats = array(), $force_check = false ) {
-	if ( wp_installing() ) {
+function wp_version_check($extra_stats = array(), $force_check = false) {
+	if (wp_installing()) {
 		return;
 	}
 
 	global $wpdb, $wp_local_package;
 	// include an unmodified $wp_version
-	include( ABSPATH . WPINC . '/version.php' );
+	include(ABSPATH.WPINC.'/version.php');
 	$php_version = phpversion();
 
-	$current = get_site_transient( 'update_core' );
-	$translations = wp_get_installed_translations( 'core' );
+	$current = get_site_transient('update_core');
+	$translations = wp_get_installed_translations('core');
 
 	// Invalidate the transient when $wp_version changes
-	if ( is_object( $current ) && $wp_version != $current->version_checked )
+	if (is_object($current) && $wp_version != $current->version_checked)
 		$current = false;
 
-	if ( ! is_object($current) ) {
+	if ( ! is_object($current)) {
 		$current = new stdClass;
 		$current->updates = array();
 		$current->version_checked = $wp_version;
 	}
 
-	if ( ! empty( $extra_stats ) )
+	if ( ! empty($extra_stats))
 		$force_check = true;
 
 	// Wait 60 seconds between multiple version check requests
 	$timeout = 60;
-	$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
-	if ( ! $force_check && $time_not_changed ) {
+	$time_not_changed = isset($current->last_checked) && $timeout > (time() - $current->last_checked);
+	if ( ! $force_check && $time_not_changed) {
 		return;
 	}
 
@@ -61,18 +61,18 @@ 
 	 *
 	 * @param string $locale Current locale.
 	 */
-	$locale = apply_filters( 'core_version_check_locale', get_locale() );
+	$locale = apply_filters('core_version_check_locale', get_locale());
 
 	// Update last_checked for current to prevent multiple blocking requests if request hangs
 	$current->last_checked = time();
-	set_site_transient( 'update_core', $current );
+	set_site_transient('update_core', $current);
 
-	if ( method_exists( $wpdb, 'db_version' ) )
+	if (method_exists($wpdb, 'db_version'))
 		$mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version());
 	else
 		$mysql_version = 'N/A';
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$user_count = get_user_count();
 		$num_blogs = get_blog_count();
 		$wp_install = network_site_url();
@@ -82,7 +82,7 @@ 
 		$user_count = $user_count['total_users'];
 		$multisite_enabled = 0;
 		$num_blogs = 1;
-		$wp_install = home_url( '/' );
+		$wp_install = home_url('/');
 	}
 
 	$query = array(
@@ -90,65 +90,65 @@ 
 		'php'                => $php_version,
 		'locale'             => $locale,
 		'mysql'              => $mysql_version,
-		'local_package'      => isset( $wp_local_package ) ? $wp_local_package : '',
+		'local_package'      => isset($wp_local_package) ? $wp_local_package : '',
 		'blogs'              => $num_blogs,
 		'users'              => $user_count,
 		'multisite_enabled'  => $multisite_enabled,
-		'initial_db_version' => get_site_option( 'initial_db_version' ),
+		'initial_db_version' => get_site_option('initial_db_version'),
 	);
 
 	$post_body = array(
-		'translations' => wp_json_encode( $translations ),
+		'translations' => wp_json_encode($translations),
 	);
 
-	if ( is_array( $extra_stats ) )
-		$post_body = array_merge( $post_body, $extra_stats );
+	if (is_array($extra_stats))
+		$post_body = array_merge($post_body, $extra_stats);
 
-	$url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	$url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?'.http_build_query($query, null, '&');
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
 	$options = array(
-		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
-		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+		'timeout' => ((defined('DOING_CRON') && DOING_CRON) ? 30 : 3),
+		'user-agent' => 'WordPress/'.$wp_version.'; '.home_url('/'),
 		'headers' => array(
 			'wp_install' => $wp_install,
-			'wp_blog' => home_url( '/' )
+			'wp_blog' => home_url('/')
 		),
 		'body' => $post_body,
 	);
 
-	$response = wp_remote_post( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$response = wp_remote_post( $http_url, $options );
+	$response = wp_remote_post($url, $options);
+	if ($ssl && is_wp_error($response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$response = wp_remote_post($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 		return;
 	}
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['offers'] ) ) {
+	if ( ! is_array($body) || ! isset($body['offers'])) {
 		return;
 	}
 
 	$offers = $body['offers'];
 
-	foreach ( $offers as &$offer ) {
-		foreach ( $offer as $offer_key => $value ) {
-			if ( 'packages' == $offer_key )
-				$offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ),
-					array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' ) );
-			elseif ( 'download' == $offer_key )
-				$offer['download'] = esc_url( $value );
+	foreach ($offers as &$offer) {
+		foreach ($offer as $offer_key => $value) {
+			if ('packages' == $offer_key)
+				$offer['packages'] = (object) array_intersect_key(array_map('esc_url', $offer['packages']),
+					array_fill_keys(array('full', 'no_content', 'new_bundled', 'partial', 'rollback'), ''));
+			elseif ('download' == $offer_key)
+				$offer['download'] = esc_url($value);
 			else
-				$offer[ $offer_key ] = esc_html( $value );
+				$offer[$offer_key] = esc_html($value);
 		}
-		$offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
-			'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) );
+		$offer = (object) array_intersect_key($offer, array_fill_keys(array('response', 'download', 'locale',
+			'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files'), ''));
 	}
 
 	$updates = new stdClass();
@@ -156,22 +156,22 @@ 
 	$updates->last_checked = time();
 	$updates->version_checked = $wp_version;
 
-	if ( isset( $body['translations'] ) )
+	if (isset($body['translations']))
 		$updates->translations = $body['translations'];
 
-	set_site_transient( 'update_core', $updates );
+	set_site_transient('update_core', $updates);
 
-	if ( ! empty( $body['ttl'] ) ) {
+	if ( ! empty($body['ttl'])) {
 		$ttl = (int) $body['ttl'];
-		if ( $ttl && ( time() + $ttl < wp_next_scheduled( 'wp_version_check' ) ) ) {
+		if ($ttl && (time() + $ttl < wp_next_scheduled('wp_version_check'))) {
 			// Queue an event to re-run the update check in $ttl seconds.
-			wp_schedule_single_event( time() + $ttl, 'wp_version_check' );
+			wp_schedule_single_event(time() + $ttl, 'wp_version_check');
 		}
 	}
 
 	// Trigger background updates if running non-interactively, and we weren't called from the update handler.
-	if ( defined( 'DOING_CRON' ) && DOING_CRON && ! doing_action( 'wp_maybe_auto_update' ) ) {
-		do_action( 'wp_maybe_auto_update' );
+	if (defined('DOING_CRON') && DOING_CRON && ! doing_action('wp_maybe_auto_update')) {
+		do_action('wp_maybe_auto_update');
 	}
 }
 
@@ -187,31 +187,31 @@ 
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  */
-function wp_update_plugins( $extra_stats = array() ) {
-	if ( wp_installing() ) {
+function wp_update_plugins($extra_stats = array()) {
+	if (wp_installing()) {
 		return;
 	}
 
 	// include an unmodified $wp_version
-	include( ABSPATH . WPINC . '/version.php' );
+	include(ABSPATH.WPINC.'/version.php');
 
 	// If running blog-side, bail unless we've not checked in the last 12 hours
-	if ( !function_exists( 'get_plugins' ) )
-		require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	if ( ! function_exists('get_plugins'))
+		require_once(ABSPATH.'wp-admin/includes/plugin.php');
 
 	$plugins = get_plugins();
-	$translations = wp_get_installed_translations( 'plugins' );
+	$translations = wp_get_installed_translations('plugins');
 
-	$active  = get_option( 'active_plugins', array() );
-	$current = get_site_transient( 'update_plugins' );
-	if ( ! is_object($current) )
+	$active  = get_option('active_plugins', array());
+	$current = get_site_transient('update_plugins');
+	if ( ! is_object($current))
 		$current = new stdClass;
 
 	$new_option = new stdClass;
 	$new_option->last_checked = time();
 
 	// Check for update on a different schedule, depending on the page.
-	switch ( current_filter() ) {
+	switch (current_filter()) {
 		case 'upgrader_process_complete' :
 			$timeout = 0;
 			break;
@@ -223,27 +223,27 @@ 
 			$timeout = HOUR_IN_SECONDS;
 			break;
 		default :
-			if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+			if (defined('DOING_CRON') && DOING_CRON) {
 				$timeout = 0;
 			} else {
 				$timeout = 12 * HOUR_IN_SECONDS;
 			}
 	}
 
-	$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
+	$time_not_changed = isset($current->last_checked) && $timeout > (time() - $current->last_checked);
 
-	if ( $time_not_changed && ! $extra_stats ) {
+	if ($time_not_changed && ! $extra_stats) {
 		$plugin_changed = false;
-		foreach ( $plugins as $file => $p ) {
-			$new_option->checked[ $file ] = $p['Version'];
+		foreach ($plugins as $file => $p) {
+			$new_option->checked[$file] = $p['Version'];
 
-			if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
+			if ( ! isset($current->checked[$file]) || strval($current->checked[$file]) !== strval($p['Version']))
 				$plugin_changed = true;
 		}
 
-		if ( isset ( $current->response ) && is_array( $current->response ) ) {
-			foreach ( $current->response as $plugin_file => $update_details ) {
-				if ( ! isset($plugins[ $plugin_file ]) ) {
+		if (isset ($current->response) && is_array($current->response)) {
+			foreach ($current->response as $plugin_file => $update_details) {
+				if ( ! isset($plugins[$plugin_file])) {
 					$plugin_changed = true;
 					break;
 				}
@@ -251,18 +251,18 @@ 
 		}
 
 		// Bail if we've checked recently and if nothing has changed
-		if ( ! $plugin_changed ) {
+		if ( ! $plugin_changed) {
 			return;
 		}
 	}
 
 	// Update last_checked for current to prevent multiple blocking requests if request hangs
 	$current->last_checked = time();
-	set_site_transient( 'update_plugins', $current );
+	set_site_transient('update_plugins', $current);
 
-	$to_send = compact( 'plugins', 'active' );
+	$to_send = compact('plugins', 'active');
 
-	$locales = array_values( get_available_languages() );
+	$locales = array_values(get_available_languages());
 
 	/**
 	 * Filter the locales requested for plugin translations.
@@ -272,62 +272,62 @@ 
 	 *
 	 * @param array $locales Plugin locales. Default is all available locales of the site.
 	 */
-	$locales = apply_filters( 'plugins_update_check_locales', $locales );
-	$locales = array_unique( $locales );
+	$locales = apply_filters('plugins_update_check_locales', $locales);
+	$locales = array_unique($locales);
 
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+	if (defined('DOING_CRON') && DOING_CRON) {
 		$timeout = 30;
 	} else {
 		// Three seconds, plus one extra second for every 10 plugins
-		$timeout = 3 + (int) ( count( $plugins ) / 10 );
+		$timeout = 3 + (int) (count($plugins) / 10);
 	}
 
 	$options = array(
 		'timeout' => $timeout,
 		'body' => array(
-			'plugins'      => wp_json_encode( $to_send ),
-			'translations' => wp_json_encode( $translations ),
-			'locale'       => wp_json_encode( $locales ),
-			'all'          => wp_json_encode( true ),
+			'plugins'      => wp_json_encode($to_send),
+			'translations' => wp_json_encode($translations),
+			'locale'       => wp_json_encode($locales),
+			'all'          => wp_json_encode(true),
 		),
-		'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+		'user-agent' => 'WordPress/'.$wp_version.'; '.get_bloginfo('url')
 	);
 
-	if ( $extra_stats ) {
-		$options['body']['update_stats'] = wp_json_encode( $extra_stats );
+	if ($extra_stats) {
+		$options['body']['update_stats'] = wp_json_encode($extra_stats);
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
-	$raw_response = wp_remote_post( $url, $options );
-	if ( $ssl && is_wp_error( $raw_response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$raw_response = wp_remote_post( $http_url, $options );
+	$raw_response = wp_remote_post($url, $options);
+	if ($ssl && is_wp_error($raw_response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$raw_response = wp_remote_post($http_url, $options);
 	}
 
-	if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) {
+	if (is_wp_error($raw_response) || 200 != wp_remote_retrieve_response_code($raw_response)) {
 		return;
 	}
 
-	$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
-	foreach ( $response['plugins'] as &$plugin ) {
+	$response = json_decode(wp_remote_retrieve_body($raw_response), true);
+	foreach ($response['plugins'] as &$plugin) {
 		$plugin = (object) $plugin;
-		if ( isset( $plugin->compatibility ) ) {
+		if (isset($plugin->compatibility)) {
 			$plugin->compatibility = (object) $plugin->compatibility;
-			foreach ( $plugin->compatibility as &$data ) {
+			foreach ($plugin->compatibility as &$data) {
 				$data = (object) $data;
 			}
 		}
 	}
-	unset( $plugin, $data );
-	foreach ( $response['no_update'] as &$plugin ) {
+	unset($plugin, $data);
+	foreach ($response['no_update'] as &$plugin) {
 		$plugin = (object) $plugin;
 	}
-	unset( $plugin );
+	unset($plugin);
 
-	if ( is_array( $response ) ) {
+	if (is_array($response)) {
 		$new_option->response = $response['plugins'];
 		$new_option->translations = $response['translations'];
 		// TODO: Perhaps better to store no_update in a separate transient with an expiry?
@@ -338,7 +338,7 @@ 
 		$new_option->no_update = array();
 	}
 
-	set_site_transient( 'update_plugins', $new_option );
+	set_site_transient('update_plugins', $new_option);
 }
 
 /**
@@ -352,30 +352,30 @@ 
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  */
-function wp_update_themes( $extra_stats = array() ) {
-	if ( wp_installing() ) {
+function wp_update_themes($extra_stats = array()) {
+	if (wp_installing()) {
 		return;
 	}
 
 	// include an unmodified $wp_version
-	include( ABSPATH . WPINC . '/version.php' );
+	include(ABSPATH.WPINC.'/version.php');
 
 	$installed_themes = wp_get_themes();
-	$translations = wp_get_installed_translations( 'themes' );
+	$translations = wp_get_installed_translations('themes');
 
-	$last_update = get_site_transient( 'update_themes' );
-	if ( ! is_object($last_update) )
+	$last_update = get_site_transient('update_themes');
+	if ( ! is_object($last_update))
 		$last_update = new stdClass;
 
 	$themes = $checked = $request = array();
 
 	// Put slug of current theme into request.
-	$request['active'] = get_option( 'stylesheet' );
+	$request['active'] = get_option('stylesheet');
 
-	foreach ( $installed_themes as $theme ) {
-		$checked[ $theme->get_stylesheet() ] = $theme->get('Version');
+	foreach ($installed_themes as $theme) {
+		$checked[$theme->get_stylesheet()] = $theme->get('Version');
 
-		$themes[ $theme->get_stylesheet() ] = array(
+		$themes[$theme->get_stylesheet()] = array(
 			'Name'       => $theme->get('Name'),
 			'Title'      => $theme->get('Name'),
 			'Version'    => $theme->get('Version'),
@@ -387,7 +387,7 @@ 
 	}
 
 	// Check for update on a different schedule, depending on the page.
-	switch ( current_filter() ) {
+	switch (current_filter()) {
 		case 'upgrader_process_complete' :
 			$timeout = 0;
 			break;
@@ -399,25 +399,25 @@ 
 			$timeout = HOUR_IN_SECONDS;
 			break;
 		default :
-			if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+			if (defined('DOING_CRON') && DOING_CRON) {
 				$timeout = 0;
 			} else {
 				$timeout = 12 * HOUR_IN_SECONDS;
 			}
 	}
 
-	$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
+	$time_not_changed = isset($last_update->last_checked) && $timeout > (time() - $last_update->last_checked);
 
-	if ( $time_not_changed && ! $extra_stats ) {
+	if ($time_not_changed && ! $extra_stats) {
 		$theme_changed = false;
-		foreach ( $checked as $slug => $v ) {
-			if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
+		foreach ($checked as $slug => $v) {
+			if ( ! isset($last_update->checked[$slug]) || strval($last_update->checked[$slug]) !== strval($v))
 				$theme_changed = true;
 		}
 
-		if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
-			foreach ( $last_update->response as $slug => $update_details ) {
-				if ( ! isset($checked[ $slug ]) ) {
+		if (isset ($last_update->response) && is_array($last_update->response)) {
+			foreach ($last_update->response as $slug => $update_details) {
+				if ( ! isset($checked[$slug])) {
 					$theme_changed = true;
 					break;
 				}
@@ -425,18 +425,18 @@ 
 		}
 
 		// Bail if we've checked recently and if nothing has changed
-		if ( ! $theme_changed ) {
+		if ( ! $theme_changed) {
 			return;
 		}
 	}
 
 	// Update last_checked for current to prevent multiple blocking requests if request hangs
 	$last_update->last_checked = time();
-	set_site_transient( 'update_themes', $last_update );
+	set_site_transient('update_themes', $last_update);
 
 	$request['themes'] = $themes;
 
-	$locales = array_values( get_available_languages() );
+	$locales = array_values(get_available_languages());
 
 	/**
 	 * Filter the locales requested for theme translations.
@@ -446,41 +446,41 @@ 
 	 *
 	 * @param array $locales Theme locales. Default is all available locales of the site.
 	 */
-	$locales = apply_filters( 'themes_update_check_locales', $locales );
-	$locales = array_unique( $locales );
+	$locales = apply_filters('themes_update_check_locales', $locales);
+	$locales = array_unique($locales);
 
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+	if (defined('DOING_CRON') && DOING_CRON) {
 		$timeout = 30;
 	} else {
 		// Three seconds, plus one extra second for every 10 themes
-		$timeout = 3 + (int) ( count( $themes ) / 10 );
+		$timeout = 3 + (int) (count($themes) / 10);
 	}
 
 	$options = array(
 		'timeout' => $timeout,
 		'body' => array(
-			'themes'       => wp_json_encode( $request ),
-			'translations' => wp_json_encode( $translations ),
-			'locale'       => wp_json_encode( $locales ),
+			'themes'       => wp_json_encode($request),
+			'translations' => wp_json_encode($translations),
+			'locale'       => wp_json_encode($locales),
 		),
-		'user-agent'	=> 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+		'user-agent'	=> 'WordPress/'.$wp_version.'; '.get_bloginfo('url')
 	);
 
-	if ( $extra_stats ) {
-		$options['body']['update_stats'] = wp_json_encode( $extra_stats );
+	if ($extra_stats) {
+		$options['body']['update_stats'] = wp_json_encode($extra_stats);
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
-	$raw_response = wp_remote_post( $url, $options );
-	if ( $ssl && is_wp_error( $raw_response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$raw_response = wp_remote_post( $http_url, $options );
+	$raw_response = wp_remote_post($url, $options);
+	if ($ssl && is_wp_error($raw_response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$raw_response = wp_remote_post($http_url, $options);
 	}
 
-	if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) {
+	if (is_wp_error($raw_response) || 200 != wp_remote_retrieve_response_code($raw_response)) {
 		return;
 	}
 
@@ -488,14 +488,14 @@ 
 	$new_update->last_checked = time();
 	$new_update->checked = $checked;
 
-	$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
+	$response = json_decode(wp_remote_retrieve_body($raw_response), true);
 
-	if ( is_array( $response ) ) {
+	if (is_array($response)) {
 		$new_update->response     = $response['themes'];
 		$new_update->translations = $response['translations'];
 	}
 
-	set_site_transient( 'update_themes', $new_update );
+	set_site_transient('update_themes', $new_update);
 }
 
 /**
@@ -504,8 +504,8 @@ 
  * @since 3.7.0
  */
 function wp_maybe_auto_update() {
-	include_once( ABSPATH . '/wp-admin/includes/admin.php' );
-	include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'/wp-admin/includes/admin.php');
+	include_once(ABSPATH.'/wp-admin/includes/class-wp-upgrader.php');
 
 	$upgrader = new WP_Automatic_Updater;
 	$upgrader->run();
@@ -520,13 +520,13 @@ 
  */
 function wp_get_translation_updates() {
 	$updates = array();
-	$transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' );
-	foreach ( $transients as $transient => $type ) {
-		$transient = get_site_transient( $transient );
-		if ( empty( $transient->translations ) )
+	$transients = array('update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme');
+	foreach ($transients as $transient => $type) {
+		$transient = get_site_transient($transient);
+		if (empty($transient->translations))
 			continue;
 
-		foreach ( $transient->translations as $translation ) {
+		foreach ($transient->translations as $translation) {
 			$updates[] = (object) $translation;
 		}
 	}
@@ -541,43 +541,43 @@ 
  * @return array
  */
 function wp_get_update_data() {
-	$counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 );
+	$counts = array('plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0);
 
-	if ( $plugins = current_user_can( 'update_plugins' ) ) {
-		$update_plugins = get_site_transient( 'update_plugins' );
-		if ( ! empty( $update_plugins->response ) )
-			$counts['plugins'] = count( $update_plugins->response );
+	if ($plugins = current_user_can('update_plugins')) {
+		$update_plugins = get_site_transient('update_plugins');
+		if ( ! empty($update_plugins->response))
+			$counts['plugins'] = count($update_plugins->response);
 	}
 
-	if ( $themes = current_user_can( 'update_themes' ) ) {
-		$update_themes = get_site_transient( 'update_themes' );
-		if ( ! empty( $update_themes->response ) )
-			$counts['themes'] = count( $update_themes->response );
+	if ($themes = current_user_can('update_themes')) {
+		$update_themes = get_site_transient('update_themes');
+		if ( ! empty($update_themes->response))
+			$counts['themes'] = count($update_themes->response);
 	}
 
-	if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) {
-		$update_wordpress = get_core_updates( array('dismissed' => false) );
-		if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
+	if (($core = current_user_can('update_core')) && function_exists('get_core_updates')) {
+		$update_wordpress = get_core_updates(array('dismissed' => false));
+		if ( ! empty($update_wordpress) && ! in_array($update_wordpress[0]->response, array('development', 'latest')) && current_user_can('update_core'))
 			$counts['wordpress'] = 1;
 	}
 
-	if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() )
+	if (($core || $plugins || $themes) && wp_get_translation_updates())
 		$counts['translations'] = 1;
 
 	$counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
 	$titles = array();
-	if ( $counts['wordpress'] )
-		$titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
-	if ( $counts['plugins'] )
-		$titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
-	if ( $counts['themes'] )
-		$titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
-	if ( $counts['translations'] )
-		$titles['translations'] = __( 'Translation Updates' );
-
-	$update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';
-
-	$update_data = array( 'counts' => $counts, 'title' => $update_title );
+	if ($counts['wordpress'])
+		$titles['wordpress'] = sprintf(__('%d WordPress Update'), $counts['wordpress']);
+	if ($counts['plugins'])
+		$titles['plugins'] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $counts['plugins']), $counts['plugins']);
+	if ($counts['themes'])
+		$titles['themes'] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
+	if ($counts['translations'])
+		$titles['translations'] = __('Translation Updates');
+
+	$update_title = $titles ? esc_attr(implode(', ', $titles)) : '';
+
+	$update_data = array('counts' => $counts, 'title' => $update_title);
 	/**
 	 * Filter the returned array of update data for plugins, themes, and WordPress core.
 	 *
@@ -591,7 +591,7 @@ 
 	 * }
 	 * @param array $titles An array of update counts and UI strings for available updates.
 	 */
-	return apply_filters( 'wp_get_update_data', $update_data, $titles );
+	return apply_filters('wp_get_update_data', $update_data, $titles);
 }
 
 /**
@@ -603,13 +603,13 @@ 
  */
 function _maybe_update_core() {
 	// include an unmodified $wp_version
-	include( ABSPATH . WPINC . '/version.php' );
+	include(ABSPATH.WPINC.'/version.php');
 
-	$current = get_site_transient( 'update_core' );
+	$current = get_site_transient('update_core');
 
-	if ( isset( $current->last_checked, $current->version_checked ) &&
-		12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) &&
-		$current->version_checked == $wp_version ) {
+	if (isset($current->last_checked, $current->version_checked) &&
+		12 * HOUR_IN_SECONDS > (time() - $current->last_checked) &&
+		$current->version_checked == $wp_version) {
 		return;
 	}
 	wp_version_check();
@@ -625,8 +625,8 @@ 
  * @access private
  */
 function _maybe_update_plugins() {
-	$current = get_site_transient( 'update_plugins' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
+	$current = get_site_transient('update_plugins');
+	if (isset($current->last_checked) && 12 * HOUR_IN_SECONDS > (time() - $current->last_checked))
 		return;
 	wp_update_plugins();
 }
@@ -641,8 +641,8 @@ 
  * @access private
  */
 function _maybe_update_themes() {
-	$current = get_site_transient( 'update_themes' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
+	$current = get_site_transient('update_themes');
+	if (isset($current->last_checked) && 12 * HOUR_IN_SECONDS > (time() - $current->last_checked))
 		return;
 	wp_update_themes();
 }
@@ -653,13 +653,13 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
+	if ( ! wp_next_scheduled('wp_version_check') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
 
-	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
+	if ( ! wp_next_scheduled('wp_update_plugins') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
 
-	if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
+	if ( ! wp_next_scheduled('wp_update_themes') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
 }
 
@@ -669,39 +669,39 @@ 
  * @since 4.1.0
  */
 function wp_clean_update_cache() {
-	if ( function_exists( 'wp_clean_plugins_cache' ) ) {
+	if (function_exists('wp_clean_plugins_cache')) {
 		wp_clean_plugins_cache();
 	} else {
-		delete_site_transient( 'update_plugins' );
+		delete_site_transient('update_plugins');
 	}
 	wp_clean_themes_cache();
-	delete_site_transient( 'update_core' );
+	delete_site_transient('update_core');
 }
 
-if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+if (( ! is_main_site() && ! is_network_admin()) || (defined('DOING_AJAX') && DOING_AJAX)) {
 	return;
 }
 
-add_action( 'admin_init', '_maybe_update_core' );
-add_action( 'wp_version_check', 'wp_version_check' );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
+add_action('admin_init', '_maybe_update_core');
+add_action('wp_version_check', 'wp_version_check');
+add_action('upgrader_process_complete', 'wp_version_check', 10, 0);
 
-add_action( 'load-plugins.php', 'wp_update_plugins' );
-add_action( 'load-update.php', 'wp_update_plugins' );
-add_action( 'load-update-core.php', 'wp_update_plugins' );
-add_action( 'admin_init', '_maybe_update_plugins' );
-add_action( 'wp_update_plugins', 'wp_update_plugins' );
-add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
+add_action('load-plugins.php', 'wp_update_plugins');
+add_action('load-update.php', 'wp_update_plugins');
+add_action('load-update-core.php', 'wp_update_plugins');
+add_action('admin_init', '_maybe_update_plugins');
+add_action('wp_update_plugins', 'wp_update_plugins');
+add_action('upgrader_process_complete', 'wp_update_plugins', 10, 0);
 
-add_action( 'load-themes.php', 'wp_update_themes' );
-add_action( 'load-update.php', 'wp_update_themes' );
-add_action( 'load-update-core.php', 'wp_update_themes' );
-add_action( 'admin_init', '_maybe_update_themes' );
-add_action( 'wp_update_themes', 'wp_update_themes' );
-add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+add_action('load-themes.php', 'wp_update_themes');
+add_action('load-update.php', 'wp_update_themes');
+add_action('load-update-core.php', 'wp_update_themes');
+add_action('admin_init', '_maybe_update_themes');
+add_action('wp_update_themes', 'wp_update_themes');
+add_action('upgrader_process_complete', 'wp_update_themes', 10, 0);
 
-add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );
+add_action('update_option_WPLANG', 'wp_clean_update_cache', 10, 0);
 
-add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
+add_action('wp_maybe_auto_update', 'wp_maybe_auto_update');
 
-add_action( 'init', 'wp_schedule_update_checks' );
+add_action('init', 'wp_schedule_update_checks');

Braces +91 added lines, -63 removed lines

@@ -35,8 +35,9 @@ 
 	$translations = wp_get_installed_translations( 'core' );
 
 	// Invalidate the transient when $wp_version changes
-	if ( is_object( $current ) && $wp_version != $current->version_checked )
-		$current = false;
+	if ( is_object( $current ) && $wp_version != $current->version_checked ) {
+			$current = false;
+	}
 
 	if ( ! is_object($current) ) {
 		$current = new stdClass;
@@ -44,8 +45,9 @@ 
 		$current->version_checked = $wp_version;
 	}
 
-	if ( ! empty( $extra_stats ) )
-		$force_check = true;
+	if ( ! empty( $extra_stats ) ) {
+			$force_check = true;
+	}
 
 	// Wait 60 seconds between multiple version check requests
 	$timeout = 60;
@@ -67,10 +69,11 @@ 
 	$current->last_checked = time();
 	set_site_transient( 'update_core', $current );
 
-	if ( method_exists( $wpdb, 'db_version' ) )
-		$mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version());
-	else
-		$mysql_version = 'N/A';
+	if ( method_exists( $wpdb, 'db_version' ) ) {
+			$mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version());
+	} else {
+			$mysql_version = 'N/A';
+	}
 
 	if ( is_multisite() ) {
 		$user_count = get_user_count();
@@ -101,12 +104,14 @@ 
 		'translations' => wp_json_encode( $translations ),
 	);
 
-	if ( is_array( $extra_stats ) )
-		$post_body = array_merge( $post_body, $extra_stats );
+	if ( is_array( $extra_stats ) ) {
+			$post_body = array_merge( $post_body, $extra_stats );
+	}
 
 	$url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	$options = array(
 		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
@@ -139,13 +144,14 @@ 
 
 	foreach ( $offers as &$offer ) {
 		foreach ( $offer as $offer_key => $value ) {
-			if ( 'packages' == $offer_key )
-				$offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ),
+			if ( 'packages' == $offer_key ) {
+							$offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ),
 					array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' ) );
-			elseif ( 'download' == $offer_key )
-				$offer['download'] = esc_url( $value );
-			else
-				$offer[ $offer_key ] = esc_html( $value );
+			} elseif ( 'download' == $offer_key ) {
+							$offer['download'] = esc_url( $value );
+			} else {
+							$offer[ $offer_key ] = esc_html( $value );
+			}
 		}
 		$offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
 			'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) );
@@ -156,8 +162,9 @@ 
 	$updates->last_checked = time();
 	$updates->version_checked = $wp_version;
 
-	if ( isset( $body['translations'] ) )
-		$updates->translations = $body['translations'];
+	if ( isset( $body['translations'] ) ) {
+			$updates->translations = $body['translations'];
+	}
 
 	set_site_transient( 'update_core', $updates );
 
@@ -196,16 +203,18 @@ 
 	include( ABSPATH . WPINC . '/version.php' );
 
 	// If running blog-side, bail unless we've not checked in the last 12 hours
-	if ( !function_exists( 'get_plugins' ) )
-		require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	if ( !function_exists( 'get_plugins' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
 
 	$plugins = get_plugins();
 	$translations = wp_get_installed_translations( 'plugins' );
 
 	$active  = get_option( 'active_plugins', array() );
 	$current = get_site_transient( 'update_plugins' );
-	if ( ! is_object($current) )
-		$current = new stdClass;
+	if ( ! is_object($current) ) {
+			$current = new stdClass;
+	}
 
 	$new_option = new stdClass;
 	$new_option->last_checked = time();
@@ -237,8 +246,9 @@ 
 		foreach ( $plugins as $file => $p ) {
 			$new_option->checked[ $file ] = $p['Version'];
 
-			if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
-				$plugin_changed = true;
+			if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) ) {
+							$plugin_changed = true;
+			}
 		}
 
 		if ( isset ( $current->response ) && is_array( $current->response ) ) {
@@ -298,8 +308,9 @@ 
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	$raw_response = wp_remote_post( $url, $options );
 	if ( $ssl && is_wp_error( $raw_response ) ) {
@@ -364,8 +375,9 @@ 
 	$translations = wp_get_installed_translations( 'themes' );
 
 	$last_update = get_site_transient( 'update_themes' );
-	if ( ! is_object($last_update) )
-		$last_update = new stdClass;
+	if ( ! is_object($last_update) ) {
+			$last_update = new stdClass;
+	}
 
 	$themes = $checked = $request = array();
 
@@ -411,8 +423,9 @@ 
 	if ( $time_not_changed && ! $extra_stats ) {
 		$theme_changed = false;
 		foreach ( $checked as $slug => $v ) {
-			if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
-				$theme_changed = true;
+			if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) ) {
+							$theme_changed = true;
+			}
 		}
 
 		if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
@@ -471,8 +484,9 @@ 
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	$raw_response = wp_remote_post( $url, $options );
 	if ( $ssl && is_wp_error( $raw_response ) ) {
@@ -523,8 +537,9 @@ 
 	$transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' );
 	foreach ( $transients as $transient => $type ) {
 		$transient = get_site_transient( $transient );
-		if ( empty( $transient->translations ) )
-			continue;
+		if ( empty( $transient->translations ) ) {
+					continue;
+		}
 
 		foreach ( $transient->translations as $translation ) {
 			$updates[] = (object) $translation;
@@ -545,35 +560,43 @@ 
 
 	if ( $plugins = current_user_can( 'update_plugins' ) ) {
 		$update_plugins = get_site_transient( 'update_plugins' );
-		if ( ! empty( $update_plugins->response ) )
-			$counts['plugins'] = count( $update_plugins->response );
+		if ( ! empty( $update_plugins->response ) ) {
+					$counts['plugins'] = count( $update_plugins->response );
+		}
 	}
 
 	if ( $themes = current_user_can( 'update_themes' ) ) {
 		$update_themes = get_site_transient( 'update_themes' );
-		if ( ! empty( $update_themes->response ) )
-			$counts['themes'] = count( $update_themes->response );
+		if ( ! empty( $update_themes->response ) ) {
+					$counts['themes'] = count( $update_themes->response );
+		}
 	}
 
 	if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) {
 		$update_wordpress = get_core_updates( array('dismissed' => false) );
-		if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
-			$counts['wordpress'] = 1;
+		if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') ) {
+					$counts['wordpress'] = 1;
+		}
 	}
 
-	if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() )
-		$counts['translations'] = 1;
+	if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() ) {
+			$counts['translations'] = 1;
+	}
 
 	$counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
 	$titles = array();
-	if ( $counts['wordpress'] )
-		$titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
-	if ( $counts['plugins'] )
-		$titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
-	if ( $counts['themes'] )
-		$titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
-	if ( $counts['translations'] )
-		$titles['translations'] = __( 'Translation Updates' );
+	if ( $counts['wordpress'] ) {
+			$titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
+	}
+	if ( $counts['plugins'] ) {
+			$titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
+	}
+	if ( $counts['themes'] ) {
+			$titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
+	}
+	if ( $counts['translations'] ) {
+			$titles['translations'] = __( 'Translation Updates' );
+	}
 
 	$update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';
 
@@ -626,8 +649,9 @@ 
  */
 function _maybe_update_plugins() {
 	$current = get_site_transient( 'update_plugins' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
-		return;
+	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) {
+			return;
+	}
 	wp_update_plugins();
 }
 
@@ -642,8 +666,9 @@ 
  */
 function _maybe_update_themes() {
 	$current = get_site_transient( 'update_themes' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
-		return;
+	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) {
+			return;
+	}
 	wp_update_themes();
 }
 
@@ -653,15 +678,18 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
+	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
+	}
 
-	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
+	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
+	}
 
-	if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
-}
+	if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
+	}
+	}
 
 /**
  * Clear existing update caches for plugins, themes, and core.

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Rewrite API: WP_Rewrite class
- *
- * @package WordPress
- * @subpackage Rewrite
- * @since 1.5.0
- */
+	 * Rewrite API: WP_Rewrite class
+	 *
+	 * @package WordPress
+	 * @subpackage Rewrite
+	 * @since 1.5.0
+	 */
 
 /**
  * Core class used to implement a rewrite component API.

Spacing +250 added lines, -250 removed lines

@@ -364,7 +364,7 @@ 
 	 * @since 1.5.0
 	 * @var array
 	 */
-	public $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+	public $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
 	/**
 	 * Determines whether permalinks are being used.
@@ -391,12 +391,12 @@ 
 	 * @return bool Whether permalink links are enabled and index.php is in the URL.
 	 */
 	public function using_index_permalinks() {
-		if ( empty( $this->permalink_structure ) ) {
+		if (empty($this->permalink_structure)) {
 			return false;
 		}
 
 		// If the index is not in the permalink, we're using mod_rewrite.
-		return preg_match( '#^/*' . $this->index . '#', $this->permalink_structure );
+		return preg_match('#^/*'.$this->index.'#', $this->permalink_structure);
 	}
 
 	/**
@@ -433,8 +433,8 @@ 
 		$match_prefix = '$';
 		$match_suffix = '';
 
-		if ( ! empty($this->matches) ) {
-			$match_prefix = '$' . $this->matches . '[';
+		if ( ! empty($this->matches)) {
+			$match_prefix = '$'.$this->matches.'[';
 			$match_suffix = ']';
 		}
 
@@ -459,11 +459,11 @@ 
 
 		// Get pages in order of hierarchy, i.e. children after parents.
 		$pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");
-		$posts = get_page_hierarchy( $pages );
+		$posts = get_page_hierarchy($pages);
 
 		// If we have no pages get out quick.
-		if ( !$posts )
-			return array( array(), array() );
+		if ( ! $posts)
+			return array(array(), array());
 
 		// Now reverse it, because we need parents after children for rewrite rules to work properly.
 		$posts = array_reverse($posts, true);
@@ -471,12 +471,12 @@ 
 		$page_uris = array();
 		$page_attachment_uris = array();
 
-		foreach ( $posts as $id => $post ) {
+		foreach ($posts as $id => $post) {
 			// URL => page name
 			$uri = get_page_uri($id);
-			$attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ));
-			if ( !empty($attachments) ) {
-				foreach ( $attachments as $attachment ) {
+			$attachments = $wpdb->get_results($wpdb->prepare("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id));
+			if ( ! empty($attachments)) {
+				foreach ($attachments as $attachment) {
 					$attach_uri = get_page_uri($attachment->ID);
 					$page_attachment_uris[$attach_uri] = $attachment->ID;
 				}
@@ -485,7 +485,7 @@ 
 			$page_uris[$uri] = $id;
 		}
 
-		return array( $page_uris, $page_attachment_uris );
+		return array($page_uris, $page_attachment_uris);
 	}
 
 	/**
@@ -498,9 +498,9 @@ 
 	 */
 	public function page_rewrite_rules() {
 		// The extra .? at the beginning prevents clashes with other regular expressions in the rules array.
-		$this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );
+		$this->add_rewrite_tag('%pagename%', '(.?.+?)', 'pagename=');
 
-		return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES, true, true, false, false );
+		return $this->generate_rewrite_rules($this->get_page_permastruct(), EP_PAGES, true, true, false, false);
 	}
 
 	/**
@@ -524,10 +524,10 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
+		if (isset($this->date_structure))
 			return $this->date_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->date_structure = '';
 			return false;
 		}
@@ -538,14 +538,14 @@ 
 		$this->date_structure = '';
 		$date_endian = '';
 
-		foreach ( $endians as $endian ) {
-			if ( false !== strpos($this->permalink_structure, $endian) ) {
-				$date_endian= $endian;
+		foreach ($endians as $endian) {
+			if (false !== strpos($this->permalink_structure, $endian)) {
+				$date_endian = $endian;
 				break;
 			}
 		}
 
-		if ( empty($date_endian) )
+		if (empty($date_endian))
 			$date_endian = '%year%/%monthnum%/%day%';
 
 		/*
@@ -555,15 +555,15 @@ 
 		$front = $this->front;
 		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
 		$tok_index = 1;
-		foreach ( (array) $tokens[0] as $token) {
-			if ( '%post_id%' == $token && ($tok_index <= 3) ) {
-				$front = $front . 'date/';
+		foreach ((array) $tokens[0] as $token) {
+			if ('%post_id%' == $token && ($tok_index <= 3)) {
+				$front = $front.'date/';
 				break;
 			}
 			$tok_index++;
 		}
 
-		$this->date_structure = $front . $date_endian;
+		$this->date_structure = $front.$date_endian;
 
 		return $this->date_structure;
 	}
@@ -582,7 +582,7 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%monthnum%', '', $structure);
@@ -606,7 +606,7 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if (empty($structure))
 			return false;
 
 		$structure = str_replace('%day%', '', $structure);
@@ -673,10 +673,10 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return false;
 
-		if ( isset($this->extra_permastructs[$name]) )
+		if (isset($this->extra_permastructs[$name]))
 			return $this->extra_permastructs[$name]['struct'];
 
 		return false;
@@ -695,15 +695,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
+		if (isset($this->author_structure))
 			return $this->author_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->author_structure = '';
 			return false;
 		}
 
-		$this->author_structure = $this->front . $this->author_base . '/%author%';
+		$this->author_structure = $this->front.$this->author_base.'/%author%';
 
 		return $this->author_structure;
 	}
@@ -721,15 +721,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
+		if (isset($this->search_structure))
 			return $this->search_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->search_structure = '';
 			return false;
 		}
 
-		$this->search_structure = $this->root . $this->search_base . '/%search%';
+		$this->search_structure = $this->root.$this->search_base.'/%search%';
 
 		return $this->search_structure;
 	}
@@ -747,7 +747,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
+		if (isset($this->page_structure))
 			return $this->page_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -755,7 +755,7 @@ 
 			return false;
 		}
 
-		$this->page_structure = $this->root . '%pagename%';
+		$this->page_structure = $this->root.'%pagename%';
 
 		return $this->page_structure;
 	}
@@ -773,15 +773,15 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
+		if (isset($this->feed_structure))
 			return $this->feed_structure;
 
-		if ( empty($this->permalink_structure) ) {
+		if (empty($this->permalink_structure)) {
 			$this->feed_structure = '';
 			return false;
 		}
 
-		$this->feed_structure = $this->root . $this->feed_base . '/%feed%';
+		$this->feed_structure = $this->root.$this->feed_base.'/%feed%';
 
 		return $this->feed_structure;
 	}
@@ -799,7 +799,7 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
+		if (isset($this->comment_feed_structure))
 			return $this->comment_feed_structure;
 
 		if (empty($this->permalink_structure)) {
@@ -807,7 +807,7 @@ 
 			return false;
 		}
 
-		$this->comment_feed_structure = $this->root . $this->comments_base . '/' . $this->feed_base . '/%feed%';
+		$this->comment_feed_structure = $this->root.$this->comments_base.'/'.$this->feed_base.'/%feed%';
 
 		return $this->comment_feed_structure;
 	}
@@ -829,11 +829,11 @@ 
 	 * @param string $regex Regular expression to substitute the tag for in rewrite rules.
 	 * @param string $query String to append to the rewritten query. Must end in '='.
 	 */
-	public function add_rewrite_tag( $tag, $regex, $query ) {
-		$position = array_search( $tag, $this->rewritecode );
-		if ( false !== $position && null !== $position ) {
-			$this->rewritereplace[ $position ] = $regex;
-			$this->queryreplace[ $position ] = $query;
+	public function add_rewrite_tag($tag, $regex, $query) {
+		$position = array_search($tag, $this->rewritecode);
+		if (false !== $position && null !== $position) {
+			$this->rewritereplace[$position] = $regex;
+			$this->queryreplace[$position] = $query;
 		} else {
 			$this->rewritecode[] = $tag;
 			$this->rewritereplace[] = $regex;
@@ -854,12 +854,12 @@ 
 	 *
 	 * @param string $tag Name of the rewrite tag to remove.
 	 */
-	public function remove_rewrite_tag( $tag ) {
-		$position = array_search( $tag, $this->rewritecode );
-		if ( false !== $position && null !== $position ) {
-			unset( $this->rewritecode[ $position ] );
-			unset( $this->rewritereplace[ $position ] );
-			unset( $this->queryreplace[ $position ] );
+	public function remove_rewrite_tag($tag) {
+		$position = array_search($tag, $this->rewritecode);
+		if (false !== $position && null !== $position) {
+			unset($this->rewritecode[$position]);
+			unset($this->rewritereplace[$position]);
+			unset($this->queryreplace[$position]);
 		}
 	}
 
@@ -894,32 +894,32 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		// Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
-		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
+		foreach ((array) $this->feeds as $feed_name)
+			$feedregex2 .= $feed_name.'|';
+		$feedregex2 = '('.trim($feedregex2, '|').')/?$';
 
 		/*
 		 * $feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
 		 * and <permalink>/atom are both possible
 		 */
-		$feedregex = $this->feed_base . '/' . $feedregex2;
+		$feedregex = $this->feed_base.'/'.$feedregex2;
 
 		// Build a regex to match the trackback and page/xx parts of URLs.
 		$trackbackregex = 'trackback/?$';
-		$pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-		$commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
+		$pageregex = $this->pagination_base.'/?([0-9]{1,})/?$';
+		$commentregex = $this->comments_pagination_base.'-([0-9]{1,})/?$';
 		$embedregex = 'embed/?$';
 
 		// Build up an array of endpoint regexes to append => queries to append.
-		if ( $endpoints ) {
-			$ep_query_append = array ();
-			foreach ( (array) $this->endpoints as $endpoint) {
+		if ($endpoints) {
+			$ep_query_append = array();
+			foreach ((array) $this->endpoints as $endpoint) {
 				// Match everything after the endpoint name, but allow for nothing to appear there.
-				$epmatch = $endpoint[1] . '(/(.*))?/?$';
+				$epmatch = $endpoint[1].'(/(.*))?/?$';
 
 				// This will be appended on to the rest of the query for each dir.
-				$epquery = '&' . $endpoint[2] . '=';
-				$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
+				$epquery = '&'.$endpoint[2].'=';
+				$ep_query_append[$epmatch] = array($endpoint[0], $epquery);
 			}
 		}
 
@@ -941,19 +941,19 @@ 
 		 * like tagname=$matches[i] where i is the current $i.
 		 */
 		$queries = array();
-		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
+		for ($i = 0; $i < $num_tokens; ++$i) {
+			if (0 < $i)
+				$queries[$i] = $queries[$i - 1].'&';
 			else
 				$queries[$i] = '';
 
-			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
+			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]).$this->preg_index($i + 1);
 			$queries[$i] .= $query_token;
 		}
 
 		// Get the structure, minus any cruft (stuff that isn't tags) at the front.
 		$structure = $permalink_structure;
-		if ( $front != '/' )
+		if ($front != '/')
 			$structure = str_replace($front, '', $structure);
 
 		/*
@@ -962,7 +962,7 @@ 
 		 * rewrite rules for /%year%/, /%year%/%monthnum%/ and /%year%/%monthnum%/%postname%
 		 */
 		$structure = trim($structure, '/');
-		$dirs = $walk_dirs ? explode('/', $structure) : array( $structure );
+		$dirs = $walk_dirs ? explode('/', $structure) : array($structure);
 		$num_dirs = count($dirs);
 
 		// Strip slashes from the front of $front.
@@ -971,9 +971,9 @@ 
 		// The main workhorse loop.
 		$post_rewrite = array();
 		$struct = $front;
-		for ( $j = 0; $j < $num_dirs; ++$j ) {
+		for ($j = 0; $j < $num_dirs; ++$j) {
 			// Get the struct for this dir, and trim slashes off the front.
-			$struct .= $dirs[$j] . '/'; // Accumulate. see comment near explode('/', $structure) above.
+			$struct .= $dirs[$j].'/'; // Accumulate. see comment near explode('/', $structure) above.
 			$struct = ltrim($struct, '/');
 
 			// Replace tags with regexes.
@@ -983,10 +983,10 @@ 
 			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
 
 			// Get the 'tagname=$matches[i]'.
-			$query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
+			$query = ( ! empty($num_toks) && isset($queries[$num_toks - 1])) ? $queries[$num_toks - 1] : '';
 
 			// Set up $ep_mask_specific which is used to match more specific URL types.
-			switch ( $dirs[$j] ) {
+			switch ($dirs[$j]) {
 				case '%year%':
 					$ep_mask_specific = EP_YEAR;
 					break;
@@ -1001,33 +1001,33 @@ 
 			}
 
 			// Create query for /page/xx.
-			$pagematch = $match . $pageregex;
-			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+			$pagematch = $match.$pageregex;
+			$pagequery = $index.'?'.$query.'&paged='.$this->preg_index($num_toks + 1);
 
 			// Create query for /comment-page-xx.
-			$commentmatch = $match . $commentregex;
-			$commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
+			$commentmatch = $match.$commentregex;
+			$commentquery = $index.'?'.$query.'&cpage='.$this->preg_index($num_toks + 1);
 
-			if ( get_option('page_on_front') ) {
+			if (get_option('page_on_front')) {
 				// Create query for Root /comment-page-xx.
-				$rootcommentmatch = $match . $commentregex;
-				$rootcommentquery = $index . '?' . $query . '&page_id=' . get_option('page_on_front') . '&cpage=' . $this->preg_index($num_toks + 1);
+				$rootcommentmatch = $match.$commentregex;
+				$rootcommentquery = $index.'?'.$query.'&page_id='.get_option('page_on_front').'&cpage='.$this->preg_index($num_toks + 1);
 			}
 
 			// Create query for /feed/(feed|atom|rss|rss2|rdf).
-			$feedmatch = $match . $feedregex;
-			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch = $match.$feedregex;
+			$feedquery = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			// Create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex).
-			$feedmatch2 = $match . $feedregex2;
-			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedmatch2 = $match.$feedregex2;
+			$feedquery2 = $feedindex.'?'.$query.'&feed='.$this->preg_index($num_toks + 1);
 
 			// Create query and regex for embeds.
-			$embedmatch = $match . $embedregex;
-			$embedquery = $embedindex . '?' . $query . '&embed=true';
+			$embedmatch = $match.$embedregex;
+			$embedquery = $embedindex.'?'.$query.'&embed=true';
 
 			// If asked to, turn the feed queries into comment feed ones.
-			if ( $forcomments ) {
+			if ($forcomments) {
 				$feedquery .= '&withcomments=1';
 				$feedquery2 .= '&withcomments=1';
 			}
@@ -1036,33 +1036,33 @@ 
 			$rewrite = array();
 
 			// ...adding on /feed/ regexes => queries
-			if ( $feed ) {
-				$rewrite = array( $feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery );
+			if ($feed) {
+				$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery);
 			}
 
 			//...and /page/xx ones
-			if ( $paged ) {
-				$rewrite = array_merge( $rewrite, array( $pagematch => $pagequery ) );
+			if ($paged) {
+				$rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 			}
 
 			// Only on pages with comments add ../comment-page-xx/.
-			if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
+			if (EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask) {
 				$rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
-			} elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
+			} elseif (EP_ROOT & $ep_mask && get_option('page_on_front')) {
 				$rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
 			}
 
 			// Do endpoints.
-			if ( $endpoints ) {
-				foreach ( (array) $ep_query_append as $regex => $ep) {
+			if ($endpoints) {
+				foreach ((array) $ep_query_append as $regex => $ep) {
 					// Add the endpoints on if the mask fits.
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific)
+						$rewrite[$match.$regex] = $index.'?'.$query.$ep[1].$this->preg_index($num_toks + 2);
 				}
 			}
 
 			// If we've got some tags in this dir.
-			if ( $num_toks ) {
+			if ($num_toks) {
 				$post = false;
 				$page = false;
 
@@ -1072,97 +1072,97 @@ 
 				 * 2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
 				 * minute all present). Set these flags now as we need them for the endpoints.
 				 */
-				if ( strpos($struct, '%postname%') !== false
+				if (strpos($struct, '%postname%') !== false
 						|| strpos($struct, '%post_id%') !== false
 						|| strpos($struct, '%pagename%') !== false
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
+					if (strpos($struct, '%pagename%') !== false)
 						$page = true;
 				}
 
-				if ( ! $post ) {
+				if ( ! $post) {
 					// For custom post types, we need to add on endpoints as well.
-					foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
-						if ( strpos($struct, "%$ptype%") !== false ) {
+					foreach (get_post_types(array('_builtin' => false)) as $ptype) {
+						if (strpos($struct, "%$ptype%") !== false) {
 							$post = true;
 
 							// This is for page style attachment URLs.
-							$page = is_post_type_hierarchical( $ptype );
+							$page = is_post_type_hierarchical($ptype);
 							break;
 						}
 					}
 				}
 
 				// If creating rules for a permalink, do all the endpoints like attachments etc.
-				if ( $post ) {
+				if ($post) {
 					// Create query and regex for trackback.
-					$trackbackmatch = $match . $trackbackregex;
-					$trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
+					$trackbackmatch = $match.$trackbackregex;
+					$trackbackquery = $trackbackindex.'?'.$query.'&tb=1';
 
 					// Create query and regex for embeds.
-					$embedmatch = $match . $embedregex;
-					$embedquery = $embedindex . '?' . $query . '&embed=true';
+					$embedmatch = $match.$embedregex;
+					$embedquery = $embedindex.'?'.$query.'&embed=true';
 
 					// Trim slashes from the end of the regex for this dir.
 					$match = rtrim($match, '/');
 
 					// Get rid of brackets.
-					$submatchbase = str_replace( array('(', ')'), '', $match);
+					$submatchbase = str_replace(array('(', ')'), '', $match);
 
 					// Add a rule for at attachments, which take the form of <permalink>/some-text.
-					$sub1 = $submatchbase . '/([^/]+)/';
+					$sub1 = $submatchbase.'/([^/]+)/';
 
 					// Add trackback regex <permalink>/trackback/...
-					$sub1tb = $sub1 . $trackbackregex;
+					$sub1tb = $sub1.$trackbackregex;
 
 					// And <permalink>/feed/(atom|...)
-					$sub1feed = $sub1 . $feedregex;
+					$sub1feed = $sub1.$feedregex;
 
 					// And <permalink>/(feed|atom...)
-					$sub1feed2 = $sub1 . $feedregex2;
+					$sub1feed2 = $sub1.$feedregex2;
 
 					// And <permalink>/comment-page-xx
-					$sub1comment = $sub1 . $commentregex;
+					$sub1comment = $sub1.$commentregex;
 
 					// And <permalink>/embed/...
-					$sub1embed = $sub1 . $embedregex;
+					$sub1embed = $sub1.$embedregex;
 
 					/*
 					 * Add another rule to match attachments in the explicit form:
 					 * <permalink>/attachment/some-text
 					 */
-					$sub2 = $submatchbase . '/attachment/([^/]+)/';
+					$sub2 = $submatchbase.'/attachment/([^/]+)/';
 
 					// And add trackbacks <permalink>/attachment/trackback.
-					$sub2tb = $sub2 . $trackbackregex;
+					$sub2tb = $sub2.$trackbackregex;
 
 					// Feeds, <permalink>/attachment/feed/(atom|...)
-					$sub2feed = $sub2 . $feedregex;
+					$sub2feed = $sub2.$feedregex;
 
 					// And feeds again on to this <permalink>/attachment/(feed|atom...)
-					$sub2feed2 = $sub2 . $feedregex2;
+					$sub2feed2 = $sub2.$feedregex2;
 
 					// And <permalink>/comment-page-xx
-					$sub2comment = $sub2 . $commentregex;
+					$sub2comment = $sub2.$commentregex;
 
 					// And <permalink>/embed/...
-					$sub2embed = $sub2 . $embedregex;
+					$sub2embed = $sub2.$embedregex;
 
 					// Create queries for these extra tag-ons we've just dealt with.
-					$subquery = $index . '?attachment=' . $this->preg_index(1);
-					$subtbquery = $subquery . '&tb=1';
-					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-					$subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
-					$subembedquery = $subquery . '&embed=true';
+					$subquery = $index.'?attachment='.$this->preg_index(1);
+					$subtbquery = $subquery.'&tb=1';
+					$subfeedquery = $subquery.'&feed='.$this->preg_index(2);
+					$subcommentquery = $subquery.'&cpage='.$this->preg_index(2);
+					$subembedquery = $subquery.'&embed=true';
 
 					// Do endpoints for attachments.
-					if ( !empty($endpoints) ) {
-						foreach ( (array) $ep_query_append as $regex => $ep ) {
-							if ( $ep[0] & EP_ATTACHMENT ) {
-								$rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
-								$rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
+					if ( ! empty($endpoints)) {
+						foreach ((array) $ep_query_append as $regex => $ep) {
+							if ($ep[0] & EP_ATTACHMENT) {
+								$rewrite[$sub1.$regex] = $subquery.$ep[1].$this->preg_index(3);
+								$rewrite[$sub2.$regex] = $subquery.$ep[1].$this->preg_index(3);
 							}
 						}
 					}
@@ -1180,14 +1180,14 @@ 
 					 * Previously: '(/[0-9]+)?/?$', which produced '/2' for page.
 					 * When cast to int, returned 0.
 					 */
-					$match = $match . '(?:/([0-9]+))?/?$';
-					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+					$match = $match.'(?:/([0-9]+))?/?$';
+					$query = $index.'?'.$query.'&page='.$this->preg_index($num_toks + 1);
 
 				// Not matching a permalink so this is a lot simpler.
 				} else {
 					// Close the match and finalise the query.
 					$match .= '?$';
-					$query = $index . '?' . $query;
+					$query = $index.'?'.$query;
 				}
 
 				/*
@@ -1198,27 +1198,27 @@ 
 				$rewrite = array_merge($rewrite, array($match => $query));
 
 				// If we're matching a permalink, add those extras (attachments etc) on.
-				if ( $post ) {
+				if ($post) {
 					// Add trackback.
 					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
 
 					// Add embed.
-					$rewrite = array_merge( array( $embedmatch => $embedquery ), $rewrite );
+					$rewrite = array_merge(array($embedmatch => $embedquery), $rewrite);
 
 					// Add regexes/queries for attachments, attachment trackbacks and so on.
-					if ( ! $page ) {
+					if ( ! $page) {
 						// Require <permalink>/attachment/stuff form for pages because of confusion with subpages.
-						$rewrite = array_merge( $rewrite, array(
+						$rewrite = array_merge($rewrite, array(
 							$sub1        => $subquery,
 							$sub1tb      => $subtbquery,
 							$sub1feed    => $subfeedquery,
 							$sub1feed2   => $subfeedquery,
 							$sub1comment => $subcommentquery,
 							$sub1embed   => $subembedquery
-						) );
+						));
 					}
 
-					$rewrite = array_merge( array( $sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery, $sub2embed => $subembedquery ), $rewrite );
+					$rewrite = array_merge(array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery, $sub2embed => $subembedquery), $rewrite);
 				}
 			}
 			// Add the rules for this dir to the accumulating $post_rewrite.
@@ -1270,31 +1270,31 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
+		if (empty($this->permalink_structure))
 			return $rewrite;
 
 		// robots.txt -only if installed at the root
-		$home_path = parse_url( home_url() );
-		$robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
+		$home_path = parse_url(home_url());
+		$robots_rewrite = (empty($home_path['path']) || '/' == $home_path['path']) ? array('robots\.txt$' => $this->index.'?robots=1') : array();
 
 		// Old feed and service files.
 		$deprecated_files = array(
-			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
-			'.*wp-app\.php(/.*)?$' => $this->index . '?error=403',
+			'.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index.'?feed=old',
+			'.*wp-app\.php(/.*)?$' => $this->index.'?error=403',
 		);
 
 		// Registration rules.
 		$registration_pages = array();
-		if ( is_multisite() && is_main_site() ) {
-			$registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
-			$registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
+		if (is_multisite() && is_main_site()) {
+			$registration_pages['.*wp-signup.php$'] = $this->index.'?signup=true';
+			$registration_pages['.*wp-activate.php$'] = $this->index.'?activate=true';
 		}
 
 		// Deprecated.
-		$registration_pages['.*wp-register.php$'] = $this->index . '?register=true';
+		$registration_pages['.*wp-register.php$'] = $this->index.'?register=true';
 
 		// Post rewrite rules.
-		$post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK );
+		$post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
 
 		/**
 		 * Filter rewrite rules used for "post" archives.
@@ -1303,7 +1303,7 @@ 
 		 *
 		 * @param array $post_rewrite The rewrite rules for posts.
 		 */
-		$post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
+		$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
 
 		// Date rewrite rules.
 		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
@@ -1317,10 +1317,10 @@ 
 		 *
 		 * @param array $date_rewrite The rewrite rules for date archives.
 		 */
-		$date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
+		$date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
 
 		// Root-level rewrite rules.
-		$root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
+		$root_rewrite = $this->generate_rewrite_rules($this->root.'/', EP_ROOT);
 
 		/**
 		 * Filter rewrite rules used for root-level archives.
@@ -1332,10 +1332,10 @@ 
 		 *
 		 * @param array $root_rewrite The root-level rewrite rules.
 		 */
-		$root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
+		$root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
 
 		// Comments rewrite rules.
-		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false);
+		$comments_rewrite = $this->generate_rewrite_rules($this->root.$this->comments_base, EP_COMMENTS, false, true, true, false);
 
 		/**
 		 * Filter rewrite rules used for comment feed archives.
@@ -1346,7 +1346,7 @@ 
 		 *
 		 * @param array $comments_rewrite The rewrite rules for the site-wide comments feeds.
 		 */
-		$comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite );
+		$comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
 
 		// Search rewrite rules.
 		$search_structure = $this->get_search_permastruct();
@@ -1362,7 +1362,7 @@ 
 		 *
 		 * @param array $search_rewrite The rewrite rules for search queries.
 		 */
-		$search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
+		$search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
 		// Author rewrite rules.
 		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
@@ -1377,7 +1377,7 @@ 
 		 *
 		 * @param array $author_rewrite The rewrite rules for author archives.
 		 */
-		$author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite );
+		$author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
 
 		// Pages rewrite rules.
 		$page_rewrite = $this->page_rewrite_rules();
@@ -1389,17 +1389,17 @@ 
 		 *
 		 * @param array $page_rewrite The rewrite rules for the "page" post type.
 		 */
-		$page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite );
+		$page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
 		// Extra permastructs.
-		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
-			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+		foreach ($this->extra_permastructs as $permastructname => $struct) {
+			if (is_array($struct)) {
+				if (count($struct) == 2)
+					$rules = $this->generate_rewrite_rules($struct[0], $struct[1]);
 				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+					$rules = $this->generate_rewrite_rules($struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints']);
 			} else {
-				$rules = $this->generate_rewrite_rules( $struct );
+				$rules = $this->generate_rewrite_rules($struct);
 			}
 
 			/**
@@ -1413,8 +1413,8 @@ 
 			 *
 			 * @param array $rules The rewrite rules generated for the current permastruct.
 			 */
-			$rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
-			if ( 'post_tag' == $permastructname ) {
+			$rules = apply_filters($permastructname.'_rewrite_rules', $rules);
+			if ('post_tag' == $permastructname) {
 
 				/**
 				 * Filter rewrite rules used specifically for Tags.
@@ -1424,17 +1424,17 @@ 
 				 *
 				 * @param array $rules The rewrite rules generated for tags.
 				 */
-				$rules = apply_filters( 'tag_rewrite_rules', $rules );
+				$rules = apply_filters('tag_rewrite_rules', $rules);
 			}
 
 			$this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		if ($this->use_verbose_page_rules)
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
 		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1443,7 +1443,7 @@ 
 		 *
 		 * @param WP_Rewrite $this Current WP_Rewrite instance, passed by reference.
 		 */
-		do_action_ref_array( 'generate_rewrite_rules', array( &$this ) );
+		do_action_ref_array('generate_rewrite_rules', array(&$this));
 
 		/**
 		 * Filter the full set of generated rewrite rules.
@@ -1452,7 +1452,7 @@ 
 		 *
 		 * @param array $this->rules The compiled array of rewrite rules.
 		 */
-		$this->rules = apply_filters( 'rewrite_rules_array', $this->rules );
+		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
 
 		return $this->rules;
 	}
@@ -1472,7 +1472,7 @@ 
 	 */
 	public function wp_rewrite_rules() {
 		$this->rules = get_option('rewrite_rules');
-		if ( empty($this->rules) ) {
+		if (empty($this->rules)) {
 			$this->matches = 'matches';
 			$this->rewrite_rules();
 			update_option('rewrite_rules', $this->rules);
@@ -1496,15 +1496,15 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
+		if ( ! $this->using_permalinks())
 			return '';
 
-		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
+		$site_root = parse_url(site_url());
+		if (isset($site_root['path']))
 			$site_root = trailingslashit($site_root['path']);
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
+		if (isset($home_root['path']))
 			$home_root = trailingslashit($home_root['path']);
 		else
 			$home_root = '/';
@@ -1517,33 +1517,33 @@ 
 		$rules .= "RewriteRule ^index\.php$ - [L]\n";
 
 		// Add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all).
-		foreach ( (array) $this->non_wp_rules as $match => $query) {
+		foreach ((array) $this->non_wp_rules as $match => $query) {
 			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 			$match = str_replace('.+?', '.+', $match);
 
-			$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+			$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 		}
 
-		if ( $this->use_verbose_rules ) {
+		if ($this->use_verbose_rules) {
 			$this->matches = '';
 			$rewrite = $this->rewrite_rules();
 			$num_rules = count($rewrite);
-			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
-				"RewriteCond %{REQUEST_FILENAME} -d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n".
+				"RewriteCond %{REQUEST_FILENAME} -d\n".
 				"RewriteRule ^.*$ - [S=$num_rules]\n";
 
-			foreach ( (array) $rewrite as $match => $query) {
+			foreach ((array) $rewrite as $match => $query) {
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace('.+?', '.+', $match);
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				if (strpos($query, $this->index) !== false)
+					$rules .= 'RewriteRule ^'.$match.' '.$home_root.$query." [QSA,L]\n";
 				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+					$rules .= 'RewriteRule ^'.$match.' '.$site_root.$query." [QSA,L]\n";
 			}
 		} else {
-			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
-				"RewriteCond %{REQUEST_FILENAME} !-d\n" .
+			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n".
+				"RewriteCond %{REQUEST_FILENAME} !-d\n".
 				"RewriteRule . {$home_root}{$this->index} [L]\n";
 		}
 
@@ -1556,7 +1556,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		$rules = apply_filters( 'mod_rewrite_rules', $rules );
+		$rules = apply_filters('mod_rewrite_rules', $rules);
 
 		/**
 		 * Filter the list of rewrite rules formatted for output to an .htaccess file.
@@ -1566,7 +1566,7 @@ 
 		 *
 		 * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.
 		 */
-		return apply_filters( 'rewrite_rules', $rules );
+		return apply_filters('rewrite_rules', $rules);
 	}
 
 	/**
@@ -1582,11 +1582,11 @@ 
 	 *                              Default false.
 	 * @return string IIS7 URL rewrite rule sets.
 	 */
-	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
+	public function iis7_url_rewrite_rules($add_parent_tags = false) {
+		if ( ! $this->using_permalinks())
 			return '';
 		$rules = '';
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '<configuration>
 	<system.webServer>
 		<rewrite>
@@ -1594,7 +1594,7 @@ 
 		}
 
 		$rules .= '
-			<rule name="WordPress: ' . esc_attr( home_url() ) . '" patternSyntax="Wildcard">
+			<rule name="WordPress: ' . esc_attr(home_url()).'" patternSyntax="Wildcard">
 				<match url="*" />
 					<conditions>
 						<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
@@ -1603,7 +1603,7 @@ 
 				<action type="Rewrite" url="index.php" />
 			</rule>';
 
-		if ( $add_parent_tags ) {
+		if ($add_parent_tags) {
 			$rules .= '
 			</rules>
 		</rewrite>
@@ -1618,7 +1618,7 @@ 
 		 *
 		 * @param string $rules Rewrite rules formatted for IIS web.config.
 		 */
-		return apply_filters( 'iis7_url_rewrite_rules', $rules );
+		return apply_filters('iis7_url_rewrite_rules', $rules);
 	}
 
 	/**
@@ -1636,25 +1636,25 @@ 
 	 * @param string       $after Optional. Priority of the new rule. Accepts 'top'
 	 *                            or 'bottom'. Default 'bottom'.
 	 */
-	public function add_rule( $regex, $query, $after = 'bottom' ) {
-		if ( is_array( $query ) ) {
+	public function add_rule($regex, $query, $after = 'bottom') {
+		if (is_array($query)) {
 			$external = false;
-			$query = add_query_arg( $query, 'index.php' );
+			$query = add_query_arg($query, 'index.php');
 		} else {
-			$index = false === strpos( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
-			$front = substr( $query, 0, $index );
+			$index = false === strpos($query, '?') ? strlen($query) : strpos($query, '?');
+			$front = substr($query, 0, $index);
 
 			$external = $front != $this->index;
 		}
 
 		// "external" = it doesn't correspond to index.php.
-		if ( $external ) {
-			$this->add_external_rule( $regex, $query );
+		if ($external) {
+			$this->add_external_rule($regex, $query);
 		} else {
-			if ( 'bottom' == $after ) {
-				$this->extra_rules = array_merge( $this->extra_rules, array( $regex => $query ) );
+			if ('bottom' == $after) {
+				$this->extra_rules = array_merge($this->extra_rules, array($regex => $query));
 			} else {
-				$this->extra_rules_top = array_merge( $this->extra_rules_top, array( $regex => $query ) );
+				$this->extra_rules_top = array_merge($this->extra_rules_top, array($regex => $query));
 			}
 		}
 	}
@@ -1668,8 +1668,8 @@ 
 	 * @param string $regex Regular expression to match request against.
 	 * @param string $query The corresponding query vars for this rewrite rule.
 	 */
-	public function add_external_rule( $regex, $query ) {
-		$this->non_wp_rules[ $regex ] = $query;
+	public function add_external_rule($regex, $query) {
+		$this->non_wp_rules[$regex] = $query;
 	}
 
 	/**
@@ -1689,17 +1689,17 @@ 
 	 *                               skip registering a query_var for this endpoint. Defaults to the
 	 *                               value of `$name`.
 	 */
-	public function add_endpoint( $name, $places, $query_var = true ) {
+	public function add_endpoint($name, $places, $query_var = true) {
 		global $wp;
 
 		// For backward compatibility, if null has explicitly been passed as `$query_var`, assume `true`.
-		if ( true === $query_var || null === func_get_arg( 2 ) ) {
+		if (true === $query_var || null === func_get_arg(2)) {
 			$query_var = $name;
 		}
-		$this->endpoints[] = array( $places, $name, $query_var );
+		$this->endpoints[] = array($places, $name, $query_var);
 
-		if ( $query_var ) {
-			$wp->add_query_var( $query_var );
+		if ($query_var) {
+			$wp->add_query_var($query_var);
 		}
 	}
 
@@ -1742,12 +1742,12 @@ 
 	 *     @type bool $endpoints   Whether endpoints should be applied to the generated rules. Default true.
 	 * }
 	 */
-	public function add_permastruct( $name, $struct, $args = array() ) {
+	public function add_permastruct($name, $struct, $args = array()) {
 		// Backwards compatibility for the old parameters: $with_front and $ep_mask.
-		if ( ! is_array( $args ) )
-			$args = array( 'with_front' => $args );
-		if ( func_num_args() == 4 )
-			$args['ep_mask'] = func_get_arg( 3 );
+		if ( ! is_array($args))
+			$args = array('with_front' => $args);
+		if (func_num_args() == 4)
+			$args['ep_mask'] = func_get_arg(3);
 
 		$defaults = array(
 			'with_front' => true,
@@ -1758,16 +1758,16 @@ 
 			'walk_dirs' => true,
 			'endpoints' => true,
 		);
-		$args = array_intersect_key( $args, $defaults );
-		$args = wp_parse_args( $args, $defaults );
+		$args = array_intersect_key($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
+		if ($args['with_front'])
+			$struct = $this->front.$struct;
 		else
-			$struct = $this->root . $struct;
+			$struct = $this->root.$struct;
 		$args['struct'] = $struct;
 
-		$this->extra_permastructs[ $name ] = $args;
+		$this->extra_permastructs[$name] = $args;
 	}
 
 	/**
@@ -1778,8 +1778,8 @@ 
 	 *
 	 * @param string $name Name for permalink structure.
 	 */
-	public function remove_permastruct( $name ) {
-		unset( $this->extra_permastructs[ $name ] );
+	public function remove_permastruct($name) {
+		unset($this->extra_permastructs[$name]);
 	}
 
 	/**
@@ -1795,22 +1795,22 @@ 
 	 *
 	 * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
 	 */
-	public function flush_rules( $hard = true ) {
+	public function flush_rules($hard = true) {
 		static $do_hard_later = null;
 
 		// Prevent this action from running before everyone has registered their rewrites.
-		if ( ! did_action( 'wp_loaded' ) ) {
-			add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
-			$do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
+		if ( ! did_action('wp_loaded')) {
+			add_action('wp_loaded', array($this, 'flush_rules'));
+			$do_hard_later = (isset($do_hard_later)) ? $do_hard_later || $hard : $hard;
 			return;
 		}
 
-		if ( isset( $do_hard_later ) ) {
+		if (isset($do_hard_later)) {
 			$hard = $do_hard_later;
-			unset( $do_hard_later );
+			unset($do_hard_later);
 		}
 
-		update_option( 'rewrite_rules', '' );
+		update_option('rewrite_rules', '');
 		$this->wp_rewrite_rules();
 
 		/**
@@ -1822,12 +1822,12 @@ 
 		 *
 		 * @param bool $hard Whether to flush rewrite rules "hard". Default true.
 		 */
-		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
+		if ( ! $hard || ! apply_filters('flush_rewrite_rules_hard', true)) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
+		if (function_exists('save_mod_rewrite_rules'))
 			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
+		if (function_exists('iis7_save_url_rewrite_rules'))
 			iis7_save_url_rewrite_rules();
 	}
 
@@ -1847,8 +1847,8 @@ 
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
 
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ($this->using_index_permalinks())
+			$this->root = $this->index.'/';
 
 		unset($this->author_structure);
 		unset($this->date_structure);
@@ -1856,10 +1856,10 @@ 
 		unset($this->search_structure);
 		unset($this->feed_structure);
 		unset($this->comment_feed_structure);
-		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
+		$this->use_trailing_slashes = ('/' == substr($this->permalink_structure, -1, 1));
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
+		if (preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure))
 			 $this->use_verbose_page_rules = true;
 		else
 			$this->use_verbose_page_rules = false;
@@ -1881,7 +1881,7 @@ 
 	 * @param string $permalink_structure Permalink structure.
 	 */
 	public function set_permalink_structure($permalink_structure) {
-		if ( $permalink_structure != $this->permalink_structure ) {
+		if ($permalink_structure != $this->permalink_structure) {
 			$old_permalink_structure = $this->permalink_structure;
 			update_option('permalink_structure', $permalink_structure);
 
@@ -1895,7 +1895,7 @@ 
 			 * @param string $old_permalink_structure The previous permalink structure.
 			 * @param string $permalink_structure     The new permalink structure.
 			 */
-			do_action( 'permalink_structure_changed', $old_permalink_structure, $permalink_structure );
+			do_action('permalink_structure_changed', $old_permalink_structure, $permalink_structure);
 		}
 	}
 
@@ -1912,7 +1912,7 @@ 
 	 * @param string $category_base Category permalink structure base.
 	 */
 	public function set_category_base($category_base) {
-		if ( $category_base != get_option('category_base') ) {
+		if ($category_base != get_option('category_base')) {
 			update_option('category_base', $category_base);
 			$this->init();
 		}
@@ -1930,9 +1930,9 @@ 
 	 *
 	 * @param string $tag_base Tag permalink structure base.
 	 */
-	public function set_tag_base( $tag_base ) {
-		if ( $tag_base != get_option( 'tag_base') ) {
-			update_option( 'tag_base', $tag_base );
+	public function set_tag_base($tag_base) {
+		if ($tag_base != get_option('tag_base')) {
+			update_option('tag_base', $tag_base);
 			$this->init();
 		}
 	}

Braces +110 added lines, -78 removed lines

@@ -462,8 +462,9 @@ 
 		$posts = get_page_hierarchy( $pages );
 
 		// If we have no pages get out quick.
-		if ( !$posts )
-			return array( array(), array() );
+		if ( !$posts ) {
+					return array( array(), array() );
+		}
 
 		// Now reverse it, because we need parents after children for rewrite rules to work properly.
 		$posts = array_reverse($posts, true);
@@ -524,8 +525,9 @@ 
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
-			return $this->date_structure;
+		if ( isset($this->date_structure) ) {
+					return $this->date_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->date_structure = '';
@@ -545,8 +547,9 @@ 
 			}
 		}
 
-		if ( empty($date_endian) )
-			$date_endian = '%year%/%monthnum%/%day%';
+		if ( empty($date_endian) ) {
+					$date_endian = '%year%/%monthnum%/%day%';
+		}
 
 		/*
 		 * Do not allow the date tags and %post_id% to overlap in the permalink
@@ -582,8 +585,9 @@ 
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%monthnum%', '', $structure);
 		$structure = str_replace('%day%', '', $structure);
@@ -606,8 +610,9 @@ 
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
-			return false;
+		if ( empty($structure) ) {
+					return false;
+		}
 
 		$structure = str_replace('%day%', '', $structure);
 		$structure = preg_replace('#/+#', '/', $structure);
@@ -673,11 +678,13 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
-			return false;
+		if ( empty($this->permalink_structure) ) {
+					return false;
+		}
 
-		if ( isset($this->extra_permastructs[$name]) )
-			return $this->extra_permastructs[$name]['struct'];
+		if ( isset($this->extra_permastructs[$name]) ) {
+					return $this->extra_permastructs[$name]['struct'];
+		}
 
 		return false;
 	}
@@ -695,8 +702,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
-			return $this->author_structure;
+		if ( isset($this->author_structure) ) {
+					return $this->author_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->author_structure = '';
@@ -721,8 +729,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
-			return $this->search_structure;
+		if ( isset($this->search_structure) ) {
+					return $this->search_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->search_structure = '';
@@ -747,8 +756,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
-			return $this->page_structure;
+		if ( isset($this->page_structure) ) {
+					return $this->page_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->page_structure = '';
@@ -773,8 +783,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
-			return $this->feed_structure;
+		if ( isset($this->feed_structure) ) {
+					return $this->feed_structure;
+		}
 
 		if ( empty($this->permalink_structure) ) {
 			$this->feed_structure = '';
@@ -799,8 +810,9 @@ 
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
-			return $this->comment_feed_structure;
+		if ( isset($this->comment_feed_structure) ) {
+					return $this->comment_feed_structure;
+		}
 
 		if (empty($this->permalink_structure)) {
 			$this->comment_feed_structure = '';
@@ -894,8 +906,9 @@ 
 	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
 		// Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
-			$feedregex2 .= $feed_name . '|';
+		foreach ( (array) $this->feeds as $feed_name) {
+					$feedregex2 .= $feed_name . '|';
+		}
 		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
 
 		/*
@@ -942,10 +955,11 @@ 
 		 */
 		$queries = array();
 		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
-			else
-				$queries[$i] = '';
+			if ( 0 < $i ) {
+							$queries[$i] = $queries[$i - 1] . '&';
+			} else {
+							$queries[$i] = '';
+			}
 
 			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
 			$queries[$i] .= $query_token;
@@ -953,8 +967,9 @@ 
 
 		// Get the structure, minus any cruft (stuff that isn't tags) at the front.
 		$structure = $permalink_structure;
-		if ( $front != '/' )
-			$structure = str_replace($front, '', $structure);
+		if ( $front != '/' ) {
+					$structure = str_replace($front, '', $structure);
+		}
 
 		/*
 		 * Create a list of dirs to walk over, making rewrite rules for each level
@@ -1056,8 +1071,9 @@ 
 			if ( $endpoints ) {
 				foreach ( (array) $ep_query_append as $regex => $ep) {
 					// Add the endpoints on if the mask fits.
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific ) {
+											$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					}
 				}
 			}
 
@@ -1078,8 +1094,9 @@ 
 						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
-						$page = true;
+					if ( strpos($struct, '%pagename%') !== false ) {
+											$page = true;
+					}
 				}
 
 				if ( ! $post ) {
@@ -1270,8 +1287,9 @@ 
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
-			return $rewrite;
+		if ( empty($this->permalink_structure) ) {
+					return $rewrite;
+		}
 
 		// robots.txt -only if installed at the root
 		$home_path = parse_url( home_url() );
@@ -1394,10 +1412,11 @@ 
 		// Extra permastructs.
 		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
 			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
-					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
-				else
-					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				if ( count( $struct ) == 2 ) {
+									$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
+				} else {
+									$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				}
 			} else {
 				$rules = $this->generate_rewrite_rules( $struct );
 			}
@@ -1431,10 +1450,11 @@ 
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
-		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		if ( $this->use_verbose_page_rules ) {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
+		} else {
+					$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		}
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1496,18 +1516,21 @@ 
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 
 		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
-			$site_root = trailingslashit($site_root['path']);
+		if ( isset( $site_root['path'] ) ) {
+					$site_root = trailingslashit($site_root['path']);
+		}
 
 		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
-			$home_root = trailingslashit($home_root['path']);
-		else
-			$home_root = '/';
+		if ( isset( $home_root['path'] ) ) {
+					$home_root = trailingslashit($home_root['path']);
+		} else {
+					$home_root = '/';
+		}
 
 		$rules = "<IfModule mod_rewrite.c>\n";
 		$rules .= "RewriteEngine On\n";
@@ -1536,10 +1559,11 @@ 
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace('.+?', '.+', $match);
 
-				if ( strpos($query, $this->index) !== false )
-					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
-				else
-					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				if ( strpos($query, $this->index) !== false ) {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
+				} else {
+									$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				}
 			}
 		} else {
 			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
@@ -1583,8 +1607,9 @@ 
 	 * @return string IIS7 URL rewrite rule sets.
 	 */
 	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
-			return '';
+		if ( ! $this->using_permalinks() ) {
+					return '';
+		}
 		$rules = '';
 		if ( $add_parent_tags ) {
 			$rules .= '<configuration>
@@ -1744,10 +1769,12 @@ 
 	 */
 	public function add_permastruct( $name, $struct, $args = array() ) {
 		// Backwards compatibility for the old parameters: $with_front and $ep_mask.
-		if ( ! is_array( $args ) )
-			$args = array( 'with_front' => $args );
-		if ( func_num_args() == 4 )
-			$args['ep_mask'] = func_get_arg( 3 );
+		if ( ! is_array( $args ) ) {
+					$args = array( 'with_front' => $args );
+		}
+		if ( func_num_args() == 4 ) {
+					$args['ep_mask'] = func_get_arg( 3 );
+		}
 
 		$defaults = array(
 			'with_front' => true,
@@ -1761,10 +1788,11 @@ 
 		$args = array_intersect_key( $args, $defaults );
 		$args = wp_parse_args( $args, $defaults );
 
-		if ( $args['with_front'] )
-			$struct = $this->front . $struct;
-		else
-			$struct = $this->root . $struct;
+		if ( $args['with_front'] ) {
+					$struct = $this->front . $struct;
+		} else {
+					$struct = $this->root . $struct;
+		}
 		$args['struct'] = $struct;
 
 		$this->extra_permastructs[ $name ] = $args;
@@ -1825,10 +1853,12 @@ 
 		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
-			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
-			iis7_save_url_rewrite_rules();
+		if ( function_exists( 'save_mod_rewrite_rules' ) ) {
+					save_mod_rewrite_rules();
+		}
+		if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) {
+					iis7_save_url_rewrite_rules();
+		}
 	}
 
 	/**
@@ -1847,8 +1877,9 @@ 
 		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
 		$this->root = '';
 
-		if ( $this->using_index_permalinks() )
-			$this->root = $this->index . '/';
+		if ( $this->using_index_permalinks() ) {
+					$this->root = $this->index . '/';
+		}
 
 		unset($this->author_structure);
 		unset($this->date_structure);
@@ -1859,10 +1890,11 @@ 
 		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
-			 $this->use_verbose_page_rules = true;
-		else
-			$this->use_verbose_page_rules = false;
+		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) ) {
+					 $this->use_verbose_page_rules = true;
+		} else {
+					$this->use_verbose_page_rules = false;
+		}
 	}
 
 	/**

src/wp-includes/rest-api.php

Spacing +118 added lines, -118 removed lines

@@ -12,7 +12,7 @@ 
  *
  * @var string
  */
-define( 'REST_API_VERSION', '2.0' );
+define('REST_API_VERSION', '2.0');
 
 /**
  * Registers a REST API route.
@@ -29,26 +29,26 @@ 
  *                          false merges (with newer overriding if duplicate keys exist). Default false.
  * @return bool True on success, false on error.
  */
-function register_rest_route( $namespace, $route, $args = array(), $override = false ) {
+function register_rest_route($namespace, $route, $args = array(), $override = false) {
 	/** @var WP_REST_Server $wp_rest_server */
 	global $wp_rest_server;
 
-	if ( empty( $namespace ) ) {
+	if (empty($namespace)) {
 		/*
 		 * Non-namespaced routes are not allowed, with the exception of the main
 		 * and namespace indexes. If you really need to register a
 		 * non-namespaced route, call `WP_REST_Server::register_route` directly.
 		 */
-		_doing_it_wrong( 'register_rest_route', __( 'Routes must be namespaced with plugin or theme name and version.' ), '4.4.0' );
+		_doing_it_wrong('register_rest_route', __('Routes must be namespaced with plugin or theme name and version.'), '4.4.0');
 		return false;
-	} else if ( empty( $route ) ) {
-		_doing_it_wrong( 'register_rest_route', __( 'Route must be specified.' ), '4.4.0' );
+	} else if (empty($route)) {
+		_doing_it_wrong('register_rest_route', __('Route must be specified.'), '4.4.0');
 		return false;
 	}
 
-	if ( isset( $args['callback'] ) ) {
+	if (isset($args['callback'])) {
 		// Upgrade a single set to multiple.
-		$args = array( $args );
+		$args = array($args);
 	}
 
 	$defaults = array(
@@ -56,17 +56,17 @@ 
 		'callback'        => null,
 		'args'            => array(),
 	);
-	foreach ( $args as $key => &$arg_group ) {
-		if ( ! is_numeric( $arg_group ) ) {
+	foreach ($args as $key => &$arg_group) {
+		if ( ! is_numeric($arg_group)) {
 			// Route option, skip here.
 			continue;
 		}
 
-		$arg_group = array_merge( $defaults, $arg_group );
+		$arg_group = array_merge($defaults, $arg_group);
 	}
 
-	$full_route = '/' . trim( $namespace, '/' ) . '/' . trim( $route, '/' );
-	$wp_rest_server->register_route( $namespace, $full_route, $args, $override );
+	$full_route = '/'.trim($namespace, '/').'/'.trim($route, '/');
+	$wp_rest_server->register_route($namespace, $full_route, $args, $override);
 	return true;
 }
 
@@ -82,7 +82,7 @@ 
 	rest_api_register_rewrites();
 
 	global $wp;
-	$wp->add_query_var( 'rest_route' );
+	$wp->add_query_var('rest_route');
 }
 
 /**
@@ -93,8 +93,8 @@ 
  * @see add_rewrite_rule()
  */
 function rest_api_register_rewrites() {
-	add_rewrite_rule( '^' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' );
-	add_rewrite_rule( '^' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' );
+	add_rewrite_rule('^'.rest_get_url_prefix().'/?$', 'index.php?rest_route=/', 'top');
+	add_rewrite_rule('^'.rest_get_url_prefix().'/(.*)?', 'index.php?rest_route=/$matches[1]', 'top');
 }
 
 /**
@@ -107,16 +107,16 @@ 
  */
 function rest_api_default_filters() {
 	// Deprecated reporting.
-	add_action( 'deprecated_function_run', 'rest_handle_deprecated_function', 10, 3 );
-	add_filter( 'deprecated_function_trigger_error', '__return_false' );
-	add_action( 'deprecated_argument_run', 'rest_handle_deprecated_argument', 10, 3 );
-	add_filter( 'deprecated_argument_trigger_error', '__return_false' );
+	add_action('deprecated_function_run', 'rest_handle_deprecated_function', 10, 3);
+	add_filter('deprecated_function_trigger_error', '__return_false');
+	add_action('deprecated_argument_run', 'rest_handle_deprecated_argument', 10, 3);
+	add_filter('deprecated_argument_trigger_error', '__return_false');
 
 	// Default serving.
-	add_filter( 'rest_pre_serve_request', 'rest_send_cors_headers' );
-	add_filter( 'rest_post_dispatch', 'rest_send_allow_header', 10, 3 );
+	add_filter('rest_pre_serve_request', 'rest_send_cors_headers');
+	add_filter('rest_post_dispatch', 'rest_send_allow_header', 10, 3);
 
-	add_filter( 'rest_pre_dispatch', 'rest_handle_options_request', 10, 3 );
+	add_filter('rest_pre_dispatch', 'rest_handle_options_request', 10, 3);
 }
 
 /**
@@ -128,7 +128,7 @@ 
  * @global WP_REST_Server $wp_rest_server ResponseHandler instance (usually WP_REST_Server).
  */
 function rest_api_loaded() {
-	if ( empty( $GLOBALS['wp']->query_vars['rest_route'] ) ) {
+	if (empty($GLOBALS['wp']->query_vars['rest_route'])) {
 		return;
 	}
 
@@ -138,13 +138,13 @@ 
 	 * @since 4.4.0
 	 * @var bool
 	 */
-	define( 'REST_REQUEST', true );
+	define('REST_REQUEST', true);
 
 	// Initialize the server.
 	$server = rest_get_server();
 
 	// Fire off the request.
-	$server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] );
+	$server->serve_request($GLOBALS['wp']->query_vars['rest_route']);
 
 	// We're done.
 	die();
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param string $prefix URL prefix. Default 'wp-json'.
 	 */
-	return apply_filters( 'rest_url_prefix', 'wp-json' );
+	return apply_filters('rest_url_prefix', 'wp-json');
 }
 
 /**
@@ -182,26 +182,26 @@ 
  * @param string $scheme  Optional. Sanitization scheme. Default 'rest'.
  * @return string Full URL to the endpoint.
  */
-function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) {
-	if ( empty( $path ) ) {
+function get_rest_url($blog_id = null, $path = '/', $scheme = 'rest') {
+	if (empty($path)) {
 		$path = '/';
 	}
 
-	if ( is_multisite() && get_blog_option( $blog_id, 'permalink_structure' ) || get_option( 'permalink_structure' ) ) {
-		$url = get_home_url( $blog_id, rest_get_url_prefix(), $scheme );
-		$url .= '/' . ltrim( $path, '/' );
+	if (is_multisite() && get_blog_option($blog_id, 'permalink_structure') || get_option('permalink_structure')) {
+		$url = get_home_url($blog_id, rest_get_url_prefix(), $scheme);
+		$url .= '/'.ltrim($path, '/');
 	} else {
-		$url = trailingslashit( get_home_url( $blog_id, '', $scheme ) );
+		$url = trailingslashit(get_home_url($blog_id, '', $scheme));
 
-		$path = '/' . ltrim( $path, '/' );
+		$path = '/'.ltrim($path, '/');
 
-		$url = add_query_arg( 'rest_route', $path, $url );
+		$url = add_query_arg('rest_route', $path, $url);
 	}
 
-	if ( is_ssl() ) {
+	if (is_ssl()) {
 		// If the current host is the same as the REST URL host, force the REST URL scheme to HTTPS.
-		if ( $_SERVER['SERVER_NAME'] === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) {
-			$url = set_url_scheme( $url, 'https' );
+		if ($_SERVER['SERVER_NAME'] === parse_url(get_home_url($blog_id), PHP_URL_HOST)) {
+			$url = set_url_scheme($url, 'https');
 		}
 	}
 
@@ -217,7 +217,7 @@ 
 	 * @param int    $blog_id Blog ID.
 	 * @param string $scheme  Sanitization scheme.
 	 */
-	return apply_filters( 'rest_url', $url, $path, $blog_id, $scheme );
+	return apply_filters('rest_url', $url, $path, $blog_id, $scheme);
 }
 
 /**
@@ -231,8 +231,8 @@ 
  * @param string $scheme Optional. Sanitization scheme. Default 'json'.
  * @return string Full URL to the endpoint.
  */
-function rest_url( $path = '', $scheme = 'json' ) {
-	return get_rest_url( null, $path, $scheme );
+function rest_url($path = '', $scheme = 'json') {
+	return get_rest_url(null, $path, $scheme);
 }
 
 /**
@@ -247,9 +247,9 @@ 
  * @param WP_REST_Request|string $request Request.
  * @return WP_REST_Response REST response.
  */
-function rest_do_request( $request ) {
-	$request = rest_ensure_request( $request );
-	return rest_get_server()->dispatch( $request );
+function rest_do_request($request) {
+	$request = rest_ensure_request($request);
+	return rest_get_server()->dispatch($request);
 }
 
 /**
@@ -267,7 +267,7 @@ 
 	/* @var WP_REST_Server $wp_rest_server */
 	global $wp_rest_server;
 
-	if ( empty( $wp_rest_server ) ) {
+	if (empty($wp_rest_server)) {
 		/**
 		 * Filter the REST Server Class.
 		 *
@@ -278,7 +278,7 @@ 
 		 *
 		 * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
 		 */
-		$wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
+		$wp_rest_server_class = apply_filters('wp_rest_server_class', 'WP_REST_Server');
 		$wp_rest_server = new $wp_rest_server_class;
 
 		/**
@@ -291,7 +291,7 @@ 
 		 *
 		 * @param WP_REST_Server $wp_rest_server Server object.
 		 */
-		do_action( 'rest_api_init', $wp_rest_server );
+		do_action('rest_api_init', $wp_rest_server);
 	}
 
 	return $wp_rest_server;
@@ -305,12 +305,12 @@ 
  * @param array|WP_REST_Request $request Request to check.
  * @return WP_REST_Request REST request instance.
  */
-function rest_ensure_request( $request ) {
-	if ( $request instanceof WP_REST_Request ) {
+function rest_ensure_request($request) {
+	if ($request instanceof WP_REST_Request) {
 		return $request;
 	}
 
-	return new WP_REST_Request( 'GET', '', $request );
+	return new WP_REST_Request('GET', '', $request);
 }
 
 /**
@@ -326,16 +326,16 @@ 
  * @return mixed WP_Error if response generated an error, WP_HTTP_Response if response
  *               is a already an instance, otherwise returns a new WP_REST_Response instance.
  */
-function rest_ensure_response( $response ) {
-	if ( is_wp_error( $response ) ) {
+function rest_ensure_response($response) {
+	if (is_wp_error($response)) {
 		return $response;
 	}
 
-	if ( $response instanceof WP_HTTP_Response ) {
+	if ($response instanceof WP_HTTP_Response) {
 		return $response;
 	}
 
-	return new WP_REST_Response( $response );
+	return new WP_REST_Response($response);
 }
 
 /**
@@ -347,16 +347,16 @@ 
  * @param string $replacement The function that should have been called.
  * @param string $version     Version.
  */
-function rest_handle_deprecated_function( $function, $replacement, $version ) {
-	if ( ! empty( $replacement ) ) {
+function rest_handle_deprecated_function($function, $replacement, $version) {
+	if ( ! empty($replacement)) {
 		/* translators: 1: function name, 2: WordPress version number, 3: new function name */
-		$string = sprintf( __( '%1$s (since %2$s; use %3$s instead)' ), $function, $version, $replacement );
+		$string = sprintf(__('%1$s (since %2$s; use %3$s instead)'), $function, $version, $replacement);
 	} else {
 		/* translators: 1: function name, 2: WordPress version number */
-		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version );
+		$string = sprintf(__('%1$s (since %2$s; no alternative available)'), $function, $version);
 	}
 
-	header( sprintf( 'X-WP-DeprecatedFunction: %s', $string ) );
+	header(sprintf('X-WP-DeprecatedFunction: %s', $string));
 }
 
 /**
@@ -368,16 +368,16 @@ 
  * @param string $message     A message regarding the change.
  * @param string $version     Version.
  */
-function rest_handle_deprecated_argument( $function, $message, $version ) {
-	if ( ! empty( $message ) ) {
+function rest_handle_deprecated_argument($function, $message, $version) {
+	if ( ! empty($message)) {
 		/* translators: 1: function name, 2: WordPress version number, 3: error message */
-		$string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function, $version, $message );
+		$string = sprintf(__('%1$s (since %2$s; %3$s)'), $function, $version, $message);
 	} else {
 		/* translators: 1: function name, 2: WordPress version number */
-		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version );
+		$string = sprintf(__('%1$s (since %2$s; no alternative available)'), $function, $version);
 	}
 
-	header( sprintf( 'X-WP-DeprecatedParam: %s', $string ) );
+	header(sprintf('X-WP-DeprecatedParam: %s', $string));
 }
 
 /**
@@ -388,13 +388,13 @@ 
  * @param mixed $value Response data.
  * @return mixed Response data.
  */
-function rest_send_cors_headers( $value ) {
+function rest_send_cors_headers($value) {
 	$origin = get_http_origin();
 
-	if ( $origin ) {
-		header( 'Access-Control-Allow-Origin: ' . esc_url_raw( $origin ) );
-		header( 'Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, DELETE' );
-		header( 'Access-Control-Allow-Credentials: true' );
+	if ($origin) {
+		header('Access-Control-Allow-Origin: '.esc_url_raw($origin));
+		header('Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, DELETE');
+		header('Access-Control-Allow-Credentials: true');
 	}
 
 	return $value;
@@ -413,8 +413,8 @@ 
  * @param WP_REST_Request $request  The request that was used to make current response.
  * @return WP_REST_Response Modified response, either response or `null` to indicate pass-through.
  */
-function rest_handle_options_request( $response, $handler, $request ) {
-	if ( ! empty( $response ) || $request->get_method() !== 'OPTIONS' ) {
+function rest_handle_options_request($response, $handler, $request) {
+	if ( ! empty($response) || $request->get_method() !== 'OPTIONS') {
 		return $response;
 	}
 
@@ -423,19 +423,19 @@ 
 
 	$accept = array();
 
-	foreach ( $handler->get_routes() as $route => $endpoints ) {
-		$match = preg_match( '@^' . $route . '$@i', $request->get_route(), $args );
+	foreach ($handler->get_routes() as $route => $endpoints) {
+		$match = preg_match('@^'.$route.'$@i', $request->get_route(), $args);
 
-		if ( ! $match ) {
+		if ( ! $match) {
 			continue;
 		}
 
-		$data = $handler->get_data_for_route( $route, $endpoints, 'help' );
-		$response->set_matched_route( $route );
+		$data = $handler->get_data_for_route($route, $endpoints, 'help');
+		$response->set_matched_route($route);
 		break;
 	}
 
-	$response->set_data( $data );
+	$response->set_data($data);
 	return $response;
 }
 
@@ -449,10 +449,10 @@ 
  * @param WP_REST_Request  $request  The request that was used to make current response.
  * @return WP_REST_Response Response to be served, with "Allow" header if route has allowed methods.
  */
-function rest_send_allow_header( $response, $server, $request ) {
+function rest_send_allow_header($response, $server, $request) {
 	$matched_route = $response->get_matched_route();
 
-	if ( ! $matched_route ) {
+	if ( ! $matched_route) {
 		return $response;
 	}
 
@@ -461,25 +461,25 @@ 
 	$allowed_methods = array();
 
 	// Get the allowed methods across the routes.
-	foreach ( $routes[ $matched_route ] as $_handler ) {
-		foreach ( $_handler['methods'] as $handler_method => $value ) {
+	foreach ($routes[$matched_route] as $_handler) {
+		foreach ($_handler['methods'] as $handler_method => $value) {
 
-			if ( ! empty( $_handler['permission_callback'] ) ) {
+			if ( ! empty($_handler['permission_callback'])) {
 
-				$permission = call_user_func( $_handler['permission_callback'], $request );
+				$permission = call_user_func($_handler['permission_callback'], $request);
 
-				$allowed_methods[ $handler_method ] = true === $permission;
+				$allowed_methods[$handler_method] = true === $permission;
 			} else {
-				$allowed_methods[ $handler_method ] = true;
+				$allowed_methods[$handler_method] = true;
 			}
 		}
 	}
 
 	// Strip out all the methods that are not allowed (false values).
-	$allowed_methods = array_filter( $allowed_methods );
+	$allowed_methods = array_filter($allowed_methods);
 
-	if ( $allowed_methods ) {
-		$response->header( 'Allow', implode( ', ', array_map( 'strtoupper', array_keys( $allowed_methods ) ) ) );
+	if ($allowed_methods) {
+		$response->header('Allow', implode(', ', array_map('strtoupper', array_keys($allowed_methods))));
 	}
 
 	return $response;
@@ -495,11 +495,11 @@ 
 function rest_output_rsd() {
 	$api_root = get_rest_url();
 
-	if ( empty( $api_root ) ) {
+	if (empty($api_root)) {
 		return;
 	}
 	?>
-	<api name="WP-API" blogID="1" preferred="false" apiLink="<?php echo esc_url( $api_root ); ?>" />
+	<api name="WP-API" blogID="1" preferred="false" apiLink="<?php echo esc_url($api_root); ?>" />
 	<?php
 }
 
@@ -513,11 +513,11 @@ 
 function rest_output_link_wp_head() {
 	$api_root = get_rest_url();
 
-	if ( empty( $api_root ) ) {
+	if (empty($api_root)) {
 		return;
 	}
 
-	echo "<link rel='https://api.w.org/' href='" . esc_url( $api_root ) . "' />\n";
+	echo "<link rel='https://api.w.org/' href='".esc_url($api_root)."' />\n";
 }
 
 /**
@@ -526,17 +526,17 @@ 
  * @since 4.4.0
  */
 function rest_output_link_header() {
-	if ( headers_sent() ) {
+	if (headers_sent()) {
 		return;
 	}
 
 	$api_root = get_rest_url();
 
-	if ( empty( $api_root ) ) {
+	if (empty($api_root)) {
 		return;
 	}
 
-	header( 'Link: <' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"', false );
+	header('Link: <'.esc_url_raw($api_root).'>; rel="https://api.w.org/"', false);
 }
 
 /**
@@ -554,8 +554,8 @@ 
  *                               or another value if not.
  * @return WP_Error|mixed|bool WP_Error if the cookie is invalid, the $result, otherwise true.
  */
-function rest_cookie_check_errors( $result ) {
-	if ( ! empty( $result ) ) {
+function rest_cookie_check_errors($result) {
+	if ( ! empty($result)) {
 		return $result;
 	}
 
@@ -566,30 +566,30 @@ 
 	 * error, but we're still logged in, another authentication
 	 * must have been used).
 	 */
-	if ( true !== $wp_rest_auth_cookie && is_user_logged_in() ) {
+	if (true !== $wp_rest_auth_cookie && is_user_logged_in()) {
 		return $result;
 	}
 
 	// Determine if there is a nonce.
 	$nonce = null;
 
-	if ( isset( $_REQUEST['_wpnonce'] ) ) {
+	if (isset($_REQUEST['_wpnonce'])) {
 		$nonce = $_REQUEST['_wpnonce'];
-	} elseif ( isset( $_SERVER['HTTP_X_WP_NONCE'] ) ) {
+	} elseif (isset($_SERVER['HTTP_X_WP_NONCE'])) {
 		$nonce = $_SERVER['HTTP_X_WP_NONCE'];
 	}
 
-	if ( null === $nonce ) {
+	if (null === $nonce) {
 		// No nonce at all, so act as if it's an unauthenticated request.
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 		return true;
 	}
 
 	// Check the nonce.
-	$result = wp_verify_nonce( $nonce, 'wp_rest' );
+	$result = wp_verify_nonce($nonce, 'wp_rest');
 
-	if ( ! $result ) {
-		return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) );
+	if ( ! $result) {
+		return new WP_Error('rest_cookie_invalid_nonce', __('Cookie nonce is invalid'), array('status' => 403));
 	}
 
 	return true;
@@ -610,8 +610,8 @@ 
 
 	$status_type = current_action();
 
-	if ( 'auth_cookie_valid' !== $status_type ) {
-		$wp_rest_auth_cookie = substr( $status_type, 12 );
+	if ('auth_cookie_valid' !== $status_type) {
+		$wp_rest_auth_cookie = substr($status_type, 12);
 		return;
 	}
 
@@ -628,18 +628,18 @@ 
  *                          the timestamp's timezone. Default false.
  * @return int Unix timestamp.
  */
-function rest_parse_date( $date, $force_utc = false ) {
-	if ( $force_utc ) {
-		$date = preg_replace( '/[+-]\d+:?\d+$/', '+00:00', $date );
+function rest_parse_date($date, $force_utc = false) {
+	if ($force_utc) {
+		$date = preg_replace('/[+-]\d+:?\d+$/', '+00:00', $date);
 	}
 
 	$regex = '#^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}(?::\d{2})?)?$#';
 
-	if ( ! preg_match( $regex, $date, $matches ) ) {
+	if ( ! preg_match($regex, $date, $matches)) {
 		return false;
 	}
 
-	return strtotime( $date );
+	return strtotime($date);
 }
 
 /**
@@ -654,15 +654,15 @@ 
  * @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
  *                    null on failure.
  */
-function rest_get_date_with_gmt( $date, $force_utc = false ) {
-	$date = rest_parse_date( $date, $force_utc );
+function rest_get_date_with_gmt($date, $force_utc = false) {
+	$date = rest_parse_date($date, $force_utc);
 
-	if ( empty( $date ) ) {
+	if (empty($date)) {
 		return null;
 	}
 
-	$utc = date( 'Y-m-d H:i:s', $date );
-	$local = get_date_from_gmt( $utc );
+	$utc = date('Y-m-d H:i:s', $date);
+	$local = get_date_from_gmt($utc);
 
-	return array( $local, $utc );
+	return array($local, $utc);
 }

src/wp-includes/script-loader.php

Spacing +528 added lines, -528 removed lines

@@ -17,19 +17,19 @@ 
  */
 
 /** WordPress Dependencies Class */
-require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
+require(ABSPATH.WPINC.'/class.wp-dependencies.php');
 
 /** WordPress Scripts Class */
-require( ABSPATH . WPINC . '/class.wp-scripts.php' );
+require(ABSPATH.WPINC.'/class.wp-scripts.php');
 
 /** WordPress Scripts Functions */
-require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
+require(ABSPATH.WPINC.'/functions.wp-scripts.php');
 
 /** WordPress Styles Class */
-require( ABSPATH . WPINC . '/class.wp-styles.php' );
+require(ABSPATH.WPINC.'/class.wp-styles.php');
 
 /** WordPress Styles Functions */
-require( ABSPATH . WPINC . '/functions.wp-styles.php' );
+require(ABSPATH.WPINC.'/functions.wp-styles.php');
 
 /**
  * Register all WordPress scripts.
@@ -42,101 +42,101 @@ 
  *
  * @param WP_Scripts $scripts WP_Scripts object.
  */
-function wp_default_scripts( &$scripts ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+function wp_default_scripts(&$scripts) {
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	$develop_src = false !== strpos( $wp_version, '-src' );
+	$develop_src = false !== strpos($wp_version, '-src');
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
-		define( 'SCRIPT_DEBUG', $develop_src );
+	if ( ! defined('SCRIPT_DEBUG')) {
+		define('SCRIPT_DEBUG', $develop_src);
 	}
 
-	if ( ! $guessurl = site_url() ) {
+	if ( ! $guessurl = site_url()) {
 		$guessed_url = true;
 		$guessurl = wp_guess_url();
 	}
 
 	$scripts->base_url = $guessurl;
-	$scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
-	$scripts->default_version = get_bloginfo( 'version' );
+	$scripts->content_url = defined('WP_CONTENT_URL') ? WP_CONTENT_URL : '';
+	$scripts->default_version = get_bloginfo('version');
 	$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 	$dev_suffix = $develop_src ? '' : '.min';
 
-	$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
-	did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
+	$scripts->add('utils', "/wp-includes/js/utils$suffix.js");
+	did_action('init') && $scripts->localize('utils', 'userSettings', array(
 		'url' => (string) SITECOOKIEPATH,
 		'uid' => (string) get_current_user_id(),
 		'time' => (string) time(),
-		'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
-	) );
-
-	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
-		'warnDelete' => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'dismiss'    => __( 'Dismiss this notice.' ),
-	) );
-
-	$scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );
-
-	$scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
-
-	$scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-		'closeAllOpenTags'      => __( 'Close all open tags' ),
-		'closeTags'             => __( 'close tags' ),
-		'enterURL'              => __( 'Enter the URL' ),
-		'enterImageURL'         => __( 'Enter the URL of the image' ),
-		'enterImageDescription' => __( 'Enter a description of the image' ),
-		'textdirection'         => __( 'text direction' ),
-		'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
-		'dfw'                   => __( 'Distraction-free writing mode' ),
-		'strong'          => __( 'Bold' ),
-		'strongClose'     => __( 'Close bold tag' ),
-		'em'              => __( 'Italic' ),
-		'emClose'         => __( 'Close italic tag' ),
-		'link'            => __( 'Insert link' ),
-		'blockquote'      => __( 'Blockquote' ),
-		'blockquoteClose' => __( 'Close blockquote tag' ),
-		'del'             => __( 'Deleted text (strikethrough)' ),
-		'delClose'        => __( 'Close deleted text tag' ),
-		'ins'             => __( 'Inserted text' ),
-		'insClose'        => __( 'Close inserted text tag' ),
-		'image'           => __( 'Insert image' ),
-		'ul'              => __( 'Bulleted list' ),
-		'ulClose'         => __( 'Close bulleted list tag' ),
-		'ol'              => __( 'Numbered list' ),
-		'olClose'         => __( 'Close numbered list tag' ),
-		'li'              => __( 'List item' ),
-		'liClose'         => __( 'Close list item tag' ),
-		'code'            => __( 'Code' ),
-		'codeClose'       => __( 'Close code tag' ),
-		'more'            => __( 'Insert Read More tag' ),
-	) );
-
-	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
-
-	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
+		'secure' => (string) ('https' === parse_url(site_url(), PHP_URL_SCHEME)),
+	));
+
+	$scripts->add('common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1);
+	did_action('init') && $scripts->localize('common', 'commonL10n', array(
+		'warnDelete' => __("You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'dismiss'    => __('Dismiss this notice.'),
+	));
+
+	$scripts->add('wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array('jquery'), false, 1);
+
+	$scripts->add('sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1);
+
+	$scripts->add('quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1);
+	did_action('init') && $scripts->localize('quicktags', 'quicktagsL10n', array(
+		'closeAllOpenTags'      => __('Close all open tags'),
+		'closeTags'             => __('close tags'),
+		'enterURL'              => __('Enter the URL'),
+		'enterImageURL'         => __('Enter the URL of the image'),
+		'enterImageDescription' => __('Enter a description of the image'),
+		'textdirection'         => __('text direction'),
+		'toggleTextdirection'   => __('Toggle Editor Text Direction'),
+		'dfw'                   => __('Distraction-free writing mode'),
+		'strong'          => __('Bold'),
+		'strongClose'     => __('Close bold tag'),
+		'em'              => __('Italic'),
+		'emClose'         => __('Close italic tag'),
+		'link'            => __('Insert link'),
+		'blockquote'      => __('Blockquote'),
+		'blockquoteClose' => __('Close blockquote tag'),
+		'del'             => __('Deleted text (strikethrough)'),
+		'delClose'        => __('Close deleted text tag'),
+		'ins'             => __('Inserted text'),
+		'insClose'        => __('Close inserted text tag'),
+		'image'           => __('Insert image'),
+		'ul'              => __('Bulleted list'),
+		'ulClose'         => __('Close bulleted list tag'),
+		'ol'              => __('Numbered list'),
+		'olClose'         => __('Close numbered list tag'),
+		'li'              => __('List item'),
+		'liClose'         => __('Close list item tag'),
+		'code'            => __('Code'),
+		'codeClose'       => __('Close code tag'),
+		'more'            => __('Insert Read More tag'),
+	));
+
+	$scripts->add('colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m');
+
+	$scripts->add('editor', "/wp-admin/js/editor$suffix.js", array('utils', 'jquery'), false, 1);
 
 	// Back-compat for old DFW. To-do: remove at the end of 2016.
-	$scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 );
+	$scripts->add('wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1);
 
-	$scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
+	$scripts->add('wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1);
+	did_action('init') && $scripts->localize('wp-ajax-response', 'wpAjax', array(
 		'noPerm' => __('You do not have permission to do that.'),
 		'broken' => __('An unidentified error has occurred.')
-	) );
+	));
 
-	$scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-pointer', 'wpPointerL10n', array(
+	$scripts->add('wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array('jquery-ui-widget', 'jquery-ui-position'), '20111129a', 1);
+	did_action('init') && $scripts->localize('wp-pointer', 'wpPointerL10n', array(
 		'dismiss' => __('Dismiss'),
-	) );
+	));
 
-	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 );
+	$scripts->add('autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1);
 
-	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
+	$scripts->add('heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1);
+	did_action('init') && $scripts->localize('heartbeat', 'heartbeatSettings',
 		/**
 		 * Filter the Heartbeat settings.
 		 *
@@ -144,11 +144,11 @@ 
 		 *
 		 * @param array $settings Heartbeat settings array.
 		 */
-		apply_filters( 'heartbeat_settings', array() )
+		apply_filters('heartbeat_settings', array())
 	);
 
-	$scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-auth-check', 'authcheckL10n', array(
+	$scripts->add('wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1);
+	did_action('init') && $scripts->localize('wp-auth-check', 'authcheckL10n', array(
 		'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
 
 		/**
@@ -159,99 +159,99 @@ 
 		 * @param int $interval The interval in which to check a user's authentication.
 		 *                      Default 3 minutes in seconds, or 180.
 		 */
-		'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
-	) );
+		'interval' => apply_filters('wp_auth_check_interval', 3 * MINUTE_IN_SECONDS),
+	));
 
-	$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
+	$scripts->add('wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response', 'jquery-color'), false, 1);
 
 	// WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
-	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
-	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
-	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
-	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
+	$scripts->add('prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
+	$scripts->add('scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
+	$scripts->add('scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
+	$scripts->add('scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
+	$scripts->add('scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
+	$scripts->add('scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'));
 
 	// not used in core, replaced by Jcrop.js
-	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
+	$scripts->add('cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'));
 
 	// jQuery
-	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.1' );
-	$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.1' );
-	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.3.0' );
+	$scripts->add('jquery', false, array('jquery-core', 'jquery-migrate'), '1.12.1');
+	$scripts->add('jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.1');
+	$scripts->add('jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.3.0');
 
 	// full jQuery UI
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add('jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1);
+	$scripts->add('jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1);
+
+	$scripts->add('jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1);
+	$scripts->add('jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1);
+	$scripts->add('jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+	$scripts->add('jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1);
+
+	$scripts->add('jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array('jquery-ui-menu', 'wp-a11y'), '1.11.4', 1);
+	$scripts->add('jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1);
+	$scripts->add('jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1);
+	$scripts->add('jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1);
+	$scripts->add('jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1);
+	$scripts->add('jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1);
+	$scripts->add('jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array('jquery-ui-button'), '1.11.4', 1);
+	$scripts->add('jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1);
+	$scripts->add('jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position'), '1.11.4', 1);
+	$scripts->add('jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1);
 
 	// Strings for 'jquery-ui-autocomplete' live region messages
-	did_action( 'init' ) && $scripts->localize( 'jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
-		'noResults' => __( 'No search results.' ),
+	did_action('init') && $scripts->localize('jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
+		'noResults' => __('No search results.'),
 		/* translators: Number of results found when using jQuery UI Autocomplete */
-		'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),
-		'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ),
-	) );
+		'oneResult' => __('1 result found. Use up and down arrow keys to navigate.'),
+		'manyResults' => __('%d results found. Use up and down arrow keys to navigate.'),
+	));
 
 	// deprecated, not used in core, most functionality is included in jQuery 1.3
-	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1 );
+	$scripts->add('jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '3.37.0', 1);
 
 	// jQuery plugins
-	$scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
-	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
-	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
-	$scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
-	$scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
-	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
-	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
-	$scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
+	$scripts->add('jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1);
+	$scripts->add('suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1);
+	$scripts->add('schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1);
+	$scripts->add('jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1);
+	$scripts->add('jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1);
+	$scripts->add('jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1);
+	$scripts->add('jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1);
+	$scripts->add('jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1);
 
 	// Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
 	// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-	$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array(), '3.1.2', 1 );
-	$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2', 1 );
+	$scripts->add('masonry', "/wp-includes/js/masonry.min.js", array(), '3.1.2', 1);
+	$scripts->add('jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array('jquery', 'masonry'), '3.1.2', 1);
 
-	$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
-	did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
+	$scripts->add('thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1);
+	did_action('init') && $scripts->localize('thickbox', 'thickboxL10n', array(
 		'next' => __('Next >'),
 		'prev' => __('< Prev'),
 		'image' => __('Image'),
@@ -259,11 +259,11 @@ 
 		'close' => __('Close'),
 		'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
 		'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
-	) );
+	));
 
-	$scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
+	$scripts->add('jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
 
-	$scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
+	$scripts->add('swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
 
 	// error message for both plupload and swfupload
 	$uploader_l10n = array(
@@ -291,73 +291,73 @@ 
 		'error_uploading' => __('“%s” has failed to upload.')
 	);
 
-	$scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.8' );
+	$scripts->add('plupload', '/wp-includes/js/plupload/plupload.full.min.js', array(), '2.1.8');
 	// Back compat handles:
-	foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
-		$scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );
+	foreach (array('all', 'html5', 'flash', 'silverlight', 'html4') as $handle) {
+		$scripts->add("plupload-$handle", false, array('plupload'), '2.1.1');
 	}
 
-	$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array( 'plupload', 'jquery' ) );
-	did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
+	$scripts->add('plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload', 'jquery'));
+	did_action('init') && $scripts->localize('plupload-handlers', 'pluploadL10n', $uploader_l10n);
 
-	$scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
+	$scripts->add('wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload', 'jquery', 'json2', 'media-models'), false, 1);
+	did_action('init') && $scripts->localize('wp-plupload', 'pluploadL10n', $uploader_l10n);
 
 	// keep 'swfupload' for back-compat.
-	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
-	$scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
-	$scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
-	$scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
-	$scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
-	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
-	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
+	$scripts->add('swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
+	$scripts->add('swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
+	$scripts->add('swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
+	$scripts->add('swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
+	$scripts->add('swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
+	$scripts->add('swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
+	did_action('init') && $scripts->localize('swfupload-handlers', 'swfuploadL10n', $uploader_l10n);
 
-	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
+	$scripts->add('comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1);
 
-	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' );
-	did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
+	$scripts->add('json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03');
+	did_action('init') && $scripts->add_data('json2', 'conditional', 'lt IE 8');
 
-	$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 );
-	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.2.3', 1 );
+	$scripts->add('underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1);
+	$scripts->add('backbone', "/wp-includes/js/backbone$dev_suffix.js", array('underscore', 'jquery'), '1.2.3', 1);
 
-	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-util', '_wpUtilSettings', array(
+	$scripts->add('wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1);
+	did_action('init') && $scripts->localize('wp-util', '_wpUtilSettings', array(
 		'ajax' => array(
-			'url' => admin_url( 'admin-ajax.php', 'relative' ),
+			'url' => admin_url('admin-ajax.php', 'relative'),
 		),
-	) );
+	));
 
-	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
+	$scripts->add('wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1);
 
-	$scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 );
+	$scripts->add('revisions', "/wp-admin/js/revisions$suffix.js", array('wp-backbone', 'jquery-ui-slider', 'hoverIntent'), false, 1);
 
-	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 );
+	$scripts->add('imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1);
 
-	$scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.18.1', 1 );
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', 'mejsL10n', array(
-		'language' => get_bloginfo( 'language' ),
+	$scripts->add('mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.min.js", array('jquery'), '2.18.1', 1);
+	did_action('init') && $scripts->localize('mediaelement', 'mejsL10n', array(
+		'language' => get_bloginfo('language'),
 		'strings'  => array(
-			'Close'               => __( 'Close' ),
-			'Fullscreen'          => __( 'Fullscreen' ),
-			'Download File'       => __( 'Download File' ),
-			'Download Video'      => __( 'Download Video' ),
-			'Play/Pause'          => __( 'Play/Pause' ),
-			'Mute Toggle'         => __( 'Mute Toggle' ),
-			'None'                => __( 'None' ),
-			'Turn off Fullscreen' => __( 'Turn off Fullscreen' ),
-			'Go Fullscreen'       => __( 'Go Fullscreen' ),
-			'Unmute'              => __( 'Unmute' ),
-			'Mute'                => __( 'Mute' ),
-			'Captions/Subtitles'  => __( 'Captions/Subtitles' )
+			'Close'               => __('Close'),
+			'Fullscreen'          => __('Fullscreen'),
+			'Download File'       => __('Download File'),
+			'Download Video'      => __('Download Video'),
+			'Play/Pause'          => __('Play/Pause'),
+			'Mute Toggle'         => __('Mute Toggle'),
+			'None'                => __('None'),
+			'Turn off Fullscreen' => __('Turn off Fullscreen'),
+			'Go Fullscreen'       => __('Go Fullscreen'),
+			'Unmute'              => __('Unmute'),
+			'Mute'                => __('Mute'),
+			'Captions/Subtitles'  => __('Captions/Subtitles')
 		),
-	) );
+	));
 
 
-	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
+	$scripts->add('wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1);
 	$mejs_settings = array(
-		'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+		'pluginPath' => includes_url('js/mediaelement/', 'relative'),
 	);
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings',
+	did_action('init') && $scripts->localize('mediaelement', '_wpmejsSettings',
 		/**
 		 * Filter the MediaElement configuration settings.
 		 *
@@ -365,154 +365,154 @@ 
 		 *
 		 * @param array $mejs_settings MediaElement settings array.
 		 */
-		apply_filters( 'mejs_settings', $mejs_settings )
+		apply_filters('mejs_settings', $mejs_settings)
 	);
 
-	$scripts->add( 'froogaloop',  "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0' );
-	$scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
-
-	$scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
-	did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
-		'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
-	) );
-
-	$scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-		'short'    => _x( 'Very weak', 'password strength' ),
-		'bad'      => _x( 'Weak', 'password strength' ),
-		'good'     => _x( 'Medium', 'password strength' ),
-		'strong'   => _x( 'Strong', 'password strength' ),
-		'mismatch' => _x( 'Mismatch', 'password mismatch' ),
-	) );
-
-	$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
-		'warn'     => __( 'Your new password has not been saved.' ),
-		'show'     => __( 'Show' ),
-		'hide'     => __( 'Hide' ),
-		'cancel'   => __( 'Cancel' ),
-		'ariaShow' => esc_attr__( 'Show password' ),
-		'ariaHide' => esc_attr__( 'Hide password' ),
-	) );
-
-	$scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
-
-	$scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
-
-	$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
-
-	$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
+	$scripts->add('froogaloop', "/wp-includes/js/mediaelement/froogaloop.min.js", array(), '2.0');
+	$scripts->add('wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array('wp-util', 'backbone', 'mediaelement'), false, 1);
+
+	$scripts->add('zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0');
+	did_action('init') && $scripts->localize('zxcvbn-async', '_zxcvbnSettings', array(
+		'src' => empty($guessed_url) ? includes_url('/js/zxcvbn.min.js') : $scripts->base_url.'/wp-includes/js/zxcvbn.min.js',
+	));
+
+	$scripts->add('password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery', 'zxcvbn-async'), false, 1);
+	did_action('init') && $scripts->localize('password-strength-meter', 'pwsL10n', array(
+		'short'    => _x('Very weak', 'password strength'),
+		'bad'      => _x('Weak', 'password strength'),
+		'good'     => _x('Medium', 'password strength'),
+		'strong'   => _x('Strong', 'password strength'),
+		'mismatch' => _x('Mismatch', 'password mismatch'),
+	));
+
+	$scripts->add('user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery', 'password-strength-meter', 'wp-util'), false, 1);
+	did_action('init') && $scripts->localize('user-profile', 'userProfileL10n', array(
+		'warn'     => __('Your new password has not been saved.'),
+		'show'     => __('Show'),
+		'hide'     => __('Hide'),
+		'cancel'   => __('Cancel'),
+		'ariaShow' => esc_attr__('Show password'),
+		'ariaHide' => esc_attr__('Hide password'),
+	));
+
+	$scripts->add('language-chooser', "/wp-admin/js/language-chooser$suffix.js", array('jquery'), false, 1);
+
+	$scripts->add('user-suggest', "/wp-admin/js/user-suggest$suffix.js", array('jquery-ui-autocomplete'), false, 1);
+
+	$scripts->add('admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1);
+
+	$scripts->add('wplink', "/wp-includes/js/wplink$suffix.js", array('jquery', 'wp-a11y'), false, 1);
+	did_action('init') && $scripts->localize('wplink', 'wpLinkL10n', array(
 		'title' => __('Insert/edit link'),
 		'update' => __('Update'),
 		'save' => __('Add Link'),
 		'noTitle' => __('(no title)'),
 		'noMatchesFound' => __('No results found.'),
-		'linkSelected' => __( 'Link selected.' ),
-		'linkInserted' => __( 'Link inserted.' ),
-	) );
+		'linkSelected' => __('Link selected.'),
+		'linkInserted' => __('Link inserted.'),
+	));
 
-	$scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
+	$scripts->add('wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array('jquery-ui-dialog'), false, 1);
 
-	$scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
+	$scripts->add('word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1);
+	did_action('init') && $scripts->localize('word-count', 'wordCountL10n', array(
 		/*
 		 * translators: If your word count is based on single characters (e.g. East Asian characters),
 		 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 		 * Do not translate into your own language.
 		 */
-		'type' => _x( 'words', 'Word count type. Do not translate!' ),
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
-
-	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
-
-	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 );
-
-	$scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2', 'underscore' ), false, 1 );
-	$scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-models',   "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 );
-	$scripts->add( 'customize-views',    "/wp-includes/js/customize-views.js",  array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
-	$scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
-		'activate'           => __( 'Save & Activate' ),
-		'save'               => __( 'Save & Publish' ),
-		'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		'saved'              => __( 'Saved' ),
-		'cancel'             => __( 'Cancel' ),
-		'close'              => __( 'Close' ),
-		'cheatin'            => __( 'Cheatin’ uh?' ),
-		'notAllowed'         => __( 'You are not allowed to customize the appearance of this site.' ),
-		'previewIframeTitle' => __( 'Site Preview' ),
-		'loginIframeTitle'   => __( 'Session expired' ),
-		'collapseSidebar'    => __( 'Collapse Sidebar' ),
-		'expandSidebar'      => __( 'Expand Sidebar' ),
-		'untitledBlogName'   => __( '(Untitled)' ),
+		'type' => _x('words', 'Word count type. Do not translate!'),
+		'shortcodes' => ! empty($GLOBALS['shortcode_tags']) ? array_keys($GLOBALS['shortcode_tags']) : array()
+	));
+
+	$scripts->add('media-upload', "/wp-admin/js/media-upload$suffix.js", array('thickbox', 'shortcode'), false, 1);
+
+	$scripts->add('hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1);
+
+	$scripts->add('customize-base', "/wp-includes/js/customize-base$suffix.js", array('jquery', 'json2', 'underscore'), false, 1);
+	$scripts->add('customize-loader', "/wp-includes/js/customize-loader$suffix.js", array('customize-base'), false, 1);
+	$scripts->add('customize-preview', "/wp-includes/js/customize-preview$suffix.js", array('customize-base'), false, 1);
+	$scripts->add('customize-models', "/wp-includes/js/customize-models.js", array('underscore', 'backbone'), false, 1);
+	$scripts->add('customize-views', "/wp-includes/js/customize-views.js", array('jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views'), false, 1);
+	$scripts->add('customize-controls', "/wp-admin/js/customize-controls$suffix.js", array('customize-base', 'wp-a11y'), false, 1);
+	did_action('init') && $scripts->localize('customize-controls', '_wpCustomizeControlsL10n', array(
+		'activate'           => __('Save & Activate'),
+		'save'               => __('Save & Publish'),
+		'saveAlert'          => __('The changes you made will be lost if you navigate away from this page.'),
+		'saved'              => __('Saved'),
+		'cancel'             => __('Cancel'),
+		'close'              => __('Close'),
+		'cheatin'            => __('Cheatin’ uh?'),
+		'notAllowed'         => __('You are not allowed to customize the appearance of this site.'),
+		'previewIframeTitle' => __('Site Preview'),
+		'loginIframeTitle'   => __('Session expired'),
+		'collapseSidebar'    => __('Collapse Sidebar'),
+		'expandSidebar'      => __('Expand Sidebar'),
+		'untitledBlogName'   => __('(Untitled)'),
 		// Used for overriding the file types allowed in plupload.
-		'allowedFiles'       => __( 'Allowed Files' ),
-	) );
-	$scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
+		'allowedFiles'       => __('Allowed Files'),
+	));
+	$scripts->add('customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array('jquery', 'wp-util', 'customize-preview'), false, 1);
 
-	$scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
-	$scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
+	$scripts->add('customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array('jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls'), false, 1);
+	$scripts->add('customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array('jquery', 'wp-util', 'customize-preview'), false, 1);
 
-	$scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 );
-	$scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
+	$scripts->add('customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array('jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu'), false, 1);
+	$scripts->add('customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array('jquery', 'wp-util', 'customize-preview'), false, 1);
 
-	$scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
+	$scripts->add('accordion', "/wp-admin/js/accordion$suffix.js", array('jquery'), false, 1);
 
-	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
-	$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
+	$scripts->add('shortcode', "/wp-includes/js/shortcode$suffix.js", array('underscore'), false, 1);
+	$scripts->add('media-models', "/wp-includes/js/media-models$suffix.js", array('wp-backbone'), false, 1);
+	did_action('init') && $scripts->localize('media-models', '_wpMediaModelsL10n', array(
 		'settings' => array(
-			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
-			'post' => array( 'id' => 0 ),
+			'ajaxurl' => admin_url('admin-ajax.php', 'relative'),
+			'post' => array('id' => 0),
 		),
-	) );
+	));
 
-	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" );
+	$scripts->add('wp-embed', "/wp-includes/js/wp-embed$suffix.js");
 
 	// To enqueue media-views or media-editor, call wp_enqueue_media().
 	// Both rely on numerous settings, styles, and templates to operate correctly.
-	$scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
-	$scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
-	$scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
-	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
-
-	if ( is_admin() ) {
-		$scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
+	$scripts->add('media-views', "/wp-includes/js/media-views$suffix.js", array('utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement'), false, 1);
+	$scripts->add('media-editor', "/wp-includes/js/media-editor$suffix.js", array('shortcode', 'media-views'), false, 1);
+	$scripts->add('media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array('media-editor'), false, 1);
+	$scripts->add('mce-view', "/wp-includes/js/mce-view$suffix.js", array('shortcode', 'jquery', 'media-views', 'media-audiovideo'), false, 1);
+
+	if (is_admin()) {
+		$scripts->add('admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1);
+		did_action('init') && $scripts->localize('admin-tags', 'tagsl10n', array(
 			'noPerm' => __('You do not have permission to do that.'),
 			'broken' => __('An unidentified error has occurred.')
 		));
 
-		$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
+		$scripts->add('admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1);
+		did_action('init') && $scripts->localize('admin-comments', 'adminCommentsL10n', array(
 			'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
 			'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
-			'replyApprove' => __( 'Approve and Reply' ),
-			'reply' => __( 'Reply' ),
-			'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
-			'docTitleComments' => __( 'Comments' ),
+			'replyApprove' => __('Approve and Reply'),
+			'reply' => __('Reply'),
+			'warnQuickEdit' => __("Are you sure you want to edit this comment?\nThe changes you made will be lost."),
+			'docTitleComments' => __('Comments'),
 			/* translators: %s: comments count */
-			'docTitleCommentsCount' => __( 'Comments (%s)' ),
-		) );
+			'docTitleCommentsCount' => __('Comments (%s)'),
+		));
 
-		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );
+		$scripts->add('xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1);
 
-		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array(
-			'postBoxEmptyString' => __( 'Drag boxes here' ),
-		) );
+		$scripts->add('postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1);
+		did_action('init') && $scripts->localize('postbox', 'postBoxL10n', array(
+			'postBoxEmptyString' => __('Drag boxes here'),
+		));
 
-		$scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'tags-box', 'tagsBoxL10n', array(
-			'tagDelimiter' => _x( ',', 'tag delimiter' ),
-		) );
+		$scripts->add('tags-box', "/wp-admin/js/tags-box$suffix.js", array('jquery', 'suggest'), false, 1);
+		did_action('init') && $scripts->localize('tags-box', 'tagsBoxL10n', array(
+			'tagDelimiter' => _x(',', 'tag delimiter'),
+		));
 
-		$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
+		$scripts->add('post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('post', 'postL10n', array(
 			'ok' => __('OK'),
 			'cancel' => __('Cancel'),
 			'publishOn' => __('Publish on:'),
@@ -535,133 +535,133 @@ 
 			'published' => __('Published'),
 			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
 			'savingText' => __('Saving Draft…'),
-			'permalinkSaved' => __( 'Permalink saved' ),
-		) );
-
-		$scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
-			'newPost' => __( 'Title' ),
-			'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+			'permalinkSaved' => __('Permalink saved'),
+		));
+
+		$scripts->add('press-this', "/wp-admin/js/press-this$suffix.js", array('jquery', 'tags-box'), false, 1);
+		did_action('init') && $scripts->localize('press-this', 'pressThisL10n', array(
+			'newPost' => __('Title'),
+			'serverError' => __('Connection lost or the server is busy. Please try again later.'),
+			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
 			/* translators: %d: nth embed found in a post */
-			'suggestedEmbedAlt' => __( 'Suggested embed #%d' ),
+			'suggestedEmbedAlt' => __('Suggested embed #%d'),
 			/* translators: %d: nth image found in a post */
-			'suggestedImgAlt' => __( 'Suggested image #%d' ),
-		) );
+			'suggestedImgAlt' => __('Suggested image #%d'),
+		));
 
-		$scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery' ), false, 1 );
+		$scripts->add('editor-expand', "/wp-admin/js/editor-expand$suffix.js", array('jquery'), false, 1);
 
-		$scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
+		$scripts->add('link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), false, 1);
 
-		$scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) );
-		$scripts->add_data( 'comment', 'group', 1 );
-		did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
-			'submittedOn' => __( 'Submitted on:' ),
+		$scripts->add('comment', "/wp-admin/js/comment$suffix.js", array('jquery', 'postbox'));
+		$scripts->add_data('comment', 'group', 1);
+		did_action('init') && $scripts->localize('comment', 'commentL10n', array(
+			'submittedOn' => __('Submitted on:'),
 			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-			'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
-		) );
-
-		$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
-
-		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
-
-		$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 );
-
-		$scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-			'error'      => __( 'Error while saving the changes.' ),
-			'ntdeltitle' => __( 'Remove From Bulk Edit' ),
-			'notitle'    => __( '(no title)' ),
-			'comma'      => trim( _x( ',', 'tag delimiter' ) ),
-			'saved'      => __( 'Changes saved.' ),
-		) );
-
-		$scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-			'error' => __( 'Error while saving the changes.' ),
-			'saved' => __( 'Changes saved.' ),
-		) );
-
-		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
-			'plugin_information' => __( 'Plugin:' ),
-			'plugin_modal_label' => __( 'Plugin details' ),
+			'dateFormat' => __('%1$s %2$s, %3$s @ %4$s:%5$s')
+		));
+
+		$scripts->add('admin-gallery', "/wp-admin/js/gallery$suffix.js", array('jquery-ui-sortable'));
+
+		$scripts->add('admin-widgets', "/wp-admin/js/widgets$suffix.js", array('jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable'), false, 1);
+
+		$scripts->add('theme', "/wp-admin/js/theme$suffix.js", array('wp-backbone', 'wp-a11y'), false, 1);
+
+		$scripts->add('inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array('jquery', 'suggest', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('inline-edit-post', 'inlineEditL10n', array(
+			'error'      => __('Error while saving the changes.'),
+			'ntdeltitle' => __('Remove From Bulk Edit'),
+			'notitle'    => __('(no title)'),
+			'comma'      => trim(_x(',', 'tag delimiter')),
+			'saved'      => __('Changes saved.'),
+		));
+
+		$scripts->add('inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array('jquery', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('inline-edit-tax', 'inlineEditL10n', array(
+			'error' => __('Error while saving the changes.'),
+			'saved' => __('Changes saved.'),
+		));
+
+		$scripts->add('plugin-install', "/wp-admin/js/plugin-install$suffix.js", array('jquery', 'jquery-ui-core', 'thickbox'), false, 1);
+		did_action('init') && $scripts->localize('plugin-install', 'plugininstallL10n', array(
+			'plugin_information' => __('Plugin:'),
+			'plugin_modal_label' => __('Plugin details'),
 			'ays' => __('Are you sure you want to install this plugin?')
-		) );
+		));
 
-		$scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ) );
-		did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array(
-			'ajax_nonce' => wp_create_nonce( 'updates' ),
+		$scripts->add('updates', "/wp-admin/js/updates$suffix.js", array('jquery', 'wp-util', 'wp-a11y'));
+		did_action('init') && $scripts->localize('updates', '_wpUpdatesSettings', array(
+			'ajax_nonce' => wp_create_nonce('updates'),
 			'l10n'       => array(
-				'updating'          => __( 'Updating...' ), // no ellipsis
-				'updated'           => __( 'Updated!' ),
-				'updateFailedShort' => __( 'Update Failed!' ),
+				'updating'          => __('Updating...'), // no ellipsis
+				'updated'           => __('Updated!'),
+				'updateFailedShort' => __('Update Failed!'),
 				/* translators: Error string for a failed update */
-				'updateFailed'      => __( 'Update Failed: %s' ),
+				'updateFailed'      => __('Update Failed: %s'),
 				/* translators: Plugin name and version */
-				'updatingLabel'     => __( 'Updating %s...' ), // no ellipsis
+				'updatingLabel'     => __('Updating %s...'), // no ellipsis
 				/* translators: Plugin name and version */
-				'updatedLabel'      => __( '%s updated!' ),
+				'updatedLabel'      => __('%s updated!'),
 				/* translators: Plugin name and version */
-				'updateFailedLabel' => __( '%s update failed' ),
+				'updateFailedLabel' => __('%s update failed'),
 				/* translators: JavaScript accessible string */
-				'updatingMsg'       => __( 'Updating... please wait.' ), // no ellipsis
+				'updatingMsg'       => __('Updating... please wait.'), // no ellipsis
 				/* translators: JavaScript accessible string */
-				'updatedMsg'        => __( 'Update completed successfully.' ),
+				'updatedMsg'        => __('Update completed successfully.'),
 				/* translators: JavaScript accessible string */
-				'updateCancel'      => __( 'Update canceled.' ),
-				'beforeunload'      => __( 'Plugin updates may not complete if you navigate away from this page.' ),
+				'updateCancel'      => __('Update canceled.'),
+				'beforeunload'      => __('Plugin updates may not complete if you navigate away from this page.'),
 			)
-		) );
+		));
 
-		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
+		$scripts->add('farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2');
 
-		$scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 );
-		$scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array(
-			'clear' => __( 'Clear' ),
-			'defaultString' => __( 'Default' ),
-			'pick' => __( 'Select Color' ),
-			'current' => __( 'Current Color' ),
-		) );
+		$scripts->add('iris', '/wp-admin/js/iris.min.js', array('jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch'), '1.0.7', 1);
+		$scripts->add('wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array('iris'), false, 1);
+		did_action('init') && $scripts->localize('wp-color-picker', 'wpColorPickerL10n', array(
+			'clear' => __('Clear'),
+			'defaultString' => __('Default'),
+			'pick' => __('Select Color'),
+			'current' => __('Current Color'),
+		));
 
-		$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
+		$scripts->add('dashboard', "/wp-admin/js/dashboard$suffix.js", array('jquery', 'admin-comments', 'postbox'), false, 1);
 
-		$scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
+		$scripts->add('list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js");
 
-		$scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 );
-		$scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array(
-			'error' => __( 'An error has occurred. Please reload the page and try again.' ),
+		$scripts->add('media-grid', "/wp-includes/js/media-grid$suffix.js", array('media-editor'), false, 1);
+		$scripts->add('media', "/wp-admin/js/media$suffix.js", array('jquery'), false, 1);
+		did_action('init') && $scripts->localize('media', 'attachMediaBoxL10n', array(
+			'error' => __('An error has occurred. Please reload the page and try again.'),
 		));
 
-		$scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'image-edit', 'imageEditL10n', array(
-			'error' => __( 'Could not load the preview image. Please reload the page and try again.' )
+		$scripts->add('image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1);
+		did_action('init') && $scripts->localize('image-edit', 'imageEditL10n', array(
+			'error' => __('Could not load the preview image. Please reload the page and try again.')
 		));
 
-		$scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
-			'setThumbnail' => __( 'Use as featured image' ),
-			'saving' => __( 'Saving...' ), // no ellipsis
-			'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
-			'done' => __( 'Done' )
-		) );
+		$scripts->add('set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array('jquery'), false, 1);
+		did_action('init') && $scripts->localize('set-post-thumbnail', 'setPostThumbnailL10n', array(
+			'setThumbnail' => __('Use as featured image'),
+			'saving' => __('Saving...'), // no ellipsis
+			'error' => __('Could not set that as the thumbnail image. Try a different attachment.'),
+			'done' => __('Done')
+		));
 
 		// Navigation Menus
-		$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) );
-		did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
-			'noResultsFound' => __( 'No results found.' ),
-			'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'untitled' => _x( '(no label)', 'missing menu item navigation label' )
-		) );
-
-		$scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 );
-		$scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 );
-		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
-
-		$scripts->add( 'svg-painter', '/wp-admin/js/svg-painter.js', array( 'jquery' ), false, 1 );
+		$scripts->add('nav-menu', "/wp-admin/js/nav-menu$suffix.js", array('jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2'));
+		did_action('init') && $scripts->localize('nav-menu', 'navMenuL10n', array(
+			'noResultsFound' => __('No results found.'),
+			'warnDeleteMenu' => __("You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete."),
+			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
+			'untitled' => _x('(no label)', 'missing menu item navigation label')
+		));
+
+		$scripts->add('custom-header', "/wp-admin/js/custom-header.js", array('jquery-masonry'), false, 1);
+		$scripts->add('custom-background', "/wp-admin/js/custom-background$suffix.js", array('wp-color-picker', 'media-views'), false, 1);
+		$scripts->add('media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1);
+
+		$scripts->add('svg-painter', '/wp-admin/js/svg-painter.js', array('jquery'), false, 1);
 	}
 }
 
@@ -680,19 +680,19 @@ 
  *
  * @param WP_Styles $styles
  */
-function wp_default_styles( &$styles ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+function wp_default_styles(&$styles) {
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
-		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	if ( ! defined('SCRIPT_DEBUG'))
+		define('SCRIPT_DEBUG', false !== strpos($wp_version, '-src'));
 
-	if ( ! $guessurl = site_url() )
+	if ( ! $guessurl = site_url())
 		$guessurl = wp_guess_url();
 
 	$styles->base_url = $guessurl;
-	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
-	$styles->default_version = get_bloginfo( 'version' );
-	$styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
+	$styles->content_url = defined('WP_CONTENT_URL') ? WP_CONTENT_URL : '';
+	$styles->default_version = get_bloginfo('version');
+	$styles->text_direction = function_exists('is_rtl') && is_rtl() ? 'rtl' : 'ltr';
 	$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
 
 	$open_sans_font_url = '';
@@ -700,19 +700,19 @@ 
 	/* translators: If there are characters in your language that are not supported
 	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+	if ('off' !== _x('on', 'Open Sans font: on or off')) {
 		$subsets = 'latin,latin-ext';
 
 		/* translators: To add an additional Open Sans character subset specific to your language,
 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 		 */
-		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+		$subset = _x('no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)');
 
-		if ( 'cyrillic' == $subset ) {
+		if ('cyrillic' == $subset) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		} elseif ( 'greek' == $subset ) {
+		} elseif ('greek' == $subset) {
 			$subsets .= ',greek,greek-ext';
-		} elseif ( 'vietnamese' == $subset ) {
+		} elseif ('vietnamese' == $subset) {
 			$subsets .= ',vietnamese';
 		}
 
@@ -721,66 +721,66 @@ 
 	}
 
 	// Register a stylesheet for the selected admin color scheme.
-	$styles->add( 'colors', true, array( 'wp-admin', 'buttons' ) );
+	$styles->add('colors', true, array('wp-admin', 'buttons'));
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 	// Admin CSS
-	$styles->add( 'common',              "/wp-admin/css/common$suffix.css" );
-	$styles->add( 'forms',               "/wp-admin/css/forms$suffix.css" );
-	$styles->add( 'admin-menu',          "/wp-admin/css/admin-menu$suffix.css" );
-	$styles->add( 'dashboard',           "/wp-admin/css/dashboard$suffix.css" );
-	$styles->add( 'list-tables',         "/wp-admin/css/list-tables$suffix.css" );
-	$styles->add( 'edit',                "/wp-admin/css/edit$suffix.css" );
-	$styles->add( 'revisions',           "/wp-admin/css/revisions$suffix.css" );
-	$styles->add( 'media',               "/wp-admin/css/media$suffix.css" );
-	$styles->add( 'themes',              "/wp-admin/css/themes$suffix.css" );
-	$styles->add( 'about',               "/wp-admin/css/about$suffix.css" );
-	$styles->add( 'nav-menus',           "/wp-admin/css/nav-menus$suffix.css" );
-	$styles->add( 'widgets',             "/wp-admin/css/widgets$suffix.css" );
-	$styles->add( 'site-icon',           "/wp-admin/css/site-icon$suffix.css" );
-	$styles->add( 'l10n',                "/wp-admin/css/l10n$suffix.css" );
-
-	$styles->add( 'wp-admin', false, array( 'open-sans', 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
-
-	$styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'open-sans', 'dashicons', 'buttons', 'forms', 'l10n' ) );
-	$styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'open-sans', 'buttons' ) );
-	$styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
-	$styles->add( 'customize-controls',  "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
-	$styles->add( 'customize-widgets',   "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
-	$styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) );
-	$styles->add( 'press-this',          "/wp-admin/css/press-this$suffix.css", array( 'open-sans', 'buttons' ) );
-
-	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
-	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
+	$styles->add('common', "/wp-admin/css/common$suffix.css");
+	$styles->add('forms', "/wp-admin/css/forms$suffix.css");
+	$styles->add('admin-menu', "/wp-admin/css/admin-menu$suffix.css");
+	$styles->add('dashboard', "/wp-admin/css/dashboard$suffix.css");
+	$styles->add('list-tables', "/wp-admin/css/list-tables$suffix.css");
+	$styles->add('edit', "/wp-admin/css/edit$suffix.css");
+	$styles->add('revisions', "/wp-admin/css/revisions$suffix.css");
+	$styles->add('media', "/wp-admin/css/media$suffix.css");
+	$styles->add('themes', "/wp-admin/css/themes$suffix.css");
+	$styles->add('about', "/wp-admin/css/about$suffix.css");
+	$styles->add('nav-menus', "/wp-admin/css/nav-menus$suffix.css");
+	$styles->add('widgets', "/wp-admin/css/widgets$suffix.css");
+	$styles->add('site-icon', "/wp-admin/css/site-icon$suffix.css");
+	$styles->add('l10n', "/wp-admin/css/l10n$suffix.css");
+
+	$styles->add('wp-admin', false, array('open-sans', 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n'));
+
+	$styles->add('login', "/wp-admin/css/login$suffix.css", array('open-sans', 'dashicons', 'buttons', 'forms', 'l10n'));
+	$styles->add('install', "/wp-admin/css/install$suffix.css", array('open-sans', 'buttons'));
+	$styles->add('wp-color-picker', "/wp-admin/css/color-picker$suffix.css");
+	$styles->add('customize-controls', "/wp-admin/css/customize-controls$suffix.css", array('wp-admin', 'colors', 'ie', 'imgareaselect'));
+	$styles->add('customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array('wp-admin', 'colors'));
+	$styles->add('customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array('wp-admin', 'colors'));
+	$styles->add('press-this', "/wp-admin/css/press-this$suffix.css", array('open-sans', 'buttons'));
+
+	$styles->add('ie', "/wp-admin/css/ie$suffix.css");
+	$styles->add_data('ie', 'conditional', 'lte IE 7');
 
 	// Common dependencies
-	$styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
-	$styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
-	$styles->add( 'open-sans', $open_sans_font_url );
+	$styles->add('buttons', "/wp-includes/css/buttons$suffix.css");
+	$styles->add('dashicons', "/wp-includes/css/dashicons$suffix.css");
+	$styles->add('open-sans', $open_sans_font_url);
 
 	// Includes CSS
-	$styles->add( 'admin-bar',            "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
-	$styles->add( 'wp-auth-check',        "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'editor-buttons',       "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'media-views',          "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
-	$styles->add( 'wp-pointer',           "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'customize-preview',    "/wp-includes/css/customize-preview$suffix.css" );
-	$styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" );
-	$styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' );
+	$styles->add('admin-bar', "/wp-includes/css/admin-bar$suffix.css", array('open-sans', 'dashicons'));
+	$styles->add('wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array('dashicons'));
+	$styles->add('editor-buttons', "/wp-includes/css/editor$suffix.css", array('dashicons'));
+	$styles->add('media-views', "/wp-includes/css/media-views$suffix.css", array('buttons', 'dashicons', 'wp-mediaelement'));
+	$styles->add('wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array('dashicons'));
+	$styles->add('customize-preview', "/wp-includes/css/customize-preview$suffix.css");
+	$styles->add('wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css");
+	$styles->add_data('wp-embed-template-ie', 'conditional', 'lte IE 8');
 
 	// External libraries and friends
-	$styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
-	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.18.1' );
-	$styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
-	$styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
+	$styles->add('imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8');
+	$styles->add('wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array('dashicons'));
+	$styles->add('mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.18.1');
+	$styles->add('wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array('mediaelement'));
+	$styles->add('thickbox', '/wp-includes/js/thickbox/thickbox.css', array('dashicons'));
 
 	// Deprecated CSS
-	$styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );
-	$styles->add( 'farbtastic',       "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
-	$styles->add( 'jcrop',            "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
-	$styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.
+	$styles->add('deprecated-media', "/wp-admin/css/deprecated-media$suffix.css");
+	$styles->add('farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1');
+	$styles->add('jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12');
+	$styles->add('colors-fresh', false, array('wp-admin', 'buttons')); // Old handle.
 
 	// RTL CSS
 	$rtl_styles = array(
@@ -795,10 +795,10 @@ 
 		'deprecated-media', 'farbtastic',
 	);
 
-	foreach ( $rtl_styles as $rtl_style ) {
-		$styles->add_data( $rtl_style, 'rtl', 'replace' );
-		if ( $suffix ) {
-			$styles->add_data( $rtl_style, 'suffix', $suffix );
+	foreach ($rtl_styles as $rtl_style) {
+		$styles->add_data($rtl_style, 'rtl', 'replace');
+		if ($suffix) {
+			$styles->add_data($rtl_style, 'suffix', $suffix);
 		}
 	}
 }
@@ -811,19 +811,19 @@ 
  * @param array $js_array JavaScript scripts array
  * @return array Reordered array, if needed.
  */
-function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
+function wp_prototype_before_jquery($js_array) {
+	if (false === $prototype = array_search('prototype', $js_array, true))
 		return $js_array;
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
+	if (false === $jquery = array_search('jquery', $js_array, true))
 		return $js_array;
 
-	if ( $prototype < $jquery )
+	if ($prototype < $jquery)
 		return $js_array;
 
 	unset($js_array[$prototype]);
 
-	array_splice( $js_array, $jquery, 0, 'prototype' );
+	array_splice($js_array, $jquery, 0, 'prototype');
 
 	return $js_array;
 }
@@ -837,10 +837,10 @@ 
  */
 function wp_just_in_time_script_localization() {
 
-	wp_localize_script( 'autosave', 'autosaveL10n', array(
+	wp_localize_script('autosave', 'autosaveL10n', array(
 		'autosaveInterval' => AUTOSAVE_INTERVAL,
 		'blog_id' => get_current_blog_id(),
-	) );
+	));
 
 }
 
@@ -864,29 +864,29 @@ 
  * @param string $handle Either 'colors' or 'colors-rtl'.
  * @return string|false URL path to CSS stylesheet for Administration Screens.
  */
-function wp_style_loader_src( $src, $handle ) {
+function wp_style_loader_src($src, $handle) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
-		return preg_replace( '#^wp-admin/#', './', $src );
+	if (wp_installing())
+		return preg_replace('#^wp-admin/#', './', $src);
 
-	if ( 'colors' == $handle ) {
+	if ('colors' == $handle) {
 		$color = get_user_option('admin_color');
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+		if (empty($color) || ! isset($_wp_admin_css_colors[$color]))
 			$color = 'fresh';
 
 		$color = $_wp_admin_css_colors[$color];
 		$url = $color->url;
 
-		if ( ! $url ) {
+		if ( ! $url) {
 			return false;
 		}
 
-		$parsed = parse_url( $src );
-		if ( isset($parsed['query']) && $parsed['query'] ) {
-			wp_parse_str( $parsed['query'], $qv );
-			$url = add_query_arg( $qv, $url );
+		$parsed = parse_url($src);
+		if (isset($parsed['query']) && $parsed['query']) {
+			wp_parse_str($parsed['query'], $qv);
+			$url = add_query_arg($qv, $url);
 		}
 
 		return $url;
@@ -912,9 +912,9 @@ 
 function print_head_scripts() {
 	global $concatenate_scripts;
 
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action('wp_print_scripts')) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
-		do_action( 'wp_print_scripts' );
+		do_action('wp_print_scripts');
 	}
 
 	$wp_scripts = wp_scripts();
@@ -930,7 +930,7 @@ 
 	 *
 	 * @param bool $print Whether to print the head scripts. Default true.
 	 */
-	if ( apply_filters( 'print_head_scripts', true ) ) {
+	if (apply_filters('print_head_scripts', true)) {
 		_print_scripts();
 	}
 
@@ -951,7 +951,7 @@ 
 function print_footer_scripts() {
 	global $wp_scripts, $concatenate_scripts;
 
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		return array(); // No need to run if not instantiated.
 	}
 	script_concat_settings();
@@ -965,7 +965,7 @@ 
 	 *
 	 * @param bool $print Whether to print the footer scripts. Default true.
 	 */
-	if ( apply_filters( 'print_footer_scripts', true ) ) {
+	if (apply_filters('print_footer_scripts', true)) {
 		_print_scripts();
 	}
 
@@ -985,12 +985,12 @@ 
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ($zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP)
 		$zip = 'gzip';
 
-	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
+	if ($concat = trim($wp_scripts->concat, ', ')) {
 
-		if ( !empty($wp_scripts->print_code) ) {
+		if ( ! empty($wp_scripts->print_code)) {
 			echo "\n<script type='text/javascript'>\n";
 			echo "/* <![CDATA[ */\n"; // not needed in HTML 5
 			echo $wp_scripts->print_code;
@@ -998,18 +998,18 @@ 
 			echo "</script>\n";
 		}
 
-		if ( ! empty( $wp_scripts->print_html_before ) ) {
+		if ( ! empty($wp_scripts->print_html_before)) {
 			echo $wp_scripts->print_html_before;
 		}
 
-		$concat = str_split( $concat, 128 );
-		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+		$concat = str_split($concat, 128);
+		$concat = 'load%5B%5D='.implode('&load%5B%5D=', $concat);
 
-		$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
-		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+		$src = $wp_scripts->base_url."/wp-admin/load-scripts.php?c={$zip}&".$concat.'&ver='.$wp_scripts->default_version;
+		echo "<script type='text/javascript' src='".esc_attr($src)."'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
+	if ( ! empty($wp_scripts->print_html))
 		echo $wp_scripts->print_html;
 }
 
@@ -1026,14 +1026,14 @@ 
  * @return array
  */
 function wp_print_head_scripts() {
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action('wp_print_scripts')) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
-		do_action( 'wp_print_scripts' );
+		do_action('wp_print_scripts');
 	}
 
 	global $wp_scripts;
 
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		return array(); // no need to run if nothing is queued
 	}
 	return print_head_scripts();
@@ -1060,7 +1060,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_print_footer_scripts' );
+	do_action('wp_print_footer_scripts');
 }
 
 /**
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_enqueue_scripts' );
+	do_action('wp_enqueue_scripts');
 }
 
 /**
@@ -1105,7 +1105,7 @@ 
 	 *
 	 * @param bool $print Whether to print the admin styles. Default true.
 	 */
-	if ( apply_filters( 'print_admin_styles', true ) ) {
+	if (apply_filters('print_admin_styles', true)) {
 		_print_styles();
 	}
 
@@ -1126,7 +1126,7 @@ 
 function print_late_styles() {
 	global $wp_styles, $concatenate_scripts;
 
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		return;
 	}
 
@@ -1141,7 +1141,7 @@ 
 	 *
 	 * @param bool $print Whether to print the 'late' styles. Default true.
 	 */
-	if ( apply_filters( 'print_late_styles', true ) ) {
+	if (apply_filters('print_late_styles', true)) {
 		_print_styles();
 	}
 
@@ -1163,27 +1163,27 @@ 
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ($zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP)
 		$zip = 'gzip';
 
-	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
+	if ($concat = trim($wp_styles->concat, ', ')) {
 		$dir = $wp_styles->text_direction;
 		$ver = $wp_styles->default_version;
 
-		$concat = str_split( $concat, 128 );
-		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
+		$concat = str_split($concat, 128);
+		$concat = 'load%5B%5D='.implode('&load%5B%5D=', $concat);
 
-		$href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
-		echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+		$href = $wp_styles->base_url."/wp-admin/load-styles.php?c={$zip}&dir={$dir}&".$concat.'&ver='.$ver;
+		echo "<link rel='stylesheet' href='".esc_attr($href)."' type='text/css' media='all' />\n";
 
-		if ( !empty($wp_styles->print_code) ) {
+		if ( ! empty($wp_styles->print_code)) {
 			echo "<style type='text/css'>\n";
 			echo $wp_styles->print_code;
 			echo "\n</style>\n";
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
+	if ( ! empty($wp_styles->print_html))
 		echo $wp_styles->print_html;
 }
 
@@ -1199,23 +1199,23 @@ 
 function script_concat_settings() {
 	global $concatenate_scripts, $compress_scripts, $compress_css;
 
-	$compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+	$compressed_output = (ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler'));
 
-	if ( ! isset($concatenate_scripts) ) {
+	if ( ! isset($concatenate_scripts)) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+		if (( ! is_admin() && ! did_action('login_init')) || (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG))
 			$concatenate_scripts = false;
 	}
 
-	if ( ! isset($compress_scripts) ) {
+	if ( ! isset($compress_scripts)) {
 		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+		if ($compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output))
 			$compress_scripts = false;
 	}
 
-	if ( ! isset($compress_css) ) {
+	if ( ! isset($compress_css)) {
 		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+		if ($compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output))
 			$compress_css = false;
 	}
 }

Braces +44 added lines, -30 removed lines

@@ -683,11 +683,13 @@ 
 function wp_default_styles( &$styles ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
-		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
+			define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	}
 
-	if ( ! $guessurl = site_url() )
-		$guessurl = wp_guess_url();
+	if ( ! $guessurl = site_url() ) {
+			$guessurl = wp_guess_url();
+	}
 
 	$styles->base_url = $guessurl;
 	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
@@ -812,14 +814,17 @@ 
  * @return array Reordered array, if needed.
  */
 function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
-		return $js_array;
+	if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
+			return $js_array;
+	}
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
-		return $js_array;
+	if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
+			return $js_array;
+	}
 
-	if ( $prototype < $jquery )
-		return $js_array;
+	if ( $prototype < $jquery ) {
+			return $js_array;
+	}
 
 	unset($js_array[$prototype]);
 
@@ -867,14 +872,16 @@ 
 function wp_style_loader_src( $src, $handle ) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
-		return preg_replace( '#^wp-admin/#', './', $src );
+	if ( wp_installing() ) {
+			return preg_replace( '#^wp-admin/#', './', $src );
+	}
 
 	if ( 'colors' == $handle ) {
 		$color = get_user_option('admin_color');
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
-			$color = 'fresh';
+		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) ) {
+					$color = 'fresh';
+		}
 
 		$color = $_wp_admin_css_colors[$color];
 		$url = $color->url;
@@ -985,8 +992,9 @@ 
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
-		$zip = 'gzip';
+	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) {
+			$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
 
@@ -1009,9 +1017,10 @@ 
 		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
-		echo $wp_scripts->print_html;
-}
+	if ( !empty($wp_scripts->print_html) ) {
+			echo $wp_scripts->print_html;
+	}
+	}
 
 /**
  * Prints the script queue in the HTML head on the front end.
@@ -1163,8 +1172,9 @@ 
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
-		$zip = 'gzip';
+	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP ) {
+			$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
 		$dir = $wp_styles->text_direction;
@@ -1183,9 +1193,10 @@ 
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
-		echo $wp_styles->print_html;
-}
+	if ( !empty($wp_styles->print_html) ) {
+			echo $wp_styles->print_html;
+	}
+	}
 
 /**
  * Determine the concatenation and compression settings for scripts and styles.
@@ -1203,19 +1214,22 @@ 
 
 	if ( ! isset($concatenate_scripts) ) {
 		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
-			$concatenate_scripts = false;
+		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) {
+					$concatenate_scripts = false;
+		}
 	}
 
 	if ( ! isset($compress_scripts) ) {
 		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_scripts = false;
+		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) ) {
+					$compress_scripts = false;
+		}
 	}
 
 	if ( ! isset($compress_css) ) {
 		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
-			$compress_css = false;
+		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) ) {
+					$compress_css = false;
+		}
 	}
 }

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

Spacing +490 added lines, -490 removed lines

@@ -62,7 +62,7 @@ 
 	 * }
 	 * @return array Parsed arguments array.
 	 */
-	public static function parse_settings( $editor_id, $settings ) {
+	public static function parse_settings($editor_id, $settings) {
 
 		/**
 		 * Filter the wp_editor() settings.
@@ -74,9 +74,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'      => '',
@@ -92,43 +92,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', 'TinyMCE editor IDs cannot have brackets.' );
+				_deprecated_argument('wp_editor()', '3.9', '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;
@@ -142,75 +142,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.
@@ -219,24 +219,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>';
 		}
 
 		/**
@@ -246,14 +246,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);
 		}
 
 		/**
@@ -265,31 +265,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);
 	}
 
 	/**
@@ -304,30 +304,30 @@ 
 	public static function editor_settings($editor_id, $set) {
 		global $wp_version, $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';
 			}
 
@@ -339,26 +339,26 @@ 
 			 * @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_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 = '';
 
-				if ( $set['teeny'] ) {
+				if ($set['teeny']) {
 
 					/**
 					 * Filter the list of teenyMCE plugins.
@@ -368,7 +368,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 {
 
 					/**
@@ -388,7 +388,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',
@@ -412,7 +412,7 @@ 
 						'wpembed',
 					);
 
-					if ( ! self::$has_medialib ) {
+					if ( ! self::$has_medialib) {
 						$plugins[] = 'image';
 					}
 
@@ -426,15 +426,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)) {
 
 						/**
 						 * Filter the translations loaded for external TinyMCE 3.x plugins.
@@ -449,64 +449,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";
 						}
 					}
 				}
@@ -518,20 +518,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,
@@ -541,35 +541,35 @@ 
 					'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' )
+					'wpeditimage_html5_captions' => current_theme_supports('html5', 'caption'),
+					'plugins' => implode(',', $plugins),
+					'wp_lang_attr' => get_bloginfo('language')
 				);
 
-				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=' . $wp_version;
-				$dashicons = includes_url( "css/dashicons$suffix.css?$version" );
+				$version = 'ver='.$wp_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;
 					}
 				}
@@ -581,13 +581,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']) {
 
 				/**
 				 * Filter the list of teenyMCE buttons (Text tab).
@@ -597,13 +597,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( 'bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', 'alignleft', 'aligncenter', 'alignright', 'link', 'unlink', 'wp_more', 'spellchecker' );
+				$mce_buttons = array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'hr', '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';
@@ -620,11 +620,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( 'formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo' );
+				$mce_buttons_2 = array('formatselect', 'underline', 'alignjustify', 'forecolor', 'pastetext', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo');
 
-				if ( ! wp_is_mobile() ) {
+				if ( ! wp_is_mobile()) {
 					$mce_buttons_2[] = 'wp_help';
 				}
 
@@ -636,7 +636,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);
 
 				/**
 				 * Filter the third-row list of TinyMCE buttons (Visual tab).
@@ -646,7 +646,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);
 
 				/**
 				 * Filter the fourth-row list of TinyMCE buttons (Visual tab).
@@ -656,30 +656,30 @@ 
 				 * @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_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 = 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);
 					else
 						$body_class .= ' post-format-standard';
 				}
 			}
 
-			$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+			$body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_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,
@@ -694,10 +694,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
@@ -707,7 +707,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']) {
 
 				/**
 				 * Filter the teenyMCE config before init.
@@ -717,7 +717,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 {
 
 				/**
@@ -728,10 +728,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'] = '';
 			}
@@ -749,19 +749,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, ' ,').'}';
 	}
 
 	/**
@@ -769,24 +769,24 @@ 
 	 * @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');
 		}
@@ -799,10 +799,10 @@ 
 		 * @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,
-		) );
+		));
 	}
 
 	/**
@@ -814,261 +814,261 @@ 
 	 * @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 ) {
+	public static function wp_mce_translation($mce_locale = '', $json_only = false) {
 
 		$mce_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' => __( 'Heading 1' ),
-			'Heading 2' => __( 'Heading 2' ),
-			'Heading 3' => __( 'Heading 3' ),
-			'Heading 4' => __( 'Heading 4' ),
-			'Heading 5' => __( 'Heading 5' ),
-			'Heading 6' => __( 'Heading 6' ),
+			'Headings' => _x('Headings', 'TinyMCE'),
+			'Heading 1' => __('Heading 1'),
+			'Heading 2' => __('Heading 2'),
+			'Heading 3' => __('Heading 3'),
+			'Heading 4' => __('Heading 4'),
+			'Heading 5' => __('Heading 5'),
+			'Heading 6' => __('Heading 6'),
 
 			/* translators: block tags */
-			'Blocks' => _x( 'Blocks', 'TinyMCE' ),
-			'Paragraph' => __( 'Paragraph' ),
-			'Blockquote' => __( 'Blockquote' ),
-			'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' => __( 'Underline' ),
-			'Strikethrough' => __( 'Strikethrough' ),
-			'Subscript' => __( 'Subscript' ),
-			'Superscript' => __( 'Superscript' ),
-			'Clear formatting' => __( 'Clear formatting' ),
-			'Bold' => __( 'Bold' ),
-			'Italic' => __( 'Italic' ),
-			'Code' => _x( 'Code', 'editor button' ),
-			'Source code' => __( 'Source code' ),
-			'Font Family' => __( 'Font Family' ),
-			'Font Sizes' => __( 'Font Sizes' ),
-
-			'Align center' => __( 'Align center' ),
-			'Align right' => __( 'Align right' ),
-			'Align left' => __( 'Align left' ),
-			'Justify' => __( 'Justify' ),
-			'Increase indent' => __( 'Increase indent' ),
-			'Decrease indent' => __( 'Decrease indent' ),
-
-			'Cut' => __( 'Cut' ),
-			'Copy' => __( 'Copy' ),
-			'Paste' => __( 'Paste' ),
-			'Select all' => __( 'Select all' ),
-			'Undo' => __( 'Undo' ),
-			'Redo' => __( 'Redo' ),
-
-			'Ok' => __( 'OK' ),
-			'Cancel' => __( 'Cancel' ),
-			'Close' => __( 'Close' ),
-			'Visual aids' => __( 'Visual aids' ),
-
-			'Bullet list' => __( 'Bulleted list' ),
-			'Numbered list' => __( 'Numbered list' ),
-			'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' => __('Paragraph'),
+			'Blockquote' => __('Blockquote'),
+			'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' => __('Underline'),
+			'Strikethrough' => __('Strikethrough'),
+			'Subscript' => __('Subscript'),
+			'Superscript' => __('Superscript'),
+			'Clear formatting' => __('Clear formatting'),
+			'Bold' => __('Bold'),
+			'Italic' => __('Italic'),
+			'Code' => _x('Code', 'editor button'),
+			'Source code' => __('Source code'),
+			'Font Family' => __('Font Family'),
+			'Font Sizes' => __('Font Sizes'),
+
+			'Align center' => __('Align center'),
+			'Align right' => __('Align right'),
+			'Align left' => __('Align left'),
+			'Justify' => __('Justify'),
+			'Increase indent' => __('Increase indent'),
+			'Decrease indent' => __('Decrease indent'),
+
+			'Cut' => __('Cut'),
+			'Copy' => __('Copy'),
+			'Paste' => __('Paste'),
+			'Select all' => __('Select all'),
+			'Undo' => __('Undo'),
+			'Redo' => __('Redo'),
+
+			'Ok' => __('OK'),
+			'Cancel' => __('Cancel'),
+			'Close' => __('Close'),
+			'Visual aids' => __('Visual aids'),
+
+			'Bullet list' => __('Bulleted list'),
+			'Numbered list' => __('Numbered list'),
+			'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' => __( 'Insert/edit image' ),
-			'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' => __('Insert/edit image'),
+			'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' => __( 'Insert/edit link' ),
-			'Remove link' => __( 'Remove link' ),
-
-			'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' => __('Insert/edit link'),
+			'Remove link' => __('Remove link'),
+
+			'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' ),
-			'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'),
+			'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' => __( 'Toolbar Toggle' ),
-			'Insert Read More tag' => __( 'Insert Read More tag' ),
-			'Insert Page Break tag' => __( 'Insert Page Break tag' ),
-			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)
-			'Distraction-free writing mode' => __( 'Distraction-free writing mode' ),
-			'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
-			'Link options'  => __( 'Link options' ),
+			'Toolbar Toggle' => __('Toolbar Toggle'),
+			'Insert Read More tag' => __('Insert Read More tag'),
+			'Insert Page Break tag' => __('Insert Page Break tag'),
+			'Read more...' => __('Read more...'), // Title on the placeholder inside the editor (no ellipsis)
+			'Distraction-free writing mode' => __('Distraction-free writing mode'),
+			'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
+			'Link options'  => __('Link options'),
 
 			// Shortcuts help modal
-			'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
-			'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' ),
+			'Keyboard Shortcuts' => __('Keyboard Shortcuts'),
+			'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'),
 			'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.'),
 		);
 
 		/**
@@ -1082,7 +1082,7 @@ 
 		 *	Url
 		 */
 
-		if ( ! $mce_locale ) {
+		if ( ! $mce_locale) {
 			$mce_locale = self::$mce_locale;
 		}
 
@@ -1094,32 +1094,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";
 	}
 
@@ -1141,38 +1141,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
 		);
@@ -1186,7 +1186,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">
@@ -1195,14 +1195,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>
@@ -1210,19 +1210,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( $wp_version, '-src' ) ? '' : '.min';
+		$mce_suffix = false !== strpos($wp_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";
 			}
@@ -1236,17 +1236,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').'";';
 
 		?>
 
@@ -1281,7 +1281,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();
 
 		/**
@@ -1291,7 +1291,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);
 	}
 
 	/**
@@ -1300,7 +1300,7 @@ 
 	 * @global int $content_width
 	 */
 	public static function wp_fullscreen_html() {
-		_deprecated_function( __FUNCTION__, '4.3' );
+		_deprecated_function(__FUNCTION__, '4.3');
 	}
 
 	/**
@@ -1312,9 +1312,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,
@@ -1325,12 +1325,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;
 
 		/**
 		 * Filter the link query arguments.
@@ -1343,27 +1343,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,
 			);
 		}
@@ -1390,7 +1390,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);
 	}
 
 	/**
@@ -1406,31 +1406,31 @@ 
 		<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">
 				<div>
-					<label><span><?php _e( 'URL' ); ?></span>
-					<input id="wp-link-url" type="text" role="combobox" aria-autocomplete="list" aria-expanded="false" placeholder="<?php _e( 'Paste URL or type to search' ); ?>" /></label>
+					<label><span><?php _e('URL'); ?></span>
+					<input id="wp-link-url" type="text" role="combobox" aria-autocomplete="list" aria-expanded="false" placeholder="<?php _e('Paste URL or type to search'); ?>" /></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>
 		</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>