ntwb / wordpress

src/wp-includes/shortcodes.php

Indentation +33 added lines, -33 removed lines

@@ -1,34 +1,34 @@ 
 <?php
 /**
- * WordPress API for creating bbcode like tags or what WordPress calls
- * "shortcodes." The tag and attribute parsing or regular expression code is
- * based on the Textpattern tag parser.
- *
- * A few examples are below:
- *
- * [shortcode /]
- * [shortcode foo="bar" baz="bing" /]
- * [shortcode foo="bar"]content[/shortcode]
- *
- * Shortcode tags support attributes and enclosed content, but does not entirely
- * support inline shortcodes in other shortcodes. You will have to call the
- * shortcode parser in your function to account for that.
- *
- * {@internal
- * Please be aware that the above note was made during the beta of WordPress 2.6
- * and in the future may not be accurate. Please update the note when it is no
- * longer the case.}}
- *
- * To apply shortcode tags to content:
- *
- *     $out = do_shortcode( $content );
- *
- * @link https://codex.wordpress.org/Shortcode_API
- *
- * @package WordPress
- * @subpackage Shortcodes
- * @since 2.5.0
- */
+	 * WordPress API for creating bbcode like tags or what WordPress calls
+	 * "shortcodes." The tag and attribute parsing or regular expression code is
+	 * based on the Textpattern tag parser.
+	 *
+	 * A few examples are below:
+	 *
+	 * [shortcode /]
+	 * [shortcode foo="bar" baz="bing" /]
+	 * [shortcode foo="bar"]content[/shortcode]
+	 *
+	 * Shortcode tags support attributes and enclosed content, but does not entirely
+	 * support inline shortcodes in other shortcodes. You will have to call the
+	 * shortcode parser in your function to account for that.
+	 *
+	 * {@internal
+	 * Please be aware that the above note was made during the beta of WordPress 2.6
+	 * and in the future may not be accurate. Please update the note when it is no
+	 * longer the case.}}
+	 *
+	 * To apply shortcode tags to content:
+	 *
+	 *     $out = do_shortcode( $content );
+	 *
+	 * @link https://codex.wordpress.org/Shortcode_API
+	 *
+	 * @package WordPress
+	 * @subpackage Shortcodes
+	 * @since 2.5.0
+	 */
 
 /**
  * Container for storing shortcode tags and their hook to call for the shortcode
@@ -426,11 +426,11 @@ 
  * @return string Content with placeholders removed.
  */
 function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
+		// Clean up entire string, avoids re-parsing HTML.
+		$trans = array( '&#91;' => '[', '&#93;' => ']' );
+		$content = strtr( $content, $trans );
 
-        return $content;
+		return $content;
 }
 
 /**

Doc Comments +2 added lines, -2 removed lines

@@ -300,7 +300,7 @@ 
  *
  * @global array $shortcode_tags
  *
- * @param array $m Regular expression match array
+ * @param string[] $m Regular expression match array
  * @return string|false False on failure.
  */
 function do_shortcode_tag( $m ) {
@@ -602,7 +602,7 @@ 
  * @since 3.3.0
  *
  * @param array $m RegEx matches against post content.
- * @return string|false The content stripped of the tag, otherwise false.
+ * @return string The content stripped of the tag, otherwise false.
  */
 function strip_shortcode_tag( $m ) {
 	// allow [[foo]] syntax for escaping a tag

Spacing +106 added lines, -106 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;
 }
@@ -250,13 +250,13 @@ 
  * @param array $tagnames List of shortcodes to find. Optional. 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.
@@ -288,7 +288,7 @@ 
 		.         '\\[\\/\\2\\]'             // Closing shortcode tag
 		.     ')?'
 		. ')'
-		. '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
+		. '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
 }
 
 /**
@@ -303,30 +303,30 @@ 
  * @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];
 	}
 
-	if ( isset( $m[5] ) ) {
+	if (isset($m[5])) {
 		// enclosing tag - extra parameter
-		return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
+		return $m[1].call_user_func($shortcode_tags[$tag], $attr, $m[5], $tag).$m[6];
 	} else {
 		// self-closing tag
-		return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null,  $tag ) . $m[6];
+		return $m[1].call_user_func($shortcode_tags[$tag], $attr, null, $tag).$m[6];
 	}
 }
 
@@ -345,93 +345,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;
 }
@@ -444,10 +444,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;
 }
@@ -482,13 +482,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]);
@@ -497,9 +497,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 = '';
 				}
 			}
@@ -527,11 +527,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;
@@ -550,8 +550,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;
@@ -567,31 +567,31 @@ 
  * @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 );
-	$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, 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;
 }
@@ -604,11 +604,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];
 }

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

src/wp-includes/kses.php

Indentation +30 added lines, -30 removed lines

@@ -1,35 +1,35 @@
 <?php
 /**
- * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
- * Copyright (C) 2002, 2003, 2005  Ulf Harnhammar
- *
- * This program is free software and open source software; you can redistribute
- * it and/or modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- * http://www.gnu.org/licenses/gpl.html
- *
- * [kses strips evil scripts!]
- *
- * Added wp_ prefix to avoid conflicts with existing kses users
- *
- * @version 0.2.2
- * @copyright (C) 2002, 2003, 2005
- * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
- *
- * @package External
- * @subpackage KSES
- *
- */
+	 * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
+	 * Copyright (C) 2002, 2003, 2005  Ulf Harnhammar
+	 *
+	 * This program is free software and open source software; you can redistribute
+	 * it and/or modify it under the terms of the GNU General Public License as
+	 * published by the Free Software Foundation; either version 2 of the License,
+	 * or (at your option) any later version.
+	 *
+	 * This program is distributed in the hope that it will be useful, but WITHOUT
+	 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+	 * more details.
+	 *
+	 * You should have received a copy of the GNU General Public License along
+	 * with this program; if not, write to the Free Software Foundation, Inc.,
+	 * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+	 * http://www.gnu.org/licenses/gpl.html
+	 *
+	 * [kses strips evil scripts!]
+	 *
+	 * Added wp_ prefix to avoid conflicts with existing kses users
+	 *
+	 * @version 0.2.2
+	 * @copyright (C) 2002, 2003, 2005
+	 * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
+	 *
+	 * @package External
+	 * @subpackage KSES
+	 *
+	 */
 
 /**
  * You can override this in a plugin.

Braces +143 added lines, -92 removed lines

@@ -41,8 +41,9 @@ 
  *
  * @since 1.2.0
  */
-if ( ! defined( 'CUSTOM_TAGS' ) )
+if ( ! defined( 'CUSTOM_TAGS' ) ) {
 	define( 'CUSTOM_TAGS', false );
+}
 
 // Ensure that these variables are added to the global namespace
 // (e.g. if using namespaces / autoload in the current PHP environment).
@@ -519,8 +520,9 @@ 
  * @return string Filtered content with only allowed HTML elements
  */
 function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
-	if ( empty( $allowed_protocols ) )
-		$allowed_protocols = wp_allowed_protocols();
+	if ( empty( $allowed_protocols ) ) {
+			$allowed_protocols = wp_allowed_protocols();
+	}
 	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
 	$string = wp_kses_js_entities($string);
 	$string = wp_kses_normalize_entities($string);
@@ -758,16 +760,19 @@ 
 function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
 	$string = wp_kses_stripslashes($string);
 
-	if (substr($string, 0, 1) != '<')
-		return '&gt;';
+	if (substr($string, 0, 1) != '<') {
+			return '&gt;';
+	}
 	// It matched a ">" character
 
 	if ( '<!--' == substr( $string, 0, 4 ) ) {
 		$string = str_replace( array('<!--', '-->'), '', $string );
-		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
-			$string = $newstring;
-		if ( $string == '' )
-			return '';
+		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) ) {
+					$string = $newstring;
+		}
+		if ( $string == '' ) {
+					return '';
+		}
 		// prevent multiple dashes in comments
 		$string = preg_replace('/--+/', '-', $string);
 		// prevent three dashes closing a comment
@@ -776,23 +781,27 @@ 
 	}
 	// Allow HTML comments
 
-	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-		return '';
+	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+			return '';
+	}
 	// It's seriously malformed
 
 	$slash = trim($matches[1]);
 	$elem = $matches[2];
 	$attrlist = $matches[3];
 
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array( $allowed_html ) ) {
+			$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
-	if ( ! isset($allowed_html[strtolower($elem)]) )
-		return '';
+	if ( ! isset($allowed_html[strtolower($elem)]) ) {
+			return '';
+	}
 	// They are using a not allowed HTML element
 
-	if ($slash != '')
-		return "</$elem>";
+	if ($slash != '') {
+			return "</$elem>";
+	}
 	// No attributes are allowed for closing elements
 
 	return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
@@ -816,17 +825,20 @@ 
  * @return string Sanitized HTML element
  */
 function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array( $allowed_html ) ) {
+			$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
 	// Is there a closing XHTML slash at the end of the attributes?
 	$xhtml_slash = '';
-	if (preg_match('%\s*/\s*$%', $attr))
-		$xhtml_slash = ' /';
+	if (preg_match('%\s*/\s*$%', $attr)) {
+			$xhtml_slash = ' /';
+	}
 
 	// Are any attributes allowed at all for this element?
-	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
-		return "<$element$xhtml_slash>";
+	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 ) {
+			return "<$element$xhtml_slash>";
+	}
 
 	// Split it
 	$attrarr = wp_kses_hair($attr, $allowed_protocols);
@@ -934,17 +946,21 @@ 
 
 			case 1 : // equals sign or valueless ("selected")
 
-				if (preg_match('/^\s*=\s*/', $attr)) // equals sign
+				if (preg_match('/^\s*=\s*/', $attr)) {
+					// equals sign
 					{
 					$working = 1;
+				}
 					$mode = 2;
 					$attr = preg_replace('/^\s*=\s*/', '', $attr);
 					break;
 				}
 
-				if (preg_match('/^\s+/', $attr)) // valueless
+				if (preg_match('/^\s+/', $attr)) {
+					// valueless
 					{
 					$working = 1;
+				}
 					$mode = 0;
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
@@ -956,12 +972,14 @@ 
 
 			case 2 : // attribute value, a URL after href= for instance
 
-				if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
-					// "value"
+				if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) {
+									// "value"
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -972,12 +990,14 @@ 
 					break;
 				}
 
-				if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
-					// 'value'
+				if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) {
+									// 'value'
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
@@ -988,12 +1008,14 @@ 
 					break;
 				}
 
-				if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
-					// value
+				if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) {
+									// value
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+				}
+					if ( in_array(strtolower($attrname), $uris) ) {
+											$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					}
 
 					if(false === array_key_exists($attrname, $attrarr)) {
 						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -1007,17 +1029,20 @@ 
 				break;
 		} // switch
 
-		if ($working == 0) // not well formed, remove and try again
+		if ($working == 0) {
+			// not well formed, remove and try again
 		{
 			$attr = wp_kses_html_error($attr);
+		}
 			$mode = 0;
 		}
 	} // while
 
-	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
-		// special case, for when the attribute list ends with a valueless
+	if ($mode == 1 && false === array_key_exists($attrname, $attrarr)) {
+			// special case, for when the attribute list ends with a valueless
 		// attribute like "selected"
 		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+	}
 
 	return $attrarr;
 }
@@ -1148,16 +1173,18 @@ 
 			// greater than the given value. This can be used to avoid Buffer Overflows
 			// in WWW clients and various Internet servers.
 
-			if (strlen($value) > $checkvalue)
-				$ok = false;
+			if (strlen($value) > $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'minlen' :
 			// The minlen check makes sure that the attribute value has a length not
 			// smaller than the given value.
 
-			if (strlen($value) < $checkvalue)
-				$ok = false;
+			if (strlen($value) < $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'maxval' :
@@ -1167,20 +1194,24 @@ 
 			// value is not greater than the given value.
 			// This check can be used to avoid Denial of Service attacks.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				$ok = false;
-			if ($value > $checkvalue)
-				$ok = false;
+			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+							$ok = false;
+			}
+			if ($value > $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'minval' :
 			// The minval check makes sure that the attribute value is a positive integer,
 			// and that it is not smaller than the given value.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				$ok = false;
-			if ($value < $checkvalue)
-				$ok = false;
+			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+							$ok = false;
+			}
+			if ($value < $checkvalue) {
+							$ok = false;
+			}
 			break;
 
 		case 'valueless' :
@@ -1189,8 +1220,9 @@ 
 			// is a "y" or a "Y", the attribute must not have a value.
 			// If the given value is an "n" or an "N", the attribute must have one.
 
-			if (strtolower($checkvalue) != $vless)
-				$ok = false;
+			if (strtolower($checkvalue) != $vless) {
+							$ok = false;
+			}
 			break;
 	} // switch
 
@@ -1220,8 +1252,9 @@ 
 		$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
 	} while ( $original_string != $string && ++$iterations < 6 );
 
-	if ( $original_string != $string )
-		return '';
+	if ( $original_string != $string ) {
+			return '';
+	}
 
 	return $string;
 }
@@ -1335,11 +1368,13 @@ 
 		$string = trim( $string2[1] );
 		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
 		if ( 'feed:' == $protocol ) {
-			if ( $count > 2 )
-				return '';
+			if ( $count > 2 ) {
+							return '';
+			}
 			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) )
-				return $string;
+			if ( empty( $string ) ) {
+							return $string;
+			}
 		}
 		$string = $protocol . $string;
 	}
@@ -1367,17 +1402,19 @@ 
 	$string2 = strtolower($string2);
 
 	$allowed = false;
