ntwb / wordpress

src/wp-includes/class-walker-category.php

Spacing +42 added lines, -42 removed lines

@@ -32,7 +32,7 @@ 
 	 * @todo Decouple this
 	 * @var array
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id');
 
 	/**
 	 * Starts the list before the elements are added.
@@ -46,8 +46,8 @@ 
 	 * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
 	 *                       @see wp_list_categories()
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$indent = str_repeat("\t", $depth);
@@ -66,8 +66,8 @@ 
 	 * @param array  $args   An array of arguments. Will only append content if style argument value is 'list'.
 	 *                       @wsee wp_list_categories()
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$indent = str_repeat("\t", $depth);
@@ -87,21 +87,21 @@ 
 	 * @param array  $args     An array of arguments. @see wp_list_categories()
 	 * @param int    $id       ID of the current category.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters(
 			'list_cats',
-			esc_attr( $category->name ),
+			esc_attr($category->name),
 			$category
 		);
 
 		// Don't generate an element if the category name is empty.
-		if ( ! $cat_name ) {
+		if ( ! $cat_name) {
 			return;
 		}
 
-		$link = '<a href="' . esc_url( get_term_link( $category ) ) . '" ';
-		if ( $args['use_desc_for_title'] && ! empty( $category->description ) ) {
+		$link = '<a href="'.esc_url(get_term_link($category)).'" ';
+		if ($args['use_desc_for_title'] && ! empty($category->description)) {
 			/**
 			 * Filter the category description for display.
 			 *
@@ -110,72 +110,72 @@ 
 			 * @param string $description Category description.
 			 * @param object $category    Category object.
 			 */
-			$link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"';
+			$link .= 'title="'.esc_attr(strip_tags(apply_filters('category_description', $category->description, $category))).'"';
 		}
 
 		$link .= '>';
-		$link .= $cat_name . '</a>';
+		$link .= $cat_name.'</a>';
 
