ntwb / wordpress

src/wp-includes/compat.php

Braces +15 added lines, -10 removed lines

@@ -161,13 +161,15 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
-		return false;
+	if ( !isset($packs[$algo]) ) {
+			return false;
+	}
 
 	$pack = $packs[$algo];
 
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
+	if (strlen($key) > 64) {
+			$key = pack($pack, $algo($key));
+	}
 
 	$key = str_pad($key, 64, chr(0));
 
@@ -176,8 +178,9 @@ 
 
 	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ( $raw_output ) {
+			return pack( $pack, $hmac );
+	}
 	return $hmac;
 }
 
@@ -210,8 +213,9 @@ 
 		}
 
 		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		if ( $assoc_array ) {
+					$res = _json_decode_object_helper( $res );
+		}
 		return $res;
 	}
 
@@ -220,8 +224,9 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
+		if ( is_object($data) ) {
+					$data = get_object_vars($data);
+		}
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }

Doc Comments +5 added lines, -1 removed lines

@@ -8,6 +8,10 @@ 
 
 // If gettext isn't available
 if ( !function_exists('_') ) {
+
+	/**
+	 * @param string $string
+	 */
 	function _($string) {
 		return $string;
 	}
@@ -366,7 +370,7 @@ 
 	 *
 	 * @internal This is a compatibility function for PHP <5.5
 	 *
-	 * @return bool|string Returns the error message on success, "No Error" if no error has occurred,
+	 * @return false|string Returns the error message on success, "No Error" if no error has occurred,
 	 *                     or false on failure.
 	 */
 	function json_last_error_msg() {

Indentation +2 added lines, -2 removed lines

@@ -472,8 +472,8 @@
 
 				foreach ( array_keys( $head ) as $key ) {
 					if ( isset( $key, $bref ) &&
-					     isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
-					     isset( $head[ $key ] ) && is_array( $head[ $key ] )
+						 isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
+						 isset( $head[ $key ] ) && is_array( $head[ $key ] )
 					) {
 						$bref_stack[] = &$bref[ $key ];
 						$head_stack[] = $head[ $key ];

Spacing +112 added lines, -112 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // If gettext isn't available
-if ( !function_exists('_') ) {
+if ( ! function_exists('_')) {
 	function _($string) {
 		return $string;
 	}
@@ -27,21 +27,21 @@ 
  *             false  : Used for testing - return false for future calls to this function
  *             'reset': Used for testing - restore default behavior of this function
  */
-function _wp_can_use_pcre_u( $set = null ) {
+function _wp_can_use_pcre_u($set = null) {
 	static $utf8_pcre = 'reset';
 
-	if ( null !== $set ) {
+	if (null !== $set) {
 		$utf8_pcre = $set;
 	}
 
-	if ( 'reset' === $utf8_pcre ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ('reset' === $utf8_pcre) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 
 	return $utf8_pcre;
 }
 
-if ( ! function_exists( 'mb_substr' ) ) :
+if ( ! function_exists('mb_substr')) :
 	/**
 	 * Compat function to mimic mb_substr().
 	 *
@@ -57,8 +57,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return string Extracted substring.
 	 */
-	function mb_substr( $str, $start, $length = null, $encoding = null ) {
-		return _mb_substr( $str, $start, $length, $encoding );
+	function mb_substr($str, $start, $length = null, $encoding = null) {
+		return _mb_substr($str, $start, $length, $encoding);
 	}
 endif;
 
@@ -79,24 +79,24 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return string Extracted substring.
  */
-function _mb_substr( $str, $start, $length = null, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_substr($str, $start, $length = null, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different
 	 * charset just use built-in substr().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return is_null($length) ? substr($str, $start) : substr($str, $start, $length);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		$chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-		return implode( '', $chars );
+		preg_match_all('/./us', $str, $match);
+		$chars = is_null($length) ? array_slice($match[0], $start) : array_slice($match[0], $start, $length);
+		return implode('', $chars);
 	}
 
 	$regex = '/(
@@ -112,26 +112,26 @@ 
 	)/x';
 
 	// Start with 1 element instead of 0 since the first thing we do is pop.
-	$chars = array( '' );
+	$chars = array('');
 	do {
 		// We had some string left over from the last round, but we counted it in that last round.
-		array_pop( $chars );
+		array_pop($chars);
 
 		/*
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+		$pieces = preg_split($regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		$chars = array_merge( $chars, $pieces );
+		$chars = array_merge($chars, $pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) );
+	} while (count($pieces) > 1 && $str = array_pop($pieces));
 
-	return join( '', array_slice( $chars, $start, $length ) );
+	return join('', array_slice($chars, $start, $length));
 }
 
-if ( ! function_exists( 'mb_strlen' ) ) :
+if ( ! function_exists('mb_strlen')) :
 	/**
 	 * Compat function to mimic mb_strlen().
 	 *
@@ -144,8 +144,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return int String length of `$str`.
 	 */
-	function mb_strlen( $str, $encoding = null ) {
-		return _mb_strlen( $str, $encoding );
+	function mb_strlen($str, $encoding = null) {
+		return _mb_strlen($str, $encoding);
 	}
 endif;
 
@@ -163,23 +163,23 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return int String length of `$str`.
  */
-function _mb_strlen( $str, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_strlen($str, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different charset
 	 * just use built-in strlen().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return strlen( $str );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return strlen($str);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		return count( $match[0] );
+		preg_match_all('/./us', $str, $match);
+		return count($match[0]);
 	}
 
 	$regex = '/(?:
@@ -204,19 +204,19 @@ 
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000 );
+		$pieces = preg_split($regex, $str, 1000);
 
 		// Increment.
-		$count += count( $pieces );
+		$count += count($pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( $str = array_pop( $pieces ) );
+	} while ($str = array_pop($pieces));
 
 	// Fencepost: preg_split() always returns one extra item in the array.
 	return --$count;
 }
 
-if ( !function_exists('hash_hmac') ):
+if ( ! function_exists('hash_hmac')):
 /**
  * Compat function to mimic hash_hmac().
  *
@@ -255,7 +255,7 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
+	if ( ! isset($packs[$algo]))
 		return false;
 
 	$pack = $packs[$algo];
@@ -268,44 +268,44 @@ 
 	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
 	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
 
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+	$hmac = $algo($opad.pack($pack, $algo($ipad.$data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ($raw_output)
+		return pack($pack, $hmac);
 	return $hmac;
 }
 
-if ( !function_exists('json_encode') ) {
-	function json_encode( $string ) {
+if ( ! function_exists('json_encode')) {
+	function json_encode($string) {
 		global $wp_json;
 
-		if ( ! ( $wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		return $wp_json->encodeUnsafe( $string );
+		return $wp_json->encodeUnsafe($string);
 	}
 }
 
-if ( !function_exists('json_decode') ) {
+if ( ! function_exists('json_decode')) {
 	/**
 	 * @global Services_JSON $wp_json
 	 * @param string $string
 	 * @param bool   $assoc_array
 	 * @return object|array
 	 */
-	function json_decode( $string, $assoc_array = false ) {
+	function json_decode($string, $assoc_array = false) {
 		global $wp_json;
 
-		if ( ! ($wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		$res = $wp_json->decode($string);
+		if ($assoc_array)
+			$res = _json_decode_object_helper($res);
 		return $res;
 	}
 
@@ -314,13 +314,13 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
+		if (is_object($data))
 			$data = get_object_vars($data);
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }
 
-if ( ! function_exists( 'hash_equals' ) ) :
+if ( ! function_exists('hash_equals')) :
 /**
  * Timing attack safe string comparison
  *
@@ -336,16 +336,16 @@ 
  * @param string $b Actual, user supplied, string.
  * @return bool Whether strings are equal.
  */
-function hash_equals( $a, $b ) {
-	$a_length = strlen( $a );
-	if ( $a_length !== strlen( $b ) ) {
+function hash_equals($a, $b) {
+	$a_length = strlen($a);
+	if ($a_length !== strlen($b)) {
 		return false;
 	}
 	$result = 0;
 
 	// Do not attempt to "optimize" this.
-	for ( $i = 0; $i < $a_length; $i++ ) {
-		$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+	for ($i = 0; $i < $a_length; $i++) {
+		$result |= ord($a[$i]) ^ ord($b[$i]);
 	}
 
 	return $result === 0;
@@ -354,11 +354,11 @@ 
 
 // JSON_PRETTY_PRINT was introduced in PHP 5.4
 // Defined here to prevent a notice when using it with wp_json_encode()
-if ( ! defined( 'JSON_PRETTY_PRINT' ) ) {
-	define( 'JSON_PRETTY_PRINT', 128 );
+if ( ! defined('JSON_PRETTY_PRINT')) {
+	define('JSON_PRETTY_PRINT', 128);
 }
 
-if ( ! function_exists( 'json_last_error_msg' ) ) :
+if ( ! function_exists('json_last_error_msg')) :
 	/**
 	 * Retrieves the error string of the last json_encode() or json_decode() call.
 	 *
@@ -371,41 +371,41 @@ 
 	 */
 	function json_last_error_msg() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
 		// Just in case JSON_ERROR_NONE is not defined.
-		$error_code_none = defined( 'JSON_ERROR_NONE' ) ? JSON_ERROR_NONE : 0;
+		$error_code_none = defined('JSON_ERROR_NONE') ? JSON_ERROR_NONE : 0;
 
-		switch ( true ) {
+		switch (true) {
 			case $last_error_code === $error_code_none:
 				return 'No error';
 
-			case defined( 'JSON_ERROR_DEPTH' ) && JSON_ERROR_DEPTH === $last_error_code:
+			case defined('JSON_ERROR_DEPTH') && JSON_ERROR_DEPTH === $last_error_code:
 				return 'Maximum stack depth exceeded';
 
-			case defined( 'JSON_ERROR_STATE_MISMATCH' ) && JSON_ERROR_STATE_MISMATCH === $last_error_code:
+			case defined('JSON_ERROR_STATE_MISMATCH') && JSON_ERROR_STATE_MISMATCH === $last_error_code:
 				return 'State mismatch (invalid or malformed JSON)';
 
-			case defined( 'JSON_ERROR_CTRL_CHAR' ) && JSON_ERROR_CTRL_CHAR === $last_error_code:
+			case defined('JSON_ERROR_CTRL_CHAR') && JSON_ERROR_CTRL_CHAR === $last_error_code:
 				return 'Control character error, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_SYNTAX' ) && JSON_ERROR_SYNTAX === $last_error_code:
+			case defined('JSON_ERROR_SYNTAX') && JSON_ERROR_SYNTAX === $last_error_code:
 				return 'Syntax error';
 
-			case defined( 'JSON_ERROR_UTF8' ) && JSON_ERROR_UTF8 === $last_error_code:
+			case defined('JSON_ERROR_UTF8') && JSON_ERROR_UTF8 === $last_error_code:
 				return 'Malformed UTF-8 characters, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_RECURSION' ) && JSON_ERROR_RECURSION === $last_error_code:
+			case defined('JSON_ERROR_RECURSION') && JSON_ERROR_RECURSION === $last_error_code:
 				return 'Recursion detected';
 
-			case defined( 'JSON_ERROR_INF_OR_NAN' ) && JSON_ERROR_INF_OR_NAN === $last_error_code:
+			case defined('JSON_ERROR_INF_OR_NAN') && JSON_ERROR_INF_OR_NAN === $last_error_code:
 				return 'Inf and NaN cannot be JSON encoded';
 
-			case defined( 'JSON_ERROR_UNSUPPORTED_TYPE' ) && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
+			case defined('JSON_ERROR_UNSUPPORTED_TYPE') && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
 				return 'Type is not supported';
 
 			default:
@@ -414,8 +414,8 @@ 
 	}
 endif;
 
-if ( ! interface_exists( 'JsonSerializable' ) ) {
-	define( 'WP_JSON_SERIALIZE_COMPATIBLE', true );
+if ( ! interface_exists('JsonSerializable')) {
+	define('WP_JSON_SERIALIZE_COMPATIBLE', true);
 	/**
 	 * JsonSerializable interface.
 	 *
@@ -431,11 +431,11 @@ 
 }
 
 // random_int was introduced in PHP 7.0
-if ( ! function_exists( 'random_int' ) ) {
-	require ABSPATH . WPINC . '/random_compat/random.php';
+if ( ! function_exists('random_int')) {
+	require ABSPATH.WPINC.'/random_compat/random.php';
 }
 
-if ( ! function_exists( 'array_replace_recursive' ) ) :
+if ( ! function_exists('array_replace_recursive')) :
 	/**
 	 * PHP-agnostic version of {@link array_replace_recursive()}.
 	 *
@@ -457,31 +457,31 @@ 
 	 *
 	 * @return array
 	 */
-	function array_replace_recursive( $base = array(), $replacements = array() ) {
-		foreach ( array_slice( func_get_args(), 1 ) as $replacements ) {
-			$bref_stack = array( &$base );
-			$head_stack = array( $replacements );
+	function array_replace_recursive($base = array(), $replacements = array()) {
+		foreach (array_slice(func_get_args(), 1) as $replacements) {
+			$bref_stack = array(&$base);
+			$head_stack = array($replacements);
 
 			do {
-				end( $bref_stack );
+				end($bref_stack);
 
-				$bref = &$bref_stack[ key( $bref_stack ) ];
-				$head = array_pop( $head_stack );
+				$bref = &$bref_stack[key($bref_stack)];
+				$head = array_pop($head_stack);
 
-				unset( $bref_stack[ key( $bref_stack ) ] );
+				unset($bref_stack[key($bref_stack)]);
 
-				foreach ( array_keys( $head ) as $key ) {
-					if ( isset( $key, $bref ) &&
-					     isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
-					     isset( $head[ $key ] ) && is_array( $head[ $key ] )
+				foreach (array_keys($head) as $key) {
+					if (isset($key, $bref) &&
+					     isset($bref[$key]) && is_array($bref[$key]) &&
+					     isset($head[$key]) && is_array($head[$key])
 					) {
-						$bref_stack[] = &$bref[ $key ];
-						$head_stack[] = $head[ $key ];
+						$bref_stack[] = &$bref[$key];
+						$head_stack[] = $head[$key];
 					} else {
-						$bref[ $key ] = $head[ $key ];
+						$bref[$key] = $head[$key];
 					}
 				}
-			} while ( count( $head_stack ) );
+			} while (count($head_stack));
 		}
 
 		return $base;
@@ -489,7 +489,7 @@ 
 endif;
 
 // SPL can be disabled on PHP 5.2
-if ( ! function_exists( 'spl_autoload_register' ) ):
+if ( ! function_exists('spl_autoload_register')):
 	$_wp_spl_autoloaders = array();
 
 	/**
@@ -499,18 +499,18 @@ 
 	 *
 	 * @param string $classname Class to attempt autoloading.
 	 */
-	function __autoload( $classname ) {
+	function __autoload($classname) {
 		global $_wp_spl_autoloaders;
-		foreach ( $_wp_spl_autoloaders as $autoloader ) {
-			if ( ! is_callable( $autoloader ) ) {
+		foreach ($_wp_spl_autoloaders as $autoloader) {
+			if ( ! is_callable($autoloader)) {
 				// Avoid the extra warning if the autoloader isn't callable.
 				continue;
 			}
 
-			call_user_func( $autoloader, $classname );
+			call_user_func($autoloader, $classname);
 
 			// If it has been autoloaded, stop processing.
-			if ( class_exists( $classname, false ) ) {
+			if (class_exists($classname, false)) {
 				return;
 			}
 		}
@@ -525,21 +525,21 @@ 
 	 * @param boolean $throw Should the function throw an exception if the function isn't callable?
 	 * @param boolean $prepend Should we prepend the function to the stack?
 	 */
-	function spl_autoload_register( $autoload_function, $throw = true, $prepend = false ) {
-		if ( $throw && ! is_callable( $autoload_function ) ) {
+	function spl_autoload_register($autoload_function, $throw = true, $prepend = false) {
+		if ($throw && ! is_callable($autoload_function)) {
 			// String not translated to match PHP core.
-			throw new Exception( 'Function not callable' );
+			throw new Exception('Function not callable');
 		}
 
 		global $_wp_spl_autoloaders;
 
 		// Don't allow multiple registration.
-		if ( in_array( $autoload_function, $_wp_spl_autoloaders ) ) {
+		if (in_array($autoload_function, $_wp_spl_autoloaders)) {
 			return;
 		}
 
-		if ( $prepend ) {
-			array_unshift( $_wp_spl_autoloaders, $autoload_function );
+		if ($prepend) {
+			array_unshift($_wp_spl_autoloaders, $autoload_function);
 		} else {
 			$_wp_spl_autoloaders[] = $autoload_function;
 		}
@@ -553,11 +553,11 @@ 
 	 * @param callable $function The function to unregister.
 	 * @return boolean True if the function was unregistered, false if it could not be.
 	 */
-	function spl_autoload_unregister( $function ) {
+	function spl_autoload_unregister($function) {
 		global $_wp_spl_autoloaders;
-		foreach ( $_wp_spl_autoloaders as &$autoloader ) {
-			if ( $autoloader === $function ) {
-				unset( $autoloader );
+		foreach ($_wp_spl_autoloaders as &$autoloader) {
+			if ($autoloader === $function) {
+				unset($autoloader);
 				return true;
 			}
 		}

src/wp-includes/Text/Diff/Engine/shell.php

Indentation +142 added lines, -142 removed lines

@@ -16,147 +16,147 @@
  */
 class Text_Diff_Engine_shell {
 
-    /**
-     * Path to the diff executable
-     *
-     * @var string
-     */
-    var $_diffCommand = 'diff';
-
-    /**
-     * Returns the array of differences.
-     *
-     * @param array $from_lines lines of text from old file
-     * @param array $to_lines   lines of text from new file
-     *
-     * @return array all changes made (array with Text_Diff_Op_* objects)
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $temp_dir = Text_Diff::_getTempDir();
-
-        // Execute gnu diff or similar to get a standard diff file.
-        $from_file = tempnam($temp_dir, 'Text_Diff');
-        $to_file = tempnam($temp_dir, 'Text_Diff');
-        $fp = fopen($from_file, 'w');
-        fwrite($fp, implode("\n", $from_lines));
-        fclose($fp);
-        $fp = fopen($to_file, 'w');
-        fwrite($fp, implode("\n", $to_lines));
-        fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
-        unlink($from_file);
-        unlink($to_file);
-
-        if (is_null($diff)) {
-            // No changes were made
-            return array(new Text_Diff_Op_copy($from_lines));
-        }
-
-        $from_line_no = 1;
-        $to_line_no = 1;
-        $edits = array();
-
-        // Get changed lines by parsing something like:
-        // 0a1,2
-        // 1,2c4,6
-        // 1,5d6
-        preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
-            $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $match) {
-            if (!isset($match[5])) {
-                // This paren is not set every time (see regex).
-                $match[5] = false;
-            }
-
-            if ($match[3] == 'a') {
-                $from_line_no--;
-            }
-
-            if ($match[3] == 'd') {
-                $to_line_no--;
-            }
-
-            if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
-                // copied lines
-                assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
-                array_push($edits,
-                    new Text_Diff_Op_copy(
-                        $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
-                        $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
-            }
-
-            switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
-            }
-        }
-
-        if (!empty($from_lines)) {
-            // Some lines might still be pending. Add them as copied
-            array_push($edits,
-                new Text_Diff_Op_copy(
-                    $this->_getLines($from_lines, $from_line_no,
-                                     $from_line_no + count($from_lines) - 1),
-                    $this->_getLines($to_lines, $to_line_no,
-                                     $to_line_no + count($to_lines) - 1)));
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Get lines from either the old or new text
-     *
-     * @access private
-     *
-     * @param array &$text_lines Either $from_lines or $to_lines
-     * @param int   &$line_no    Current line number
-     * @param int   $end         Optional end line, when we want to chop more
-     *                           than one line.
-     *
-     * @return array The chopped lines
-     */
-    function _getLines(&$text_lines, &$line_no, $end = false)
-    {
-        if (!empty($end)) {
-            $lines = array();
-            // We can shift even more
-            while ($line_no <= $end) {
-                array_push($lines, array_shift($text_lines));
-                $line_no++;
-            }
-        } else {
-            $lines = array(array_shift($text_lines));
-            $line_no++;
-        }
-
-        return $lines;
-    }
+	/**
+	 * Path to the diff executable
+	 *
+	 * @var string
+	 */
+	var $_diffCommand = 'diff';
+
+	/**
+	 * Returns the array of differences.
+	 *
+	 * @param array $from_lines lines of text from old file
+	 * @param array $to_lines   lines of text from new file
+	 *
+	 * @return array all changes made (array with Text_Diff_Op_* objects)
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$temp_dir = Text_Diff::_getTempDir();
+
+		// Execute gnu diff or similar to get a standard diff file.
+		$from_file = tempnam($temp_dir, 'Text_Diff');
+		$to_file = tempnam($temp_dir, 'Text_Diff');
+		$fp = fopen($from_file, 'w');
+		fwrite($fp, implode("\n", $from_lines));
+		fclose($fp);
+		$fp = fopen($to_file, 'w');
+		fwrite($fp, implode("\n", $to_lines));
+		fclose($fp);
+		$diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+		unlink($from_file);
+		unlink($to_file);
+
+		if (is_null($diff)) {
+			// No changes were made
+			return array(new Text_Diff_Op_copy($from_lines));
+		}
+
+		$from_line_no = 1;
+		$to_line_no = 1;
+		$edits = array();
+
+		// Get changed lines by parsing something like:
+		// 0a1,2
+		// 1,2c4,6
+		// 1,5d6
+		preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
+			$matches, PREG_SET_ORDER);
+
+		foreach ($matches as $match) {
+			if (!isset($match[5])) {
+				// This paren is not set every time (see regex).
+				$match[5] = false;
+			}
+
+			if ($match[3] == 'a') {
+				$from_line_no--;
+			}
+
+			if ($match[3] == 'd') {
+				$to_line_no--;
+			}
+
+			if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
+				// copied lines
+				assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+				array_push($edits,
+					new Text_Diff_Op_copy(
+						$this->_getLines($from_lines, $from_line_no, $match[1] - 1),
+						$this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
+			}
+
+			switch ($match[3]) {
+			case 'd':
+				// deleted lines
+				array_push($edits,
+					new Text_Diff_Op_delete(
+						$this->_getLines($from_lines, $from_line_no, $match[2])));
+				$to_line_no++;
+				break;
+
+			case 'c':
+				// changed lines
+				array_push($edits,
+					new Text_Diff_Op_change(
+						$this->_getLines($from_lines, $from_line_no, $match[2]),
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				break;
+
+			case 'a':
+				// added lines
+				array_push($edits,
+					new Text_Diff_Op_add(
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				$from_line_no++;
+				break;
+			}
+		}
+
+		if (!empty($from_lines)) {
+			// Some lines might still be pending. Add them as copied
+			array_push($edits,
+				new Text_Diff_Op_copy(
+					$this->_getLines($from_lines, $from_line_no,
+									 $from_line_no + count($from_lines) - 1),
+					$this->_getLines($to_lines, $to_line_no,
+									 $to_line_no + count($to_lines) - 1)));
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Get lines from either the old or new text
+	 *
+	 * @access private
+	 *
+	 * @param array &$text_lines Either $from_lines or $to_lines
+	 * @param int   &$line_no    Current line number
+	 * @param int   $end         Optional end line, when we want to chop more
+	 *                           than one line.
+	 *
+	 * @return array The chopped lines
+	 */
+	function _getLines(&$text_lines, &$line_no, $end = false)
+	{
+		if (!empty($end)) {
+			$lines = array();
+			// We can shift even more
+			while ($line_no <= $end) {
+				array_push($lines, array_shift($text_lines));
+				$line_no++;
+			}
+		} else {
+			$lines = array(array_shift($text_lines));
+			$line_no++;
+		}
+
+		return $lines;
+	}
 
 }

Switch Indentation +23 added lines, -23 removed lines

@@ -91,29 +91,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+            	case 'd':
+                	// deleted lines
+                	array_push($edits,
+                    	new Text_Diff_Op_delete(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2])));
+                	$to_line_no++;
+                	break;
+
+            	case 'c':
+                	// changed lines
+                	array_push($edits,
+                    	new Text_Diff_Op_change(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2]),
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	break;
+
+            	case 'a':
+                	// added lines
+                	array_push($edits,
+                    	new Text_Diff_Op_add(
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	$from_line_no++;
+                	break;
             }
         }
 

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $fp = fopen($to_file, 'w');
         fwrite($fp, implode("\n", $to_lines));
         fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
         unlink($from_file);
         unlink($to_file);
 
@@ -68,7 +68,7 @@ 
             $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            if (!isset($match[5])) {
+            if ( ! isset($match[5])) {
                 // This paren is not set every time (see regex).
                 $match[5] = false;
             }
@@ -117,7 +117,7 @@ 
             }
         }
 
-        if (!empty($from_lines)) {
+        if ( ! empty($from_lines)) {
             // Some lines might still be pending. Add them as copied
             array_push($edits,
                 new Text_Diff_Op_copy(
@@ -144,7 +144,7 @@ 
      */
     function _getLines(&$text_lines, &$line_no, $end = false)
     {
-        if (!empty($end)) {
+        if ( ! empty($end)) {
             $lines = array();
             // We can shift even more
             while ($line_no <= $end) {

src/wp-includes/Text/Diff/Engine/xdiff.php

Indentation +32 added lines, -32 removed lines

@@ -15,22 +15,22 @@ 
  */
 class Text_Diff_Engine_xdiff {
 
-    /**
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+	/**
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
 
-        /* Convert the two input arrays into strings for xdiff processing. */
-        $from_string = implode("\n", $from_lines);
-        $to_string = implode("\n", $to_lines);
+		/* Convert the two input arrays into strings for xdiff processing. */
+		$from_string = implode("\n", $from_lines);
+		$to_string = implode("\n", $to_lines);
 
-        /* Diff the two strings and convert the result to an array. */
-        $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
-        $diff = explode("\n", $diff);
+		/* Diff the two strings and convert the result to an array. */
+		$diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+		$diff = explode("\n", $diff);
 
-        /* Walk through the diff one line at a time.  We build the $edits
+		/* Walk through the diff one line at a time.  We build the $edits
          * array of diff operations by reading the first character of the
          * xdiff output (which is in the "unified diff" format).
          *
@@ -38,27 +38,27 @@ 
          * lines using this approach, so we can't add Text_Diff_Op_changed
          * instances to the $edits array.  The result is still perfectly
          * valid, albeit a little less descriptive and efficient. */
-        $edits = array();
-        foreach ($diff as $line) {
-            if (!strlen($line)) {
-                continue;
-            }
-            switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+		$edits = array();
+		foreach ($diff as $line) {
+			if (!strlen($line)) {
+				continue;
+			}
+			switch ($line[0]) {
+			case ' ':
+				$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+				break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+			case '+':
+				$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+				break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
-            }
-        }
+			case '-':
+				$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+				break;
+			}
+		}
 
-        return $edits;
-    }
+		return $edits;
+	}
 
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+            	case ' ':
+                	$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+                	break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+            	case '+':
+                	$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+                	break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+            	case '-':
+                	$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+                	break;
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
          * valid, albeit a little less descriptive and efficient. */
         $edits = array();
         foreach ($diff as $line) {
-            if (!strlen($line)) {
+            if ( ! strlen($line)) {
                 continue;
             }
             switch ($line[0]) {

src/wp-includes/Text/Diff.php

Indentation +356 added lines, -356 removed lines

@@ -17,43 +17,43 @@ 
  */
 class Text_Diff {
 
-    /**
-     * Array of changes.
-     *
-     * @var array
-     */
-    var $_edits;
-
-    /**
-     * Computes diffs between sequences of strings.
-     *
-     * @param string $engine     Name of the diffing engine to use.  'auto'
-     *                           will automatically select the best.
-     * @param array $params      Parameters to pass to the diffing engine.
-     *                           Normally an array of two arrays, each
-     *                           containing the lines from a file.
-     */
-    function __construct( $engine, $params )
-    {
-        // Backward compatibility workaround.
-        if (!is_string($engine)) {
-            $params = array($engine, $params);
-            $engine = 'auto';
-        }
-
-        if ($engine == 'auto') {
-            $engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
-        } else {
-            $engine = basename($engine);
-        }
-
-        // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
-        $diff_engine = new $class();
-
-        $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
-    }
+	/**
+	 * Array of changes.
+	 *
+	 * @var array
+	 */
+	var $_edits;
+
+	/**
+	 * Computes diffs between sequences of strings.
+	 *
+	 * @param string $engine     Name of the diffing engine to use.  'auto'
+	 *                           will automatically select the best.
+	 * @param array $params      Parameters to pass to the diffing engine.
+	 *                           Normally an array of two arrays, each
+	 *                           containing the lines from a file.
+	 */
+	function __construct( $engine, $params )
+	{
+		// Backward compatibility workaround.
+		if (!is_string($engine)) {
+			$params = array($engine, $params);
+			$engine = 'auto';
+		}
+
+		if ($engine == 'auto') {
+			$engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
+		} else {
+			$engine = basename($engine);
+		}
+
+		// WP #7391
+		require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
+		$class = 'Text_Diff_Engine_' . $engine;
+		$diff_engine = new $class();
+
+		$this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -62,230 +62,230 @@ 
 		self::__construct( $engine, $params );
 	}
 
-    /**
-     * Returns the array of differences.
-     */
-    function getDiff()
-    {
-        return $this->_edits;
-    }
-
-    /**
-     * returns the number of new (added) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of new lines
-     */
-    function countAddedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_add') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->nfinal();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Returns the number of deleted (removed) lines in a given diff.
-     *
-     * @since Text_Diff 1.1.0
-     *
-     * @return integer The number of deleted lines
-     */
-    function countDeletedLines()
-    {
-        $count = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_delete') ||
-                is_a($edit, 'Text_Diff_Op_change')) {
-                $count += $edit->norig();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * Computes a reversed diff.
-     *
-     * Example:
-     * <code>
-     * $diff = new Text_Diff($lines1, $lines2);
-     * $rev = $diff->reverse();
-     * </code>
-     *
-     * @return Text_Diff  A Diff object representing the inverse of the
-     *                    original diff.  Note that we purposely don't return a
-     *                    reference here, since this essentially is a clone()
-     *                    method.
-     */
-    function reverse()
-    {
-        if (version_compare(zend_version(), '2', '>')) {
-            $rev = clone($this);
-        } else {
-            $rev = $this;
-        }
-        $rev->_edits = array();
-        foreach ($this->_edits as $edit) {
-            $rev->_edits[] = $edit->reverse();
-        }
-        return $rev;
-    }
-
-    /**
-     * Checks for an empty diff.
-     *
-     * @return boolean  True if two sequences were identical.
-     */
-    function isEmpty()
-    {
-        foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Computes the length of the Longest Common Subsequence (LCS).
-     *
-     * This is mostly for diagnostic purposes.
-     *
-     * @return integer  The length of the LCS.
-     */
-    function lcs()
-    {
-        $lcs = 0;
-        foreach ($this->_edits as $edit) {
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                $lcs += count($edit->orig);
-            }
-        }
-        return $lcs;
-    }
-
-    /**
-     * Gets the original set of lines.
-     *
-     * This reconstructs the $from_lines parameter passed to the constructor.
-     *
-     * @return array  The original sequence of strings.
-     */
-    function getOriginal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->orig) {
-                array_splice($lines, count($lines), 0, $edit->orig);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Gets the final set of lines.
-     *
-     * This reconstructs the $to_lines parameter passed to the constructor.
-     *
-     * @return array  The sequence of strings.
-     */
-    function getFinal()
-    {
-        $lines = array();
-        foreach ($this->_edits as $edit) {
-            if ($edit->final) {
-                array_splice($lines, count($lines), 0, $edit->final);
-            }
-        }
-        return $lines;
-    }
-
-    /**
-     * Removes trailing newlines from a line of text. This is meant to be used
-     * with array_walk().
-     *
-     * @param string $line  The line to trim.
-     * @param integer $key  The index of the line in the array. Not used.
-     */
-    static function trimNewlines(&$line, $key)
-    {
-        $line = str_replace(array("\n", "\r"), '', $line);
-    }
-
-    /**
-     * Determines the location of the system temporary directory.
-     *
-     * @static
-     *
-     * @access protected
-     *
-     * @return string  A directory name which can be used for temp files.
-     *                 Returns false if one could not be found.
-     */
-    function _getTempDir()
-    {
-        $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
-                               'c:\windows\temp', 'c:\winnt\temp');
-
-        /* Try PHP's upload_tmp_dir directive. */
-        $tmp = ini_get('upload_tmp_dir');
-
-        /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
-            $tmp = getenv('TMPDIR');
-        }
-
-        /* If we still cannot determine a value, then cycle through a list of
+	/**
+	 * Returns the array of differences.
+	 */
+	function getDiff()
+	{
+		return $this->_edits;
+	}
+
+	/**
+	 * returns the number of new (added) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of new lines
+	 */
+	function countAddedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_add') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->nfinal();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Returns the number of deleted (removed) lines in a given diff.
+	 *
+	 * @since Text_Diff 1.1.0
+	 *
+	 * @return integer The number of deleted lines
+	 */
+	function countDeletedLines()
+	{
+		$count = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_delete') ||
+				is_a($edit, 'Text_Diff_Op_change')) {
+				$count += $edit->norig();
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * Computes a reversed diff.
+	 *
+	 * Example:
+	 * <code>
+	 * $diff = new Text_Diff($lines1, $lines2);
+	 * $rev = $diff->reverse();
+	 * </code>
+	 *
+	 * @return Text_Diff  A Diff object representing the inverse of the
+	 *                    original diff.  Note that we purposely don't return a
+	 *                    reference here, since this essentially is a clone()
+	 *                    method.
+	 */
+	function reverse()
+	{
+		if (version_compare(zend_version(), '2', '>')) {
+			$rev = clone($this);
+		} else {
+			$rev = $this;
+		}
+		$rev->_edits = array();
+		foreach ($this->_edits as $edit) {
+			$rev->_edits[] = $edit->reverse();
+		}
+		return $rev;
+	}
+
+	/**
+	 * Checks for an empty diff.
+	 *
+	 * @return boolean  True if two sequences were identical.
+	 */
+	function isEmpty()
+	{
+		foreach ($this->_edits as $edit) {
+			if (!is_a($edit, 'Text_Diff_Op_copy')) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Computes the length of the Longest Common Subsequence (LCS).
+	 *
+	 * This is mostly for diagnostic purposes.
+	 *
+	 * @return integer  The length of the LCS.
+	 */
+	function lcs()
+	{
+		$lcs = 0;
+		foreach ($this->_edits as $edit) {
+			if (is_a($edit, 'Text_Diff_Op_copy')) {
+				$lcs += count($edit->orig);
+			}
+		}
+		return $lcs;
+	}
+
+	/**
+	 * Gets the original set of lines.
+	 *
+	 * This reconstructs the $from_lines parameter passed to the constructor.
+	 *
+	 * @return array  The original sequence of strings.
+	 */
+	function getOriginal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->orig) {
+				array_splice($lines, count($lines), 0, $edit->orig);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Gets the final set of lines.
+	 *
+	 * This reconstructs the $to_lines parameter passed to the constructor.
+	 *
+	 * @return array  The sequence of strings.
+	 */
+	function getFinal()
+	{
+		$lines = array();
+		foreach ($this->_edits as $edit) {
+			if ($edit->final) {
+				array_splice($lines, count($lines), 0, $edit->final);
+			}
+		}
+		return $lines;
+	}
+
+	/**
+	 * Removes trailing newlines from a line of text. This is meant to be used
+	 * with array_walk().
+	 *
+	 * @param string $line  The line to trim.
+	 * @param integer $key  The index of the line in the array. Not used.
+	 */
+	static function trimNewlines(&$line, $key)
+	{
+		$line = str_replace(array("\n", "\r"), '', $line);
+	}
+
+	/**
+	 * Determines the location of the system temporary directory.
+	 *
+	 * @static
+	 *
+	 * @access protected
+	 *
+	 * @return string  A directory name which can be used for temp files.
+	 *                 Returns false if one could not be found.
+	 */
+	function _getTempDir()
+	{
+		$tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
+							   'c:\windows\temp', 'c:\winnt\temp');
+
+		/* Try PHP's upload_tmp_dir directive. */
+		$tmp = ini_get('upload_tmp_dir');
+
+		/* Otherwise, try to determine the TMPDIR environment variable. */
+		if (!strlen($tmp)) {
+			$tmp = getenv('TMPDIR');
+		}
+
+		/* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
-            $tmp_check = array_shift($tmp_locations);
-            if (@is_dir($tmp_check)) {
-                $tmp = $tmp_check;
-            }
-        }
-
-        /* If it is still empty, we have failed, so return false; otherwise
+		while (!strlen($tmp) && count($tmp_locations)) {
+			$tmp_check = array_shift($tmp_locations);
+			if (@is_dir($tmp_check)) {
+				$tmp = $tmp_check;
+			}
+		}
+
+		/* If it is still empty, we have failed, so return false; otherwise
          * return the directory determined. */
-        return strlen($tmp) ? $tmp : false;
-    }
-
-    /**
-     * Checks a diff for validity.
-     *
-     * This is here only for debugging purposes.
-     */
-    function _check($from_lines, $to_lines)
-    {
-        if (serialize($from_lines) != serialize($this->getOriginal())) {
-            trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($to_lines) != serialize($this->getFinal())) {
-            trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
-        }
-
-        $rev = $this->reverse();
-        if (serialize($to_lines) != serialize($rev->getOriginal())) {
-            trigger_error("Reversed original doesn't match", E_USER_ERROR);
-        }
-        if (serialize($from_lines) != serialize($rev->getFinal())) {
-            trigger_error("Reversed final doesn't match", E_USER_ERROR);
-        }
-
-        $prevtype = null;
-        foreach ($this->_edits as $edit) {
-            if ($prevtype == get_class($edit)) {
-                trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
-            }
-            $prevtype = get_class($edit);
-        }
-
-        return true;
-    }
+		return strlen($tmp) ? $tmp : false;
+	}
+
+	/**
+	 * Checks a diff for validity.
+	 *
+	 * This is here only for debugging purposes.
+	 */
+	function _check($from_lines, $to_lines)
+	{
+		if (serialize($from_lines) != serialize($this->getOriginal())) {
+			trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($to_lines) != serialize($this->getFinal())) {
+			trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
+		}
+
+		$rev = $this->reverse();
+		if (serialize($to_lines) != serialize($rev->getOriginal())) {
+			trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		}
+		if (serialize($from_lines) != serialize($rev->getFinal())) {
+			trigger_error("Reversed final doesn't match", E_USER_ERROR);
+		}
+
+		$prevtype = null;
+		foreach ($this->_edits as $edit) {
+			if ($prevtype == get_class($edit)) {
+				trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			}
+			$prevtype = get_class($edit);
+		}
+
+		return true;
+	}
 
 }
 
@@ -295,53 +295,53 @@ 
  */
 class Text_MappedDiff extends Text_Diff {
 
-    /**
-     * Computes a diff between sequences of strings.
-     *
-     * This can be used to compute things like case-insensitve diffs, or diffs
-     * which ignore changes in white-space.
-     *
-     * @param array $from_lines         An array of strings.
-     * @param array $to_lines           An array of strings.
-     * @param array $mapped_from_lines  This array should have the same size
-     *                                  number of elements as $from_lines.  The
-     *                                  elements in $mapped_from_lines and
-     *                                  $mapped_to_lines are what is actually
-     *                                  compared when computing the diff.
-     * @param array $mapped_to_lines    This array should have the same number
-     *                                  of elements as $to_lines.
-     */
-    function __construct($from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines)
-    {
-        assert(count($from_lines) == count($mapped_from_lines));
-        assert(count($to_lines) == count($mapped_to_lines));
-
-        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
-
-        $xi = $yi = 0;
-        for ($i = 0; $i < count($this->_edits); $i++) {
-            $orig = &$this->_edits[$i]->orig;
-            if (is_array($orig)) {
-                $orig = array_slice($from_lines, $xi, count($orig));
-                $xi += count($orig);
-            }
-
-            $final = &$this->_edits[$i]->final;
-            if (is_array($final)) {
-                $final = array_slice($to_lines, $yi, count($final));
-                $yi += count($final);
-            }
-        }
-    }
+	/**
+	 * Computes a diff between sequences of strings.
+	 *
+	 * This can be used to compute things like case-insensitve diffs, or diffs
+	 * which ignore changes in white-space.
+	 *
+	 * @param array $from_lines         An array of strings.
+	 * @param array $to_lines           An array of strings.
+	 * @param array $mapped_from_lines  This array should have the same size
+	 *                                  number of elements as $from_lines.  The
+	 *                                  elements in $mapped_from_lines and
+	 *                                  $mapped_to_lines are what is actually
+	 *                                  compared when computing the diff.
+	 * @param array $mapped_to_lines    This array should have the same number
+	 *                                  of elements as $to_lines.
+	 */
+	function __construct($from_lines, $to_lines,
+							 $mapped_from_lines, $mapped_to_lines)
+	{
+		assert(count($from_lines) == count($mapped_from_lines));
+		assert(count($to_lines) == count($mapped_to_lines));
+
+		parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+
+		$xi = $yi = 0;
+		for ($i = 0; $i < count($this->_edits); $i++) {
+			$orig = &$this->_edits[$i]->orig;
+			if (is_array($orig)) {
+				$orig = array_slice($from_lines, $xi, count($orig));
+				$xi += count($orig);
+			}
+
+			$final = &$this->_edits[$i]->final;
+			if (is_array($final)) {
+				$final = array_slice($to_lines, $yi, count($final));
+				$yi += count($final);
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
 	 */
 	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
+							 $mapped_from_lines, $mapped_to_lines ) {
 		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+							 $mapped_from_lines, $mapped_to_lines );
 	}
 
 }
@@ -354,23 +354,23 @@ 
  */
 class Text_Diff_Op {
 
-    var $orig;
-    var $final;
+	var $orig;
+	var $final;
 
-    function &reverse()
-    {
-        trigger_error('Abstract method', E_USER_ERROR);
-    }
+	function &reverse()
+	{
+		trigger_error('Abstract method', E_USER_ERROR);
+	}
 
-    function norig()
-    {
-        return $this->orig ? count($this->orig) : 0;
-    }
+	function norig()
+	{
+		return $this->orig ? count($this->orig) : 0;
+	}
 
-    function nfinal()
-    {
-        return $this->final ? count($this->final) : 0;
-    }
+	function nfinal()
+	{
+		return $this->final ? count($this->final) : 0;
+	}
 
 }
 
@@ -385,14 +385,14 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
-    {
-        if (!is_array($final)) {
-            $final = $orig;
-        }
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final = false )
+	{
+		if (!is_array($final)) {
+			$final = $orig;
+		}
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -401,11 +401,11 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_copy($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_copy($this->final, $this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -421,10 +421,10 @@ 
 	 * PHP5 constructor.
 	 */
 	function __construct( $lines )
-    {
-        $this->orig = $lines;
-        $this->final = false;
-    }
+	{
+		$this->orig = $lines;
+		$this->final = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -433,11 +433,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_add($this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_add($this->orig);
+		return $reverse;
+	}
 
 }
 
@@ -452,11 +452,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
-    {
-        $this->final = $lines;
-        $this->orig = false;
-    }
+	function __construct( $lines )
+	{
+		$this->final = $lines;
+		$this->orig = false;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -465,11 +465,11 @@ 
 		self::__construct( $lines );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_delete($this->final);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_delete($this->final);
+		return $reverse;
+	}
 
 }
 
@@ -484,11 +484,11 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
-    {
-        $this->orig = $orig;
-        $this->final = $final;
-    }
+	function __construct( $orig, $final )
+	{
+		$this->orig = $orig;
+		$this->final = $final;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -497,10 +497,10 @@ 
 		self::__construct( $orig, $final );
 	}
 
-    function &reverse()
-    {
-        $reverse = new Text_Diff_Op_change($this->final, $this->orig);
-        return $reverse;
-    }
+	function &reverse()
+	{
+		$reverse = new Text_Diff_Op_change($this->final, $this->orig);
+		return $reverse;
+	}
 
 }

Spacing +26 added lines, -26 removed lines

@@ -33,10 +33,10 @@ 
      *                           Normally an array of two arrays, each
      *                           containing the lines from a file.
      */
-    function __construct( $engine, $params )
+    function __construct($engine, $params)
     {
         // Backward compatibility workaround.
-        if (!is_string($engine)) {
+        if ( ! is_string($engine)) {
             $params = array($engine, $params);
             $engine = 'auto';
         }
@@ -48,8 +48,8 @@ 
         }
 
         // WP #7391
-        require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
-        $class = 'Text_Diff_Engine_' . $engine;
+        require_once dirname(__FILE__).'/Diff/Engine/'.$engine.'.php';
+        $class = 'Text_Diff_Engine_'.$engine;
         $diff_engine = new $class();
 
         $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
@@ -58,8 +58,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff( $engine, $params ) {
-		self::__construct( $engine, $params );
+	public function Text_Diff($engine, $params) {
+		self::__construct($engine, $params);
 	}
 
     /**
@@ -144,7 +144,7 @@ 
     function isEmpty()
     {
         foreach ($this->_edits as $edit) {
-            if (!is_a($edit, 'Text_Diff_Op_copy')) {
+            if ( ! is_a($edit, 'Text_Diff_Op_copy')) {
                 return false;
             }
         }
@@ -236,13 +236,13 @@ 
         $tmp = ini_get('upload_tmp_dir');
 
         /* Otherwise, try to determine the TMPDIR environment variable. */
-        if (!strlen($tmp)) {
+        if ( ! strlen($tmp)) {
             $tmp = getenv('TMPDIR');
         }
 
         /* If we still cannot determine a value, then cycle through a list of
          * preset possibilities. */
-        while (!strlen($tmp) && count($tmp_locations)) {
+        while ( ! strlen($tmp) && count($tmp_locations)) {
             $tmp_check = array_shift($tmp_locations);
             if (@is_dir($tmp_check)) {
                 $tmp = $tmp_check;
@@ -338,10 +338,10 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_MappedDiff( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines ) {
-		self::__construct( $from_lines, $to_lines,
-                             $mapped_from_lines, $mapped_to_lines );
+	public function Text_MappedDiff($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines) {
+		self::__construct($from_lines, $to_lines,
+                             $mapped_from_lines, $mapped_to_lines);
 	}
 
 }
@@ -385,9 +385,9 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final = false )
+    function __construct($orig, $final = false)
     {
-        if (!is_array($final)) {
+        if ( ! is_array($final)) {
             $final = $orig;
         }
         $this->orig = $orig;
@@ -397,8 +397,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_copy( $orig, $final = false ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_copy($orig, $final = false) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()
@@ -420,7 +420,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $lines )
+	function __construct($lines)
     {
         $this->orig = $lines;
         $this->final = false;
@@ -429,8 +429,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_delete( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_delete($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -452,7 +452,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $lines )
+    function __construct($lines)
     {
         $this->final = $lines;
         $this->orig = false;
@@ -461,8 +461,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_add( $lines ) {
-		self::__construct( $lines );
+	public function Text_Diff_Op_add($lines) {
+		self::__construct($lines);
 	}
 
     function &reverse()
@@ -484,7 +484,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $orig, $final )
+    function __construct($orig, $final)
     {
         $this->orig = $orig;
         $this->final = $final;
@@ -493,8 +493,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Op_change( $orig, $final ) {
-		self::__construct( $orig, $final );
+	public function Text_Diff_Op_change($orig, $final) {
+		self::__construct($orig, $final);
 	}
 
     function &reverse()

src/wp-includes/class-simplepie.php

Braces +92 added lines, -180 removed lines

@@ -22,8 +22,9 @@ 
  * @since 3.5.0
  */
 function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
-		return;
+	if ( 0 !== strpos( $class, 'SimplePie_' ) ) {
+			return;
+	}
 
 	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
 	include( $file );
@@ -784,8 +785,7 @@ 
 			{
 				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
 			}
-		}
-		else
+		} else
 		{
 			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
 		}
@@ -920,8 +920,7 @@ 
 		if ($encoding)
 		{
 			$this->input_encoding = (string) $encoding;
-		}
-		else
+		} else
 		{
 			$this->input_encoding = false;
 		}
@@ -1238,8 +1237,7 @@ 
 		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
+		} else
 		{
 			$this->image_handler = '';
 		}
@@ -1317,8 +1315,7 @@ 
 				$i++;
 			}
 			return (bool) $success;
-		}
-		elseif ($this->feed_url === null && $this->raw_data === null)
+		} elseif ($this->feed_url === null && $this->raw_data === null)
 		{
 			return false;
 		}
@@ -1342,8 +1339,7 @@ 
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
 				return true;
-			}
-			elseif ($fetched === false) {
+			} elseif ($fetched === false) {
 				return false;
 			}
 
@@ -1373,8 +1369,7 @@ 
 				}
 				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
 				$encodings[] = 'UTF-8';
-			}
-			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+			} elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
 			{
 				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
 				{
@@ -1437,8 +1432,7 @@ 
 		{
 			// We have an error, just set SimplePie_Misc::error to it and quit
 			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-		}
-		else
+		} else
 		{
 			$this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
 		}
@@ -1520,8 +1514,7 @@ 
 								$cache->touch();
 								return true;
 							}
-						}
-						else
+						} else
 						{
 							unset($file);
 						}
@@ -1547,8 +1540,7 @@ 
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
 				$file =& $this->file;
-			}
-			else
+			} else
 			{
 				$headers = array(
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
@@ -1580,8 +1572,7 @@ 
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
-				}
-				catch (SimplePie_Exception $e)
+				} catch (SimplePie_Exception $e)
 				{
 					// This is usually because DOMDocument doesn't exist
 					$this->error = $e->getMessage();
@@ -1672,8 +1663,7 @@ 
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
+			} else
 			{
 				$header .= ' charset=UTF-8';
 			}
@@ -1715,12 +1705,10 @@ 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
 			{
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
 				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
@@ -1736,8 +1724,7 @@ 
 				{
 					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
 				}
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
@@ -1778,8 +1765,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
 			}
@@ -1804,8 +1790,7 @@ 
 		if ($this->feed_url !== null)
 		{
 			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2000,12 +1985,10 @@ 
 		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
-		}
-		elseif ($this->get_link() !== null)
+		} elseif ($this->get_link() !== null)
 		{
 			return $this->get_link();
-		}
-		else
+		} else
 		{
 			return $this->subscribe_url();
 		}
@@ -2039,32 +2022,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2083,8 +2059,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2129,8 +2104,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -2148,8 +2122,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2168,8 +2141,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2246,8 +2218,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2266,8 +2237,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2332,8 +2302,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2353,8 +2322,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2435,13 +2403,11 @@ 
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
+					} else
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
-				}
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -2452,8 +2418,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2478,40 +2443,31 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2530,24 +2486,19 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2566,32 +2517,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['headers']['content-language']))
+		} elseif (isset($this->data['headers']['content-language']))
 		{
 			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2615,12 +2559,10 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2643,16 +2585,13 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2672,24 +2611,19 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2711,28 +2645,22 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2755,16 +2683,13 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2785,12 +2710,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2811,12 +2734,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2838,8 +2759,7 @@ 
 		if ($max === 0)
 		{
 			return $qty;
-		}
-		else
+		} else
 		{
 			return ($qty > $max) ? $max : $qty;
 		}
@@ -2863,8 +2783,7 @@ 
 		if (isset($items[$key]))
 		{
 			return $items[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2890,8 +2809,7 @@ 
 			if (!empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-			}
-			else
+			} else
 			{
 				$this->data['items'] = array();
 				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
@@ -2961,8 +2879,7 @@ 
 					}
 				}
 				$items = $this->data['ordered_items'];
-			}
-			else
+			} else
 			{
 				$items = $this->data['items'];
 			}
@@ -2971,13 +2888,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3078,8 +2993,7 @@ 
 				if ($arg instanceof SimplePie)
 				{
 					$items = array_merge($items, $arg->get_items(0, $limit));
-				}
-				else
+				} else
 				{
 					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
 				}
@@ -3103,13 +3017,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
 			return array();

Spacing +65 added lines, -65 removed lines

@@ -1,38 +1,38 @@ 
 <?php
-if ( ! class_exists( 'SimplePie', false ) ) :
+if ( ! class_exists('SimplePie', false)) :
 
 // Load classes we will need.
-require ABSPATH . WPINC . '/SimplePie/Misc.php';
-require ABSPATH . WPINC . '/SimplePie/Cache.php';
-require ABSPATH . WPINC . '/SimplePie/File.php';
-require ABSPATH . WPINC . '/SimplePie/Sanitize.php';
-require ABSPATH . WPINC . '/SimplePie/Registry.php';
-require ABSPATH . WPINC . '/SimplePie/IRI.php';
-require ABSPATH . WPINC . '/SimplePie/Locator.php';
-require ABSPATH . WPINC . '/SimplePie/Content/Type/Sniffer.php';
-require ABSPATH . WPINC . '/SimplePie/XML/Declaration/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Item.php';
-require ABSPATH . WPINC . '/SimplePie/Parse/Date.php';
-require ABSPATH . WPINC . '/SimplePie/Author.php';
+require ABSPATH.WPINC.'/SimplePie/Misc.php';
+require ABSPATH.WPINC.'/SimplePie/Cache.php';
+require ABSPATH.WPINC.'/SimplePie/File.php';
+require ABSPATH.WPINC.'/SimplePie/Sanitize.php';
+require ABSPATH.WPINC.'/SimplePie/Registry.php';
+require ABSPATH.WPINC.'/SimplePie/IRI.php';
+require ABSPATH.WPINC.'/SimplePie/Locator.php';
+require ABSPATH.WPINC.'/SimplePie/Content/Type/Sniffer.php';
+require ABSPATH.WPINC.'/SimplePie/XML/Declaration/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Item.php';
+require ABSPATH.WPINC.'/SimplePie/Parse/Date.php';
+require ABSPATH.WPINC.'/SimplePie/Author.php';
 
 /**
  * WordPress autoloader for SimplePie.
  *
  * @since 3.5.0
  */
-function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
+function wp_simplepie_autoload($class) {
+	if (0 !== strpos($class, 'SimplePie_'))
 		return;
 
-	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
-	include( $file );
+	$file = ABSPATH.WPINC.'/'.str_replace('_', '/', $class).'.php';
+	include($file);
 }
 
 /**
  * We autoload classes we may not need.
  */
-spl_autoload_register( 'wp_simplepie_autoload' );
+spl_autoload_register('wp_simplepie_autoload');
 
 /**
  * SimplePie
@@ -102,12 +102,12 @@ 
  * SimplePie Useragent
  * @see SimplePie::set_useragent()
  */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
 
 /**
  * SimplePie Linkback
  */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 
 /**
  * No Autodiscovery
@@ -700,9 +700,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || ! gc_enabled()) && ! ini_get('zend.ze1_compatibility_mode'))
 		{
-			if (!empty($this->data['items']))
+			if ( ! empty($this->data['items']))
 			{
 				foreach ($this->data['items'] as $item)
 				{
@@ -710,7 +710,7 @@ 
 				}
 				unset($item, $this->data['items']);
 			}
-			if (!empty($this->data['ordered_items']))
+			if ( ! empty($this->data['ordered_items']))
 			{
 				foreach ($this->data['ordered_items'] as $item)
 				{
@@ -777,7 +777,7 @@ 
 		if ($file instanceof SimplePie_File)
 		{
 			$this->feed_url = $file->url;
-			$this->file =& $file;
+			$this->file = & $file;
 			return true;
 		}
 		return false;
@@ -1212,7 +1212,7 @@ 
 	{
 		if ($page !== false)
 		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
 		}
 		else
 		{
@@ -1242,12 +1242,12 @@ 
 	public function init()
 	{
 		// Check absolute bare minimum requirements.
-		if (!extension_loaded('xml') || !extension_loaded('pcre'))
+		if ( ! extension_loaded('xml') || ! extension_loaded('pcre'))
 		{
 			return false;
 		}
 		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-		elseif (!extension_loaded('xmlreader'))
+		elseif ( ! extension_loaded('xmlreader'))
 		{
 			static $xml_is_sane = null;
 			if ($xml_is_sane === null)
@@ -1257,7 +1257,7 @@ 
 				xml_parser_free($parser_check);
 				$xml_is_sane = isset($values[0]['value']);
 			}
-			if (!$xml_is_sane)
+			if ( ! $xml_is_sane)
 			{
 				return false;
 			}
@@ -1273,7 +1273,7 @@ 
 		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
 		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
 
-		if (!empty($this->multifeed_url))
+		if ( ! empty($this->multifeed_url))
 		{
 			$i = 0;
 			$success = 0;
@@ -1285,7 +1285,7 @@ 
 				$this->multifeed_objects[$i]->set_feed_url($url);
 				$single_success = $this->multifeed_objects[$i]->init();
 				$success |= $single_success;
-				if (!$single_success)
+				if ( ! $single_success)
 				{
 					$this->error[$i] = $this->multifeed_objects[$i]->error();
 				}
@@ -1385,7 +1385,7 @@ 
 				if ($parser->parse($utf8_data, 'UTF-8'))
 				{
 					$this->data = $parser->get_data();
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					if ( ! ($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
 					{
 						$this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
@@ -1399,7 +1399,7 @@ 
 					$this->data['build'] = SIMPLEPIE_BUILD;
 
 					// Cache the file if caching is enabled
-					if ($cache && !$cache->save($this))
+					if ($cache && ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1437,10 +1437,10 @@ 
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if (!empty($this->data))
+			if ( ! empty($this->data))
 			{
 				// If the cache is for an outdated build of SimplePie
-				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
+				if ( ! isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
 				{
 					$cache->unlink();
 					$this->data = array();
@@ -1486,7 +1486,7 @@ 
 							$headers['if-none-match'] = $this->data['headers']['etag'];
 						}
 
-						$file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+						$file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen));
 
 						if ($file->success)
 						{
@@ -1517,11 +1517,11 @@ 
 			}
 		}
 		// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
-		if (!isset($file))
+		if ( ! isset($file))
 		{
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
-				$file =& $this->file;
+				$file = & $this->file;
 			}
 			else
 			{
@@ -1532,26 +1532,26 @@ 
 			}
 		}
 		// If the file connection has an error, set SimplePie::error to that and quit
-		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		if ( ! $file->success && ! ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 		{
 			$this->error = $file->error;
-			return !empty($this->data);
+			return ! empty($this->data);
 		}
 
-		if (!$this->force_feed)
+		if ( ! $this->force_feed)
 		{
 			// Check if the supplied URL is a feed, if it isn't, look for it.
 			$locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds));
 
-			if (!$locate->is_feed($file))
+			if ( ! $locate->is_feed($file))
 			{
 				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 				unset($file);
 				try
 				{
-					if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+					if ( ! ($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
 					{
-						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or ".SIMPLEPIE_NAME." was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
@@ -1566,7 +1566,7 @@ 
 				if ($cache)
 				{
 					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-					if (!$cache->save($this))
+					if ( ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1641,12 +1641,12 @@ 
 	 */
 	public function handle_content_type($mime = 'text/html')
 	{
-		if (!headers_sent())
+		if ( ! headers_sent())
 		{
 			$header = "Content-type: $mime;";
 			if ($this->get_encoding())
 			{
-				$header .= ' charset=' . $this->get_encoding();
+				$header .= ' charset='.$this->get_encoding();
 			}
 			else
 			{
@@ -1684,7 +1684,7 @@ 
 	 */
 	public function get_type()
 	{
-		if (!isset($this->data['type']))
+		if ( ! isset($this->data['type']))
 		{
 			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
@@ -1972,7 +1972,7 @@ 
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if ( ! ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && ! empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -2120,7 +2120,7 @@ 
 			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($categories))
+		if ( ! empty($categories))
 		{
 			return array_unique($categories);
 		}
@@ -2218,7 +2218,7 @@ 
 			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($authors))
+		if ( ! empty($authors))
 		{
 			return array_unique($authors);
 		}
@@ -2304,7 +2304,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -2362,7 +2362,7 @@ 
 	 */
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
@@ -2406,19 +2406,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -2860,9 +2860,9 @@ 
 	 */
 	public function get_items($start = 0, $end = 0)
 	{
-		if (!isset($this->data['items']))
+		if ( ! isset($this->data['items']))
 		{
-			if (!empty($this->multifeed_objects))
+			if ( ! empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
 			}
@@ -2912,17 +2912,17 @@ 
 			}
 		}
 
-		if (!empty($this->data['items']))
+		if ( ! empty($this->data['items']))
 		{
 			// If we want to order it by date, check if all items have a date, and then sort it
 			if ($this->order_by_date && empty($this->multifeed_objects))
 			{
-				if (!isset($this->data['ordered_items']))
+				if ( ! isset($this->data['ordered_items']))
 				{
 					$do_sort = true;
 					foreach ($this->data['items'] as $item)
 					{
-						if (!$item->get_date('U'))
+						if ( ! $item->get_date('U'))
 						{
 							$do_sort = false;
 							break;
@@ -2982,7 +2982,7 @@ 
 
 		if (($url = $this->get_link()) !== null)
 		{
-			return 'http://g.etfv.co/' . urlencode($url);
+			return 'http://g.etfv.co/'.urlencode($url);
 		}
 
 		return false;
@@ -3063,7 +3063,7 @@ 
 			$do_sort = true;
 			foreach ($items as $item)
 			{
-				if (!$item->get_date('U'))
+				if ( ! $item->get_date('U'))
 				{
 					$do_sort = false;
 					break;

Doc Comments +5 added lines, -5 removed lines

@@ -1589,7 +1589,7 @@ 
 	/**
 	 * Get the error message for the occurred error.
 	 *
-	 * @return string|array Error message, or array of messages for multifeeds
+	 * @return string Error message, or array of messages for multifeeds
 	 */
 	public function error()
 	{
@@ -2582,7 +2582,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -2611,7 +2611,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{
@@ -2753,7 +2753,7 @@ 
 	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_width()
 	{
@@ -2779,7 +2779,7 @@ 
 	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_height()
 	{

src/wp-includes/nav-menu-template.php

Braces +56 added lines, -39 removed lines

@@ -272,8 +272,9 @@ 
 	$menu = wp_get_nav_menu_object( $args->menu );
 
 	// Get the nav menu based on the theme_location
-	if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) )
-		$menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );
+	if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) ) {
+			$menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );
+	}
 
 	// get the first menu that has items if we still can't find a menu
 	if ( ! $menu && !$args->theme_location ) {
@@ -291,8 +292,9 @@ 
 	}
 
 	// If the menu exists, get its items.
-	if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+	if ( $menu && ! is_wp_error($menu) && !isset($menu_items) ) {
+			$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+	}
 
 	/*
 	 * If no menu was found:
@@ -303,11 +305,13 @@ 
 	 *  - Otherwise, bail.
 	 */
 	if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
-		&& isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) )
-			return call_user_func( $args->fallback_cb, (array) $args );
+		&& isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) ) {
+				return call_user_func( $args->fallback_cb, (array) $args );
+	}
 
-	if ( ! $menu || is_wp_error( $menu ) )
-		return false;
+	if ( ! $menu || is_wp_error( $menu ) ) {
+			return false;
+	}
 
 	$nav_menu = $items = '';
 
@@ -336,15 +340,17 @@ 
 	$sorted_menu_items = $menu_items_with_children = array();
 	foreach ( (array) $menu_items as $menu_item ) {
 		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
-		if ( $menu_item->menu_item_parent )
-			$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
+		if ( $menu_item->menu_item_parent ) {
+					$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
+		}
 	}
 
 	// Add the menu-item-has-children class where applicable
 	if ( $menu_items_with_children ) {
 		foreach ( $sorted_menu_items as &$menu_item ) {
-			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) )
-				$menu_item->classes[] = 'menu-item-has-children';
+			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) ) {
+							$menu_item->classes[] = 'menu-item-has-children';
+			}
 		}
 	}
 
@@ -369,10 +375,11 @@ 
 	} else {
 		$wrap_id = 'menu-' . $menu->slug;
 		while ( in_array( $wrap_id, $menu_id_slugs ) ) {
-			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) )
-				$wrap_id = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
-			else
-				$wrap_id = $wrap_id . '-1';
+			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) ) {
+							$wrap_id = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
+			} else {
+							$wrap_id = $wrap_id . '-1';
+			}
 		}
 	}
 	$menu_id_slugs[] = $wrap_id;
@@ -403,14 +410,16 @@ 
 	$items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
 
 	// Don't print any markup if there are no items at this point.
-	if ( empty( $items ) )
-		return false;
+	if ( empty( $items ) ) {
+			return false;
+	}
 
 	$nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
 	unset( $items );
 
-	if ( $show_container )
-		$nav_menu .= '</' . $args->container . '>';
+	if ( $show_container ) {
+			$nav_menu .= '</' . $args->container . '>';
+	}
 
 	/**
 	 * Filter the HTML content for navigation menus.
@@ -424,11 +433,12 @@ 
 	 */
 	$nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
-	if ( $args->echo )
-		echo $nav_menu;
-	else
-		return $nav_menu;
-}
+	if ( $args->echo ) {
+			echo $nav_menu;
+	} else {
+			return $nav_menu;
+	}
+	}
 
 /**
  * Add the class property classes for the current context, if applicable.
@@ -464,8 +474,9 @@ 
 					$possible_object_parents = array_merge( $possible_object_parents, $terms );
 					$term_to_ancestor = array();
 					foreach ( (array) $term_hierarchy as $anc => $descs ) {
-						foreach ( (array) $descs as $desc )
-							$term_to_ancestor[ $desc ] = $anc;
+						foreach ( (array) $descs as $desc ) {
+													$term_to_ancestor[ $desc ] = $anc;
+						}
 					}
 
 					foreach ( $terms as $desc ) {
@@ -487,8 +498,9 @@ 
 		$term_hierarchy = _get_term_hierarchy( $queried_object->taxonomy );
 		$term_to_ancestor = array();
 		foreach ( (array) $term_hierarchy as $anc => $descs ) {
-			foreach ( (array) $descs as $desc )
-				$term_to_ancestor[ $desc ] = $anc;
+			foreach ( (array) $descs as $desc ) {
+							$term_to_ancestor[ $desc ] = $anc;
+			}
 		}
 		$desc = $queried_object->term_id;
 		do {
@@ -585,13 +597,15 @@ 
 				$classes[] = 'current-menu-item';
 			}
 
-			if ( untrailingslashit($item_url) == home_url() )
-				$classes[] = 'menu-item-home';
+			if ( untrailingslashit($item_url) == home_url() ) {
+							$classes[] = 'menu-item-home';
+			}
 		}
 
 		// back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
-		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
-			$classes[] = 'current_page_parent';
+		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) {
+					$classes[] = 'current_page_parent';
+		}
 
 		$menu_items[$key]->classes = array_unique( $classes );
 	}
@@ -640,15 +654,18 @@ 
 			$classes[] = 'current-menu-parent';
 			$menu_items[$key]->current_item_parent = true;
 		}
-		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
-			$classes[] = 'current-' . $active_object . '-parent';
+		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) ) {
+					$classes[] = 'current-' . $active_object . '-parent';
+		}
 
 		if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
 			// Back compat classes for pages to match wp_page_menu()
-			if ( in_array('current-menu-parent', $classes) )
-				$classes[] = 'current_page_parent';
-			if ( in_array('current-menu-ancestor', $classes) )
-				$classes[] = 'current_page_ancestor';
+			if ( in_array('current-menu-parent', $classes) ) {
+							$classes[] = 'current_page_parent';
+			}
+			if ( in_array('current-menu-ancestor', $classes) ) {
+							$classes[] = 'current_page_ancestor';
+			}
 		}
 
 		$menu_items[$key]->classes = array_unique( $classes );

Spacing +142 added lines, -142 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 /** Walker_Nav_Menu class */
-require_once ABSPATH . WPINC . '/class-walker-nav-menu.php';
+require_once ABSPATH.WPINC.'/class-walker-nav-menu.php';
 
 /**
  * Displays a navigation menu.
@@ -45,16 +45,16 @@ 
  * }
  * @return object|false|void Menu output if $echo is false, false if there are no items or no menu was found.
  */
-function wp_nav_menu( $args = array() ) {
+function wp_nav_menu($args = array()) {
 	static $menu_id_slugs = array();
 
-	$defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
+	$defaults = array('menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
 	'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>', 'item_spacing' => 'preserve',
-	'depth' => 0, 'walker' => '', 'theme_location' => '' );
+	'depth' => 0, 'walker' => '', 'theme_location' => '');
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ), true ) ) {
+	if ( ! in_array($args['item_spacing'], array('preserve', 'discard'), true)) {
 		// invalid value, fall back to default.
 		$args['item_spacing'] = $defaults['item_spacing'];
 	}
@@ -68,7 +68,7 @@ 
 	 *
 	 * @param array $args Array of wp_nav_menu() arguments.
 	 */
-	$args = apply_filters( 'wp_nav_menu_args', $args );
+	$args = apply_filters('wp_nav_menu_args', $args);
 	$args = (object) $args;
 
 	/**
@@ -85,10 +85,10 @@ 
 	 * @param string|null $output Nav menu output to short-circuit with. Default null.
 	 * @param stdClass    $args   An object containing wp_nav_menu() arguments.
 	 */
-	$nav_menu = apply_filters( 'pre_wp_nav_menu', null, $args );
+	$nav_menu = apply_filters('pre_wp_nav_menu', null, $args);
 
-	if ( null !== $nav_menu ) {
-		if ( $args->echo ) {
+	if (null !== $nav_menu) {
+		if ($args->echo) {
 			echo $nav_menu;
 			return;
 		}
@@ -97,30 +97,30 @@ 
 	}
 
 	// Get the nav menu based on the requested menu
-	$menu = wp_get_nav_menu_object( $args->menu );
+	$menu = wp_get_nav_menu_object($args->menu);
 
 	// Get the nav menu based on the theme_location
-	if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) )
-		$menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );
+	if ( ! $menu && $args->theme_location && ($locations = get_nav_menu_locations()) && isset($locations[$args->theme_location]))
+		$menu = wp_get_nav_menu_object($locations[$args->theme_location]);
 
 	// get the first menu that has items if we still can't find a menu
-	if ( ! $menu && !$args->theme_location ) {
+	if ( ! $menu && ! $args->theme_location) {
 		$menus = wp_get_nav_menus();
-		foreach ( $menus as $menu_maybe ) {
-			if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) {
+		foreach ($menus as $menu_maybe) {
+			if ($menu_items = wp_get_nav_menu_items($menu_maybe->term_id, array('update_post_term_cache' => false))) {
 				$menu = $menu_maybe;
 				break;
 			}
 		}
 	}
 
-	if ( empty( $args->menu ) ) {
+	if (empty($args->menu)) {
 		$args->menu = $menu;
 	}
 
 	// If the menu exists, get its items.
-	if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+	if ($menu && ! is_wp_error($menu) && ! isset($menu_items))
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('update_post_term_cache' => false));
 
 	/*
 	 * If no menu was found:
@@ -130,17 +130,17 @@ 
 	 *  - Fall back, but only if no theme location was specified.
 	 *  - Otherwise, bail.
 	 */
-	if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
-		&& isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) )
-			return call_user_func( $args->fallback_cb, (array) $args );
+	if (( ! $menu || is_wp_error($menu) || (isset($menu_items) && empty($menu_items) && ! $args->theme_location))
+		&& isset($args->fallback_cb) && $args->fallback_cb && is_callable($args->fallback_cb))
+			return call_user_func($args->fallback_cb, (array) $args);
 
-	if ( ! $menu || is_wp_error( $menu ) )
+	if ( ! $menu || is_wp_error($menu))
 		return false;
 
 	$nav_menu = $items = '';
 
 	$show_container = false;
-	if ( $args->container ) {
+	if ($args->container) {
 		/**
 		 * Filters the list of HTML tags that are valid for use as menu containers.
 		 *
@@ -149,34 +149,34 @@ 
 		 * @param array $tags The acceptable HTML tags for use as menu containers.
 		 *                    Default is array containing 'div' and 'nav'.
 		 */
-		$allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) );
-		if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags ) ) {
+		$allowed_tags = apply_filters('wp_nav_menu_container_allowedtags', array('div', 'nav'));
+		if (is_string($args->container) && in_array($args->container, $allowed_tags)) {
 			$show_container = true;
-			$class = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-'. $menu->slug .'-container"';
-			$id = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : '';
-			$nav_menu .= '<'. $args->container . $id . $class . '>';
+			$class = $args->container_class ? ' class="'.esc_attr($args->container_class).'"' : ' class="menu-'.$menu->slug.'-container"';
+			$id = $args->container_id ? ' id="'.esc_attr($args->container_id).'"' : '';
+			$nav_menu .= '<'.$args->container.$id.$class.'>';
 		}
 	}
 
 	// Set up the $menu_item variables
-	_wp_menu_item_classes_by_context( $menu_items );
+	_wp_menu_item_classes_by_context($menu_items);
 
 	$sorted_menu_items = $menu_items_with_children = array();
-	foreach ( (array) $menu_items as $menu_item ) {
-		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
-		if ( $menu_item->menu_item_parent )
-			$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
+	foreach ((array) $menu_items as $menu_item) {
+		$sorted_menu_items[$menu_item->menu_order] = $menu_item;
+		if ($menu_item->menu_item_parent)
+			$menu_items_with_children[$menu_item->menu_item_parent] = true;
 	}
 
 	// Add the menu-item-has-children class where applicable
-	if ( $menu_items_with_children ) {
-		foreach ( $sorted_menu_items as &$menu_item ) {
-			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) )
+	if ($menu_items_with_children) {
+		foreach ($sorted_menu_items as &$menu_item) {
+			if (isset($menu_items_with_children[$menu_item->ID]))
 				$menu_item->classes[] = 'menu-item-has-children';
 		}
 	}
 
-	unset( $menu_items, $menu_item );
+	unset($menu_items, $menu_item);
 
 	/**
 	 * Filters the sorted list of menu item objects before generating the menu's HTML.
@@ -186,21 +186,21 @@ 
 	 * @param array    $sorted_menu_items The menu items, sorted by each menu item's menu order.
 	 * @param stdClass $args              An object containing wp_nav_menu() arguments.
 	 */
-	$sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
+	$sorted_menu_items = apply_filters('wp_nav_menu_objects', $sorted_menu_items, $args);
 
-	$items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );
+	$items .= walk_nav_menu_tree($sorted_menu_items, $args->depth, $args);
 	unset($sorted_menu_items);
 
 	// Attributes
-	if ( ! empty( $args->menu_id ) ) {
+	if ( ! empty($args->menu_id)) {
 		$wrap_id = $args->menu_id;
 	} else {
-		$wrap_id = 'menu-' . $menu->slug;
-		while ( in_array( $wrap_id, $menu_id_slugs ) ) {
-			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) )
-				$wrap_id = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
+		$wrap_id = 'menu-'.$menu->slug;
+		while (in_array($wrap_id, $menu_id_slugs)) {
+			if (preg_match('#-(\d+)$#', $wrap_id, $matches))
+				$wrap_id = preg_replace('#-(\d+)$#', '-'.++$matches[1], $wrap_id);
 			else
-				$wrap_id = $wrap_id . '-1';
+				$wrap_id = $wrap_id.'-1';
 		}
 	}
 	$menu_id_slugs[] = $wrap_id;
@@ -217,7 +217,7 @@ 
 	 * @param string   $items The HTML list content for the menu items.
 	 * @param stdClass $args  An object containing wp_nav_menu() arguments.
 	 */
-	$items = apply_filters( 'wp_nav_menu_items', $items, $args );
+	$items = apply_filters('wp_nav_menu_items', $items, $args);
 	/**
 	 * Filters the HTML list content for a specific navigation menu.
 	 *
@@ -228,17 +228,17 @@ 
 	 * @param string   $items The HTML list content for the menu items.
 	 * @param stdClass $args  An object containing wp_nav_menu() arguments.
 	 */
-	$items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
+	$items = apply_filters("wp_nav_menu_{$menu->slug}_items", $items, $args);
 
 	// Don't print any markup if there are no items at this point.
-	if ( empty( $items ) )
+	if (empty($items))
 		return false;
 
-	$nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
-	unset( $items );
+	$nav_menu .= sprintf($args->items_wrap, esc_attr($wrap_id), esc_attr($wrap_class), $items);
+	unset($items);
 
-	if ( $show_container )
-		$nav_menu .= '</' . $args->container . '>';
+	if ($show_container)
+		$nav_menu .= '</'.$args->container.'>';
 
 	/**
 	 * Filters the HTML content for navigation menus.
@@ -250,9 +250,9 @@ 
 	 * @param string   $nav_menu The HTML content for the navigation menu.
 	 * @param stdClass $args     An object containing wp_nav_menu() arguments.
 	 */
-	$nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
+	$nav_menu = apply_filters('wp_nav_menu', $nav_menu, $args);
 
-	if ( $args->echo )
+	if ($args->echo)
 		echo $nav_menu;
 	else
 		return $nav_menu;
@@ -269,7 +269,7 @@ 
  *
  * @param array $menu_items The current menu item objects to which to add the class property information.
  */
-function _wp_menu_item_classes_by_context( &$menu_items ) {
+function _wp_menu_item_classes_by_context(&$menu_items) {
 	global $wp_query, $wp_rewrite;
 
 	$queried_object = $wp_query->get_queried_object();
@@ -281,77 +281,77 @@ 
 	$active_parent_object_ids = array();
 	$possible_taxonomy_ancestors = array();
 	$possible_object_parents = array();
-	$home_page_id = (int) get_option( 'page_for_posts' );
-
-	if ( $wp_query->is_singular && ! empty( $queried_object->post_type ) && ! is_post_type_hierarchical( $queried_object->post_type ) ) {
-		foreach ( (array) get_object_taxonomies( $queried_object->post_type ) as $taxonomy ) {
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-				$term_hierarchy = _get_term_hierarchy( $taxonomy );
-				$terms = wp_get_object_terms( $queried_object_id, $taxonomy, array( 'fields' => 'ids' ) );
-				if ( is_array( $terms ) ) {
-					$possible_object_parents = array_merge( $possible_object_parents, $terms );
+	$home_page_id = (int) get_option('page_for_posts');
+
+	if ($wp_query->is_singular && ! empty($queried_object->post_type) && ! is_post_type_hierarchical($queried_object->post_type)) {
+		foreach ((array) get_object_taxonomies($queried_object->post_type) as $taxonomy) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
+				$term_hierarchy = _get_term_hierarchy($taxonomy);
+				$terms = wp_get_object_terms($queried_object_id, $taxonomy, array('fields' => 'ids'));
+				if (is_array($terms)) {
+					$possible_object_parents = array_merge($possible_object_parents, $terms);
 					$term_to_ancestor = array();
-					foreach ( (array) $term_hierarchy as $anc => $descs ) {
-						foreach ( (array) $descs as $desc )
-							$term_to_ancestor[ $desc ] = $anc;
+					foreach ((array) $term_hierarchy as $anc => $descs) {
+						foreach ((array) $descs as $desc)
+							$term_to_ancestor[$desc] = $anc;
 					}
 
-					foreach ( $terms as $desc ) {
+					foreach ($terms as $desc) {
 						do {
-							$possible_taxonomy_ancestors[ $taxonomy ][] = $desc;
-							if ( isset( $term_to_ancestor[ $desc ] ) ) {
-								$_desc = $term_to_ancestor[ $desc ];
-								unset( $term_to_ancestor[ $desc ] );
+							$possible_taxonomy_ancestors[$taxonomy][] = $desc;
+							if (isset($term_to_ancestor[$desc])) {
+								$_desc = $term_to_ancestor[$desc];
+								unset($term_to_ancestor[$desc]);
 								$desc = $_desc;
 							} else {
 								$desc = 0;
 							}
-						} while ( ! empty( $desc ) );
+						} while ( ! empty($desc));
 					}
 				}
 			}
 		}
-	} elseif ( ! empty( $queried_object->taxonomy ) && is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
-		$term_hierarchy = _get_term_hierarchy( $queried_object->taxonomy );
+	} elseif ( ! empty($queried_object->taxonomy) && is_taxonomy_hierarchical($queried_object->taxonomy)) {
+		$term_hierarchy = _get_term_hierarchy($queried_object->taxonomy);
 		$term_to_ancestor = array();
-		foreach ( (array) $term_hierarchy as $anc => $descs ) {
-			foreach ( (array) $descs as $desc )
-				$term_to_ancestor[ $desc ] = $anc;
+		foreach ((array) $term_hierarchy as $anc => $descs) {
+			foreach ((array) $descs as $desc)
+				$term_to_ancestor[$desc] = $anc;
 		}
 		$desc = $queried_object->term_id;
 		do {
-			$possible_taxonomy_ancestors[ $queried_object->taxonomy ][] = $desc;
-			if ( isset( $term_to_ancestor[ $desc ] ) ) {
-				$_desc = $term_to_ancestor[ $desc ];
-				unset( $term_to_ancestor[ $desc ] );
+			$possible_taxonomy_ancestors[$queried_object->taxonomy][] = $desc;
+			if (isset($term_to_ancestor[$desc])) {
+				$_desc = $term_to_ancestor[$desc];
+				unset($term_to_ancestor[$desc]);
 				$desc = $_desc;
 			} else {
 				$desc = 0;
 			}
-		} while ( ! empty( $desc ) );
+		} while ( ! empty($desc));
 	}
 
-	$possible_object_parents = array_filter( $possible_object_parents );
+	$possible_object_parents = array_filter($possible_object_parents);
 
 	$front_page_url = home_url();
-	$front_page_id  = (int) get_option( 'page_on_front' );
+	$front_page_id  = (int) get_option('page_on_front');
 
-	foreach ( (array) $menu_items as $key => $menu_item ) {
+	foreach ((array) $menu_items as $key => $menu_item) {
 
 		$menu_items[$key]->current = false;
 
 		$classes = (array) $menu_item->classes;
 		$classes[] = 'menu-item';
-		$classes[] = 'menu-item-type-' . $menu_item->type;
-		$classes[] = 'menu-item-object-' . $menu_item->object;
+		$classes[] = 'menu-item-type-'.$menu_item->type;
+		$classes[] = 'menu-item-object-'.$menu_item->object;
 
 		// This menu item is set as the 'Front Page'.
-		if ( 'post_type' === $menu_item->type && $front_page_id === (int) $menu_item->object_id ) {
+		if ('post_type' === $menu_item->type && $front_page_id === (int) $menu_item->object_id) {
 			$classes[] = 'menu-item-home';
 		}
 
 		// if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object
-		if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {
+		if ($wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array($menu_item->object_id, $possible_object_parents)) {
 			$active_parent_object_ids[] = (int) $menu_item->object_id;
 			$active_parent_item_ids[] = (int) $menu_item->db_id;
 			$active_object = $queried_object->post_type;
@@ -360,26 +360,26 @@ 
 		} elseif (
 			$menu_item->object_id == $queried_object_id &&
 			(
-				( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && $wp_query->is_home && $home_page_id == $menu_item->object_id ) ||
-				( 'post_type' == $menu_item->type && $wp_query->is_singular ) ||
-				( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
+				( ! empty($home_page_id) && 'post_type' == $menu_item->type && $wp_query->is_home && $home_page_id == $menu_item->object_id) ||
+				('post_type' == $menu_item->type && $wp_query->is_singular) ||
+				('taxonomy' == $menu_item->type && ($wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax) && $queried_object->taxonomy == $menu_item->object)
 			)
 		) {
 			$classes[] = 'current-menu-item';
 			$menu_items[$key]->current = true;
 			$_anc_id = (int) $menu_item->db_id;
 
-			while(
-				( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
-				! in_array( $_anc_id, $active_ancestor_item_ids )
+			while (
+				($_anc_id = get_post_meta($_anc_id, '_menu_item_menu_item_parent', true)) &&
+				! in_array($_anc_id, $active_ancestor_item_ids)
 			) {
 				$active_ancestor_item_ids[] = $_anc_id;
 			}
 
-			if ( 'post_type' == $menu_item->type && 'page' == $menu_item->object ) {
+			if ('post_type' == $menu_item->type && 'page' == $menu_item->object) {
 				// Back compat classes for pages to match wp_page_menu()
 				$classes[] = 'page_item';
-				$classes[] = 'page-item-' . $menu_item->object_id;
+				$classes[] = 'page-item-'.$menu_item->object_id;
 				$classes[] = 'current_page_item';
 			}
 
@@ -390,31 +390,31 @@ 
 		// if the menu item corresponds to the currently-queried post type archive
 		} elseif (
 			'post_type_archive' == $menu_item->type &&
-			is_post_type_archive( array( $menu_item->object ) )
+			is_post_type_archive(array($menu_item->object))
 		) {
 			$classes[] = 'current-menu-item';
 			$menu_items[$key]->current = true;
 		// if the menu item corresponds to the currently-requested URL
-		} elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
-			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
-			$raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
-			$item_url = set_url_scheme( untrailingslashit( $raw_item_url ) );
-			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
-
-			if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
+		} elseif ('custom' == $menu_item->object && isset($_SERVER['HTTP_HOST'])) {
+			$_root_relative_current = untrailingslashit($_SERVER['REQUEST_URI']);
+			$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_root_relative_current);
+			$raw_item_url = strpos($menu_item->url, '#') ? substr($menu_item->url, 0, strpos($menu_item->url, '#')) : $menu_item->url;
+			$item_url = set_url_scheme(untrailingslashit($raw_item_url));
+			$_indexless_current = untrailingslashit(preg_replace('/'.preg_quote($wp_rewrite->index, '/').'$/', '', $current_url));
+
+			if ($raw_item_url && in_array($item_url, array($current_url, $_indexless_current, $_root_relative_current))) {
 				$classes[] = 'current-menu-item';
 				$menu_items[$key]->current = true;
 				$_anc_id = (int) $menu_item->db_id;
 
-				while(
-					( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
-					! in_array( $_anc_id, $active_ancestor_item_ids )
+				while (
+					($_anc_id = get_post_meta($_anc_id, '_menu_item_menu_item_parent', true)) &&
+					! in_array($_anc_id, $active_ancestor_item_ids)
 				) {
 					$active_ancestor_item_ids[] = $_anc_id;
 				}
 
-				if ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ) ) ) {
+				if (in_array(home_url(), array(untrailingslashit($current_url), untrailingslashit($_indexless_current)))) {
 					// Back compat for home link to match wp_page_menu()
 					$classes[] = 'current_page_item';
 				}
@@ -423,77 +423,77 @@ 
 				$active_object = $menu_item->object;
 
 			// give front page item current-menu-item class when extra query arguments involved
-			} elseif ( $item_url == $front_page_url && is_front_page() ) {
+			} elseif ($item_url == $front_page_url && is_front_page()) {
 				$classes[] = 'current-menu-item';
 			}
 
-			if ( untrailingslashit($item_url) == home_url() )
+			if (untrailingslashit($item_url) == home_url())
 				$classes[] = 'menu-item-home';
 		}
 
 		// back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
-		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
+		if ( ! empty($home_page_id) && 'post_type' == $menu_item->type && empty($wp_query->is_page) && $home_page_id == $menu_item->object_id)
 			$classes[] = 'current_page_parent';
 
-		$menu_items[$key]->classes = array_unique( $classes );
+		$menu_items[$key]->classes = array_unique($classes);
 	}
-	$active_ancestor_item_ids = array_filter( array_unique( $active_ancestor_item_ids ) );
-	$active_parent_item_ids = array_filter( array_unique( $active_parent_item_ids ) );
-	$active_parent_object_ids = array_filter( array_unique( $active_parent_object_ids ) );
+	$active_ancestor_item_ids = array_filter(array_unique($active_ancestor_item_ids));
+	$active_parent_item_ids = array_filter(array_unique($active_parent_item_ids));
+	$active_parent_object_ids = array_filter(array_unique($active_parent_object_ids));
 
 	// set parent's class
-	foreach ( (array) $menu_items as $key => $parent_item ) {
+	foreach ((array) $menu_items as $key => $parent_item) {
 		$classes = (array) $parent_item->classes;
 		$menu_items[$key]->current_item_ancestor = false;
 		$menu_items[$key]->current_item_parent = false;
 
 		if (
-			isset( $parent_item->type ) &&
+			isset($parent_item->type) &&
 			(
 				// ancestral post object
 				(
 					'post_type' == $parent_item->type &&
-					! empty( $queried_object->post_type ) &&
-					is_post_type_hierarchical( $queried_object->post_type ) &&
-					in_array( $parent_item->object_id, $queried_object->ancestors ) &&
+					! empty($queried_object->post_type) &&
+					is_post_type_hierarchical($queried_object->post_type) &&
+					in_array($parent_item->object_id, $queried_object->ancestors) &&
 					$parent_item->object != $queried_object->ID
 				) ||
 
 				// ancestral term
 				(
 					'taxonomy' == $parent_item->type &&
-					isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
-					in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
+					isset($possible_taxonomy_ancestors[$parent_item->object]) &&
+					in_array($parent_item->object_id, $possible_taxonomy_ancestors[$parent_item->object]) &&
 					(
-						! isset( $queried_object->term_id ) ||
+						! isset($queried_object->term_id) ||
 						$parent_item->object_id != $queried_object->term_id
 					)
 				)
 			)
 		) {
-			$classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
+			$classes[] = empty($queried_object->taxonomy) ? 'current-'.$queried_object->post_type.'-ancestor' : 'current-'.$queried_object->taxonomy.'-ancestor';
 		}
 
-		if ( in_array(  intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
+		if (in_array(intval($parent_item->db_id), $active_ancestor_item_ids)) {
 			$classes[] = 'current-menu-ancestor';
 			$menu_items[$key]->current_item_ancestor = true;
 		}
-		if ( in_array( $parent_item->db_id, $active_parent_item_ids ) ) {
+		if (in_array($parent_item->db_id, $active_parent_item_ids)) {
 			$classes[] = 'current-menu-parent';
 			$menu_items[$key]->current_item_parent = true;
 		}
-		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
-			$classes[] = 'current-' . $active_object . '-parent';
+		if (in_array($parent_item->object_id, $active_parent_object_ids))
+			$classes[] = 'current-'.$active_object.'-parent';
 
-		if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
+		if ('post_type' == $parent_item->type && 'page' == $parent_item->object) {
 			// Back compat classes for pages to match wp_page_menu()
-			if ( in_array('current-menu-parent', $classes) )
+			if (in_array('current-menu-parent', $classes))
 				$classes[] = 'current_page_parent';
-			if ( in_array('current-menu-ancestor', $classes) )
+			if (in_array('current-menu-ancestor', $classes))
 				$classes[] = 'current_page_ancestor';
 		}
 
-		$menu_items[$key]->classes = array_unique( $classes );
+		$menu_items[$key]->classes = array_unique($classes);
 	}
 }
 
@@ -508,11 +508,11 @@ 
  * @param stdClass $r     An object containing wp_nav_menu() arguments.
  * @return string The HTML list content for the menu items.
  */
-function walk_nav_menu_tree( $items, $depth, $r ) {
-	$walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
-	$args = array( $items, $depth, $r );
+function walk_nav_menu_tree($items, $depth, $r) {
+	$walker = (empty($r->walker)) ? new Walker_Nav_Menu : $r->walker;
+	$args = array($items, $depth, $r);
 
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
@@ -526,9 +526,9 @@ 
  * @param object $item
  * @return string
  */
-function _nav_menu_item_id_use_once( $id, $item ) {
+function _nav_menu_item_id_use_once($id, $item) {
 	static $_used_ids = array();
-	if ( in_array( $item->ID, $_used_ids ) ) {
+	if (in_array($item->ID, $_used_ids)) {
 		return '';
 	}
 	$_used_ids[] = $item->ID;

src/wp-includes/feed-rss2.php

Braces +10 added lines, -4 removed lines

@@ -91,13 +91,19 @@
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 <?php if (get_option('rss_use_excerpt')) : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
-<?php else : ?>
-		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
+<?php else {
+	: ?>
+		<description><![CDATA[<?php the_excerpt_rss();
+}
+?>]]></description>
 	<?php $content = get_the_content_feed('rss2'); ?>
 	<?php if ( strlen( $content ) > 0 ) : ?>
 		<content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
-	<?php else : ?>
-		<content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
+	<?php else {
+	: ?>
+		<content:encoded><![CDATA[<?php the_excerpt_rss();
+}
+?>]]></content:encoded>
 	<?php endif; ?>
 <?php endif; ?>
 		<wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rss2').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
@@ -18,7 +18,7 @@ 
  * @param string $context Type of feed. Possible values include 'rss2', 'rss2-comments',
  *                        'rdf', 'atom', and 'atom-comments'.
  */
-do_action( 'rss_tag_pre', 'rss2' );
+do_action('rss_tag_pre', 'rss2');
 ?>
 <rss version="2.0"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -33,7 +33,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rss2_ns' );
+	do_action('rss2_ns');
 	?>
 >
 
@@ -43,10 +43,10 @@ 
 	<link><?php bloginfo_rss('url') ?></link>
 	<description><?php bloginfo_rss("description") ?></description>
 	<lastBuildDate><?php
-		$date = get_lastpostmodified( 'GMT' );
-		echo $date ? mysql2date( 'r', $date, false ) : date( 'r' );
+		$date = get_lastpostmodified('GMT');
+		echo $date ? mysql2date('r', $date, false) : date('r');
 	?></lastBuildDate>
-	<language><?php bloginfo_rss( 'language' ); ?></language>
+	<language><?php bloginfo_rss('language'); ?></language>
 	<sy:updatePeriod><?php
 		$duration = 'hourly';
 
@@ -58,7 +58,7 @@ 
 		 * @param string $duration The update period. Accepts 'hourly', 'daily', 'weekly', 'monthly',
 		 *                         'yearly'. Default 'hourly'.
 		 */
-		echo apply_filters( 'rss_update_period', $duration );
+		echo apply_filters('rss_update_period', $duration);
 	?></sy:updatePeriod>
 	<sy:updateFrequency><?php
 		$frequency = '1';
@@ -71,7 +71,7 @@ 
 		 * @param string $frequency An integer passed as a string representing the frequency
 		 *                          of RSS updates within the update period. Default '1'.
 		 */
-		echo apply_filters( 'rss_update_frequency', $frequency );
+		echo apply_filters('rss_update_frequency', $frequency);
 	?></sy:updateFrequency>
 	<?php
 	/**
@@ -79,14 +79,14 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rss2_head');
+	do_action('rss2_head');
 
-	while( have_posts()) : the_post();
+	while (have_posts()) : the_post();
 	?>
 	<item>
 		<title><?php the_title_rss() ?></title>
 		<link><?php the_permalink_rss() ?></link>
-<?php if ( get_comments_number() || comments_open() ) : ?>
+<?php if (get_comments_number() || comments_open()) : ?>
 		<comments><?php comments_link_feed(); ?></comments>
 <?php endif; ?>
 		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
@@ -99,14 +99,14 @@ 
 <?php else : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
 	<?php $content = get_the_content_feed('rss2'); ?>
-	<?php if ( strlen( $content ) > 0 ) : ?>
+	<?php if (strlen($content) > 0) : ?>
 		<content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
 	<?php else : ?>
 		<content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
 	<?php endif; ?>
 <?php endif; ?>
-<?php if ( get_comments_number() || comments_open() ) : ?>
-		<wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
+<?php if (get_comments_number() || comments_open()) : ?>
+		<wfw:commentRss><?php echo esc_url(get_post_comments_feed_link(null, 'rss2')); ?></wfw:commentRss>
 		<slash:comments><?php echo get_comments_number(); ?></slash:comments>
 <?php endif; ?>
 <?php rss_enclosure(); ?>
@@ -116,7 +116,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rss2_item' );
+	do_action('rss2_item');
 	?>
 	</item>
 	<?php endwhile; ?>

src/wp-includes/SimplePie/HTTP/Parser.php

Spacing +5 added lines, -5 removed lines

@@ -258,7 +258,7 @@ 
 			// We should only use the last Content-Type header. c.f. issue #1
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
 			{
-				$this->headers[$this->name] .= ', ' . $this->value;
+				$this->headers[$this->name] .= ', '.$this->value;
 			}
 			else
 			{
@@ -441,7 +441,7 @@ 
 	protected function body()
 	{
 		$this->body = substr($this->data, $this->position);
-		if (!empty($this->headers['transfer-encoding']))
+		if ( ! empty($this->headers['transfer-encoding']))
 		{
 			unset($this->headers['transfer-encoding']);
 			$this->state = 'chunked';
@@ -457,7 +457,7 @@ 
 	 */
 	protected function chunked()
 	{
-		if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body)))
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body)))
 		{
 			$this->state = 'emit';
 			return;
@@ -468,8 +468,8 @@ 
 
 		while (true)
 		{
-			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
-			if (!$is_chunked)
+			$is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
+			if ( ! $is_chunked)
 			{
 				// Looks like it's not chunked after all
 				$this->state = 'emit';

Braces +13 added lines, -26 removed lines

@@ -155,8 +155,7 @@ 
 		if ($this->state === 'emit' || $this->state === 'body')
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$this->http_version = '';
 			$this->status_code = '';
@@ -206,13 +205,11 @@ 
 				$this->http_version = (float) $this->http_version;
 				$this->position += strspn($this->data, "\x09\x20", $this->position);
 				$this->state = 'status';
-			}
-			else
+			} else
 			{
 				$this->state = false;
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -228,8 +225,7 @@ 
 			$this->status_code = (int) substr($this->data, $this->position, $len);
 			$this->position += $len;
 			$this->state = 'reason';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -259,8 +255,7 @@ 
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
 			{
 				$this->headers[$this->name] .= ', ' . $this->value;
-			}
-			else
+			} else
 			{
 				$this->headers[$this->name] = $this->value;
 			}
@@ -271,13 +266,11 @@ 
 		{
 			$this->position += 2;
 			$this->state = 'body';
-		}
-		elseif ($this->data[$this->position] === "\x0A")
+		} elseif ($this->data[$this->position] === "\x0A")
 		{
 			$this->position++;
 			$this->state = 'body';
-		}
-		else
+		} else
 		{
 			$this->state = 'name';
 		}
@@ -295,15 +288,13 @@ 
 			{
 				$this->position += $len;
 				$this->state = 'new_line';
-			}
-			else
+			} else
 			{
 				$this->name = substr($this->data, $this->position, $len);
 				$this->position += $len + 1;
 				$this->state = 'value';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -319,8 +310,7 @@ 
 			if (substr($this->data, $this->position, 2) === "\x0D\x0A")
 			{
 				$this->position += 2;
-			}
-			elseif ($this->data[$this->position] === "\x0A")
+			} elseif ($this->data[$this->position] === "\x0A")
 			{
 				$this->position++;
 			}
@@ -337,8 +327,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -387,8 +376,7 @@ 
 		if ($this->is_linear_whitespace())
 		{
 			$this->linear_whitespace();
-		}
-		else
+		} else
 		{
 			switch ($this->data[$this->position])
 			{
@@ -445,8 +433,7 @@ 
 		{
 			unset($this->headers['transfer-encoding']);
 			$this->state = 'chunked';
-		}
-		else
+		} else
 		{
 			$this->state = 'emit';
 		}

src/wp-includes/SimplePie/Source.php

Spacing +9 added lines, -9 removed lines

@@ -197,7 +197,7 @@ 
 			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($categories))
+		if ( ! empty($categories))
 		{
 			return array_unique($categories);
 		}
@@ -280,7 +280,7 @@ 
 			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($authors))
+		if ( ! empty($authors))
 		{
 			return array_unique($authors);
 		}
@@ -351,7 +351,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -384,7 +384,7 @@ 
 
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
@@ -428,19 +428,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}

Braces +45 added lines, -90 removed lines

@@ -79,8 +79,7 @@ 
 		if (isset($this->data['child'][$namespace][$tag]))
 		{
 			return $this->data['child'][$namespace][$tag];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -106,32 +105,25 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -143,8 +135,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -181,8 +172,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -200,8 +190,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -213,8 +202,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -283,8 +271,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -296,8 +283,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -354,8 +340,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -367,8 +352,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -432,13 +416,11 @@ 
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
+					} else
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
-				}
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -449,8 +431,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -461,40 +442,31 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -505,24 +477,19 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -533,20 +500,16 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['xml_lang']))
+		} elseif (isset($this->data['xml_lang']))
 		{
 			return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -557,12 +520,10 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -573,16 +534,13 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -593,16 +551,13 @@ 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}