-	foreach ( (array) $allowed_protocols as $one_protocol )
-		if ( strtolower($one_protocol) == $string2 ) {
+	foreach ( (array) $allowed_protocols as $one_protocol ) {
+			if ( strtolower($one_protocol) == $string2 ) {
 			$allowed = true;
+	}
 			break;
 		}
 
-	if ($allowed)
-		return "$string2:";
-	else
-		return '';
-}
+	if ($allowed) {
+			return "$string2:";
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Converts and fixes HTML entities.
@@ -1418,8 +1455,9 @@ 
 function wp_kses_named_entities($matches) {
 	global $allowedentitynames;
 
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$i = $matches[1];
 	return ( ! in_array( $i, $allowedentitynames ) ) ? "&amp;$i;" : "&$i;";
@@ -1438,8 +1476,9 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities2($matches) {
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$i = $matches[1];
 	if (valid_unicode($i)) {
@@ -1464,8 +1503,9 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities3($matches) {
-	if ( empty($matches[1]) )
-		return '';
+	if ( empty($matches[1]) ) {
+			return '';
+	}
 
 	$hexchars = $matches[1];
 	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';';
@@ -1605,10 +1645,11 @@ 
 	add_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	if ( current_user_can( 'unfiltered_html' ) )
-		add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-	else
-		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	if ( current_user_can( 'unfiltered_html' ) ) {
+			add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+	} else {
+			add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	}
 
 	// Post filtering
 	add_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1669,14 +1710,18 @@ 
  * @since 2.8.1
  */
 function safecss_filter_attr( $css, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.8.1' );
+	}
+	// Never implemented
 
 	$css = wp_kses_no_null($css);
 	$css = str_replace(array("\n","\r","\t"), '', $css);
 
-	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) {
+		// remove any inline css containing \ ( & } = or comments
 		return '';
+	}
 
 	$css_array = explode( ';', trim( $css ) );
 
@@ -1699,25 +1744,29 @@ 
 	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
 	'width' ) );
 
-	if ( empty($allowed_attr) )
-		return $css;
+	if ( empty($allowed_attr) ) {
+			return $css;
+	}
 
 	$css = '';
 	foreach ( $css_array as $css_item ) {
-		if ( $css_item == '' )
-			continue;
+		if ( $css_item == '' ) {
+					continue;
+		}
 		$css_item = trim( $css_item );
 		$found = false;
 		if ( strpos( $css_item, ':' ) === false ) {
 			$found = true;
 		} else {
 			$parts = explode( ':', $css_item );
-			if ( in_array( trim( $parts[0] ), $allowed_attr ) )
-				$found = true;
+			if ( in_array( trim( $parts[0] ), $allowed_attr ) ) {
+							$found = true;
+			}
 		}
 		if ( $found ) {
-			if( $css != '' )
-				$css .= ';';
+			if( $css != '' ) {
+							$css .= ';';
+			}
 			$css .= $css_item;
 		}
 	}
@@ -1743,11 +1792,13 @@ 
 		'role' => true,
 	);
 
-	if ( true === $value )
-		$value = array();
+	if ( true === $value ) {
+			$value = array();
+	}
 
-	if ( is_array( $value ) )
-		return array_merge( $value, $global_attributes );
+	if ( is_array( $value ) ) {
+			return array_merge( $value, $global_attributes );
+	}
 
 	return $value;
 }

Spacing +220 added lines, -220 removed lines

@@ -41,14 +41,14 @@ 
  *
  * @since 1.2.0
  */
-if ( ! defined( 'CUSTOM_TAGS' ) )
-	define( 'CUSTOM_TAGS', false );
+if ( ! defined('CUSTOM_TAGS'))
+	define('CUSTOM_TAGS', false);
 
 // Ensure that these variables are added to the global namespace
 // (e.g. if using namespaces / autoload in the current PHP environment).
 global $allowedposttags, $allowedtags, $allowedentitynames;
 