-		if ( ! empty( $args['feed_image'] ) || ! empty( $args['feed'] ) ) {
+		if ( ! empty($args['feed_image']) || ! empty($args['feed'])) {
 			$link .= ' ';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= '(';
 			}
 
-			$link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
+			$link .= '<a href="'.esc_url(get_term_feed_link($category->term_id, $category->taxonomy, $args['feed_type'])).'"';
 
-			if ( empty( $args['feed'] ) ) {
-				$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
+			if (empty($args['feed'])) {
+				$alt = ' alt="'.sprintf(__('Feed for all posts filed under %s'), $cat_name).'"';
 			} else {
-				$alt = ' alt="' . $args['feed'] . '"';
+				$alt = ' alt="'.$args['feed'].'"';
 				$name = $args['feed'];
-				$link .= empty( $args['title'] ) ? '' : $args['title'];
+				$link .= empty($args['title']) ? '' : $args['title'];
 			}
 
 			$link .= '>';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= $name;
 			} else {
-				$link .= "<img src='" . $args['feed_image'] . "'$alt" . ' />';
+				$link .= "<img src='".$args['feed_image']."'$alt".' />';
 			}
 			$link .= '</a>';
 
-			if ( empty( $args['feed_image'] ) ) {
+			if (empty($args['feed_image'])) {
 				$link .= ')';
 			}
 		}
 
-		if ( ! empty( $args['show_count'] ) ) {
-			$link .= ' (' . number_format_i18n( $category->count ) . ')';
+		if ( ! empty($args['show_count'])) {
+			$link .= ' ('.number_format_i18n($category->count).')';
 		}
-		if ( 'list' == $args['style'] ) {
+		if ('list' == $args['style']) {
 			$output .= "\t<li";
 			$css_classes = array(
 				'cat-item',
-				'cat-item-' . $category->term_id,
+				'cat-item-'.$category->term_id,
 			);
 
-			if ( ! empty( $args['current_category'] ) ) {
+			if ( ! empty($args['current_category'])) {
 				// 'current_category' can be an array, so we use `get_terms()`.
-				$_current_terms = get_terms( $category->taxonomy, array(
+				$_current_terms = get_terms($category->taxonomy, array(
 					'include' => $args['current_category'],
 					'hide_empty' => false,
-				) );
+				));
 
-				foreach ( $_current_terms as $_current_term ) {
-					if ( $category->term_id == $_current_term->term_id ) {
+				foreach ($_current_terms as $_current_term) {
+					if ($category->term_id == $_current_term->term_id) {
 						$css_classes[] = 'current-cat';
-					} elseif ( $category->term_id == $_current_term->parent ) {
+					} elseif ($category->term_id == $_current_term->parent) {
 						$css_classes[] = 'current-cat-parent';
 					}
-					while ( $_current_term->parent ) {
-						if ( $category->term_id == $_current_term->parent ) {
-							$css_classes[] =  'current-cat-ancestor';
+					while ($_current_term->parent) {
+						if ($category->term_id == $_current_term->parent) {
+							$css_classes[] = 'current-cat-ancestor';
 							break;
 						}
-						$_current_term = get_term( $_current_term->parent, $category->taxonomy );
+						$_current_term = get_term($_current_term->parent, $category->taxonomy);
 					}
 				}
 			}
@@ -192,12 +192,12 @@ 
 			 * @param int    $depth       Depth of page, used for padding.
 			 * @param array  $args        An array of wp_list_categories() arguments.
 			 */
-			$css_classes = implode( ' ', apply_filters( 'category_css_class', $css_classes, $category, $depth, $args ) );
+			$css_classes = implode(' ', apply_filters('category_css_class', $css_classes, $category, $depth, $args));
 
-			$output .=  ' class="' . $css_classes . '"';
+			$output .= ' class="'.$css_classes.'"';
 			$output .= ">$link\n";
-		} elseif ( isset( $args['separator'] ) ) {
-			$output .= "\t$link" . $args['separator'] . "\n";
+		} elseif (isset($args['separator'])) {
+			$output .= "\t$link".$args['separator']."\n";
 		} else {
 			$output .= "\t$link<br />\n";
 		}
@@ -215,8 +215,8 @@ 
 	 * @param int    $depth  Depth of category. Not used.
 	 * @param array  $args   An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories()
 	 */
-	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+	public function end_el(&$output, $page, $depth = 0, $args = array()) {
+		if ('list' != $args['style'])
 			return;
 
 		$output .= "</li>\n";

Braces +9 added lines, -6 removed lines

@@ -47,8 +47,9 @@ 
 	 *                       @see wp_list_categories()
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent<ul class='children'>\n";
@@ -67,8 +68,9 @@ 
 	 *                       @wsee wp_list_categories()
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
@@ -216,8 +218,9 @@ 
 	 * @param array  $args   An array of arguments. Only uses 'list' for whether should append to output. @see wp_list_categories()
 	 */
 	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
-			return;
+		if ( 'list' != $args['style'] ) {
+					return;
+		}
 
 		$output .= "</li>\n";
 	}

src/wp-includes/shortcodes.php

Braces +25 added lines, -20 removed lines

@@ -170,8 +170,9 @@ 
 
 	if ( shortcode_exists( $tag ) ) {
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
-			return false;
+		if ( empty( $matches ) ) {
+					return false;
+		}
 
 		foreach ( $matches as $shortcode ) {
 			if ( $tag === $shortcode[2] ) {
@@ -206,8 +207,9 @@ 
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
-		return $content;
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
+			return $content;
+	}
 
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
@@ -484,16 +486,17 @@ 
 	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
 	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
 		foreach ($match as $m) {
-			if (!empty($m[1]))
-				$atts[strtolower($m[1])] = stripcslashes($m[2]);
-			elseif (!empty($m[3]))
-				$atts[strtolower($m[3])] = stripcslashes($m[4]);
-			elseif (!empty($m[5]))
-				$atts[strtolower($m[5])] = stripcslashes($m[6]);
-			elseif (isset($m[7]) && strlen($m[7]))
-				$atts[] = stripcslashes($m[7]);
-			elseif (isset($m[8]))
-				$atts[] = stripcslashes($m[8]);
+			if (!empty($m[1])) {
+							$atts[strtolower($m[1])] = stripcslashes($m[2]);
+			} elseif (!empty($m[3])) {
+							$atts[strtolower($m[3])] = stripcslashes($m[4]);
+			} elseif (!empty($m[5])) {
+							$atts[strtolower($m[5])] = stripcslashes($m[6]);
+			} elseif (isset($m[7]) && strlen($m[7])) {
+							$atts[] = stripcslashes($m[7]);
+			} elseif (isset($m[8])) {
+							$atts[] = stripcslashes($m[8]);
+			}
 		}
 
 		// Reject any unclosed HTML elements
@@ -531,10 +534,11 @@ 
 	$atts = (array)$atts;
 	$out = array();
 	foreach ($pairs as $name => $default) {
-		if ( array_key_exists($name, $atts) )
-			$out[$name] = $atts[$name];
-		else
-			$out[$name] = $default;
+		if ( array_key_exists($name, $atts) ) {
+					$out[$name] = $atts[$name];
+		} else {
+					$out[$name] = $default;
+		}
 	}
 	/**
 	 * Filter a shortcode's default attributes.
@@ -574,8 +578,9 @@ 
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
-		return $content;
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
+			return $content;
+	}
 
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );

Indentation +4 added lines, -4 removed lines

@@ -445,11 +445,11 @@
  * @return string Content with placeholders removed.
  */
 function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '[' => '[', ']' => ']' );
-        $content = strtr( $content, $trans );
+		// Clean up entire string, avoids re-parsing HTML.
+		$trans = array( '[' => '[', ']' => ']' );
+		$content = strtr( $content, $trans );
 
-        return $content;
+		return $content;
 }
 
 /**

Spacing +110 added lines, -110 removed lines

@@ -89,20 +89,20 @@ 
 function add_shortcode($tag, $func) {
 	global $shortcode_tags;
 
-	if ( '' == trim( $tag ) ) {
-		$message = __( 'Invalid shortcode name: Empty name given.' );
-		_doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
+	if ('' == trim($tag)) {
+		$message = __('Invalid shortcode name: Empty name given.');
+		_doing_it_wrong(__FUNCTION__, $message, '4.4.0');
 		return;
 	}
 
-	if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20=]@', $tag ) ) {
+	if (0 !== preg_match('@[<>&/\[\]\x00-\x20=]@', $tag)) {
 		/* translators: 1: shortcode name, 2: space separated list of reserved characters */
-		$message = sprintf( __( 'Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s' ), $tag, '& / < > [ ] =' );
-		_doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
+		$message = sprintf(__('Invalid shortcode name: %1$s. Do not use spaces or reserved characters: %2$s'), $tag, '& / < > [ ] =');
+		_doing_it_wrong(__FUNCTION__, $message, '4.4.0');
 		return;
 	}
 
-	$shortcode_tags[ $tag ] = $func;
+	$shortcode_tags[$tag] = $func;
 }
 
 /**
@@ -147,9 +147,9 @@ 
  * @param string $tag Shortcode tag to check.
  * @return bool Whether the given shortcode exists.
  */
-function shortcode_exists( $tag ) {
+function shortcode_exists($tag) {
 	global $shortcode_tags;
-	return array_key_exists( $tag, $shortcode_tags );
+	return array_key_exists($tag, $shortcode_tags);
 }
 
 /**
@@ -163,20 +163,20 @@ 
  * @param string $tag     Shortcode tag to check.
  * @return bool Whether the passed content contains the given shortcode.
  */
-function has_shortcode( $content, $tag ) {
-	if ( false === strpos( $content, '[' ) ) {
+function has_shortcode($content, $tag) {
+	if (false === strpos($content, '[')) {
 		return false;
 	}
 
-	if ( shortcode_exists( $tag ) ) {
-		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
+	if (shortcode_exists($tag)) {
+		preg_match_all('/'.get_shortcode_regex().'/', $content, $matches, PREG_SET_ORDER);
+		if (empty($matches))
 			return false;
 
-		foreach ( $matches as $shortcode ) {
-			if ( $tag === $shortcode[2] ) {
+		foreach ($matches as $shortcode) {
+			if ($tag === $shortcode[2]) {
 				return true;
-			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+			} elseif ( ! empty($shortcode[5]) && has_shortcode($shortcode[5], $tag)) {
 				return true;
 			}
 		}
@@ -199,31 +199,31 @@ 
  * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
  * @return string Content with shortcodes filtered out.
  */
-function do_shortcode( $content, $ignore_html = false ) {
+function do_shortcode($content, $ignore_html = false) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags))
 		return $content;
 
 	// Find all registered tag names in $content.
-	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
-	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
+	preg_match_all('@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches);
+	$tagnames = array_intersect(array_keys($shortcode_tags), $matches[1]);
 
-	if ( empty( $tagnames ) ) {
+	if (empty($tagnames)) {
 		return $content;
 	}
 
-	$content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
+	$content = do_shortcodes_in_html_tags($content, $ignore_html, $tagnames);
 
-	$pattern = get_shortcode_regex( $tagnames );
-	$content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
+	$pattern = get_shortcode_regex($tagnames);
+	$content = preg_replace_callback("/$pattern/", 'do_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -251,13 +251,13 @@ 
  * @param array $tagnames Optional. List of shortcodes to find. Defaults to all registered shortcodes.
  * @return string The shortcode search regular expression
  */
-function get_shortcode_regex( $tagnames = null ) {
+function get_shortcode_regex($tagnames = null) {
 	global $shortcode_tags;
 
-	if ( empty( $tagnames ) ) {
-		$tagnames = array_keys( $shortcode_tags );
+	if (empty($tagnames)) {
+		$tagnames = array_keys($shortcode_tags);
 	}
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 
 	// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
 	// Also, see shortcode_unautop() and shortcode.js.
@@ -289,7 +289,7 @@ 
 		.         '\\[\\/\\2\\]'             // Closing shortcode tag
 		.     ')?'
 		. ')'
-		. '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
+		. '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
 }
 
 /**
@@ -304,21 +304,21 @@ 
  * @param array $m Regular expression match array
  * @return string|false False on failure.
  */
-function do_shortcode_tag( $m ) {
+function do_shortcode_tag($m) {
 	global $shortcode_tags;
 
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
+	if ($m[1] == '[' && $m[6] == ']') {
 		return substr($m[0], 1, -1);
 	}
 
 	$tag = $m[2];
-	$attr = shortcode_parse_atts( $m[3] );
+	$attr = shortcode_parse_atts($m[3]);
 
-	if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
+	if ( ! is_callable($shortcode_tags[$tag])) {
 		/* translators: %s: shortcode tag */
-		$message = sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag );
-		_doing_it_wrong( __FUNCTION__, $message, '4.3.0' );
+		$message = sprintf(__('Attempting to parse a shortcode without a valid callback: %s'), $tag);
+		_doing_it_wrong(__FUNCTION__, $message, '4.3.0');
 		return $m[0];
 	}
 
@@ -335,14 +335,14 @@ 
 	 * @param array|string $attr        Shortcode attributes array or empty string.
 	 * @param array        $m           Regular expression match array.
 	 */
-	$return = apply_filters( 'pre_do_shortcode_tag', false, $tag, $attr, $m );
-	if ( false !== $return ) {
+	$return = apply_filters('pre_do_shortcode_tag', false, $tag, $attr, $m);
+	if (false !== $return) {
 		return $return;
 	}
 
-	$content = isset( $m[5] ) ? $m[5] : null;
+	$content = isset($m[5]) ? $m[5] : null;
 
-	$output = $m[1] . call_user_func( $shortcode_tags[ $tag ], $attr, $content, $tag ) . $m[6];
+	$output = $m[1].call_user_func($shortcode_tags[$tag], $attr, $content, $tag).$m[6];
 
 	/**
 	 * Filters the output created by a shortcode callback.
@@ -354,7 +354,7 @@ 
 	 * @param array|string $attr   Shortcode attributes array or empty string.
 	 * @param array        $m      Regular expression match array.
 	 */
-	return apply_filters( 'do_shortcode_tag', $output, $tag, $attr, $m );
+	return apply_filters('do_shortcode_tag', $output, $tag, $attr, $m);
 }
 
 /**
@@ -372,93 +372,93 @@ 
  * @param array $tagnames List of shortcodes to find.
  * @return string Content with shortcodes filtered out.
  */
-function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
+function do_shortcodes_in_html_tags($content, $ignore_html, $tagnames) {
 	// Normalize entities in unfiltered HTML before adding placeholders.
-	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
-	$content = strtr( $content, $trans );
-	$trans = array( '[' => '&#91;', ']' => '&#93;' );
+	$trans = array('&#91;' => '&#091;', '&#93;' => '&#093;');
+	$content = strtr($content, $trans);
+	$trans = array('[' => '&#91;', ']' => '&#93;');
 
-	$pattern = get_shortcode_regex( $tagnames );
-	$textarr = wp_html_split( $content );
+	$pattern = get_shortcode_regex($tagnames);
+	$textarr = wp_html_split($content);
 
-	foreach ( $textarr as &$element ) {
-		if ( '' == $element || '<' !== $element[0] ) {
+	foreach ($textarr as &$element) {
+		if ('' == $element || '<' !== $element[0]) {
 			continue;
 		}
 
-		$noopen = false === strpos( $element, '[' );
-		$noclose = false === strpos( $element, ']' );
-		if ( $noopen || $noclose ) {
+		$noopen = false === strpos($element, '[');
+		$noclose = false === strpos($element, ']');
+		if ($noopen || $noclose) {
 			// This element does not contain shortcodes.
-			if ( $noopen xor $noclose ) {
+			if ($noopen xor $noclose) {
 				// Need to encode stray [ or ] chars.
-				$element = strtr( $element, $trans );
+				$element = strtr($element, $trans);
 			}
 			continue;
 		}
 
-		if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
+		if ($ignore_html || '<!--' === substr($element, 0, 4) || '<![CDATA[' === substr($element, 0, 9)) {
 			// Encode all [ and ] chars.
-			$element = strtr( $element, $trans );
+			$element = strtr($element, $trans);
 			continue;
 		}
 
-		$attributes = wp_kses_attr_parse( $element );
-		if ( false === $attributes ) {
+		$attributes = wp_kses_attr_parse($element);
+		if (false === $attributes) {
 			// Some plugins are doing things like [name] <[email]>.
-			if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
-				$element = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $element );
+			if (1 === preg_match('%^<\s*\[\[?[^\[\]]+\]%', $element)) {
+				$element = preg_replace_callback("/$pattern/", 'do_shortcode_tag', $element);
 			}
 
 			// Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.
-			$element = strtr( $element, $trans );
+			$element = strtr($element, $trans);
 			continue;
 		}
 
 		// Get element name
-		$front = array_shift( $attributes );
-		$back = array_pop( $attributes );
+		$front = array_shift($attributes);
+		$back = array_pop($attributes);
 		$matches = array();
 		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
 		$elname = $matches[0];
 
 		// Look for shortcodes in each attribute separately.
-		foreach ( $attributes as &$attr ) {
-			$open = strpos( $attr, '[' );
-			$close = strpos( $attr, ']' );
-			if ( false === $open || false === $close ) {
+		foreach ($attributes as &$attr) {
+			$open = strpos($attr, '[');
+			$close = strpos($attr, ']');
+			if (false === $open || false === $close) {
 				continue; // Go to next attribute.  Square braces will be escaped at end of loop.
 			}
-			$double = strpos( $attr, '"' );
-			$single = strpos( $attr, "'" );
-			if ( ( false === $single || $open < $single ) && ( false === $double || $open < $double ) ) {
+			$double = strpos($attr, '"');
+			$single = strpos($attr, "'");
+			if ((false === $single || $open < $single) && (false === $double || $open < $double)) {
 				// $attr like '[shortcode]' or 'name = [shortcode]' implies unfiltered_html.
 				// In this specific situation we assume KSES did not run because the input
 				// was written by an administrator, so we should avoid changing the output
 				// and we do not need to run KSES here.
-				$attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );
+				$attr = preg_replace_callback("/$pattern/", 'do_shortcode_tag', $attr);
 			} else {
 				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
 				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
 				$count = 0;
-				$new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
-				if ( $count > 0 ) {
+				$new_attr = preg_replace_callback("/$pattern/", 'do_shortcode_tag', $attr, -1, $count);
+				if ($count > 0) {
 					// Sanitize the shortcode output using KSES.
-					$new_attr = wp_kses_one_attr( $new_attr, $elname );
-					if ( '' !== trim( $new_attr ) ) {
+					$new_attr = wp_kses_one_attr($new_attr, $elname);
+					if ('' !== trim($new_attr)) {
 						// The shortcode is safe to use now.
 						$attr = $new_attr;
 					}
 				}
 			}
 		}
-		$element = $front . implode( '', $attributes ) . $back;
+		$element = $front.implode('', $attributes).$back;
 
 		// Now encode any remaining [ or ] chars.
-		$element = strtr( $element, $trans );
+		$element = strtr($element, $trans);
 	}
 
-	$content = implode( '', $textarr );
+	$content = implode('', $textarr);
 
 	return $content;
 }
@@ -471,10 +471,10 @@ 
  * @param string $content Content to search for placeholders.
  * @return string Content with placeholders removed.
  */
-function unescape_invalid_shortcodes( $content ) {
+function unescape_invalid_shortcodes($content) {
         // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
+        $trans = array('&#91;' => '[', '&#93;' => ']');
+        $content = strtr($content, $trans);
 
         return $content;
 }
@@ -509,13 +509,13 @@ 
 	$atts = array();
 	$pattern = get_shortcode_atts_regex();
 	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
-	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
+	if (preg_match_all($pattern, $text, $match, PREG_SET_ORDER)) {
 		foreach ($match as $m) {
-			if (!empty($m[1]))
+			if ( ! empty($m[1]))
 				$atts[strtolower($m[1])] = stripcslashes($m[2]);
-			elseif (!empty($m[3]))
+			elseif ( ! empty($m[3]))
 				$atts[strtolower($m[3])] = stripcslashes($m[4]);
-			elseif (!empty($m[5]))
+			elseif ( ! empty($m[5]))
 				$atts[strtolower($m[5])] = stripcslashes($m[6]);
 			elseif (isset($m[7]) && strlen($m[7]))
 				$atts[] = stripcslashes($m[7]);
@@ -524,9 +524,9 @@ 
 		}
 
 		// Reject any unclosed HTML elements
-		foreach( $atts as &$value ) {
-			if ( false !== strpos( $value, '<' ) ) {
-				if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
+		foreach ($atts as &$value) {
+			if (false !== strpos($value, '<')) {
+				if (1 !== preg_match('/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value)) {
 					$value = '';
 				}
 			}
@@ -554,11 +554,11 @@ 
  * @param string $shortcode Optional. The name of the shortcode, provided for context to enable filtering
  * @return array Combined and filtered attribute list.
  */
-function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
-	$atts = (array)$atts;
+function shortcode_atts($pairs, $atts, $shortcode = '') {
+	$atts = (array) $atts;
 	$out = array();
 	foreach ($pairs as $name => $default) {
-		if ( array_key_exists($name, $atts) )
+		if (array_key_exists($name, $atts))
 			$out[$name] = $atts[$name];
 		else
 			$out[$name] = $default;
@@ -577,8 +577,8 @@ 
 	 * @param array  $atts      The user defined shortcode attributes.
 	 * @param string $shortcode The shortcode name.
 	 */
-	if ( $shortcode ) {
-		$out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts, $shortcode );
+	if ($shortcode) {
+		$out = apply_filters("shortcode_atts_{$shortcode}", $out, $pairs, $atts, $shortcode);
 	}
 
 	return $out;
@@ -594,20 +594,20 @@ 
  * @param string $content Content to remove shortcode tags.
  * @return string Content without shortcode tags.
  */
-function strip_shortcodes( $content ) {
+function strip_shortcodes($content) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags))
 		return $content;
 
 	// Find all registered tag names in $content.
-	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
+	preg_match_all('@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches);
 
-	$tags_to_remove = array_keys( $shortcode_tags );
+	$tags_to_remove = array_keys($shortcode_tags);
 
 	/**
 	 * Filters the list of shortcode tags to remove from the content.
@@ -617,21 +617,21 @@ 
 	 * @param array  $tag_array Array of shortcode tags to remove.
 	 * @param string $content   Content shortcodes are being removed from.
 	 */
-	$tags_to_remove = apply_filters( 'strip_shortcodes_tagnames', $tags_to_remove, $content );
+	$tags_to_remove = apply_filters('strip_shortcodes_tagnames', $tags_to_remove, $content);
 
-	$tagnames = array_intersect( $tags_to_remove, $matches[1] );
+	$tagnames = array_intersect($tags_to_remove, $matches[1]);
 
-	if ( empty( $tagnames ) ) {
+	if (empty($tagnames)) {
 		return $content;
 	}
 
-	$content = do_shortcodes_in_html_tags( $content, true, $tagnames );
+	$content = do_shortcodes_in_html_tags($content, true, $tagnames);
 
-	$pattern = get_shortcode_regex( $tagnames );
-	$content = preg_replace_callback( "/$pattern/", 'strip_shortcode_tag', $content );
+	$pattern = get_shortcode_regex($tagnames);
+	$content = preg_replace_callback("/$pattern/", 'strip_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -644,11 +644,11 @@ 
  * @param array $m RegEx matches against post content.
  * @return string|false The content stripped of the tag, otherwise false.
  */
-function strip_shortcode_tag( $m ) {
+function strip_shortcode_tag($m) {
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
+	if ($m[1] == '[' && $m[6] == ']') {
 		return substr($m[0], 1, -1);
 	}
 
-	return $m[1] . $m[6];
+	return $m[1].$m[6];
 }

src/wp-includes/script-loader.php

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

Spacing +610 added lines, -610 removed lines

@@ -17,22 +17,22 @@ 
  */
 
 /** WordPress Dependency Class */
-require( ABSPATH . WPINC . '/class-wp-dependency.php' );
+require(ABSPATH.WPINC.'/class-wp-dependency.php');
 
 /** 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.
@@ -45,103 +45,103 @@ 
  *
  * @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.' ),
-		'collapseMenu' => __( 'Collapse Main menu' ),
-		'expandMenu'   => __( 'Expand Main menu' ),
-	) );
-
-	$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.'),
+		'collapseMenu' => __('Collapse Main menu'),
+		'expandMenu'   => __('Expand Main menu'),
+	));
+
+	$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' => __('Sorry, you are not allowed 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',
 		/**
 		 * Filters the Heartbeat settings.
 		 *
@@ -149,11 +149,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.'),
 
 		/**
@@ -164,104 +164,104 @@ 
 		 * @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.4' );
-	$scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
-	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
+	$scripts->add('jquery', false, array('jquery-core', 'jquery-migrate'), '1.12.4');
+	$scripts->add('jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4');
+	$scripts->add('jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1');
 
 	// 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 results found.' ),
+	did_action('init') && $scripts->localize('jquery-ui-autocomplete', 'uiAutocompleteL10n', array(
+		'noResults' => __('No results found.'),
 		/* translators: Number of results found when using jQuery UI Autocomplete */
-		'oneResult' => __( '1 result found. Use up and down arrow keys to navigate.' ),
+		'oneResult' => __('1 result found. Use up and down arrow keys to navigate.'),
 		/* translators: %d: Number of results found when using jQuery UI Autocomplete */
-		'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ),
-		'itemSelected' => __( 'Item selected.' ),
-	) );
+		'manyResults' => __('%d results found. Use up and down arrow keys to navigate.'),
+		'itemSelected' => __('Item selected.'),
+	));
 
 	// 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( '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('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);
 
 	// Not used any more, registered for backwards compatibility.
-	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
+	$scripts->add('suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 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( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
-	$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
-	$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
+	$scripts->add('imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1);
+	$scripts->add('masonry', "/wp-includes/js/masonry.min.js", array('imagesloaded'), '3.3.2', 1);
+	$scripts->add('jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array('jquery', 'masonry'), '3.1.2b', 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'),
@@ -269,11 +269,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(
@@ -302,82 +302,82 @@ 
 		'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.22.0', 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.22.0', 1);
+	did_action('init') && $scripts->localize('mediaelement', 'mejsL10n', array(
+		'language' => get_bloginfo('language'),
 		'strings'  => array(
-			'Close'                   => __( 'Close' ),
-			'Fullscreen'              => __( 'Fullscreen' ),
-			'Turn off Fullscreen'     => __( 'Turn off Fullscreen' ),
-			'Go Fullscreen'           => __( 'Go Fullscreen' ),
-			'Download File'           => __( 'Download File' ),
-			'Download Video'          => __( 'Download Video' ),
-			'Play'                    => __( 'Play' ),
-			'Pause'                   => __( 'Pause' ),
-			'Captions/Subtitles'      => __( 'Captions/Subtitles' ),
-			'None'                    => __( 'None', 'no captions/subtitles' ),
-			'Time Slider'             => __( 'Time Slider' ),
+			'Close'                   => __('Close'),
+			'Fullscreen'              => __('Fullscreen'),
+			'Turn off Fullscreen'     => __('Turn off Fullscreen'),
+			'Go Fullscreen'           => __('Go Fullscreen'),
+			'Download File'           => __('Download File'),
+			'Download Video'          => __('Download Video'),
+			'Play'                    => __('Play'),
+			'Pause'                   => __('Pause'),
+			'Captions/Subtitles'      => __('Captions/Subtitles'),
+			'None'                    => __('None', 'no captions/subtitles'),
+			'Time Slider'             => __('Time Slider'),
 			/* translators: %1: number of seconds (30 by default) */
-			'Skip back %1 seconds'    => __( 'Skip back %1 seconds' ),
-			'Video Player'            => __( 'Video Player' ),
-			'Audio Player'            => __( 'Audio Player' ),
-			'Volume Slider'           => __( 'Volume Slider' ),
-			'Mute Toggle'             => __( 'Mute Toggle' ),
-			'Unmute'                  => __( 'Unmute' ),
-			'Mute'                    => __( 'Mute' ),
-			'Use Up/Down Arrow keys to increase or decrease volume.' => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
-			'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
+			'Skip back %1 seconds'    => __('Skip back %1 seconds'),
+			'Video Player'            => __('Video Player'),
+			'Audio Player'            => __('Audio Player'),
+			'Volume Slider'           => __('Volume Slider'),
+			'Mute Toggle'             => __('Mute Toggle'),
+			'Unmute'                  => __('Unmute'),
+			'Mute'                    => __('Mute'),
+			'Use Up/Down Arrow keys to increase or decrease volume.' => __('Use Up/Down Arrow keys to increase or decrease volume.'),
+			'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' => __('Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.'),
 		),
-	) );
+	));
 
 
-	$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',
 		/**
 		 * Filters the MediaElement configuration settings.
 		 *
@@ -385,172 +385,172 @@ 
 		 *
 		 * @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(
-		'unknown'  => _x( 'Password strength unknown', 'password strength' ),
-		'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.' ),
-		'warnWeak' => __( 'Confirm use of weak password' ),
-		'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(
+		'unknown'  => _x('Password strength unknown', 'password strength'),
+		'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.'),
+		'warnWeak' => __('Confirm use of weak password'),
+		'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( 'wp-a11y', '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', 'wp-util' ), 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'         => __( 'Sorry, you are not allowed to customize this site.' ),
-		'previewIframeTitle' => __( 'Site Preview' ),
-		'loginIframeTitle'   => __( 'Session expired' ),
-		'collapseSidebar'    => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
-		'expandSidebar'      => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
-		'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('wp-a11y', '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', 'wp-util'), 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'         => __('Sorry, you are not allowed to customize this site.'),
+		'previewIframeTitle' => __('Site Preview'),
+		'loginIframeTitle'   => __('Session expired'),
+		'collapseSidebar'    => _x('Hide Controls', 'label for hide controls button without length constraints'),
+		'expandSidebar'      => _x('Show Controls', 'label for hide controls button without length constraints'),
+		'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', 'customize-selective-refresh' ), 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', 'customize-selective-refresh'), 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', 'customize-selective-refresh' ), 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', 'customize-selective-refresh'), false, 1);
 
-	$scripts->add( 'wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array( 'wp-a11y' ), false, 1 );
+	$scripts->add('wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array('wp-a11y'), 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 );
-
-	$scripts->add( 'wp-api', "/wp-includes/js/wp-api$suffix.js", array( 'jquery', 'backbone', 'underscore' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wp-api', 'wpApiSettings', array(
-		'root'          => esc_url_raw( get_rest_url() ),
-		'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
+	$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);
+
+	$scripts->add('wp-api', "/wp-includes/js/wp-api$suffix.js", array('jquery', 'backbone', 'underscore'), false, 1);
+	did_action('init') && $scripts->localize('wp-api', 'wpApiSettings', array(
+		'root'          => esc_url_raw(get_rest_url()),
+		'nonce'         => (wp_installing() && ! is_multisite()) ? '' : wp_create_nonce('wp_rest'),
 		'versionString' => 'wp/v2/',
-	) );
+	));
 
-	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(
+	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' => __('Sorry, you are not allowed 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." ),
-			'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment 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."),
+			'warnCommentChanges' => __("Are you sure you want to do this?\nThe comment 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', 'tags-suggest' ), false, 1 );
+		$scripts->add('tags-box', "/wp-admin/js/tags-box$suffix.js", array('jquery', 'tags-suggest'), false, 1);
 
-		$scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'tags-suggest', 'tagsSuggestL10n', array(
-			'tagDelimiter' => _x( ',', 'tag delimiter' ),
-			'removeTerm'   => __( 'Remove term:' ),
-			'termSelected' => __( 'Term selected.' ),
-			'termAdded'    => __( 'Term added.' ),
-			'termRemoved'  => __( 'Term removed.' ),
-		) );
+		$scripts->add('tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array('jquery-ui-autocomplete', 'wp-a11y'), false, 1);
+		did_action('init') && $scripts->localize('tags-suggest', 'tagsSuggestL10n', array(
+			'tagDelimiter' => _x(',', 'tag delimiter'),
+			'removeTerm'   => __('Remove term:'),
+			'termSelected' => __('Term selected.'),
+			'termAdded'    => __('Term added.'),
+			'termRemoved'  => __('Term removed.'),
+		));
 
-		$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:'),
@@ -573,191 +573,191 @@ 
 			'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', 'underscore' ), false, 1 );
+		$scripts->add('editor-expand', "/wp-admin/js/editor-expand$suffix.js", array('jquery', 'underscore'), 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', 'tags-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', 'tags-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' ), false, 1 );
-		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'), false, 1);
+		did_action('init') && $scripts->localize('updates', '_wpUpdatesSettings', array(
+			'ajax_nonce' => wp_create_nonce('updates'),
 			'l10n'       => array(
 				/* translators: %s: Search string */
-				'searchResults'              => __( 'Search results for “%s”' ),
-				'searchResultsLabel'         => __( 'Search Results' ),
-				'noPlugins'                  => __( 'You do not appear to have any plugins available at this time.' ),
-				'noItemsSelected'            => __( 'Please select at least one item to perform this action on.' ),
-				'updating'                   => __( 'Updating...' ), // No ellipsis.
-				'updated'                    => __( 'Updated!' ),
-				'update'                     => __( 'Update' ),
-				'updateNow'                  => __( 'Update Now' ),
+				'searchResults'              => __('Search results for “%s”'),
+				'searchResultsLabel'         => __('Search Results'),
+				'noPlugins'                  => __('You do not appear to have any plugins available at this time.'),
+				'noItemsSelected'            => __('Please select at least one item to perform this action on.'),
+				'updating'                   => __('Updating...'), // No ellipsis.
+				'updated'                    => __('Updated!'),
+				'update'                     => __('Update'),
+				'updateNow'                  => __('Update Now'),
 				/* translators: %s: Plugin name and version */
-				'updateNowLabel'             => __( 'Update %s now' ),
-				'updateFailedShort'          => __( 'Update Failed!' ),
+				'updateNowLabel'             => __('Update %s now'),
+				'updateFailedShort'          => __('Update Failed!'),
 				/* translators: %s: Error string for a failed update */
-				'updateFailed'               => __( 'Update Failed: %s' ),
+				'updateFailed'               => __('Update Failed: %s'),
 				/* translators: %s: Plugin name and version */
-				'updatingLabel'              => __( 'Updating %s...' ), // No ellipsis.
+				'updatingLabel'              => __('Updating %s...'), // No ellipsis.
 				/* translators: %s: Plugin name and version */
-				'updatedLabel'               => __( '%s updated!' ),
+				'updatedLabel'               => __('%s updated!'),
 				/* translators: %s: 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'               => __( 'Updates may not complete if you navigate away from this page.' ),
-				'installNow'                 => __( 'Install Now' ),
+				'updateCancel'               => __('Update canceled.'),
+				'beforeunload'               => __('Updates may not complete if you navigate away from this page.'),
+				'installNow'                 => __('Install Now'),
 				/* translators: %s: Plugin name */
-				'installNowLabel'            => __( 'Install %s now' ),
-				'installing'                 => __( 'Installing...' ),
-				'installed'                  => __( 'Installed!' ),
-				'installFailedShort'         => __( 'Install Failed!' ),
+				'installNowLabel'            => __('Install %s now'),
+				'installing'                 => __('Installing...'),
+				'installed'                  => __('Installed!'),
+				'installFailedShort'         => __('Install Failed!'),
 				/* translators: %s: Error string for a failed installation */
-				'installFailed'              => __( 'Installation failed: %s' ),
+				'installFailed'              => __('Installation failed: %s'),
 				/* translators: %s: Plugin name and version */
-				'pluginInstallingLabel'      => _x( 'Installing %s...', 'plugin' ), // no ellipsis
+				'pluginInstallingLabel'      => _x('Installing %s...', 'plugin'), // no ellipsis
 				/* translators: %s: Theme name and version */
-				'themeInstallingLabel'       => _x( 'Installing %s...', 'theme' ), // no ellipsis
+				'themeInstallingLabel'       => _x('Installing %s...', 'theme'), // no ellipsis
 				/* translators: %s: Plugin name and version */
-				'pluginInstalledLabel'       => _x( '%s installed!', 'plugin' ),
+				'pluginInstalledLabel'       => _x('%s installed!', 'plugin'),
 				/* translators: %s: Theme name and version */
-				'themeInstalledLabel'        => _x( '%s installed!', 'theme' ),
+				'themeInstalledLabel'        => _x('%s installed!', 'theme'),
 				/* translators: %s: Plugin name and version */
-				'pluginInstallFailedLabel'   => _x( '%s installation failed', 'plugin' ),
+				'pluginInstallFailedLabel'   => _x('%s installation failed', 'plugin'),
 				/* translators: %s: Theme name and version */
-				'themeInstallFailedLabel'    => _x( '%s installation failed', 'theme' ),
-				'installingMsg'              => __( 'Installing... please wait.' ),
-				'installedMsg'               => __( 'Installation completed successfully.' ),
+				'themeInstallFailedLabel'    => _x('%s installation failed', 'theme'),
+				'installingMsg'              => __('Installing... please wait.'),
+				'installedMsg'               => __('Installation completed successfully.'),
 				/* translators: %s: Activation URL */
-				'importerInstalledMsg'       => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
+				'importerInstalledMsg'       => __('Importer installed successfully. <a href="%s">Run importer</a>'),
 				/* translators: %s: Theme name */
-				'aysDelete'                  => __( 'Are you sure you want to delete %s?' ),
+				'aysDelete'                  => __('Are you sure you want to delete %s?'),
 				/* translators: %s: Plugin name */
-				'aysDeleteUninstall'         => __( 'Are you sure you want to delete %s and its data?' ),
-				'aysBulkDelete'              => __( 'Are you sure you want to delete the selected plugins and their data?' ),
-				'aysBulkDeleteThemes'        => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
-				'deleting'                   => __( 'Deleting...' ),
+				'aysDeleteUninstall'         => __('Are you sure you want to delete %s and its data?'),
+				'aysBulkDelete'              => __('Are you sure you want to delete the selected plugins and their data?'),
+				'aysBulkDeleteThemes'        => __('Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?'),
+				'deleting'                   => __('Deleting...'),
 				/* translators: %s: Error string for a failed deletion */
-				'deleteFailed'               => __( 'Deletion failed: %s' ),
-				'deleted'                    => __( 'Deleted!' ),
-				'livePreview'                => __( 'Live Preview' ),
-				'activatePlugin'             => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
-				'activateTheme'              => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
+				'deleteFailed'               => __('Deletion failed: %s'),
+				'deleted'                    => __('Deleted!'),
+				'livePreview'                => __('Live Preview'),
+				'activatePlugin'             => is_network_admin() ? __('Network Activate') : __('Activate'),
+				'activateTheme'              => is_network_admin() ? __('Network Enable') : __('Activate'),
 				/* translators: %s: Plugin name */
-				'activatePluginLabel'        => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
+				'activatePluginLabel'        => is_network_admin() ? _x('Network Activate %s', 'plugin') : _x('Activate %s', 'plugin'),
 				/* translators: %s: Theme name */
-				'activateThemeLabel'         => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
-				'activateImporter'           => __( 'Run Importer' ),
+				'activateThemeLabel'         => is_network_admin() ? _x('Network Activate %s', 'theme') : _x('Activate %s', 'theme'),
+				'activateImporter'           => __('Run Importer'),
 				/* translators: %s: Importer name */
-				'activateImporterLabel'      => __( 'Run %s' ),
-				'unknownError'               => __( 'An unknown error occurred' ),
-				'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
-				'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
-				'pluginsFound'               => __( 'Number of plugins found: %d' ),
-				'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
+				'activateImporterLabel'      => __('Run %s'),
+				'unknownError'               => __('An unknown error occurred'),
+				'connectionError'            => __('Connection lost or the server is busy. Please try again later.'),
+				'nonceError'                 => __('An error has occurred. Please reload the page and try again.'),
+				'pluginsFound'               => __('Number of plugins found: %d'),
+				'noPluginsFound'             => __('No plugins found. Try a different search.'),
 			),
-		) );
+		));
 
-		$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);
 	}
 }
 
@@ -776,19 +776,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 is no longer used by core, but may be relied upon by themes and plugins.
@@ -797,19 +797,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';
 		}
 
@@ -818,66 +818,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( '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( 'dashicons', 'buttons', 'forms', 'l10n' ) );
-	$styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( '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( '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('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('dashicons', 'buttons', 'forms', 'l10n'));
+	$styles->add('install', "/wp-admin/css/install$suffix.css", array('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('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('buttons', "/wp-includes/css/buttons$suffix.css");
+	$styles->add('dashicons', "/wp-includes/css/dashicons$suffix.css");
 
 	// Includes CSS
-	$styles->add( 'admin-bar',            "/wp-includes/css/admin-bar$suffix.css", array( '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", array( 'dashicons' ) );
-	$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('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", array('dashicons'));
+	$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.22.0' );
-	$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.22.0');
+	$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( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
+	$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('open-sans', $open_sans_font_url); // No longer used in core as of 4.6
 
 	// RTL CSS
 	$rtl_styles = array(
@@ -892,10 +892,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);
 		}
 	}
 }
@@ -908,19 +908,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;
 }
@@ -934,10 +934,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(),
-	) );
+	));
 }
 
 /**
@@ -952,7 +952,7 @@ 
 function wp_localize_jquery_ui_datepicker() {
 	global $wp_locale;
 
-	if ( ! wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
+	if ( ! wp_script_is('jquery-ui-datepicker', 'enqueued')) {
 		return;
 	}
 
@@ -968,25 +968,25 @@ 
 			'MM', 'M', 'm', 'mm',
 			'yy', 'y'
 		),
-		get_option( 'date_format' )
+		get_option('date_format')
 	);
 
-	$datepicker_defaults = wp_json_encode( array(
-		'closeText'       => __( 'Close' ),
-		'currentText'     => __( 'Today' ),
-		'monthNames'      => array_values( $wp_locale->month ),
-		'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
-		'nextText'        => __( 'Next' ),
-		'prevText'        => __( 'Previous' ),
-		'dayNames'        => array_values( $wp_locale->weekday ),
-		'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
-		'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
+	$datepicker_defaults = wp_json_encode(array(
+		'closeText'       => __('Close'),
+		'currentText'     => __('Today'),
+		'monthNames'      => array_values($wp_locale->month),
+		'monthNamesShort' => array_values($wp_locale->month_abbrev),
+		'nextText'        => __('Next'),
+		'prevText'        => __('Previous'),
+		'dayNames'        => array_values($wp_locale->weekday),
+		'dayNamesShort'   => array_values($wp_locale->weekday_abbrev),
+		'dayNamesMin'     => array_values($wp_locale->weekday_initial),
 		'dateFormat'      => $datepicker_date_format,
-		'firstDay'        => absint( get_option( 'start_of_week' ) ),
+		'firstDay'        => absint(get_option('start_of_week')),
 		'isRTL'           => $wp_locale->is_rtl(),
-	) );
+	));
 
-	wp_add_inline_script( 'jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});" );
+	wp_add_inline_script('jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});");
 }
 
 /**
@@ -1009,29 +1009,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;
@@ -1057,9 +1057,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();
@@ -1075,7 +1075,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();
 	}
 
@@ -1096,7 +1096,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();
@@ -1110,7 +1110,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();
 	}
 
@@ -1130,12 +1130,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;
@@ -1143,14 +1143,14 @@ 
 			echo "</script>\n";
 		}
 
-		$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;
 }
 
@@ -1167,14 +1167,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();
@@ -1201,7 +1201,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_print_footer_scripts' );
+	do_action('wp_print_footer_scripts');
 }
 
 /**
@@ -1218,7 +1218,7 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_enqueue_scripts' );
+	do_action('wp_enqueue_scripts');
 }
 
 /**
@@ -1246,7 +1246,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();
 	}
 
@@ -1267,7 +1267,7 @@ 
 function print_late_styles() {
 	global $wp_styles, $concatenate_scripts;
 
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		return;
 	}
 
@@ -1282,7 +1282,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();
 	}
 
@@ -1304,27 +1304,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;
 }
 
@@ -1340,23 +1340,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;
 	}
 }

src/wp-includes/class-wp-http-encoding.php

Spacing +36 added lines, -36 removed lines

@@ -30,8 +30,8 @@ 
 	 * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports.
 	 * @return string|false False on failure.
 	 */
-	public static function compress( $raw, $level = 9, $supports = null ) {
-		return gzdeflate( $raw, $level );
+	public static function compress($raw, $level = 9, $supports = null) {
+		return gzdeflate($raw, $level);
 	}
 
 	/**
@@ -50,24 +50,24 @@ 
 	 * @param int $length The optional length of the compressed data.
 	 * @return string|bool False on failure.
 	 */
-	public static function decompress( $compressed, $length = null ) {
+	public static function decompress($compressed, $length = null) {
 
-		if ( empty($compressed) )
+		if (empty($compressed))
 			return $compressed;
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = @gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
+		if (false !== ($decompressed = self::compatible_gzinflate($compressed)))
 			return $decompressed;
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
+		if (false !== ($decompressed = @gzuncompress($compressed)))
 			return $decompressed;
 
-		if ( function_exists('gzdecode') ) {
-			$decompressed = @gzdecode( $compressed );
+		if (function_exists('gzdecode')) {
+			$decompressed = @gzdecode($compressed);
 
-			if ( false !== $decompressed )
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
@@ -99,29 +99,29 @@ 
 	public static function compatible_gzinflate($gzData) {
 
 		// Compressed data might contain a full header, if so strip it for gzinflate().
-		if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
+		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
-			$flg = ord( substr($gzData, 3, 1) );
-			if ( $flg > 0 ) {
-				if ( $flg & 4 ) {
-					list($xlen) = unpack('v', substr($gzData, $i, 2) );
+			$flg = ord(substr($gzData, 3, 1));
+			if ($flg > 0) {
+				if ($flg & 4) {
+					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
+				if ($flg & 8)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
+				if ($flg & 16)
 					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
+				if ($flg & 2)
 					$i = $i + 2;
 			}
-			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
+			$decompressed = @gzinflate(substr($gzData, $i, -8));
+			if (false !== $decompressed)
 				return $decompressed;
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
-		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
+		$decompressed = @gzinflate(substr($gzData, 2));
+		if (false !== $decompressed)
 			return $decompressed;
 
 		return false;
@@ -138,25 +138,25 @@ 
 	 * @param array  $args
 	 * @return string Types of encoding to accept.
 	 */
-	public static function accept_encoding( $url, $args ) {
+	public static function accept_encoding($url, $args) {
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress']) // Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		elseif ($args['stream']) // Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		elseif (isset($args['limit_response_size'])) // If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
 
-		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
+		if ($compression_enabled) {
+			if (function_exists('gzinflate'))
 				$type[] = 'deflate;q=1.0';
 
-			if ( function_exists( 'gzuncompress' ) )
+			if (function_exists('gzuncompress'))
 				$type[] = 'compress;q=0.5';
 
-			if ( function_exists( 'gzdecode' ) )
+			if (function_exists('gzdecode'))
 				$type[] = 'gzip;q=0.5';
 		}
 
@@ -170,7 +170,7 @@ 
 		 * @param string $url  URL of the HTTP request.
 		 * @param array  $args HTTP request arguments.
 		 */
-		$type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
+		$type = apply_filters('wp_http_accept_encoding', $type, $url, $args);
 
 		return implode(', ', $type);
 	}
@@ -199,11 +199,11 @@ 
 	 * @return bool
 	 */
 	public static function should_decode($headers) {
-		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
+		if (is_array($headers)) {
+			if (array_key_exists('content-encoding', $headers) && ! empty($headers['content-encoding']))
 				return true;
-		} elseif ( is_string( $headers ) ) {
-			return ( stripos($headers, 'content-encoding:') !== false );
+		} elseif (is_string($headers)) {
+			return (stripos($headers, 'content-encoding:') !== false);
 		}
 
 		return false;
@@ -223,6 +223,6 @@ 
 	 * @return bool
 	 */
 	public static function is_available() {
-		return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
+		return (function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate'));
 	}
 }

Braces +49 added lines, -31 removed lines

@@ -52,23 +52,28 @@ 
 	 */
 	public static function decompress( $compressed, $length = null ) {
 
-		if ( empty($compressed) )
-			return $compressed;
+		if ( empty($compressed) ) {
+					return $compressed;
+		}
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) {
+					return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
-			return $decompressed;
+		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) {
+					return $decompressed;
+		}
 
 		if ( function_exists('gzdecode') ) {
 			$decompressed = @gzdecode( $compressed );
 
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		return $compressed;
@@ -107,22 +112,27 @@ 
 					list($xlen) = unpack('v', substr($gzData, $i, 2) );
 					$i = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
-					$i = $i + 2;
+				if ( $flg & 8 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 16 ) {
+									$i = strpos($gzData, "\0", $i) + 1;
+				}
+				if ( $flg & 2 ) {
+									$i = $i + 2;
+				}
 			}
 			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
-				return $decompressed;
+			if ( false !== $decompressed ) {
+							return $decompressed;
+			}
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
 		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
-			return $decompressed;
+		if ( false !== $decompressed ) {
+					return $decompressed;
+		}
 
 		return false;
 	}
@@ -142,22 +152,29 @@ 
 		$type = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress'] ) {
+			// Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		} elseif ( $args['stream'] ) {
+			// Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		} elseif ( isset( $args['limit_response_size'] ) ) {
+			// If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
+		}
 
 		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
-				$type[] = 'deflate;q=1.0';
+			if ( function_exists( 'gzinflate' ) ) {
+							$type[] = 'deflate;q=1.0';
+			}
 
-			if ( function_exists( 'gzuncompress' ) )
-				$type[] = 'compress;q=0.5';
+			if ( function_exists( 'gzuncompress' ) ) {
+							$type[] = 'compress;q=0.5';
+			}
 
-			if ( function_exists( 'gzdecode' ) )
-				$type[] = 'gzip;q=0.5';
+			if ( function_exists( 'gzdecode' ) ) {
+							$type[] = 'gzip;q=0.5';
+			}
 		}
 
 		/**
@@ -200,8 +217,9 @@ 
 	 */
 	public static function should_decode($headers) {
 		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
-				return true;
+			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) ) {
+							return true;
+			}
 		} elseif ( is_string( $headers ) ) {
 			return ( stripos($headers, 'content-encoding:') !== false );
 		}

src/wp-includes/pomo/entry.php

Spacing +14 added lines, -14 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage entry
  */
 
-if ( ! class_exists( 'Translation_Entry', false ) ):
+if ( ! class_exists('Translation_Entry', false)):
 /**
  * Translation_Entry class encapsulates a translatable string
  */
@@ -40,9 +40,9 @@ 
 	 * 	- references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
 	 * 	- flags (array) -- flags like php-format
 	 */
-	function __construct( $args = array() ) {
+	function __construct($args = array()) {
 		// if no singular -- empty object
-		if (!isset($args['singular'])) {
+		if ( ! isset($args['singular'])) {
 			return;
 		}
 		// get member variable values from args hash
@@ -50,16 +50,16 @@ 
 			$this->$varname = $value;
 		}
 		if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
-		if (!is_array($this->translations)) $this->translations = array();
-		if (!is_array($this->references)) $this->references = array();
-		if (!is_array($this->flags)) $this->flags = array();
+		if ( ! is_array($this->translations)) $this->translations = array();
+		if ( ! is_array($this->references)) $this->references = array();
+		if ( ! is_array($this->flags)) $this->flags = array();
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Translation_Entry( $args = array() ) {
-		self::__construct( $args );
+	public function Translation_Entry($args = array()) {
+		self::__construct($args);
 	}
 
 	/**
@@ -68,12 +68,12 @@ 
 	 * @return string|bool the key or false if the entry is empty
 	 */
 	function key() {
-		if ( null === $this->singular || '' === $this->singular ) return false;
+		if (null === $this->singular || '' === $this->singular) return false;
 
 		// Prepend context and EOT, like in MO files
-		$key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;
+		$key = ! $this->context ? $this->singular : $this->context.chr(4).$this->singular;
 		// Standardize on \n line endings
-		$key = str_replace( array( "\r\n", "\r" ), "\n", $key );
+		$key = str_replace(array("\r\n", "\r"), "\n", $key);
 
 		return $key;
 	}
@@ -82,9 +82,9 @@ 
 	 * @param object $other
 	 */
 	function merge_with(&$other) {
-		$this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
-		$this->references = array_unique( array_merge( $this->references, $other->references ) );
-		if ( $this->extracted_comments != $other->extracted_comments ) {
+		$this->flags = array_unique(array_merge($this->flags, $other->flags));
+		$this->references = array_unique(array_merge($this->references, $other->references));
+		if ($this->extracted_comments != $other->extracted_comments) {
 			$this->extracted_comments .= $other->extracted_comments;
 		}
 

Braces +15 added lines, -5 removed lines

@@ -49,10 +49,18 @@ 
 		foreach ($args as $varname => $value) {
 			$this->$varname = $value;
 		}
-		if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
-		if (!is_array($this->translations)) $this->translations = array();
-		if (!is_array($this->references)) $this->references = array();
-		if (!is_array($this->flags)) $this->flags = array();
+		if (isset($args['plural']) && $args['plural']) {
+			$this->is_plural = true;
+		}
+		if (!is_array($this->translations)) {
+			$this->translations = array();
+		}
+		if (!is_array($this->references)) {
+			$this->references = array();
+		}
+		if (!is_array($this->flags)) {
+			$this->flags = array();
+		}
 	}
 
 	/**
@@ -68,7 +76,9 @@ 
 	 * @return string|bool the key or false if the entry is empty
 	 */
 	function key() {
-		if ( null === $this->singular || '' === $this->singular ) return false;
+		if ( null === $this->singular || '' === $this->singular ) {
+			return false;
+		}
 
 		// Prepend context and EOT, like in MO files
 		$key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;

src/wp-includes/widgets/class-wp-nav-menu-widget.php

Braces +6 added lines, -4 removed lines

@@ -41,16 +41,18 @@
 		// Get menu
 		$nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
 
-		if ( !$nav_menu )
-			return;
+		if ( !$nav_menu ) {
+					return;
+		}
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
 		echo $args['before_widget'];
 
-		if ( !empty($instance['title']) )
-			echo $args['before_title'] . $instance['title'] . $args['after_title'];
+		if ( !empty($instance['title']) ) {
+					echo $args['before_title'] . $instance['title'] . $args['after_title'];
+		}
 
 		$nav_menu_args = array(
 			'fallback_cb' => '',

Spacing +32 added lines, -32 removed lines

@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Add a custom menu to your sidebar.' ),
+			'description' => __('Add a custom menu to your sidebar.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
+		parent::__construct('nav_menu', __('Custom Menu'), $widget_ops);
 	}
 
 	/**
@@ -40,20 +40,20 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Custom Menu widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		// Get menu
-		$nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
+		$nav_menu = ! empty($instance['nav_menu']) ? wp_get_nav_menu_object($instance['nav_menu']) : false;
 
-		if ( !$nav_menu )
+		if ( ! $nav_menu)
 			return;
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$instance['title'] = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
 
-		if ( !empty($instance['title']) )
-			echo $args['before_title'] . $instance['title'] . $args['after_title'];
+		if ( ! empty($instance['title']))
+			echo $args['before_title'].$instance['title'].$args['after_title'];
 
 		$nav_menu_args = array(
 			'fallback_cb' => '',
@@ -76,7 +76,7 @@ 
 		 * @param array    $args          Display arguments for the current widget.
 		 * @param array    $instance      Array of settings for the current widget.
 		 */
-		wp_nav_menu( apply_filters( 'widget_nav_menu_args', $nav_menu_args, $nav_menu, $args, $instance ) );
+		wp_nav_menu(apply_filters('widget_nav_menu_args', $nav_menu_args, $nav_menu, $args, $instance));
 
 		echo $args['after_widget'];
 	}
@@ -92,12 +92,12 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = array();
-		if ( ! empty( $new_instance['title'] ) ) {
-			$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		if ( ! empty($new_instance['title'])) {
+			$instance['title'] = sanitize_text_field($new_instance['title']);
 		}
-		if ( ! empty( $new_instance['nav_menu'] ) ) {
+		if ( ! empty($new_instance['nav_menu'])) {
 			$instance['nav_menu'] = (int) $new_instance['nav_menu'];
 		}
 		return $instance;
@@ -112,45 +112,45 @@ 
 	 * @param array $instance Current settings.
 	 * @global WP_Customize_Manager $wp_customize
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		global $wp_customize;
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
-		$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
+		$title = isset($instance['title']) ? $instance['title'] : '';
+		$nav_menu = isset($instance['nav_menu']) ? $instance['nav_menu'] : '';
 
 		// Get menus
 		$menus = wp_get_nav_menus();
 
 		// If no menus exists, direct the user to go and create some.
 		?>
-		<p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+		<p class="nav-menu-widget-no-menus-message" <?php if ( ! empty($menus)) { echo ' style="display:none" '; } ?>>
 			<?php
-			if ( $wp_customize instanceof WP_Customize_Manager ) {
+			if ($wp_customize instanceof WP_Customize_Manager) {
 				$url = 'javascript: wp.customize.panel( "nav_menus" ).focus();';
 			} else {
-				$url = admin_url( 'nav-menus.php' );
+				$url = admin_url('nav-menus.php');
 			}
 			?>
-			<?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
+			<?php echo sprintf(__('No menus have been created yet. <a href="%s">Create some</a>.'), esc_attr($url)); ?>
 		</p>
-		<div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+		<div class="nav-menu-widget-form-controls" <?php if (empty($menus)) { echo ' style="display:none" '; } ?>>
 			<p>
-				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ) ?></label>
-				<input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>"/>
+				<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
+				<input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($title); ?>"/>
 			</p>
 			<p>
-				<label for="<?php echo $this->get_field_id( 'nav_menu' ); ?>"><?php _e( 'Select Menu:' ); ?></label>
-				<select id="<?php echo $this->get_field_id( 'nav_menu' ); ?>" name="<?php echo $this->get_field_name( 'nav_menu' ); ?>">
-					<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-					<?php foreach ( $menus as $menu ) : ?>
-						<option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>>
-							<?php echo esc_html( $menu->name ); ?>
+				<label for="<?php echo $this->get_field_id('nav_menu'); ?>"><?php _e('Select Menu:'); ?></label>
+				<select id="<?php echo $this->get_field_id('nav_menu'); ?>" name="<?php echo $this->get_field_name('nav_menu'); ?>">
+					<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+					<?php foreach ($menus as $menu) : ?>
+						<option value="<?php echo esc_attr($menu->term_id); ?>" <?php selected($nav_menu, $menu->term_id); ?>>
+							<?php echo esc_html($menu->name); ?>
 						</option>
 					<?php endforeach; ?>
 				</select>
 			</p>
-			<?php if ( $wp_customize instanceof WP_Customize_Manager ) : ?>
-				<p class="edit-selected-nav-menu" style="<?php if ( ! $nav_menu ) { echo 'display: none;'; } ?>">
-					<button type="button" class="button"><?php _e( 'Edit Menu' ) ?></button>
+			<?php if ($wp_customize instanceof WP_Customize_Manager) : ?>
+				<p class="edit-selected-nav-menu" style="<?php if ( ! $nav_menu) { echo 'display: none;'; } ?>">
+					<button type="button" class="button"><?php _e('Edit Menu') ?></button>
 				</p>
 			<?php endif; ?>
 		</div>

src/wp-includes/widgets/class-wp-widget-pages.php

Braces +3 added lines, -2 removed lines

@@ -53,8 +53,9 @@
 		$sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
 		$exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
 
-		if ( $sortby == 'menu_order' )
-			$sortby = 'menu_order, post_title';
+		if ( $sortby == 'menu_order' ) {
+					$sortby = 'menu_order, post_title';
+		}
 
 		/**
 		 * Filter the arguments for the Pages widget.

Spacing +28 added lines, -28 removed lines

@@ -25,10 +25,10 @@ 
 	public function __construct() {
 		$widget_ops = array(
 			'classname' => 'widget_pages',
-			'description' => __( 'A list of your site’s Pages.' ),
+			'description' => __('A list of your site’s Pages.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'pages', __( 'Pages' ), $widget_ops );
+		parent::__construct('pages', __('Pages'), $widget_ops);
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Pages widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		/**
 		 * Filter the widget title.
@@ -52,12 +52,12 @@ 
 		 * @param array  $instance An array of the widget's settings.
 		 * @param mixed  $id_base  The widget ID.
 		 */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? __('Pages') : $instance['title'], $instance, $this->id_base);
 
-		$sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
-		$exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
+		$sortby = empty($instance['sortby']) ? 'menu_order' : $instance['sortby'];
+		$exclude = empty($instance['exclude']) ? '' : $instance['exclude'];
 
-		if ( $sortby == 'menu_order' )
+		if ($sortby == 'menu_order')
 			$sortby = 'menu_order, post_title';
 
 		/**
@@ -69,17 +69,17 @@ 
 		 *
 		 * @param array $args An array of arguments to retrieve the pages list.
 		 */
-		$out = wp_list_pages( apply_filters( 'widget_pages_args', array(
+		$out = wp_list_pages(apply_filters('widget_pages_args', array(
 			'title_li'    => '',
 			'echo'        => 0,
 			'sort_column' => $sortby,
 			'exclude'     => $exclude
-		) ) );
+		)));
 
-		if ( ! empty( $out ) ) {
+		if ( ! empty($out)) {
 			echo $args['before_widget'];
-			if ( $title ) {
-				echo $args['before_title'] . $title . $args['after_title'];
+			if ($title) {
+				echo $args['before_title'].$title.$args['after_title'];
 			}
 		?>
 		<ul>
@@ -101,16 +101,16 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
+		$instance['title'] = sanitize_text_field($new_instance['title']);
+		if (in_array($new_instance['sortby'], array('post_title', 'menu_order', 'ID'))) {
 			$instance['sortby'] = $new_instance['sortby'];
 		} else {
 			$instance['sortby'] = 'menu_order';
 		}
 
-		$instance['exclude'] = sanitize_text_field( $new_instance['exclude'] );
+		$instance['exclude'] = sanitize_text_field($new_instance['exclude']);
 
 		return $instance;
 	}
@@ -123,27 +123,27 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
+		$instance = wp_parse_args((array) $instance, array('sortby' => 'post_title', 'title' => '', 'exclude' => ''));
 		?>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:' ); ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title:'); ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" type="text" value="<?php echo esc_attr($instance['title']); ?>" />
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>"><?php _e( 'Sort by:' ); ?></label>
-			<select name="<?php echo esc_attr( $this->get_field_name( 'sortby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>" class="widefat">
-				<option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
-				<option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
-				<option value="ID"<?php selected( $instance['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
+			<label for="<?php echo esc_attr($this->get_field_id('sortby')); ?>"><?php _e('Sort by:'); ?></label>
+			<select name="<?php echo esc_attr($this->get_field_name('sortby')); ?>" id="<?php echo esc_attr($this->get_field_id('sortby')); ?>" class="widefat">
+				<option value="post_title"<?php selected($instance['sortby'], 'post_title'); ?>><?php _e('Page title'); ?></option>
+				<option value="menu_order"<?php selected($instance['sortby'], 'menu_order'); ?>><?php _e('Page order'); ?></option>
+				<option value="ID"<?php selected($instance['sortby'], 'ID'); ?>><?php _e('Page ID'); ?></option>
 			</select>
 		</p>
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>"><?php _e( 'Exclude:' ); ?></label>
-			<input type="text" value="<?php echo esc_attr( $instance['exclude'] ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'exclude' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>" class="widefat" />
+			<label for="<?php echo esc_attr($this->get_field_id('exclude')); ?>"><?php _e('Exclude:'); ?></label>
+			<input type="text" value="<?php echo esc_attr($instance['exclude']); ?>" name="<?php echo esc_attr($this->get_field_name('exclude')); ?>" id="<?php echo esc_attr($this->get_field_id('exclude')); ?>" class="widefat" />
 			<br />
-			<small><?php _e( 'Page IDs, separated by commas.' ); ?></small>
+			<small><?php _e('Page IDs, separated by commas.'); ?></small>
 		</p>
 		<?php
 	}

src/wp-includes/widgets/class-wp-widget-links.php

Braces +9 added lines, -6 removed lines

@@ -94,13 +94,15 @@ 
 		$new_instance = (array) $new_instance;
 		$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
 		foreach ( $instance as $field => $val ) {
-			if ( isset($new_instance[$field]) )
-				$instance[$field] = 1;
+			if ( isset($new_instance[$field]) ) {
+							$instance[$field] = 1;
+			}
 		}
 
 		$instance['orderby'] = 'name';
-		if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
-			$instance['orderby'] = $new_instance['orderby'];
+		if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) {
+					$instance['orderby'] = $new_instance['orderby'];
+		}
 
 		$instance['category'] = intval( $new_instance['category'] );
 		$instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
@@ -121,8 +123,9 @@ 
 		//Defaults
 		$instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
 		$link_cats = get_terms( 'link_category' );
-		if ( ! $limit = intval( $instance['limit'] ) )
-			$limit = -1;
+		if ( ! $limit = intval( $instance['limit'] ) ) {
+					$limit = -1;
+		}
 			?>
 		<p>
 		<label for="<?php echo $this->get_field_id('category'); ?>"><?php _e( 'Select Link Category:' ); ?></label>

Spacing +30 added lines, -30 removed lines

@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Your blogroll' ),
+			'description' => __('Your blogroll'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'links', __( 'Links' ), $widget_ops );
+		parent::__construct('links', __('Links'), $widget_ops);
 	}
 
 	/**
@@ -40,17 +40,17 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Links widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		$show_description = isset($instance['description']) ? $instance['description'] : false;
 		$show_name = isset($instance['name']) ? $instance['name'] : false;
 		$show_rating = isset($instance['rating']) ? $instance['rating'] : false;
 		$show_images = isset($instance['images']) ? $instance['images'] : true;
 		$category = isset($instance['category']) ? $instance['category'] : false;
-		$orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
+		$orderby = isset($instance['orderby']) ? $instance['orderby'] : 'name';
 		$order = $orderby == 'rating' ? 'DESC' : 'ASC';
-		$limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
+		$limit = isset($instance['limit']) ? $instance['limit'] : -1;
 
-		$before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] );
+		$before_widget = preg_replace('/id="[^"]*"/', 'id="%id"', $args['before_widget']);
 
 		$widget_links_args = array(
 			'title_before'     => $args['before_title'],
@@ -79,7 +79,7 @@ 
 		 * @param array $widget_links_args An array of arguments to retrieve the links list.
 		 * @param array $instance          The settings for the particular instance of the widget.
 		 */
-		wp_list_bookmarks( apply_filters( 'widget_links_args', $widget_links_args, $instance ) );
+		wp_list_bookmarks(apply_filters('widget_links_args', $widget_links_args, $instance));
 	}
 
 	/**
@@ -93,20 +93,20 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$new_instance = (array) $new_instance;
-		$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
-		foreach ( $instance as $field => $val ) {
-			if ( isset($new_instance[$field]) )
+		$instance = array('images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0);
+		foreach ($instance as $field => $val) {
+			if (isset($new_instance[$field]))
 				$instance[$field] = 1;
 		}
 
 		$instance['orderby'] = 'name';
-		if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
+		if (in_array($new_instance['orderby'], array('name', 'rating', 'id', 'rand')))
 			$instance['orderby'] = $new_instance['orderby'];
 
-		$instance['category'] = intval( $new_instance['category'] );
-		$instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
+		$instance['category'] = intval($new_instance['category']);
+		$instance['limit'] = ! empty($new_instance['limit']) ? intval($new_instance['limit']) : -1;
 
 		return $instance;
 	}
@@ -119,32 +119,32 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
-		$link_cats = get_terms( 'link_category' );
-		if ( ! $limit = intval( $instance['limit'] ) )
+		$instance = wp_parse_args((array) $instance, array('images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1));
+		$link_cats = get_terms('link_category');
+		if ( ! $limit = intval($instance['limit']))
 			$limit = -1;
 			?>
 		<p>
-		<label for="<?php echo $this->get_field_id('category'); ?>"><?php _e( 'Select Link Category:' ); ?></label>
+		<label for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Select Link Category:'); ?></label>
 		<select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">
 		<option value=""><?php _ex('All Links', 'links widget'); ?></option>
 		<?php
-		foreach ( $link_cats as $link_cat ) {
-			echo '<option value="' . intval( $link_cat->term_id ) . '"'
-				. selected( $instance['category'], $link_cat->term_id, false )
-				. '>' . $link_cat->name . "</option>\n";
+		foreach ($link_cats as $link_cat) {
+			echo '<option value="'.intval($link_cat->term_id).'"'
+				. selected($instance['category'], $link_cat->term_id, false)
+				. '>'.$link_cat->name."</option>\n";
 		}
 		?>
 		</select>
-		<label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label>
+		<label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e('Sort by:'); ?></label>
 		<select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat">
-			<option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option>
-			<option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option>
-			<option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
-			<option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _ex( 'Random', 'Links widget' ); ?></option>
+			<option value="name"<?php selected($instance['orderby'], 'name'); ?>><?php _e('Link title'); ?></option>
+			<option value="rating"<?php selected($instance['orderby'], 'rating'); ?>><?php _e('Link rating'); ?></option>
+			<option value="id"<?php selected($instance['orderby'], 'id'); ?>><?php _e('Link ID'); ?></option>
+			<option value="rand"<?php selected($instance['orderby'], 'rand'); ?>><?php _ex('Random', 'Links widget'); ?></option>
 		</select>
 		</p>
 		<p>
@@ -158,8 +158,8 @@ 
 		<label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
 		</p>
 		<p>
-		<label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e( 'Number of links to show:' ); ?></label>
-		<input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
+		<label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e('Number of links to show:'); ?></label>
+		<input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval($limit); ?>" size="3" />
 		</p>
 		<?php
 	}

src/wp-includes/widgets/class-wp-widget-rss.php

Braces +27 added lines, -18 removed lines

@@ -39,19 +39,23 @@ 
 	 * @param array $instance Settings for the current RSS widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		if ( isset($instance['error']) && $instance['error'] )
-			return;
+		if ( isset($instance['error']) && $instance['error'] ) {
+					return;
+		}
 
 		$url = ! empty( $instance['url'] ) ? $instance['url'] : '';
-		while ( stristr($url, 'http') != $url )
-			$url = substr($url, 1);
+		while ( stristr($url, 'http') != $url ) {
+					$url = substr($url, 1);
+		}
 
-		if ( empty($url) )
-			return;
+		if ( empty($url) ) {
+					return;
+		}
 
 		// self-url destruction sequence
-		if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
-			return;
+		if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) ) {
+					return;
+		}
 
 		$rss = fetch_feed($url);
 		$title = $instance['title'];
@@ -60,23 +64,27 @@ 
 
 		if ( ! is_wp_error($rss) ) {
 			$desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
-			if ( empty($title) )
-				$title = strip_tags( $rss->get_title() );
+			if ( empty($title) ) {
+							$title = strip_tags( $rss->get_title() );
+			}
 			$link = strip_tags( $rss->get_permalink() );
-			while ( stristr($link, 'http') != $link )
-				$link = substr($link, 1);
+			while ( stristr($link, 'http') != $link ) {
+							$link = substr($link, 1);
+			}
 		}
 
-		if ( empty($title) )
-			$title = empty($desc) ? __('Unknown Feed') : $desc;
+		if ( empty($title) ) {
+					$title = empty($desc) ? __('Unknown Feed') : $desc;
+		}
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
 		$url = strip_tags( $url );
 		$icon = includes_url( 'images/rss.png' );
-		if ( $title )
-			$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">'. esc_html( $title ) . '</a>';
+		if ( $title ) {
+					$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">'. esc_html( $title ) . '</a>';
+		}
 
 		echo $args['before_widget'];
 		if ( $title ) {
@@ -85,8 +93,9 @@ 
 		wp_widget_rss_output( $rss, $instance );
 		echo $args['after_widget'];
 
-		if ( ! is_wp_error($rss) )
-			$rss->__destruct();
+		if ( ! is_wp_error($rss) ) {
+					$rss->__destruct();
+		}
 		unset($rss);
 	}
 

Spacing +31 added lines, -31 removed lines

@@ -24,11 +24,11 @@ 
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Entries from any RSS or Atom feed.' ),
+			'description' => __('Entries from any RSS or Atom feed.'),
 			'customize_selective_refresh' => true,
 		);
-		$control_ops = array( 'width' => 400, 'height' => 200 );
-		parent::__construct( 'rss', __( 'RSS' ), $widget_ops, $control_ops );
+		$control_ops = array('width' => 400, 'height' => 200);
+		parent::__construct('rss', __('RSS'), $widget_ops, $control_ops);
 	}
 
 	/**
@@ -41,19 +41,19 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current RSS widget instance.
 	 */
-	public function widget( $args, $instance ) {
-		if ( isset($instance['error']) && $instance['error'] )
+	public function widget($args, $instance) {
+		if (isset($instance['error']) && $instance['error'])
 			return;
 
-		$url = ! empty( $instance['url'] ) ? $instance['url'] : '';
-		while ( stristr($url, 'http') != $url )
+		$url = ! empty($instance['url']) ? $instance['url'] : '';
+		while (stristr($url, 'http') != $url)
 			$url = substr($url, 1);
 
-		if ( empty($url) )
+		if (empty($url))
 			return;
 
 		// self-url destruction sequence
-		if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
+		if (in_array(untrailingslashit($url), array(site_url(), home_url())))
 			return;
 
 		$rss = fetch_feed($url);
@@ -61,34 +61,34 @@ 
 		$desc = '';
 		$link = '';
 
-		if ( ! is_wp_error($rss) ) {
+		if ( ! is_wp_error($rss)) {
 			$desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
-			if ( empty($title) )
-				$title = strip_tags( $rss->get_title() );
-			$link = strip_tags( $rss->get_permalink() );
-			while ( stristr($link, 'http') != $link )
+			if (empty($title))
+				$title = strip_tags($rss->get_title());
+			$link = strip_tags($rss->get_permalink());
+			while (stristr($link, 'http') != $link)
 				$link = substr($link, 1);
 		}
 
-		if ( empty($title) )
+		if (empty($title))
 			$title = empty($desc) ? __('Unknown Feed') : $desc;
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
-		$url = strip_tags( $url );
-		$icon = includes_url( 'images/rss.png' );
-		if ( $title )
-			$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">'. esc_html( $title ) . '</a>';
+		$url = strip_tags($url);
+		$icon = includes_url('images/rss.png');
+		if ($title)
+			$title = '<a class="rsswidget" href="'.esc_url($url).'"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="'.esc_url($icon).'" alt="RSS" /></a> <a class="rsswidget" href="'.esc_url($link).'">'.esc_html($title).'</a>';
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
-		wp_widget_rss_output( $rss, $instance );
+		wp_widget_rss_output($rss, $instance);
 		echo $args['after_widget'];
 
-		if ( ! is_wp_error($rss) )
+		if ( ! is_wp_error($rss))
 			$rss->__destruct();
 		unset($rss);
 	}
@@ -104,9 +104,9 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
-		$testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
-		return wp_widget_rss_process( $new_instance, $testurl );
+	public function update($new_instance, $old_instance) {
+		$testurl = (isset($new_instance['url']) && ( ! isset($old_instance['url']) || ($new_instance['url'] != $old_instance['url'])));
+		return wp_widget_rss_process($new_instance, $testurl);
 	}
 
 	/**
@@ -117,12 +117,12 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
-		if ( empty( $instance ) ) {
-			$instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 );
+	public function form($instance) {
+		if (empty($instance)) {
+			$instance = array('title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0);
 		}
 		$instance['number'] = $this->number;
 
-		wp_widget_rss_form( $instance );
+		wp_widget_rss_form($instance);
 	}
 }