-if ( ! CUSTOM_TAGS ) {
+if ( ! CUSTOM_TAGS) {
 	/**
 	 * Kses global for default allowable HTML tags.
 	 *
@@ -451,55 +451,55 @@ 
 	);
 
 	$allowedentitynames = array(
-		'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-		'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-		'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-		'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-		'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-		'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-		'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-		'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-		'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-		'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-		'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-		'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-		'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-		'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-		'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-		'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-		'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-		'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-		'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-		'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-		'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-		'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-		'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-		'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-		'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-		'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-		'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-		'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-		'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-		'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-		'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-		'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-		'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-		'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-		'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-		'radic',   'prop',   'infin',   'ang',    'and',    'or',
-		'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-		'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-		'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-		'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-		'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
-		'sup1',    'sup2',   'sup3',    'frac14', 'frac12', 'frac34',
+		'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+		'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+		'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+		'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+		'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+		'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+		'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+		'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+		'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+		'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+		'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+		'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+		'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+		'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+		'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+		'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+		'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+		'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+		'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+		'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+		'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+		'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+		'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+		'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+		'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+		'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+		'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+		'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+		'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+		'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+		'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+		'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+		'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+		'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+		'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+		'radic', 'prop', 'infin', 'ang', 'and', 'or',
+		'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+		'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+		'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+		'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+		'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
+		'sup1', 'sup2', 'sup3', 'frac14', 'frac12', 'frac34',
 		'there4',
 	);
 
-	$allowedposttags = array_map( '_wp_add_global_attributes', $allowedposttags );
+	$allowedposttags = array_map('_wp_add_global_attributes', $allowedposttags);
 } else {
-	$allowedtags = wp_kses_array_lc( $allowedtags );
-	$allowedposttags = wp_kses_array_lc( $allowedposttags );
+	$allowedtags = wp_kses_array_lc($allowedtags);
+	$allowedposttags = wp_kses_array_lc($allowedposttags);
 }
 
 /**
@@ -522,10 +522,10 @@ 
  * @param array  $allowed_protocols Optional. Allowed protocol in links.
  * @return string Filtered content with only allowed HTML elements
  */
-function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
-	if ( empty( $allowed_protocols ) )
+function wp_kses($string, $allowed_html, $allowed_protocols = array()) {
+	if (empty($allowed_protocols))
 		$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
+	$string = wp_kses_no_null($string, array('slash_zero' => 'keep'));
 	$string = wp_kses_js_entities($string);
 	$string = wp_kses_normalize_entities($string);
 	$string = wp_kses_hook($string, $allowed_html, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook
@@ -544,12 +544,12 @@ 
  * @param string $element The element name to which the attribute belongs.
  * @return string Filtered attribute.
  */
-function wp_kses_one_attr( $string, $element ) {
+function wp_kses_one_attr($string, $element) {
 	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
-	$allowed_html = wp_kses_allowed_html( 'post' );
+	$allowed_html = wp_kses_allowed_html('post');
 	$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	$string = wp_kses_js_entities( $string );
+	$string = wp_kses_no_null($string, array('slash_zero' => 'keep'));
+	$string = wp_kses_js_entities($string);
 	
 	// Preserve leading and trailing whitespace.
 	$matches = array();
@@ -557,40 +557,40 @@ 
 	$lead = $matches[0];
 	preg_match('/\s*$/', $string, $matches);
 	$trail = $matches[0];
-	if ( empty( $trail ) ) {
-		$string = substr( $string, strlen( $lead ) );
+	if (empty($trail)) {
+		$string = substr($string, strlen($lead));
 	} else {
-		$string = substr( $string, strlen( $lead ), -strlen( $trail ) );
+		$string = substr($string, strlen($lead), -strlen($trail));
 	}
 	
 	// Parse attribute name and value from input.
-	$split = preg_split( '/\s*=\s*/', $string, 2 );
+	$split = preg_split('/\s*=\s*/', $string, 2);
 	$name = $split[0];
-	if ( count( $split ) == 2 ) {
+	if (count($split) == 2) {
 		$value = $split[1];
 
 		// Remove quotes surrounding $value.
 		// Also guarantee correct quoting in $string for this one attribute.
-		if ( '' == $value ) {
+		if ('' == $value) {
 			$quote = '';
 		} else {
 			$quote = $value[0];
 		}
-		if ( '"' == $quote || "'" == $quote ) {
-			if ( substr( $value, -1 ) != $quote ) {
+		if ('"' == $quote || "'" == $quote) {
+			if (substr($value, -1) != $quote) {
 				return '';
 			}
-			$value = substr( $value, 1, -1 );
+			$value = substr($value, 1, -1);
 		} else {
 			$quote = '"';
 		}
 
 		// Sanitize quotes, angle braces, and entities.
-		$value = esc_attr( $value );
+		$value = esc_attr($value);
 
 		// Sanitize URI values.
-		if ( in_array( strtolower( $name ), $uris ) ) {
-			$value = wp_kses_bad_protocol( $value, $allowed_protocols );
+		if (in_array(strtolower($name), $uris)) {
+			$value = wp_kses_bad_protocol($value, $allowed_protocols);
 		}
 
 		$string = "$name=$quote$value$quote";
@@ -601,10 +601,10 @@ 
 	}
 	
 	// Sanitize attribute by name.
-	wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html );
+	wp_kses_attr_check($name, $value, $string, $vless, $element, $allowed_html);
 
 	// Restore whitespace.
-	return $lead . $string . $trail;
+	return $lead.$string.$trail;
 }
 
 /**
@@ -621,10 +621,10 @@ 
  *                        the name of a field filter such as pre_user_description.
  * @return array List of allowed tags and their allowed attributes.
  */
-function wp_kses_allowed_html( $context = '' ) {
+function wp_kses_allowed_html($context = '') {
 	global $allowedposttags, $allowedtags, $allowedentitynames;
 
-	if ( is_array( $context ) ) {
+	if (is_array($context)) {
 		/**
 		 * Filter HTML elements allowed for a given context.
 		 *
@@ -634,33 +634,33 @@ 
 		 * @param string $context Context to judge allowed tags by. Allowed values are 'post',
 		 *                        'data', 'strip', 'entities', 'explicit', or the name of a filter.
 		 */
-		return apply_filters( 'wp_kses_allowed_html', $context, 'explicit' );
+		return apply_filters('wp_kses_allowed_html', $context, 'explicit');
 	}
 
-	switch ( $context ) {
+	switch ($context) {
 		case 'post':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context );
+			return apply_filters('wp_kses_allowed_html', $allowedposttags, $context);
 
 		case 'user_description':
 		case 'pre_user_description':
 			$tags = $allowedtags;
 			$tags['a']['rel'] = true;
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $tags, $context );
+			return apply_filters('wp_kses_allowed_html', $tags, $context);
 
 		case 'strip':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', array(), $context );
+			return apply_filters('wp_kses_allowed_html', array(), $context);
 
 		case 'entities':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context);
+			return apply_filters('wp_kses_allowed_html', $allowedentitynames, $context);
 
 		case 'data':
 		default:
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedtags, $context );
+			return apply_filters('wp_kses_allowed_html', $allowedtags, $context);
 	}
 }
 
@@ -677,7 +677,7 @@ 
  * @param array  $allowed_protocols Allowed protocol in links
  * @return string Filtered content through 'pre_kses' hook
  */
-function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_hook($string, $allowed_html, $allowed_protocols) {
 	/**
 	 * Filter content to be run through kses.
 	 *
@@ -687,7 +687,7 @@ 
 	 * @param array  $allowed_html      Allowed HTML elements.
 	 * @param array  $allowed_protocols Allowed protocol in links.
 	 */
-	return apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols );
+	return apply_filters('pre_kses', $string, $allowed_html, $allowed_protocols);
 }
 
 /**
@@ -716,11 +716,11 @@ 
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return string Content with fixed HTML tags
  */
-function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_split($string, $allowed_html, $allowed_protocols) {
 	global $pass_allowed_html, $pass_allowed_protocols;
 	$pass_allowed_html = $allowed_html;
 	$pass_allowed_protocols = $allowed_protocols;
-	return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
+	return preg_replace_callback('%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string);
 }
 
 /**
@@ -734,9 +734,9 @@ 
  *
  * @return string
  */
-function _wp_kses_split_callback( $match ) {
+function _wp_kses_split_callback($match) {
 	global $pass_allowed_html, $pass_allowed_protocols;
-	return wp_kses_split2( $match[0], $pass_allowed_html, $pass_allowed_protocols );
+	return wp_kses_split2($match[0], $pass_allowed_html, $pass_allowed_protocols);
 }
 
 /**
@@ -766,11 +766,11 @@ 
 		return '&gt;';
 	// It matched a ">" character
 
-	if ( '<!--' == substr( $string, 0, 4 ) ) {
-		$string = str_replace( array('<!--', '-->'), '', $string );
-		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
+	if ('<!--' == substr($string, 0, 4)) {
+		$string = str_replace(array('<!--', '-->'), '', $string);
+		while ($string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)))
 			$string = $newstring;
-		if ( $string == '' )
+		if ($string == '')
 			return '';
 		// prevent multiple dashes in comments
 		$string = preg_replace('/--+/', '-', $string);
@@ -780,7 +780,7 @@ 
 	}
 	// Allow HTML comments
 
-	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+	if ( ! preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
 		return '';
 	// It's seriously malformed
 
@@ -788,10 +788,10 @@ 
 	$elem = $matches[2];
 	$attrlist = $matches[3];
 
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array($allowed_html))
+		$allowed_html = wp_kses_allowed_html($allowed_html);
 
-	if ( ! isset($allowed_html[strtolower($elem)]) )
+	if ( ! isset($allowed_html[strtolower($elem)]))
 		return '';
 	// They are using a not allowed HTML element
 
@@ -799,7 +799,7 @@ 
 		return "</$elem>";
 	// No attributes are allowed for closing elements
 
-	return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
+	return wp_kses_attr($elem, $attrlist, $allowed_html, $allowed_protocols);
 }
 
 /**
@@ -820,8 +820,8 @@ 
  * @return string Sanitized HTML element
  */
 function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
-	if ( ! is_array( $allowed_html ) )
-		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	if ( ! is_array($allowed_html))
+		$allowed_html = wp_kses_allowed_html($allowed_html);
 
 	// Is there a closing XHTML slash at the end of the attributes?
 	$xhtml_slash = '';
@@ -829,7 +829,7 @@ 
 		$xhtml_slash = ' /';
 
 	// Are any attributes allowed at all for this element?
-	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
+	if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0)
 		return "<$element$xhtml_slash>";
 
 	// Split it
@@ -838,8 +838,8 @@ 
 	// Go through $attrarr, and save the allowed attributes for this element
 	// in $attr2
 	$attr2 = '';
-	foreach ( $attrarr as $arreach ) {
-		if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
+	foreach ($attrarr as $arreach) {
+		if (wp_kses_attr_check($arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html)) {
 			$attr2 .= ' '.$arreach['whole'];
 		}
 	}
@@ -863,31 +863,31 @@ 
  * @param array $allowed_html The full list of allowed elements and attributes.
  * @return bool Is the attribute allowed?
  */
-function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
-	$allowed_attr = $allowed_html[strtolower( $element )];
+function wp_kses_attr_check(&$name, &$value, &$whole, $vless, $element, $allowed_html) {
+	$allowed_attr = $allowed_html[strtolower($element)];
 
-	$name_low = strtolower( $name );
-	if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) {
+	$name_low = strtolower($name);
+	if ( ! isset($allowed_attr[$name_low]) || '' == $allowed_attr[$name_low]) {
 		$name = $value = $whole = '';
 		return false;
 	}
 
-	if ( 'style' == $name_low ) {
-		$new_value = safecss_filter_attr( $value );
+	if ('style' == $name_low) {
+		$new_value = safecss_filter_attr($value);
 
-		if ( empty( $new_value ) ) {
+		if (empty($new_value)) {
 			$name = $value = $whole = '';
 			return false;
 		}
 
-		$whole = str_replace( $value, $new_value, $whole );
+		$whole = str_replace($value, $new_value, $whole);
 		$value = $new_value;
 	}
 
-	if ( is_array( $allowed_attr[$name_low] ) ) {
+	if (is_array($allowed_attr[$name_low])) {
 		// there are some checks
-		foreach ( $allowed_attr[$name_low] as $currkey => $currval ) {
-			if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
+		foreach ($allowed_attr[$name_low] as $currkey => $currval) {
+			if ( ! wp_kses_check_attr_val($value, $vless, $currkey, $currval)) {
 				$name = $value = $whole = '';
 				return false;
 			}
@@ -928,10 +928,10 @@ 
 		switch ($mode) {
 			case 0 : // attribute name, href for instance
 
-				if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) {
+				if (preg_match('/^([-a-zA-Z:]+)/', $attr, $match)) {
 					$attrname = $match[1];
 					$working = $mode = 1;
-					$attr = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
+					$attr = preg_replace('/^[-a-zA-Z:]+/', '', $attr);
 				}
 
 				break;
@@ -950,8 +950,8 @@ 
 					{
 					$working = 1;
 					$mode = 0;
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 					}
 					$attr = preg_replace('/^\s+/', '', $attr);
 				}
@@ -964,11 +964,11 @@ 
 					// "value"
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					$working = 1;
 					$mode = 0;
@@ -980,11 +980,11 @@ 
 					// 'value'
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
 					}
 					$working = 1;
 					$mode = 0;
@@ -996,11 +996,11 @@ 
 					// value
 					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
+					if (in_array(strtolower($attrname), $uris))
 						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if (false === array_key_exists($attrname, $attrarr)) {
+						$attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
 					}
 					// We add quotes to conform to W3C's HTML spec.
 					$working = 1;
@@ -1021,7 +1021,7 @@ 
 	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
 		// special case, for when the attribute list ends with a valueless
 		// attribute like "selected"
-		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+		$attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
 	return $attrarr;
 }
@@ -1038,40 +1038,40 @@ 
  * @param string $element HTML element/tag
  * @return array|bool List of attributes found in $element. Returns false on failure.
  */
-function wp_kses_attr_parse( $element ) {
+function wp_kses_attr_parse($element) {
 	$valid = preg_match('%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches);
-	if ( 1 !== $valid ) {
+	if (1 !== $valid) {
 		return false;
 	}
 
-	$begin =  $matches[1];
-	$slash =  $matches[2];
+	$begin = $matches[1];
+	$slash = $matches[2];
 	$elname = $matches[3];
-	$attr =   $matches[4];
-	$end =    $matches[5];
+	$attr = $matches[4];
+	$end = $matches[5];
 
-	if ( '' !== $slash ) {
+	if ('' !== $slash) {
 		// Closing elements do not get parsed.
 		return false;
 	}
 
 	// Is there a closing XHTML slash at the end of the attributes?
-	if ( 1 === preg_match( '%\s*/\s*$%', $attr, $matches ) ) {
+	if (1 === preg_match('%\s*/\s*$%', $attr, $matches)) {
 		$xhtml_slash = $matches[0];
-		$attr = substr( $attr, 0, -strlen( $xhtml_slash ) );
+		$attr = substr($attr, 0, -strlen($xhtml_slash));
 	} else {
 		$xhtml_slash = '';
 	}
 	
 	// Split it
-	$attrarr = wp_kses_hair_parse( $attr );
-	if ( false === $attrarr ) {
+	$attrarr = wp_kses_hair_parse($attr);
+	if (false === $attrarr) {
 		return false;
 	}
 
 	// Make sure all input is returned by adding front and back matter.
-	array_unshift( $attrarr, $begin . $slash . $elname );
-	array_push( $attrarr, $xhtml_slash . $end );
+	array_unshift($attrarr, $begin.$slash.$elname);
+	array_push($attrarr, $xhtml_slash.$end);
 	
 	return $attrarr;
 }
@@ -1089,8 +1089,8 @@ 
  * @param string $attr Attribute list from HTML element to closing HTML element tag
  * @return array|bool List of attributes found in $attr. Returns false on failure.
  */
-function wp_kses_hair_parse( $attr ) {
-	if ( '' === $attr ) {
+function wp_kses_hair_parse($attr) {
+	if ('' === $attr) {
 		return array();
 	}
 
@@ -1113,7 +1113,7 @@ 
 	. '|'
 	.     '(?:\s|$)'      // If attribute has no value, space is required.
 	. ')'
-	. '\s*';              // Trailing space is optional except as mentioned above.
+	. '\s*'; // Trailing space is optional except as mentioned above.
 
 	// Although it is possible to reduce this procedure to a single regexp,
 	// we must run that regexp twice to get exactly the expected result.
@@ -1121,8 +1121,8 @@ 
 	$validation = "%^($regex)+$%";
 	$extraction = "%$regex%";
 
-	if ( 1 === preg_match( $validation, $attr ) ) {
-		preg_match_all( $extraction, $attr, $attrarr );
+	if (1 === preg_match($validation, $attr)) {
+		preg_match_all($extraction, $attr, $attrarr);
 		return $attrarr[0];
 	} else {
 		return false;
@@ -1171,7 +1171,7 @@ 
 			// value is not greater than the given value.
 			// This check can be used to avoid Denial of Service attacks.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
 				$ok = false;
 			if ($value > $checkvalue)
 				$ok = false;
@@ -1181,7 +1181,7 @@ 
 			// The minval check makes sure that the attribute value is a positive integer,
 			// and that it is not smaller than the given value.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
 				$ok = false;
 			if ($value < $checkvalue)
 				$ok = false;
@@ -1222,9 +1222,9 @@ 
 	do {
 		$original_string = $string;
 		$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
-	} while ( $original_string != $string && ++$iterations < 6 );
+	} while ($original_string != $string && ++$iterations < 6);
 
-	if ( $original_string != $string )
+	if ($original_string != $string)
 		return '';
 
 	return $string;
@@ -1241,14 +1241,14 @@ 
  * @param array $options Set 'slash_zero' => 'keep' when '\0' is allowed. Default is 'remove'.
  * @return string
  */
-function wp_kses_no_null( $string, $options = null ) {
-	if ( ! isset( $options['slash_zero'] ) ) {
-		$options = array( 'slash_zero' => 'remove' );
+function wp_kses_no_null($string, $options = null) {
+	if ( ! isset($options['slash_zero'])) {
+		$options = array('slash_zero' => 'remove');
 	}
 
-	$string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string );
-	if ( 'remove' == $options['slash_zero'] ) {
-		$string = preg_replace( '/\\\\+0+/', '', $string );
+	$string = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string);
+	if ('remove' == $options['slash_zero']) {
+		$string = preg_replace('/\\\\+0+/', '', $string);
 	}
 
 	return $string;
@@ -1279,13 +1279,13 @@ 
  * @return array Fixed array with all lowercase keys
  */
 function wp_kses_array_lc($inarray) {
-	$outarray = array ();
+	$outarray = array();
 
-	foreach ( (array) $inarray as $inkey => $inval) {
+	foreach ((array) $inarray as $inkey => $inval) {
 		$outkey = strtolower($inkey);
-		$outarray[$outkey] = array ();
+		$outarray[$outkey] = array();
 
-		foreach ( (array) $inval as $inkey2 => $inval2) {
+		foreach ((array) $inval as $inkey2 => $inval2) {
 			$outkey2 = strtolower($inkey2);
 			$outarray[$outkey][$outkey2] = $inval2;
 		} // foreach $inval
@@ -1333,19 +1333,19 @@ 
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
-	$string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
-	if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {
-		$string = trim( $string2[1] );
-		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
-		if ( 'feed:' == $protocol ) {
-			if ( $count > 2 )
+function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1) {
+	$string2 = preg_split('/:|&#0*58;|&#x0*3a;/i', $string, 2);
+	if (isset($string2[1]) && ! preg_match('%/\?%', $string2[0])) {
+		$string = trim($string2[1]);
+		$protocol = wp_kses_bad_protocol_once2($string2[0], $allowed_protocols);
+		if ('feed:' == $protocol) {
+			if ($count > 2)
 				return '';
-			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) )
+			$string = wp_kses_bad_protocol_once($string, $allowed_protocols, ++$count);
+			if (empty($string))
 				return $string;
 		}
-		$string = $protocol . $string;
+		$string = $protocol.$string;
 	}
 
 	return $string;
@@ -1364,15 +1364,15 @@ 
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
+function wp_kses_bad_protocol_once2($string, $allowed_protocols) {
 	$string2 = wp_kses_decode_entities($string);
 	$string2 = preg_replace('/\s/', '', $string2);
 	$string2 = wp_kses_no_null($string2);
 	$string2 = strtolower($string2);
 
 	$allowed = false;
-	foreach ( (array) $allowed_protocols as $one_protocol )
-		if ( strtolower($one_protocol) == $string2 ) {
+	foreach ((array) $allowed_protocols as $one_protocol)
+		if (strtolower($one_protocol) == $string2) {
 			$allowed = true;
 			break;
 		}
@@ -1422,11 +1422,11 @@ 
 function wp_kses_named_entities($matches) {
 	global $allowedentitynames;
 
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$i = $matches[1];
-	return ( ! in_array( $i, $allowedentitynames ) ) ? "&amp;$i;" : "&$i;";
+	return ( ! in_array($i, $allowedentitynames)) ? "&amp;$i;" : "&$i;";
 }
 
 /**
@@ -1442,12 +1442,12 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities2($matches) {
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$i = $matches[1];
 	if (valid_unicode($i)) {
-		$i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+		$i = str_pad(ltrim($i, '0'), 3, '0', STR_PAD_LEFT);
 		$i = "&#$i;";
 	} else {
 		$i = "&amp;#$i;";
@@ -1468,11 +1468,11 @@ 
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities3($matches) {
-	if ( empty($matches[1]) )
+	if (empty($matches[1]))
 		return '';
 
 	$hexchars = $matches[1];
-	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';';
+	return ( ! valid_unicode(hexdec($hexchars))) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars, '0').';';
 }
 
 /**
@@ -1482,10 +1482,10 @@ 
  * @return bool True if the value was a valid Unicode number
  */
 function valid_unicode($i) {
-	return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
+	return ($i == 0x9 || $i == 0xa || $i == 0xd ||
 			($i >= 0x20 && $i <= 0xd7ff) ||
 			($i >= 0xe000 && $i <= 0xfffd) ||
-			($i >= 0x10000 && $i <= 0x10ffff) );
+			($i >= 0x10000 && $i <= 0x10ffff));
 }
 
 /**
@@ -1513,8 +1513,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr( $match ) {
-	return chr( $match[1] );
+function _wp_kses_decode_entities_chr($match) {
+	return chr($match[1]);
 }
 
 /**
@@ -1523,8 +1523,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr_hexdec( $match ) {
-	return chr( hexdec( $match[1] ) );
+function _wp_kses_decode_entities_chr_hexdec($match) {
+	return chr(hexdec($match[1]));
 }
 
 /**
@@ -1535,8 +1535,8 @@ 
  * @param string $data Content to filter, expected to be escaped with slashes
  * @return string Filtered content
  */
-function wp_filter_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), current_filter() ) );
+function wp_filter_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), current_filter()));
 }
 
 /**
@@ -1547,8 +1547,8 @@ 
  * @param string $data Content to filter, expected to not be escaped
  * @return string Filtered content
  */
-function wp_kses_data( $data ) {
-	return wp_kses( $data, current_filter() );
+function wp_kses_data($data) {
+	return wp_kses($data, current_filter());
 }
 
 /**
@@ -1562,8 +1562,8 @@ 
  * @param string $data Post content to filter, expected to be escaped with slashes
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
-function wp_filter_post_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), 'post' ) );
+function wp_filter_post_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), 'post'));
 }
 
 /**
@@ -1577,8 +1577,8 @@ 
  * @param string $data Post content to filter
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
-function wp_kses_post( $data ) {
-	return wp_kses( $data, 'post' );
+function wp_kses_post($data) {
+	return wp_kses($data, 'post');
 }
 
 /**
@@ -1592,8 +1592,8 @@ 
  * @param mixed $data The array, object, or scalar value to inspect.
  * @return mixed The filtered content.
  */
-function wp_kses_post_deep( $data ) {
-	return map_deep( $data, 'wp_kses_post' );
+function wp_kses_post_deep($data) {
+	return map_deep($data, 'wp_kses_post');
 }
 
 /**
@@ -1604,8 +1604,8 @@ 
  * @param string $data Content to strip all HTML from
  * @return string Filtered content without any HTML
  */
-function wp_filter_nohtml_kses( $data ) {
-	return addslashes( wp_kses( stripslashes( $data ), 'strip' ) );
+function wp_filter_nohtml_kses($data) {
+	return addslashes(wp_kses(stripslashes($data), 'strip'));
 }
 
 /**
@@ -1624,10 +1624,10 @@ 
 	add_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	if ( current_user_can( 'unfiltered_html' ) )
-		add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+	if (current_user_can('unfiltered_html'))
+		add_filter('pre_comment_content', 'wp_filter_post_kses');
 	else
-		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+		add_filter('pre_comment_content', 'wp_filter_kses');
 
 	// Post filtering
 	add_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1652,8 +1652,8 @@ 
 	remove_filter('title_save_pre', 'wp_filter_kses');
 
 	// Comment filtering
-	remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-	remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+	remove_filter('pre_comment_content', 'wp_filter_post_kses');
+	remove_filter('pre_comment_content', 'wp_filter_kses');
 
 	// Post filtering
 	remove_filter('content_save_pre', 'wp_filter_post_kses');
@@ -1677,7 +1677,7 @@ 
 function kses_init() {
 	kses_remove_filters();
 
-	if ( ! current_user_can( 'unfiltered_html' ) ) {
+	if ( ! current_user_can('unfiltered_html')) {
 		kses_init_filters();
 	}
 }
@@ -1691,17 +1691,17 @@ 
  * @param string $deprecated Not used.
  * @return string            Filtered string of CSS rules.
  */
-function safecss_filter_attr( $css, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+function safecss_filter_attr($css, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.8.1'); // Never implemented
 
 	$css = wp_kses_no_null($css);
-	$css = str_replace(array("\n","\r","\t"), '', $css);
+	$css = str_replace(array("\n", "\r", "\t"), '', $css);
 
-	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+	if (preg_match('%[\\\\(&=}]|/\*%', $css)) // remove any inline css containing \ ( & } = or comments
 		return '';
 
-	$css_array = explode( ';', trim( $css ) );
+	$css_array = explode(';', trim($css));
 
 	/**
 	 * Filter list of allowed CSS attributes.
@@ -1710,36 +1710,36 @@ 
 	 *
 	 * @param array $attr List of allowed CSS attributes.
 	 */
-	$allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
+	$allowed_attr = apply_filters('safe_style_css', array('text-align', 'margin', 'color', 'float',
 	'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
 	'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
 	'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
 	'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top',
 	'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side',
 	'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style',
-	'font-variant', 'font-weight', 'height', 'min-height','max-height' , 'letter-spacing', 'line-height', 'margin-bottom',
+	'font-variant', 'font-weight', 'height', 'min-height', 'max-height', 'letter-spacing', 'line-height', 'margin-bottom',
 	'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
 	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
-	'width', 'min-width', 'max-width' ) );
+	'width', 'min-width', 'max-width'));
 
-	if ( empty($allowed_attr) )
+	if (empty($allowed_attr))
 		return $css;
 
 	$css = '';
-	foreach ( $css_array as $css_item ) {
-		if ( $css_item == '' )
+	foreach ($css_array as $css_item) {
+		if ($css_item == '')
 			continue;
-		$css_item = trim( $css_item );
+		$css_item = trim($css_item);
 		$found = false;
-		if ( strpos( $css_item, ':' ) === false ) {
+		if (strpos($css_item, ':') === false) {
 			$found = true;
 		} else {
-			$parts = explode( ':', $css_item );
-			if ( in_array( trim( $parts[0] ), $allowed_attr ) )
+			$parts = explode(':', $css_item);
+			if (in_array(trim($parts[0]), $allowed_attr))
 				$found = true;
 		}
-		if ( $found ) {
-			if( $css != '' )
+		if ($found) {
+			if ($css != '')
 				$css .= ';';
 			$css .= $css_item;
 		}
@@ -1757,7 +1757,7 @@ 
  * @param array $value An array of attributes.
  * @return array The array of attributes with global attributes added.
  */
-function _wp_add_global_attributes( $value ) {
+function _wp_add_global_attributes($value) {
 	$global_attributes = array(
 		'class' => true,
 		'id' => true,
@@ -1766,11 +1766,11 @@ 
 		'role' => true,
 	);
 
-	if ( true === $value )
+	if (true === $value)
 		$value = array();
 
-	if ( is_array( $value ) )
-		return array_merge( $value, $global_attributes );
+	if (is_array($value))
+		return array_merge($value, $global_attributes);
 
 	return $value;
 }

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

Indentation +5 added lines, -5 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 	 * @param int    $dst_h       The destination height.
 	 * @param string $filter_name Optional. The Imagick filter to use when resizing. Default 'FILTER_TRIANGLE'.
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
-	 * @return bool|WP_Error
+	 * @return null|WP_Error
 	 */
 	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
 		$allowed_filters = array(

Spacing +157 added lines, -157 removed lines

@@ -24,7 +24,7 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image instanceof Imagick ) {
+		if ($this->image instanceof Imagick) {
 			// we don't need the original in memory anymore
 			$this->image->clear();
 			$this->image->destroy();
@@ -45,13 +45,13 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
+		if ( ! extension_loaded('imagick') || ! class_exists('Imagick', false) || ! class_exists('ImagickPixel', false))
 			return false;
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
+		if (version_compare(phpversion('imagick'), '2.2.0', '<'))
 			return false;
 
 		$required_methods = array(
@@ -76,16 +76,16 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+		if ( ! defined('imagick::COMPRESSION_JPEG'))
 			return false;
 
-		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
-		if ( array_diff( $required_methods, $class_methods ) ) {
+		$class_methods = array_map('strtolower', get_class_methods('Imagick'));
+		if (array_diff($required_methods, $class_methods)) {
 			return false;
 		}
 
 		// HHVM Imagick does not support loading from URL, so fail to allow fallback to GD.
-		if ( defined( 'HHVM_VERSION' ) && isset( $args['path'] ) && preg_match( '|^https?://|', $args['path'] ) ) {
+		if (defined('HHVM_VERSION') && isset($args['path']) && preg_match('|^https?://|', $args['path'])) {
 			return false;
 		}
 
@@ -103,21 +103,21 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
-		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
+	public static function supports_mime_type($mime_type) {
+		$imagick_extension = strtoupper(self::get_extension($mime_type));
 
-		if ( ! $imagick_extension )
+		if ( ! $imagick_extension)
 			return false;
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+		if ( ! method_exists('Imagick', 'setIteratorIndex') && $mime_type != 'image/jpeg')
 				return false;
 
 		try {
-			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
+			return ((bool) @Imagick::queryFormats($imagick_extension));
 		}
-		catch ( Exception $e ) {
+		catch (Exception $e) {
 			return false;
 		}
 	}
@@ -131,34 +131,34 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
+		if ($this->image instanceof Imagick)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn&#8217;t exist?'), $this->file);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
-		@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+		@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
 
 		try {
-			$this->image = new Imagick( $this->file );
+			$this->image = new Imagick($this->file);
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid())
+				return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
+			if (is_callable(array($this->image, 'setIteratorIndex')))
 				$this->image->setIteratorIndex(0);
 
-			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
+			$this->mime_type = $this->get_mime_type($this->image->getImageFormat());
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
+		catch (Exception $e) {
+			return new WP_Error('invalid_image', $e->getMessage(), $this->file);
 		}
 
 		$updated_size = $this->update_size();
-		if ( is_wp_error( $updated_size ) ) {
+		if (is_wp_error($updated_size)) {
 			return $updated_size;
 		}
 
@@ -174,25 +174,25 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		$quality_result = parent::set_quality( $quality );
-		if ( is_wp_error( $quality_result ) ) {
+	public function set_quality($quality = null) {
+		$quality_result = parent::set_quality($quality);
+		if (is_wp_error($quality_result)) {
 			return $quality_result;
 		} else {
 			$quality = $this->get_quality();
 		}
 
 		try {
-			if ( 'image/jpeg' == $this->mime_type ) {
-				$this->image->setImageCompressionQuality( $quality );
-				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
+			if ('image/jpeg' == $this->mime_type) {
+				$this->image->setImageCompressionQuality($quality);
+				$this->image->setImageCompression(imagick::COMPRESSION_JPEG);
 			}
 			else {
-				$this->image->setImageCompressionQuality( $quality );
+				$this->image->setImageCompressionQuality($quality);
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_quality_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_quality_error', $e->getMessage());
 		}
 
 		return true;
@@ -209,24 +209,24 @@ 
 	 *
 	 * @return true|WP_Error
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$size = null;
-		if ( !$width || !$height ) {
+		if ( ! $width || ! $height) {
 			try {
 				$size = $this->image->getImageGeometry();
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 			}
 		}
 
-		if ( ! $width )
+		if ( ! $width)
 			$width = $size['width'];
 
-		if ( ! $height )
+		if ( ! $height)
 			$height = $size['height'];
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -244,26 +244,26 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims)
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'));
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		if ( $crop ) {
-			return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
+		if ($crop) {
+			return $this->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h);
 		}
 
 		// Execute the resize
-		$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-		if ( is_wp_error( $thumb_result ) ) {
+		$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+		if (is_wp_error($thumb_result)) {
 			return $thumb_result;
 		}
 
-		return $this->update_size( $dst_w, $dst_h );
+		return $this->update_size($dst_w, $dst_h);
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
 	 * @return bool|WP_Error
 	 */
-	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
+	protected function thumbnail_image($dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true) {
 		$allowed_filters = array(
 			'FILTER_POINT',
 			'FILTER_BOX',
@@ -304,10 +304,10 @@ 
 		 * Set the filter value if '$filter_name' name is in our whitelist and the related
 		 * Imagick constant is defined or fall back to our default filter.
 		 */
-		if ( in_array( $filter_name, $allowed_filters ) && defined( 'Imagick::' . $filter_name ) ) {
-			$filter = constant( 'Imagick::' . $filter_name );
+		if (in_array($filter_name, $allowed_filters) && defined('Imagick::'.$filter_name)) {
+			$filter = constant('Imagick::'.$filter_name);
 		} else {
-			$filter = defined( 'Imagick::FILTER_TRIANGLE' ) ? Imagick::FILTER_TRIANGLE : false;
+			$filter = defined('Imagick::FILTER_TRIANGLE') ? Imagick::FILTER_TRIANGLE : false;
 		}
 
 		/**
@@ -320,7 +320,7 @@ 
 		 *
 		 * @param bool $strip_meta Whether to strip image metadata during resizing. Default true.
 		 */
-		if ( apply_filters( 'image_strip_meta', $strip_meta ) ) {
+		if (apply_filters('image_strip_meta', $strip_meta)) {
 			$this->strip_meta(); // Fail silently if not supported.
 		}
 
@@ -330,12 +330,12 @@ 
 			 * whenever the output size is less that 1/3 of the original image size (1/3^2 ~= .111),
 			 * unless we would be resampling to a scale smaller than 128x128.
 			 */
-			if ( is_callable( array( $this->image, 'sampleImage' ) ) ) {
-				$resize_ratio = ( $dst_w / $this->size['width'] ) * ( $dst_h / $this->size['height'] );
+			if (is_callable(array($this->image, 'sampleImage'))) {
+				$resize_ratio = ($dst_w / $this->size['width']) * ($dst_h / $this->size['height']);
 				$sample_factor = 5;
 
-				if ( $resize_ratio < .111 && ( $dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128 ) ) {
-					$this->image->sampleImage( $dst_w * $sample_factor, $dst_h * $sample_factor );
+				if ($resize_ratio < .111 && ($dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128)) {
+					$this->image->sampleImage($dst_w * $sample_factor, $dst_h * $sample_factor);
 				}
 			}
 
@@ -345,27 +345,27 @@ 
 			 * results in better image quality over resizeImage() with default filter
 			 * settings and retains backwards compatibility with pre 4.5 functionality.
 			 */
-			if ( is_callable( array( $this->image, 'resizeImage' ) ) && $filter ) {
-				$this->image->setOption( 'filter:support', '2.0' );
-				$this->image->resizeImage( $dst_w, $dst_h, $filter, 1 );
+			if (is_callable(array($this->image, 'resizeImage')) && $filter) {
+				$this->image->setOption('filter:support', '2.0');
+				$this->image->resizeImage($dst_w, $dst_h, $filter, 1);
 			} else {
-				$this->image->scaleImage( $dst_w, $dst_h );
+				$this->image->scaleImage($dst_w, $dst_h);
 			}
 
 			// Set appropriate quality settings after resizing.
-			if ( 'image/jpeg' == $this->mime_type ) {
-				if ( is_callable( array( $this->image, 'unsharpMaskImage' ) ) ) {
-					$this->image->unsharpMaskImage( 0.25, 0.25, 8, 0.065 );
+			if ('image/jpeg' == $this->mime_type) {
+				if (is_callable(array($this->image, 'unsharpMaskImage'))) {
+					$this->image->unsharpMaskImage(0.25, 0.25, 8, 0.065);
 				}
 
-				$this->image->setOption( 'jpeg:fancy-upsampling', 'off' );
+				$this->image->setOption('jpeg:fancy-upsampling', 'off');
 			}
 
-			if ( 'image/png' === $this->mime_type ) {
-				$this->image->setOption( 'png:compression-filter', '5' );
-				$this->image->setOption( 'png:compression-level', '9' );
-				$this->image->setOption( 'png:compression-strategy', '1' );
-				$this->image->setOption( 'png:exclude-chunk', 'all' );
+			if ('image/png' === $this->mime_type) {
+				$this->image->setOption('png:compression-filter', '5');
+				$this->image->setOption('png:compression-level', '9');
+				$this->image->setOption('png:compression-strategy', '1');
+				$this->image->setOption('png:exclude-chunk', 'all');
 			}
 
 			/*
@@ -374,30 +374,30 @@ 
 			 * Note that Imagick::getImageAlphaChannel() is only available if Imagick
 			 * has been compiled against ImageMagick version 6.4.0 or newer.
 			 */
-			if ( is_callable( array( $this->image, 'getImageAlphaChannel' ) )
-				&& is_callable( array( $this->image, 'setImageAlphaChannel' ) )
-				&& defined( Imagick::ALPHACHANNEL_UNDEFINED )
-				&& defined( Imagick::ALPHACHANNEL_OPAQUE )
+			if (is_callable(array($this->image, 'getImageAlphaChannel'))
+				&& is_callable(array($this->image, 'setImageAlphaChannel'))
+				&& defined(Imagick::ALPHACHANNEL_UNDEFINED)
+				&& defined(Imagick::ALPHACHANNEL_OPAQUE)
 			) {
-				if ( $this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED ) {
-					$this->image->setImageAlphaChannel( Imagick::ALPHACHANNEL_OPAQUE );
+				if ($this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED) {
+					$this->image->setImageAlphaChannel(Imagick::ALPHACHANNEL_OPAQUE);
 				}
 			}
 
 			// Limit the bit depth of resized images to 8 bits per channel.
-			if ( is_callable( array( $this->image, 'getImageDepth' ) ) && is_callable( array( $this->image, 'setImageDepth' ) ) ) {
-				if ( 8 < $this->image->getImageDepth() ) {
-					$this->image->setImageDepth( 8 );
+			if (is_callable(array($this->image, 'getImageDepth')) && is_callable(array($this->image, 'setImageDepth'))) {
+				if (8 < $this->image->getImageDepth()) {
+					$this->image->setImageDepth(8);
 				}
 			}
 
-			if ( is_callable( array( $this->image, 'setInterlaceScheme' ) ) && defined( 'Imagick::INTERLACE_NO' ) ) {
-				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
+			if (is_callable(array($this->image, 'setInterlaceScheme')) && defined('Imagick::INTERLACE_NO')) {
+				$this->image->setInterlaceScheme(Imagick::INTERLACE_NO);
 			}
 
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_resize_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_resize_error', $e->getMessage());
 		}
 	}
 
@@ -424,42 +424,42 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 		$orig_image = $this->image->getImage();
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
+		foreach ($sizes as $size => $size_data) {
+			if ( ! $this->image)
 				$this->image = $orig_image->getImage();
 
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$resize_result = $this->resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
-				$resized = $this->_save( $this->image );
+			if ( ! is_wp_error($resize_result) && ! $duplicate) {
+				$resized = $this->_save($this->image);
 
 				$this->image->clear();
 				$this->image->destroy();
 				$this->image = null;
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -487,34 +487,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
-		if ( $src_abs ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
 		try {
-			$this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
-			$this->image->setImagePage( $src_w, $src_h, 0, 0);
+			$this->image->cropImage($src_w, $src_h, $src_x, $src_y);
+			$this->image->setImagePage($src_w, $src_h, 0, 0);
 
-			if ( $dst_w || $dst_h ) {
+			if ($dst_w || $dst_h) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
+				if ( ! $dst_w)
 					$dst_w = $src_w;
-				if ( ! $dst_h )
+				if ( ! $dst_h)
 					$dst_h = $src_h;
 
-				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-				if ( is_wp_error( $thumb_result ) ) {
+				$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+				if (is_wp_error($thumb_result)) {
 					return $thumb_result;
 				}
 
 				return $this->update_size();
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_crop_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_crop_error', $e->getMessage());
 		}
 		return $this->update_size();
 	}
@@ -528,23 +528,23 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
+	public function rotate($angle) {
 		/**
 		 * $angle is 360-$angle because Imagick rotates clockwise
 		 * (GD rotates counter-clockwise)
 		 */
 		try {
-			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+			$this->image->rotateImage(new ImagickPixel('none'), 360 - $angle);
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
+			if (is_wp_error($result))
 				return $result;
 
-			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
+			$this->image->setImagePage($this->size['width'], $this->size['height'], 0, 0);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_rotate_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_rotate_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -559,16 +559,16 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		try {
-			if ( $horz )
+			if ($horz)
 				$this->image->flipImage();
 
-			if ( $vert )
+			if ($vert)
 				$this->image->flopImage();
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_flip_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_flip_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -583,18 +583,18 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $destfilename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $destfilename, $mime_type );
+	public function save($destfilename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $destfilename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 
 			try {
-				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
+				$this->image->setImageFormat(strtoupper($this->get_extension($this->mime_type)));
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('image_save_error', $e->getMessage(), $this->file);
 			}
 		}
 
@@ -608,35 +608,35 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
 		try {
 			// Store initial Format
 			$orig_format = $this->image->getImageFormat();
 
-			$this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-			$this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+			$this->image->setImageFormat(strtoupper($this->get_extension($mime_type)));
+			$this->make_image($filename, array($image, 'writeImage'), array($filename));
 
 			// Reset original Format
-			$this->image->setImageFormat( $orig_format );
+			$this->image->setImageFormat($orig_format);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
+		catch (Exception $e) {
+			return new WP_Error('image_save_error', $e->getMessage(), $filename);
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -652,22 +652,22 @@ 
 	 * @param string $mime_type
 	 * @return true|WP_Error
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
 		try {
 			// Temporarily change format for stream
-			$this->image->setImageFormat( strtoupper( $extension ) );
+			$this->image->setImageFormat(strtoupper($extension));
 
 			// Output stream of image content
-			header( "Content-Type: $mime_type" );
+			header("Content-Type: $mime_type");
 			print $this->image->getImageBlob();
 
 			// Reset Image to original Format
-			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
+			$this->image->setImageFormat($this->get_extension($this->mime_type));
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_stream_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_stream_error', $e->getMessage());
 		}
 
 		return true;
@@ -683,14 +683,14 @@ 
 	 */
 	protected function strip_meta() {
 
-		if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) {
+		if ( ! is_callable(array($this->image, 'getImageProfiles'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::getImageProfiles()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::getImageProfiles()</code>'));
 		}
 
-		if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) {
+		if ( ! is_callable(array($this->image, 'removeImageProfile'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::removeImageProfile()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::removeImageProfile()</code>'));
 		}
 
 		/*
@@ -712,14 +712,14 @@ 
 
 		try {
 			// Strip profiles.
-			foreach ( $this->image->getImageProfiles( '*', true ) as $key => $value ) {
-				if ( ! in_array( $key, $protected_profiles ) ) {
-					$this->image->removeImageProfile( $key );
+			foreach ($this->image->getImageProfiles('*', true) as $key => $value) {
+				if ( ! in_array($key, $protected_profiles)) {
+					$this->image->removeImageProfile($key);
 				}
 			}
 
-		} catch ( Exception $e ) {
-			return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
+		} catch (Exception $e) {
+			return new WP_Error('image_strip_meta_error', $e->getMessage());
 		}
 
 		return true;

Braces +72 added lines, -64 removed lines

@@ -48,11 +48,13 @@ 
 	public static function test( $args = array() ) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
-			return false;
+		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) ) {
+					return false;
+		}
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
-			return false;
+		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) ) {
+					return false;
+		}
 
 		$required_methods = array(
 			'clear',
@@ -76,8 +78,9 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
-			return false;
+		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) ) {
+					return false;
+		}
 
 		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
 		if ( array_diff( $required_methods, $class_methods ) ) {
@@ -106,18 +109,19 @@ 
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
-		if ( ! $imagick_extension )
-			return false;
+		if ( ! $imagick_extension ) {
+					return false;
+		}
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
-				return false;
+		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' ) {
+						return false;
+		}
 
 		try {
 			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return false;
 		}
 	}
@@ -131,11 +135,13 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
-			return true;
+		if ( $this->image instanceof Imagick ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		}
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
 		// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
@@ -144,16 +150,17 @@ 
 		try {
 			$this->image = new Imagick( $this->file );
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid() ) {
+							return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			}
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
-				$this->image->setIteratorIndex(0);
+			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {
+							$this->image->setIteratorIndex(0);
+			}
 
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
 		}
 
@@ -186,12 +193,10 @@ 
 			if ( 'image/jpeg' == $this->mime_type ) {
 				$this->image->setImageCompressionQuality( $quality );
 				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
-			}
-			else {
+			} else {
 				$this->image->setImageCompressionQuality( $quality );
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_quality_error', $e->getMessage() );
 		}
 
@@ -214,17 +219,18 @@ 
 		if ( !$width || !$height ) {
 			try {
 				$size = $this->image->getImageGeometry();
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
 			}
 		}
 
-		if ( ! $width )
-			$width = $size['width'];
+		if ( ! $width ) {
+					$width = $size['width'];
+		}
 
-		if ( ! $height )
-			$height = $size['height'];
+		if ( ! $height ) {
+					$height = $size['height'];
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -245,12 +251,14 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		if ( ! $dims ) {
+					return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
 		if ( $crop ) {
@@ -395,8 +403,7 @@ 
 				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
 			}
 
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
 		}
 	}
@@ -430,8 +437,9 @@ 
 		$orig_image = $this->image->getImage();
 
 		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
-				$this->image = $orig_image->getImage();
+			if ( ! $this->image ) {
+							$this->image = $orig_image->getImage();
+			}
 
 			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
 				continue;
@@ -500,10 +508,12 @@ 
 			if ( $dst_w || $dst_h ) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
-					$dst_w = $src_w;
-				if ( ! $dst_h )
-					$dst_h = $src_h;
+				if ( ! $dst_w ) {
+									$dst_w = $src_w;
+				}
+				if ( ! $dst_h ) {
+									$dst_h = $src_h;
+				}
 
 				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
 				if ( is_wp_error( $thumb_result ) ) {
@@ -512,8 +522,7 @@ 
 
 				return $this->update_size();
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_crop_error', $e->getMessage() );
 		}
 		return $this->update_size();
@@ -538,12 +547,12 @@ 
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
-				return $result;
+			if ( is_wp_error( $result ) ) {
+							return $result;
+			}
 
 			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_rotate_error', $e->getMessage() );
 		}
 		return true;
@@ -561,13 +570,14 @@ 
 	 */
 	public function flip( $horz, $vert ) {
 		try {
-			if ( $horz )
-				$this->image->flipImage();
+			if ( $horz ) {
+							$this->image->flipImage();
+			}
 
-			if ( $vert )
-				$this->image->flopImage();
-		}
-		catch ( Exception $e ) {
+			if ( $vert ) {
+							$this->image->flopImage();
+			}
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_flip_error', $e->getMessage() );
 		}
 		return true;
@@ -592,8 +602,7 @@ 
 
 			try {
 				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
 			}
 		}
@@ -611,8 +620,9 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		try {
 			// Store initial Format
@@ -623,8 +633,7 @@ 
 
 			// Reset original Format
 			$this->image->setImageFormat( $orig_format );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
 		}
 
@@ -665,8 +674,7 @@ 
 
 			// Reset Image to original Format
 			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_stream_error', $e->getMessage() );
 		}
 

src/wp-includes/http.php

Braces +69 added lines, -45 removed lines

@@ -215,8 +215,9 @@ 
  * @return array The headers of the response. Empty array if incorrect parameter given.
  */
 function wp_remote_retrieve_headers( $response ) {
-	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
-		return array();
+	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers'])) {
+			return array();
+	}
 
 	return $response['headers'];
 }
@@ -231,11 +232,13 @@ 
  * @return string The header value. Empty string on if incorrect parameter given, or if the header doesn't exist.
  */
 function wp_remote_retrieve_header( $response, $header ) {
-	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
-		return '';
+	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers'])) {
+			return '';
+	}
 
-	if ( array_key_exists($header, $response['headers']) )
-		return $response['headers'][$header];
+	if ( array_key_exists($header, $response['headers']) ) {
+			return $response['headers'][$header];
+	}
 
 	return '';
 }
@@ -251,8 +254,9 @@ 
  * @return int|string The response code as an integer. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_code( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
-		return '';
+	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response'])) {
+			return '';
+	}
 
 	return $response['response']['code'];
 }
@@ -268,8 +272,9 @@ 
  * @return string The response message. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_message( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
-		return '';
+	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response'])) {
+			return '';
+	}
 
 	return $response['response']['message'];
 }
@@ -283,8 +288,9 @@ 
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
 function wp_remote_retrieve_body( $response ) {
-	if ( is_wp_error($response) || ! isset($response['body']) )
-		return '';
+	if ( is_wp_error($response) || ! isset($response['body']) ) {
+			return '';
+	}
 
 	return $response['body'];
 }
@@ -331,8 +337,9 @@ 
  */
 function get_http_origin() {
 	$origin = '';
-	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) )
-		$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) ) {
+			$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	}
 
 	/**
 	 * Change the origin of an HTTP request.
@@ -390,11 +397,13 @@ 
 function is_allowed_http_origin( $origin = null ) {
 	$origin_arg = $origin;
 
-	if ( null === $origin )
-		$origin = get_http_origin();
+	if ( null === $origin ) {
+			$origin = get_http_origin();
+	}
 
-	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) )
-		$origin = '';
+	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) ) {
+			$origin = '';
+	}
 
 	/**
 	 * Change the allowed HTTP origin result.
@@ -426,8 +435,9 @@ 
 	if ( is_allowed_http_origin( $origin ) ) {
 		@header( 'Access-Control-Allow-Origin: ' .  $origin );
 		@header( 'Access-Control-Allow-Credentials: true' );
-		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
-			exit;
+		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] ) {
+					exit;
+		}
 		return $origin;
 	}
 
@@ -450,18 +460,22 @@ 
 function wp_http_validate_url( $url ) {
 	$original_url = $url;
 	$url = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
-	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) )
-		return false;
+	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) ) {
+			return false;
+	}
 
 	$parsed_url = @parse_url( $url );
-	if ( ! $parsed_url || empty( $parsed_url['host'] ) )
-		return false;
+	if ( ! $parsed_url || empty( $parsed_url['host'] ) ) {
+			return false;
+	}
 
-	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) )
-		return false;
+	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) {
+			return false;
+	}
 
-	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) )
-		return false;
+	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) ) {
+			return false;
+	}
 
 	$parsed_home = @parse_url( get_option( 'home' ) );
 
@@ -473,8 +487,10 @@ 
 			$ip = $host;
 		} else {
 			$ip = gethostbyname( $host );
-			if ( $ip === $host ) // Error condition for gethostbyname()
+			if ( $ip === $host ) {
+				// Error condition for gethostbyname()
 				$ip = false;
+			}
 		}
 		if ( $ip ) {
 			$parts = array_map( 'intval', explode( '.', $ip ) );
@@ -494,21 +510,25 @@ 
 				 * @param string $host IP of the requested host.
 				 * @param string $url  URL of the requested host.
 				 */
-				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
-					return false;
+				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) ) {
+									return false;
+				}
 			}
 		}
 	}
 
-	if ( empty( $parsed_url['port'] ) )
-		return $url;
+	if ( empty( $parsed_url['port'] ) ) {
+			return $url;
+	}
 
 	$port = $parsed_url['port'];
-	if ( 80 === $port || 443 === $port || 8080 === $port )
-		return $url;
+	if ( 80 === $port || 443 === $port || 8080 === $port ) {
+			return $url;
+	}
 
-	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port )
-		return $url;
+	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port ) {
+			return $url;
+	}
 
 	return false;
 }
@@ -525,8 +545,9 @@ 
  * @return bool
  */
 function allowed_http_request_hosts( $is_external, $host ) {
-	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
-		$is_external = true;
+	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) ) {
+			$is_external = true;
+	}
 	return $is_external;
 }
 
@@ -547,12 +568,15 @@ 
 function ms_allowed_http_request_hosts( $is_external, $host ) {
 	global $wpdb;
 	static $queried = array();
-	if ( $is_external )
-		return $is_external;
-	if ( $host === get_current_site()->domain )
-		return true;
-	if ( isset( $queried[ $host ] ) )
-		return $queried[ $host ];
+	if ( $is_external ) {
+			return $is_external;
+	}
+	if ( $host === get_current_site()->domain ) {
+			return true;
+	}
+	if ( isset( $queried[ $host ] ) ) {
+			return $queried[ $host ];
+	}
 	$queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
 	return $queried[ $host ];
 }

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Core HTTP Request API
- *
- * Standardizes the HTTP requests for WordPress. Handles cookies, gzip encoding and decoding, chunk
- * decoding, if HTTP 1.1 and various other difficult HTTP protocol implementations.
- *
- * @package WordPress
- * @subpackage HTTP
- */
+	 * Core HTTP Request API
+	 *
+	 * Standardizes the HTTP requests for WordPress. Handles cookies, gzip encoding and decoding, chunk
+	 * decoding, if HTTP 1.1 and various other difficult HTTP protocol implementations.
+	 *
+	 * @package WordPress
+	 * @subpackage HTTP
+	 */
 
 /**
  * Returns the initialized WP_Http Object

Spacing +109 added lines, -109 removed lines

@@ -22,7 +22,7 @@ 
 function _wp_http_get_object() {
 	static $http = null;
 
-	if ( is_null( $http ) ) {
+	if (is_null($http)) {
 		$http = new WP_Http();
 	}
 	return $http;
@@ -43,10 +43,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_request( $url, $args = array() ) {
+function wp_safe_remote_request($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->request( $url, $args );
+	return $http->request($url, $args);
 }
 
 /**
@@ -64,10 +64,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_get( $url, $args = array() ) {
+function wp_safe_remote_get($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->get( $url, $args );
+	return $http->get($url, $args);
 }
 
 /**
@@ -85,10 +85,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_post( $url, $args = array() ) {
+function wp_safe_remote_post($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->post( $url, $args );
+	return $http->post($url, $args);
 }
 
 /**
@@ -106,10 +106,10 @@ 
  * @param array $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_head( $url, $args = array() ) {
+function wp_safe_remote_head($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->head( $url, $args );
+	return $http->head($url, $args);
 }
 
 /**
@@ -150,7 +150,7 @@ 
  */
 function wp_remote_request($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->request( $url, $args );
+	return $http->request($url, $args);
 }
 
 /**
@@ -167,7 +167,7 @@ 
  */
 function wp_remote_get($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->get( $url, $args );
+	return $http->get($url, $args);
 }
 
 /**
@@ -184,7 +184,7 @@ 
  */
 function wp_remote_post($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->post( $url, $args );
+	return $http->post($url, $args);
 }
 
 /**
@@ -201,7 +201,7 @@ 
  */
 function wp_remote_head($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->head( $url, $args );
+	return $http->head($url, $args);
 }
 
 /**
@@ -212,8 +212,8 @@ 
  * @param array $response HTTP response.
  * @return array The headers of the response. Empty array if incorrect parameter given.
  */
-function wp_remote_retrieve_headers( $response ) {
-	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
+function wp_remote_retrieve_headers($response) {
+	if (is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
 		return array();
 
 	return $response['headers'];
@@ -228,11 +228,11 @@ 
  * @param string $header Header name to retrieve value from.
  * @return string The header value. Empty string on if incorrect parameter given, or if the header doesn't exist.
  */
-function wp_remote_retrieve_header( $response, $header ) {
-	if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
+function wp_remote_retrieve_header($response, $header) {
+	if (is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
 		return '';
 
-	if ( array_key_exists($header, $response['headers']) )
+	if (array_key_exists($header, $response['headers']))
 		return $response['headers'][$header];
 
 	return '';
@@ -248,8 +248,8 @@ 
  * @param array $response HTTP response.
  * @return int|string The response code as an integer. Empty string on incorrect parameter given.
  */
-function wp_remote_retrieve_response_code( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+function wp_remote_retrieve_response_code($response) {
+	if (is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
 		return '';
 
 	return $response['response']['code'];
@@ -265,8 +265,8 @@ 
  * @param array $response HTTP response.
  * @return string The response message. Empty string on incorrect parameter given.
  */
-function wp_remote_retrieve_response_message( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+function wp_remote_retrieve_response_message($response) {
+	if (is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
 		return '';
 
 	return $response['response']['message'];
@@ -280,8 +280,8 @@ 
  * @param array $response HTTP response.
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
-function wp_remote_retrieve_body( $response ) {
-	if ( is_wp_error($response) || ! isset($response['body']) )
+function wp_remote_retrieve_body($response) {
+	if (is_wp_error($response) || ! isset($response['body']))
 		return '';
 
 	return $response['body'];
@@ -295,8 +295,8 @@ 
  * @param array $response HTTP response.
  * @return array An array of `WP_Http_Cookie` objects from the response. Empty array if there are none, or the response is a WP_Error.
  */
-function wp_remote_retrieve_cookies( $response ) {
-	if ( is_wp_error( $response ) || empty( $response['cookies'] ) ) {
+function wp_remote_retrieve_cookies($response) {
+	if (is_wp_error($response) || empty($response['cookies'])) {
 		return array();
 	}
 
@@ -312,15 +312,15 @@ 
  * @param string $name     The name of the cookie to retrieve.
  * @return WP_Http_Cookie|string The `WP_Http_Cookie` object. Empty string if the cookie isn't present in the response.
  */
-function wp_remote_retrieve_cookie( $response, $name ) {
-	$cookies = wp_remote_retrieve_cookies( $response );
+function wp_remote_retrieve_cookie($response, $name) {
+	$cookies = wp_remote_retrieve_cookies($response);
 
-	if ( empty( $cookies ) ) {
+	if (empty($cookies)) {
 		return '';
 	}
 
-	foreach ( $cookies as $cookie ) {
-		if ( $cookie->name === $name ) {
+	foreach ($cookies as $cookie) {
+		if ($cookie->name === $name) {
 			return $cookie;
 		}
 	}
@@ -337,10 +337,10 @@ 
  * @param string $name     The name of the cookie to retrieve.
  * @return string The value of the cookie. Empty string if the cookie isn't present in the response.
  */
-function wp_remote_retrieve_cookie_value( $response, $name ) {
-	$cookie = wp_remote_retrieve_cookie( $response, $name );
+function wp_remote_retrieve_cookie_value($response, $name) {
+	$cookie = wp_remote_retrieve_cookie($response, $name);
 
-	if ( ! is_a( $cookie, 'WP_Http_Cookie' ) ) {
+	if ( ! is_a($cookie, 'WP_Http_Cookie')) {
 		return '';
 	}
 
@@ -358,26 +358,26 @@ 
  *
  * @return bool
  */
-function wp_http_supports( $capabilities = array(), $url = null ) {
+function wp_http_supports($capabilities = array(), $url = null) {
 	$http = _wp_http_get_object();
 
-	$capabilities = wp_parse_args( $capabilities );
+	$capabilities = wp_parse_args($capabilities);
 
-	$count = count( $capabilities );
+	$count = count($capabilities);
 
 	// If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array
-	if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) == $count ) {
-		$capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );
+	if ($count && count(array_filter(array_keys($capabilities), 'is_numeric')) == $count) {
+		$capabilities = array_combine(array_values($capabilities), array_fill(0, $count, true));
 	}
 
-	if ( $url && !isset( $capabilities['ssl'] ) ) {
-		$scheme = parse_url( $url, PHP_URL_SCHEME );
-		if ( 'https' == $scheme || 'ssl' == $scheme ) {
+	if ($url && ! isset($capabilities['ssl'])) {
+		$scheme = parse_url($url, PHP_URL_SCHEME);
+		if ('https' == $scheme || 'ssl' == $scheme) {
 			$capabilities['ssl'] = true;
 		}
 	}
 
-	return (bool) $http->_get_first_available_transport( $capabilities );
+	return (bool) $http->_get_first_available_transport($capabilities);
 }
 
 /**
@@ -389,8 +389,8 @@ 
  */
 function get_http_origin() {
 	$origin = '';
-	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) )
-		$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	if ( ! empty ($_SERVER['HTTP_ORIGIN']))
+		$origin = $_SERVER['HTTP_ORIGIN'];
 
 	/**
 	 * Change the origin of an HTTP request.
@@ -399,7 +399,7 @@ 
 	 *
 	 * @param string $origin The original origin for the request.
 	 */
-	return apply_filters( 'http_origin', $origin );
+	return apply_filters('http_origin', $origin);
 }
 
 /**
@@ -410,16 +410,16 @@ 
  * @return array Array of origin URLs.
  */
 function get_allowed_http_origins() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin = parse_url( home_url() );
+	$admin_origin = parse_url(admin_url());
+	$home_origin = parse_url(home_url());
 
 	// @todo preserve port?
-	$allowed_origins = array_unique( array(
-		'http://' . $admin_origin[ 'host' ],
-		'https://' . $admin_origin[ 'host' ],
-		'http://' . $home_origin[ 'host' ],
-		'https://' . $home_origin[ 'host' ],
-	) );
+	$allowed_origins = array_unique(array(
+		'http://'.$admin_origin['host'],
+		'https://'.$admin_origin['host'],
+		'http://'.$home_origin['host'],
+		'https://'.$home_origin['host'],
+	));
 
 	/**
 	 * Change the origin types allowed for HTTP requests.
@@ -434,7 +434,7 @@ 
 	 *     @type string Secure URL for home origin.
 	 * }
 	 */
-	return apply_filters( 'allowed_http_origins' , $allowed_origins );
+	return apply_filters('allowed_http_origins', $allowed_origins);
 }
 
 /**
@@ -445,13 +445,13 @@ 
  * @param null|string $origin Origin URL. If not provided, the value of get_http_origin() is used.
  * @return string Origin URL if allowed, empty string if not.
  */
-function is_allowed_http_origin( $origin = null ) {
+function is_allowed_http_origin($origin = null) {
 	$origin_arg = $origin;
 
-	if ( null === $origin )
+	if (null === $origin)
 		$origin = get_http_origin();
 
-	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) )
+	if ($origin && ! in_array($origin, get_allowed_http_origins()))
 		$origin = '';
 
 	/**
@@ -462,7 +462,7 @@ 
 	 * @param string $origin     Origin URL if allowed, empty string if not.
 	 * @param string $origin_arg Original origin string passed into is_allowed_http_origin function.
 	 */
-	return apply_filters( 'allowed_http_origin', $origin, $origin_arg );
+	return apply_filters('allowed_http_origin', $origin, $origin_arg);
 }
 
 /**
@@ -481,16 +481,16 @@ 
 function send_origin_headers() {
 	$origin = get_http_origin();
 
-	if ( is_allowed_http_origin( $origin ) ) {
-		@header( 'Access-Control-Allow-Origin: ' .  $origin );
-		@header( 'Access-Control-Allow-Credentials: true' );
-		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
+	if (is_allowed_http_origin($origin)) {
+		@header('Access-Control-Allow-Origin: '.$origin);
+		@header('Access-Control-Allow-Credentials: true');
+		if ('OPTIONS' === $_SERVER['REQUEST_METHOD'])
 			exit;
 		return $origin;
 	}
 
-	if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] ) {
-		status_header( 403 );
+	if ('OPTIONS' === $_SERVER['REQUEST_METHOD']) {
+		status_header(403);
 		exit;
 	}
 
@@ -505,44 +505,44 @@ 
  * @param string $url
  * @return false|string URL or false on failure.
  */
-function wp_http_validate_url( $url ) {
+function wp_http_validate_url($url) {
 	$original_url = $url;
-	$url = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
-	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) )
+	$url = wp_kses_bad_protocol($url, array('http', 'https'));
+	if ( ! $url || strtolower($url) !== strtolower($original_url))
 		return false;
 
-	$parsed_url = @parse_url( $url );
-	if ( ! $parsed_url || empty( $parsed_url['host'] ) )
+	$parsed_url = @parse_url($url);
+	if ( ! $parsed_url || empty($parsed_url['host']))
 		return false;
 
-	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) )
+	if (isset($parsed_url['user']) || isset($parsed_url['pass']))
 		return false;
 
-	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) )
+	if (false !== strpbrk($parsed_url['host'], ':#?[]'))
 		return false;
 
-	$parsed_home = @parse_url( get_option( 'home' ) );
+	$parsed_home = @parse_url(get_option('home'));
 
-	if ( isset( $parsed_home['host'] ) ) { 
-		$same_host = ( strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ) || 'localhost' === strtolower( $parsed_url['host'] ) );
+	if (isset($parsed_home['host'])) { 
+		$same_host = (strtolower($parsed_home['host']) === strtolower($parsed_url['host']) || 'localhost' === strtolower($parsed_url['host']));
 	} else {
 		$same_host = false;
 	}
 
-	if ( ! $same_host ) {
-		$host = trim( $parsed_url['host'], '.' );
-		if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) {
+	if ( ! $same_host) {
+		$host = trim($parsed_url['host'], '.');
+		if (preg_match('#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host)) {
 			$ip = $host;
 		} else {
-			$ip = gethostbyname( $host );
-			if ( $ip === $host ) // Error condition for gethostbyname()
+			$ip = gethostbyname($host);
+			if ($ip === $host) // Error condition for gethostbyname()
 				$ip = false;
 		}
-		if ( $ip ) {
-			$parts = array_map( 'intval', explode( '.', $ip ) );
-			if ( 127 === $parts[0] || 10 === $parts[0] || 0 === $parts[0]
-				|| ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] )
-				|| ( 192 === $parts[0] && 168 === $parts[1] )
+		if ($ip) {
+			$parts = array_map('intval', explode('.', $ip));
+			if (127 === $parts[0] || 10 === $parts[0] || 0 === $parts[0]
+				|| (172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1])
+				|| (192 === $parts[0] && 168 === $parts[1])
 			) {
 				// If host appears local, reject unless specifically allowed.
 				/**
@@ -556,20 +556,20 @@ 
 				 * @param string $host IP of the requested host.
 				 * @param string $url  URL of the requested host.
 				 */
-				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
+				if ( ! apply_filters('http_request_host_is_external', false, $host, $url))
 					return false;
 			}
 		}
 	}
 
-	if ( empty( $parsed_url['port'] ) )
+	if (empty($parsed_url['port']))
 		return $url;
 
 	$port = $parsed_url['port'];
-	if ( 80 === $port || 443 === $port || 8080 === $port )
+	if (80 === $port || 443 === $port || 8080 === $port)
 		return $url;
 
-	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port )
+	if ($parsed_home && $same_host && isset($parsed_home['port']) && $parsed_home['port'] === $port)
 		return $url;
 
 	return false;
@@ -586,8 +586,8 @@ 
  * @param string $host
  * @return bool
  */
-function allowed_http_request_hosts( $is_external, $host ) {
-	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
+function allowed_http_request_hosts($is_external, $host) {
+	if ( ! $is_external && wp_validate_redirect('http://'.$host))
 		$is_external = true;
 	return $is_external;
 }
@@ -606,17 +606,17 @@ 
  * @param string $host
  * @return bool
  */
-function ms_allowed_http_request_hosts( $is_external, $host ) {
+function ms_allowed_http_request_hosts($is_external, $host) {
 	global $wpdb;
 	static $queried = array();
-	if ( $is_external )
+	if ($is_external)
 		return $is_external;
-	if ( $host === get_current_site()->domain )
+	if ($host === get_current_site()->domain)
 		return true;
-	if ( isset( $queried[ $host ] ) )
-		return $queried[ $host ];
-	$queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
-	return $queried[ $host ];
+	if (isset($queried[$host]))
+		return $queried[$host];
+	$queried[$host] = (bool) $wpdb->get_var($wpdb->prepare("SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host));
+	return $queried[$host];
 }
 
 /**
@@ -635,30 +635,30 @@ 
  * @return bool|array False on failure; Array of URL components on success;
  *                    See parse_url()'s return values.
  */
-function wp_parse_url( $url ) {
-	$parts = @parse_url( $url );
-	if ( ! $parts ) {
+function wp_parse_url($url) {
+	$parts = @parse_url($url);
+	if ( ! $parts) {
 		// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path
-		if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
+		if ('/' == $url[0] && false !== strpos($url, '://')) {
 			// Since we know it's a relative path, prefix with a scheme/host placeholder and try again
-			if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url ) ) {
+			if ( ! $parts = @parse_url('placeholder://placeholder'.$url)) {
 				return $parts;
 			}
 			// Remove the placeholder values
-			unset( $parts['scheme'], $parts['host'] );
+			unset($parts['scheme'], $parts['host']);
 		} else {
 			return $parts;
 		}
 	}
 
 	// < PHP 5.4.7 compat, doesn't detect schemeless URL's host field
-	if ( '//' == substr( $url, 0, 2 ) && ! isset( $parts['host'] ) ) {
-		$path_parts = explode( '/', substr( $parts['path'], 2 ), 2 );
+	if ('//' == substr($url, 0, 2) && ! isset($parts['host'])) {
+		$path_parts = explode('/', substr($parts['path'], 2), 2);
 		$parts['host'] = $path_parts[0];
-		if ( isset( $path_parts[1] ) ) {
-			$parts['path'] = '/' . $path_parts[1];
+		if (isset($path_parts[1])) {
+			$parts['path'] = '/'.$path_parts[1];
 		} else {
-			unset( $parts['path'] );
+			unset($parts['path']);
 		}
 	}
 

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

Braces +25 added lines, -18 removed lines

@@ -44,17 +44,20 @@ 
 	 * @return bool
 	 */
 	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
-			return false;
+		if ( !parent::do_item($handle) ) {
+					return false;
+		}
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
-			$ver = '';
-		else
-			$ver = $obj->ver ? $obj->ver : $this->default_version;
+		if ( null === $obj->ver ) {
+					$ver = '';
+		} else {
+					$ver = $obj->ver ? $obj->ver : $this->default_version;
+		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if ( isset($this->args[$handle]) ) {
+					$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		}
 
 		if ( $this->do_concat ) {
 			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
@@ -67,10 +70,11 @@ 
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
-		else
-			$media = 'all';
+		if ( isset($obj->args) ) {
+					$media = esc_attr( $obj->args );
+		} else {
+					$media = 'all';
+		}
 
 		$href = $this->_css_href( $obj->src, $ver, $handle );
 		if ( empty( $href ) ) {
@@ -206,8 +210,9 @@ 
 			$src = $this->base_url . $src;
 		}
 
-		if ( !empty($ver) )
-			$src = add_query_arg('ver', $ver, $src);
+		if ( !empty($ver) ) {
+					$src = add_query_arg('ver', $ver, $src);
+		}
 
 		/**
 		 * Filter an enqueued style's fully-qualified URL.
@@ -226,12 +231,14 @@ 
 	 * @return bool
 	 */
 	public function in_default_dir($src) {
-		if ( ! $this->default_dirs )
-			return true;
+		if ( ! $this->default_dirs ) {
+					return true;
+		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
-				return true;
+			if ( 0 === strpos($src, $test) ) {
+							return true;
+			}
 		}
 		return false;
 	}

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Dependencies API: WP_Styles class
- *
- * @since 2.6.0
- *
- * @package WordPress
- * @subpackage Dependencies
- */
+	 * Dependencies API: WP_Styles class
+	 *
+	 * @since 2.6.0
+	 *
+	 * @package WordPress
+	 * @subpackage Dependencies
+	 */
 
 /**
  * Core class used to register styles.

Spacing +56 added lines, -56 removed lines

@@ -124,7 +124,7 @@ 
 		 *
 		 * @param WP_Styles &$this WP_Styles instance, passed by reference.
 		 */
-		do_action_ref_array( 'wp_default_styles', array(&$this) );
+		do_action_ref_array('wp_default_styles', array(&$this));
 	}
 
 	/**
@@ -138,40 +138,40 @@ 
 	 * @param string $handle The style's registered handle.
 	 * @return bool True on success, false on failure.
 	 */
-	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
+	public function do_item($handle) {
+		if ( ! parent::do_item($handle))
 			return false;
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
+		if (null === $obj->ver)
 			$ver = '';
 		else
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if (isset($this->args[$handle]))
+			$ver = $ver ? $ver.'&'.$this->args[$handle] : $this->args[$handle];
 
-		if ( $this->do_concat ) {
-			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+		if ($this->do_concat) {
+			if ($this->in_default_dir($obj->src) && ! isset($obj->extra['conditional']) && ! isset($obj->extra['alt'])) {
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 
-				$this->print_code .= $this->print_inline_style( $handle, false );
+				$this->print_code .= $this->print_inline_style($handle, false);
 
 				return true;
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
+		if (isset($obj->args))
+			$media = esc_attr($obj->args);
 		else
 			$media = 'all';
 
 		// A single item may alias a set of items, by having dependencies, but no source.
-		if ( ! $obj->src ) {
-			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
-				$inline_style = sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
-				if ( $this->do_concat ) {
+		if ( ! $obj->src) {
+			if ($inline_style = $this->print_inline_style($handle, false)) {
+				$inline_style = sprintf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $inline_style);
+				if ($this->do_concat) {
 					$this->print_html .= $inline_style;
 				} else {
 					echo $inline_style;
@@ -180,13 +180,13 @@ 
 			return true;
 		}
 
-		$href = $this->_css_href( $obj->src, $ver, $handle );
-		if ( ! $href ) {
+		$href = $this->_css_href($obj->src, $ver, $handle);
+		if ( ! $href) {
 			return true;
 		}
 
 		$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-		$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+		$title = isset($obj->extra['title']) ? "title='".esc_attr($obj->extra['title'])."'" : '';
 
 		/**
 		 * Filter the HTML link tag of an enqueued style.
@@ -200,19 +200,19 @@ 
 		 * @param string $href   The stylesheet's source URL.
 		 * @param string $media  The stylesheet's media attribute.
 		 */
-		$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
-		if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
-			if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
-				$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
-				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
+		$tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
+		if ('rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl']) {
+			if (is_bool($obj->extra['rtl']) || 'replace' === $obj->extra['rtl']) {
+				$suffix = isset($obj->extra['suffix']) ? $obj->extra['suffix'] : '';
+				$rtl_href = str_replace("{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href($obj->src, $ver, "$handle-rtl"));
 			} else {
-				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
+				$rtl_href = $this->_css_href($obj->extra['rtl'], $ver, "$handle-rtl");
 			}
 
 			/** This filter is documented in wp-includes/class.wp-styles.php */
-			$rtl_tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href, $media );
+			$rtl_tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href, $media);
 
-			if ( $obj->extra['rtl'] === 'replace' ) {
+			if ($obj->extra['rtl'] === 'replace') {
 				$tag = $rtl_tag;
 			} else {
 				$tag .= $rtl_tag;
@@ -220,22 +220,22 @@ 
 		}
 
 		$conditional_pre = $conditional_post = '';
-		if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+		if (isset($obj->extra['conditional']) && $obj->extra['conditional']) {
 			$conditional_pre  = "<!--[if {$obj->extra['conditional']}]>\n";
 			$conditional_post = "<![endif]-->\n";
 		}
 
-		if ( $this->do_concat ) {
+		if ($this->do_concat) {
 			$this->print_html .= $conditional_pre;
 			$this->print_html .= $tag;
-			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
-				$this->print_html .= sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+			if ($inline_style = $this->print_inline_style($handle, false)) {
+				$this->print_html .= sprintf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $inline_style);
 			}
 			$this->print_html .= $conditional_post;
 		} else {
 			echo $conditional_pre;
 			echo $tag;
-			$this->print_inline_style( $handle );
+			$this->print_inline_style($handle);
 			echo $conditional_post;
 		}
 
@@ -252,19 +252,19 @@ 
 	 * @param string $code   String containing the CSS styles to be added.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_inline_style( $handle, $code ) {
-		if ( ! $code ) {
+	public function add_inline_style($handle, $code) {
+		if ( ! $code) {
 			return false;
 		}
 
-		$after = $this->get_data( $handle, 'after' );
-		if ( ! $after ) {
+		$after = $this->get_data($handle, 'after');
+		if ( ! $after) {
 			$after = array();
 		}
 
 		$after[] = $code;
 
-		return $this->add_data( $handle, 'after', $after );
+		return $this->add_data($handle, 'after', $after);
 	}
 
 	/**
@@ -278,20 +278,20 @@ 
 	 *                       Default true.
 	 * @return string|bool False if no data exists, inline styles if `$echo` is true, true otherwise.
 	 */
-	public function print_inline_style( $handle, $echo = true ) {
-		$output = $this->get_data( $handle, 'after' );
+	public function print_inline_style($handle, $echo = true) {
+		$output = $this->get_data($handle, 'after');
 
-		if ( empty( $output ) ) {
+		if (empty($output)) {
 			return false;
 		}
 
-		$output = implode( "\n", $output );
+		$output = implode("\n", $output);
 
-		if ( ! $echo ) {
+		if ( ! $echo) {
 			return $output;
 		}
 
-		printf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $output );
+		printf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $output);
 
 		return true;
 	}
@@ -309,9 +309,9 @@ 
 	 * @param int|false $group     Group level: (int) level, (false) no groups.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		$r = parent::all_deps( $handles, $recursion, $group );
-		if ( ! $recursion ) {
+	public function all_deps($handles, $recursion = false, $group = false) {
+		$r = parent::all_deps($handles, $recursion, $group);
+		if ( ! $recursion) {
 			/**
 			 * Filter the array of enqueued styles before processing for output.
 			 *
@@ -319,7 +319,7 @@ 
 			 *
 			 * @param array $to_do The list of enqueued styles about to be processed.
 			 */
-			$this->to_do = apply_filters( 'print_styles_array', $this->to_do );
+			$this->to_do = apply_filters('print_styles_array', $this->to_do);
 		}
 		return $r;
 	}
@@ -335,12 +335,12 @@ 
 	 * @param string $handle The style's registered handle.
 	 * @return string Style's fully-qualified URL.
 	 */
-	public function _css_href( $src, $ver, $handle ) {
-		if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
-			$src = $this->base_url . $src;
+	public function _css_href($src, $ver, $handle) {
+		if ( ! is_bool($src) && ! preg_match('|^(https?:)?//|', $src) && ! ($this->content_url && 0 === strpos($src, $this->content_url))) {
+			$src = $this->base_url.$src;
 		}
 
-		if ( !empty($ver) )
+		if ( ! empty($ver))
 			$src = add_query_arg('ver', $ver, $src);
 
 		/**
@@ -351,8 +351,8 @@ 
 		 * @param string $src    The source URL of the enqueued style.
 		 * @param string $handle The style's registered handle.
 		 */
-		$src = apply_filters( 'style_loader_src', $src, $handle );
-		return esc_url( $src );
+		$src = apply_filters('style_loader_src', $src, $handle);
+		return esc_url($src);
 	}
 
 	/**
@@ -364,12 +364,12 @@ 
 	 * @param string $src The source of the enqueued style.
 	 * @return bool True if found, false if not.
 	 */
-	public function in_default_dir( $src ) {
-		if ( ! $this->default_dirs )
+	public function in_default_dir($src) {
+		if ( ! $this->default_dirs)
 			return true;
 
-		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
+		foreach ((array) $this->default_dirs as $test) {
+			if (0 === strpos($src, $test))
 				return true;
 		}
 		return false;

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

Indentation +5 added lines, -5 removed lines

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

Spacing +120 added lines, -120 removed lines

@@ -24,9 +24,9 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image ) {
+		if ($this->image) {
 			// we don't need the original in memory anymore
-			imagedestroy( $this->image );
+			imagedestroy($this->image);
 		}
 	}
 
@@ -41,14 +41,14 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
+	public static function test($args = array()) {
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info'))
 			return false;
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( isset( $args['methods'] ) &&
-			 in_array( 'rotate', $args['methods'] ) &&
-			 ! function_exists('imagerotate') ){
+		if (isset($args['methods']) &&
+			 in_array('rotate', $args['methods']) &&
+			 ! function_exists('imagerotate')) {
 
 				return false;
 		}
@@ -67,9 +67,9 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		$image_types = imagetypes();
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return ($image_types & IMG_JPG) != 0;
 			case 'image/png':
@@ -90,11 +90,11 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
+		if ($this->image)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn’t exist?'), $this->file);
 
 		/**
 		 * Filter the memory limit allocated for image manipulation.
@@ -105,23 +105,23 @@ 
 		 *                          Accepts an integer (bytes), or a shorthand string notation, such as '256M'.
 		 */
 		// Set artificially high because GD uses uncompressed images in memory
-		@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+		@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
 
-		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
+		$this->image = @imagecreatefromstring(file_get_contents($this->file));
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource($this->image))
+			return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
-		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		$size = @getimagesize($this->file);
+		if ( ! $size)
+			return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 
-		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
-			imagealphablending( $this->image, false );
-			imagesavealpha( $this->image, true );
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
+			imagealphablending($this->image, false);
+			imagesavealpha($this->image, true);
 		}
 
-		$this->update_size( $size[0], $size[1] );
+		$this->update_size($size[0], $size[1]);
 		$this->mime_type = $size['mime'];
 
 		return $this->set_quality();
@@ -137,14 +137,14 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+	protected function update_size($width = false, $height = false) {
+		if ( ! $width)
+			$width = imagesx($this->image);
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height)
+			$height = imagesy($this->image);
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -163,21 +163,21 @@ 
 	 * @param  bool     $crop
 	 * @return true|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$resized = $this->_resize( $max_w, $max_h, $crop );
+		$resized = $this->_resize($max_w, $max_h, $crop);
 
-		if ( is_resource( $resized ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($resized)) {
+			imagedestroy($this->image);
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
+		} elseif (is_wp_error($resized))
 			return $resized;
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -187,22 +187,22 @@ 
 	 * @param bool|array $crop
 	 * @return resource|WP_Error
 	 */
-	protected function _resize( $max_w, $max_h, $crop = false ) {
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims ) {
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file );
+	protected function _resize($max_w, $max_h, $crop = false) {
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims) {
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file);
 		}
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		$resized = wp_imagecreatetruecolor( $dst_w, $dst_h );
-		imagecopyresampled( $resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		$resized = wp_imagecreatetruecolor($dst_w, $dst_h);
+		imagecopyresampled($resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $resized ) ) {
-			$this->update_size( $dst_w, $dst_h );
+		if (is_resource($resized)) {
+			$this->update_size($dst_w, $dst_h);
 			return $resized;
 		}
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error('image_resize_error', __('Image resize failed.'), $this->file);
 	}
 
 	/**
@@ -226,36 +226,36 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+		foreach ($sizes as $size => $size_data) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$image = $this->_resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $image ) && ! $duplicate ) {
-				$resized = $this->_save( $image );
+			if ( ! is_wp_error($image) && ! $duplicate) {
+				$resized = $this->_save($image);
 
-				imagedestroy( $image );
+				imagedestroy($image);
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -281,34 +281,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
+		if ( ! $dst_w)
 			$dst_w = $src_w;
-		if ( ! $dst_h )
+		if ( ! $dst_h)
 			$dst_h = $src_h;
 
-		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
+		$dst = wp_imagecreatetruecolor($dst_w, $dst_h);
 
-		if ( $src_abs ) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if (function_exists('imageantialias'))
+			imageantialias($dst, true);
 
-		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+		imagecopyresampled($dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
 
-		if ( is_resource( $dst ) ) {
-			imagedestroy( $this->image );
+		if (is_resource($dst)) {
+			imagedestroy($this->image);
 			$this->image = $dst;
 			$this->update_size();
 			return true;
 		}
 
-		return new WP_Error( 'image_crop_error', __('Image crop failed.'), $this->file );
+		return new WP_Error('image_crop_error', __('Image crop failed.'), $this->file);
 	}
 
 	/**
@@ -321,21 +321,21 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
-		if ( function_exists('imagerotate') ) {
-			$transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
-			$rotated = imagerotate( $this->image, $angle, $transparency );
-
-			if ( is_resource( $rotated ) ) {
-				imagealphablending( $rotated, true );
-				imagesavealpha( $rotated, true );
-				imagedestroy( $this->image );
+	public function rotate($angle) {
+		if (function_exists('imagerotate')) {
+			$transparency = imagecolorallocatealpha($this->image, 255, 255, 255, 127);
+			$rotated = imagerotate($this->image, $angle, $transparency);
+
+			if (is_resource($rotated)) {
+				imagealphablending($rotated, true);
+				imagesavealpha($rotated, true);
+				imagedestroy($this->image);
 				$this->image = $rotated;
 				$this->update_size();
 				return true;
 			}
 		}
-		return new WP_Error( 'image_rotate_error', __('Image rotate failed.'), $this->file );
+		return new WP_Error('image_rotate_error', __('Image rotate failed.'), $this->file);
 	}
 
 	/**
@@ -348,24 +348,24 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		$w = $this->size['width'];
 		$h = $this->size['height'];
-		$dst = wp_imagecreatetruecolor( $w, $h );
+		$dst = wp_imagecreatetruecolor($w, $h);
 
-		if ( is_resource( $dst ) ) {
+		if (is_resource($dst)) {
 			$sx = $vert ? ($w - 1) : 0;
 			$sy = $horz ? ($h - 1) : 0;
 			$sw = $vert ? -$w : $w;
 			$sh = $horz ? -$h : $h;
 
-			if ( imagecopyresampled( $dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-				imagedestroy( $this->image );
+			if (imagecopyresampled($dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
+				imagedestroy($this->image);
 				$this->image = $dst;
 				return true;
 			}
 		}
-		return new WP_Error( 'image_flip_error', __('Image flip failed.'), $this->file );
+		return new WP_Error('image_flip_error', __('Image flip failed.'), $this->file);
 	}
 
 	/**
@@ -378,10 +378,10 @@ 
 	 * @param string|null $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $filename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $filename, $mime_type );
+	public function save($filename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $filename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 		}
@@ -395,36 +395,36 @@ 
 	 * @param string|null $mime_type
 	 * @return WP_Error|array
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
-		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		if ('image/gif' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagegif', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/png' == $mime_type ) {
+		elseif ('image/png' == $mime_type) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if (function_exists('imageistruecolor') && ! imageistruecolor($image))
+				imagetruecolortopalette($image, false, imagecolorstotal($image));
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			if ( ! $this->make_image($filename, 'imagepng', array($image, $filename)))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+		elseif ('image/jpeg' == $mime_type) {
+			if ( ! $this->make_image($filename, 'imagejpeg', array($image, $filename, $this->get_quality())))
+				return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 		else {
-			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			return new WP_Error('image_save_error', __('Image Editor Save Failed'));
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/**
 		 * Filter the name of the saved image file.
@@ -435,7 +435,7 @@ 
 		 */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -451,19 +451,19 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $this->image );
+				header('Content-Type: image/png');
+				return imagepng($this->image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $this->image );
+				header('Content-Type: image/gif');
+				return imagegif($this->image);
 			default:
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $this->image, null, $this->get_quality() );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($this->image, null, $this->get_quality());
 		}
 	}
 
@@ -478,10 +478,10 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
+	protected function make_image($filename, $function, $arguments) {
+		if (wp_is_stream($filename))
 			$arguments[1] = null;
 
-		return parent::make_image( $filename, $function, $arguments );
+		return parent::make_image($filename, $function, $arguments);
 	}
 }

Braces +57 added lines, -42 removed lines

@@ -42,8 +42,9 @@ 
 	 * @return bool
 	 */
 	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
-			return false;
+		if ( ! extension_loaded('gd') || ! function_exists('gd_info') ) {
+					return false;
+		}
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
 		if ( isset( $args['methods'] ) &&
@@ -90,11 +91,13 @@ 
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
-			return true;
+		if ( $this->image ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
+		}
 
 		/**
 		 * Filter the memory limit allocated for image manipulation.
@@ -109,12 +112,14 @@ 
 
 		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource( $this->image ) ) {
+					return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		}
 
 		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		if ( ! $size ) {
+					return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		}
 
 		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
 			imagealphablending( $this->image, false );
@@ -138,11 +143,13 @@ 
 	 * @return true
 	 */
 	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
-			$width = imagesx( $this->image );
+		if ( ! $width ) {
+					$width = imagesx( $this->image );
+		}
 
-		if ( ! $height )
-			$height = imagesy( $this->image );
+		if ( ! $height ) {
+					$height = imagesy( $this->image );
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -164,8 +171,9 @@ 
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$resized = $this->_resize( $max_w, $max_h, $crop );
 
@@ -174,8 +182,9 @@ 
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
-			return $resized;
+		} elseif ( is_wp_error( $resized ) ) {
+					return $resized;
+		}
 
 		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
 	}
@@ -284,10 +293,12 @@ 
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
-			$dst_w = $src_w;
-		if ( ! $dst_h )
-			$dst_h = $src_h;
+		if ( ! $dst_w ) {
+					$dst_w = $src_w;
+		}
+		if ( ! $dst_h ) {
+					$dst_h = $src_h;
+		}
 
 		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
@@ -296,8 +307,9 @@ 
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
-			imageantialias( $dst, true );
+		if ( function_exists( 'imageantialias' ) ) {
+					imageantialias( $dst, true );
+		}
 
 		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
@@ -398,26 +410,28 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/png' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/png' == $mime_type ) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
-				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) ) {
+							imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			}
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		else {
+			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} elseif ( 'image/jpeg' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) {
+							return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			}
+		} else {
 			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
 		}
 
@@ -479,8 +493,9 @@ 
 	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
-			$arguments[1] = null;
+		if ( wp_is_stream( $filename ) ) {
+					$arguments[1] = null;
+		}
 
 		return parent::make_image( $filename, $function, $arguments );
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

src/wp-includes/feed-rdf.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * RSS 1 RDF Feed Template for displaying RSS 1 Posts feed.
- *
- * @package WordPress
- */
+	 * RSS 1 RDF Feed Template for displaying RSS 1 Posts feed.
+	 *
+	 * @package WordPress
+	 */
 
 header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;

Spacing +8 added lines, -8 removed lines

@@ -5,13 +5,13 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rdf').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'rdf' );
+do_action('rss_tag_pre', 'rdf');
 ?>
 <rdf:RDF
 	xmlns="http://purl.org/rss/1.0/"
@@ -26,7 +26,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_ns' );
+	do_action('rdf_ns');
 	?>
 >
 <channel rdf:about="<?php bloginfo_rss("url") ?>">
@@ -36,11 +36,11 @@ 
 	<dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>
 	<sy:updatePeriod><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_period', 'hourly' );
+		echo apply_filters('rss_update_period', 'hourly');
 	?></sy:updatePeriod>
 	<sy:updateFrequency><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_frequency', '1' );
+		echo apply_filters('rss_update_frequency', '1');
 	?></sy:updateFrequency>
 	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
 	<?php
@@ -49,7 +49,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_header' );
+	do_action('rdf_header');
 	?>
 	<items>
 		<rdf:Seq>
@@ -78,8 +78,8 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_item' );
+	do_action('rdf_item');
 	?>
 </item>
-<?php endwhile;  ?>
+<?php endwhile; ?>
 </rdf:RDF>

Braces +5 added lines, -2 removed lines

@@ -68,10 +68,13 @@
 	<?php the_category_rss('rdf') ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php else : ?>
+<?php else {
+	: ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 	/**
 	 * Fires at the end of each RDF feed item.

wp-config-sample.php

Spacing +11 added lines, -11 removed lines

@@ -46,14 +46,14 @@ 
  *

  * @since 2.6.0

  */

-define('AUTH_KEY',         'put your unique phrase here');

-define('SECURE_AUTH_KEY',  'put your unique phrase here');

-define('LOGGED_IN_KEY',    'put your unique phrase here');

-define('NONCE_KEY',        'put your unique phrase here');

-define('AUTH_SALT',        'put your unique phrase here');

+define('AUTH_KEY', 'put your unique phrase here');

+define('SECURE_AUTH_KEY', 'put your unique phrase here');

+define('LOGGED_IN_KEY', 'put your unique phrase here');

+define('NONCE_KEY', 'put your unique phrase here');

+define('AUTH_SALT', 'put your unique phrase here');

 define('SECURE_AUTH_SALT', 'put your unique phrase here');

-define('LOGGED_IN_SALT',   'put your unique phrase here');

-define('NONCE_SALT',       'put your unique phrase here');

+define('LOGGED_IN_SALT', 'put your unique phrase here');

+define('NONCE_SALT', 'put your unique phrase here');

 

 /**#@-*/

 

@@ -63,7 +63,7 @@ 
  * You can have multiple installations in one database if you give each

  * a unique prefix. Only numbers, letters, and underscores please!

  */

-$table_prefix  = 'wp_';

+$table_prefix = 'wp_';

 

 /**

  * For developers: WordPress debugging mode.

@@ -82,8 +82,8 @@ 
 /* That's all, stop editing! Happy blogging. */

 

 /** Absolute path to the WordPress directory. */

-if ( !defined('ABSPATH') )

-	define('ABSPATH', dirname(__FILE__) . '/');

+if ( ! defined('ABSPATH'))

+	define('ABSPATH', dirname(__FILE__).'/');

 

 /** Sets up WordPress vars and included files. */

-require_once(ABSPATH . 'wp-settings.php');

+require_once(ABSPATH.'wp-settings.php');

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
 /* That's all, stop editing! Happy blogging. */

 

 /** Absolute path to the WordPress directory. */

-if ( !defined('ABSPATH') )

-	define('ABSPATH', dirname(__FILE__) . '/');

+if ( !defined('ABSPATH') ) {
+	define('ABSPATH', dirname(__FILE__) . '/');
+}
 

 /** Sets up WordPress vars and included files. */

 require_once(ABSPATH . 'wp-settings.php');

wp-tests-config-sample.php

Spacing +14 added lines, -14 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /* Path to the WordPress codebase you'd like to test. Add a backslash in the end. */
-define( 'ABSPATH', dirname( __FILE__ ) . '/src/' );
+define('ABSPATH', dirname(__FILE__).'/src/');
 
 // Test with multisite enabled.
 // Alternatively, use the tests/phpunit/multisite.xml configuration file.
@@ -12,7 +12,7 @@ 
 // define( 'WP_TESTS_FORCE_KNOWN_BUGS', true );
 
 // Test with WordPress debug mode (default).
-define( 'WP_DEBUG', true );
+define('WP_DEBUG', true);
 
 // ** MySQL settings ** //
 
@@ -23,19 +23,19 @@ 
 // These tests will DROP ALL TABLES in the database with the prefix named below.
 // DO NOT use a production database or one that is shared with something else.
 
-define( 'DB_NAME', 'youremptytestdbnamehere' );
-define( 'DB_USER', 'yourusernamehere' );
-define( 'DB_PASSWORD', 'yourpasswordhere' );
-define( 'DB_HOST', 'localhost' );
-define( 'DB_CHARSET', 'utf8' );
-define( 'DB_COLLATE', '' );
+define('DB_NAME', 'youremptytestdbnamehere');
+define('DB_USER', 'yourusernamehere');
+define('DB_PASSWORD', 'yourpasswordhere');
+define('DB_HOST', 'localhost');
+define('DB_CHARSET', 'utf8');
+define('DB_COLLATE', '');
 
-$table_prefix  = 'wptests_';   // Only numbers, letters, and underscores please!
+$table_prefix = 'wptests_'; // Only numbers, letters, and underscores please!
 
-define( 'WP_TESTS_DOMAIN', 'example.org' );
-define( 'WP_TESTS_EMAIL', 'admin@example.org' );
-define( 'WP_TESTS_TITLE', 'Test Blog' );
+define('WP_TESTS_DOMAIN', 'example.org');
+define('WP_TESTS_EMAIL', 'admin@example.org');
+define('WP_TESTS_TITLE', 'Test Blog');
 
-define( 'WP_PHP_BINARY', 'php' );
+define('WP_PHP_BINARY', 'php');
 
-define( 'WPLANG', '' );
+define('WPLANG', '');