ntwb / wordpress

src/wp-includes/pomo/streams.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Sets the endianness of the file.
 	 *
-	 * @param $endian string 'big' or 'little'
+	 * @param string $endian string 'big' or 'little'
 	 */
 	function setEndian($endian) {
 		$this->endian = $endian;
@@ -41,7 +41,7 @@ 
 	/**
 	 * Reads a 32bit Integer from the Stream
 	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
+	 * @return integer The integer, corresponding to the next 32 bits from
 	 * 	the stream of false if there are not enough bytes or on error
 	 */
 	function readint32() {
@@ -119,14 +119,14 @@ 
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function is_resource() {
 		return true;
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function close() {
 		return true;

Braces +21 added lines, -12 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	function readint32() {
 		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
+		if (4 != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
 		return reset( $int );
@@ -62,8 +63,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
+		if (4*$count != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
@@ -103,8 +105,9 @@ 
 		if (!function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
+			for ($i = 0; $i < $length; $i += $chunk_size) {
+							$out[] = $this->substr($string, $i, $chunk_size);
+			}
 			return $out;
 		} else {
 			return str_split( $string, $chunk_size );
@@ -197,8 +200,9 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
+		while ( !$this->feof() ) {
+					$all .= $this->read(4096);
+		}
 		return $all;
 	}
 }
@@ -236,7 +240,9 @@ 
 	function read($bytes) {
 		$data = $this->substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $data;
 	}
 
@@ -246,7 +252,9 @@ 
 	 */
 	function seekto($pos) {
 		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $this->_pos;
 	}
 
@@ -278,8 +286,9 @@ 
 	function __construct( $filename ) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
+		if (false === $this->_str) {
+					return false;
+		}
 		$this->_pos = 0;
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage streams
  */
 
-if ( ! class_exists( 'POMO_Reader', false ) ):
+if ( ! class_exists('POMO_Reader', false)):
 class POMO_Reader {
 
 	var $endian = 'little';
@@ -48,9 +48,9 @@ 
 		$bytes = $this->read(4);
 		if (4 != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
+		return reset($int);
 	}
 
 	/**
@@ -62,9 +62,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
+		if (4 * $count != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
 
@@ -100,14 +100,14 @@ 
 	 * @return array
 	 */
 	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
+		if ( ! function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
 			for ($i = 0; $i < $length; $i += $chunk_size)
 				$out[] = $this->substr($string, $i, $chunk_size);
 			return $out;
 		} else {
-			return str_split( $string, $chunk_size );
+			return str_split($string, $chunk_size);
 		}
 	}
 
@@ -134,13 +134,13 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_FileReader', false ) ):
+if ( ! class_exists('POMO_FileReader', false)):
 class POMO_FileReader extends POMO_Reader {
 
 	/**
 	 * @param string $filename
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_Reader();
 		$this->_f = fopen($filename, 'rb');
 	}
@@ -148,8 +148,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_FileReader($filename) {
+		self::__construct($filename);
 	}
 
 	/**
@@ -197,14 +197,14 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
+		while ( ! $this->feof())
 			$all .= $this->read(4096);
 		return $all;
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_StringReader', false ) ):
+if ( ! class_exists('POMO_StringReader', false)):
 /**
  * Provides file-like methods for manipulating a string instead
  * of a physical file.
@@ -216,7 +216,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $str = '' ) {
+	function __construct($str = '') {
 		parent::POMO_Reader();
 		$this->_str = $str;
 		$this->_pos = 0;
@@ -225,8 +225,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
+	public function POMO_StringReader($str = '') {
+		self::__construct($str);
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
+if ( ! class_exists('POMO_CachedFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -275,7 +275,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
 		if (false === $this->_str)
@@ -286,13 +286,13 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_CachedFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
+if ( ! class_exists('POMO_CachedIntFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -300,15 +300,15 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	public function __construct( $filename ) {
+	public function __construct($filename) {
 		parent::POMO_CachedFileReader($filename);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
+	function POMO_CachedIntFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;

src/wp-includes/pomo/translations.php

Doc Comments +4 added lines, -2 removed lines

@@ -18,6 +18,7 @@ 
 	 * Add entry to the PO structure
 	 *
 	 * @param array|Translation_Entry &$entry
+	 * @param Translation_Entry $entry
 	 * @return bool true on success, false if the entry doesn't have a key
 	 */
 	function add_entry($entry) {
@@ -72,6 +73,7 @@ 
 
 	/**
 	 * @param string $header
+	 * @return string
 	 */
 	function get_header($header) {
 		return isset($this->headers[$header])? $this->headers[$header] : false;
@@ -150,7 +152,7 @@ 
 	}
 
 	/**
-	 * @param object $other
+	 * @param Translations $other
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
@@ -326,7 +328,7 @@ 
 	/**
 	 *
 	 * @param int $count
-	 * @return bool
+	 * @return integer
 	 */
 	function select_plural_form($count) {
 		return 1 == $count? 0 : 1;

Braces +24 added lines, -15 removed lines

@@ -25,7 +25,9 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
+		if (false === $key) {
+			return false;
+		}
 		$this->entries[$key] = &$entry;
 		return true;
 	}
@@ -39,11 +41,14 @@ 
 			$entry = new Translation_Entry($entry);
 		}
 		$key = $entry->key();
-		if (false === $key) return false;
-		if (isset($this->entries[$key]))
-			$this->entries[$key]->merge_with($entry);
-		else
-			$this->entries[$key] = &$entry;
+		if (false === $key) {
+			return false;
+		}
+		if (isset($this->entries[$key])) {
+					$this->entries[$key]->merge_with($entry);
+		} else {
+					$this->entries[$key] = &$entry;
+		}
 		return true;
 	}
 
@@ -131,10 +136,11 @@ 
 		$total_plural_forms = $this->get_plural_forms_count();
 		if ($translated && 0 <= $index && $index < $total_plural_forms &&
 				is_array($translated->translations) &&
-				isset($translated->translations[$index]))
-			return $translated->translations[$index];
-		else
-			return 1 == $count? $singular : $plural;
+				isset($translated->translations[$index])) {
+					return $translated->translations[$index];
+		} else {
+					return 1 == $count? $singular : $plural;
+		}
 	}
 
 	/**
@@ -154,10 +160,11 @@ 
 	 */
 	function merge_originals_with(&$other) {
 		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
-				$this->entries[$entry->key()] = $entry;
-			else
-				$this->entries[$entry->key()]->merge_with($entry);
+			if ( !isset( $this->entries[$entry->key()] ) ) {
+							$this->entries[$entry->key()] = $entry;
+			} else {
+							$this->entries[$entry->key()]->merge_with($entry);
+			}
 		}
 	}
 }
@@ -251,7 +258,9 @@ 
 		$lines = explode("\n", $translation);
 		foreach($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if (!isset($parts[1])) {
+				continue;
+			}
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;

Spacing +24 added lines, -24 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/entry.php';
+require_once dirname(__FILE__).'/entry.php';
 
-if ( ! class_exists( 'Translations', false ) ):
+if ( ! class_exists('Translations', false)):
 class Translations {
 	var $entries = array();
 	var $headers = array();
@@ -65,7 +65,7 @@ 
 	 * @param array $headers
 	 */
 	function set_headers($headers) {
-		foreach($headers as $header => $value) {
+		foreach ($headers as $header => $value) {
 			$this->set_header($header, $value);
 		}
 	}
@@ -74,7 +74,7 @@ 
 	 * @param string $header
 	 */
 	function get_header($header) {
-		return isset($this->headers[$header])? $this->headers[$header] : false;
+		return isset($this->headers[$header]) ? $this->headers[$header] : false;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	function translate_entry(&$entry) {
 		$key = $entry->key();
-		return isset($this->entries[$key])? $this->entries[$key] : false;
+		return isset($this->entries[$key]) ? $this->entries[$key] : false;
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	 * @param string $context
 	 * @return string
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		$entry = new Translation_Entry(array('singular' => $singular, 'context' => $context));
 		$translated = $this->translate_entry($entry);
-		return ($translated && !empty($translated->translations))? $translated->translations[0] : $singular;
+		return ($translated && ! empty($translated->translations)) ? $translated->translations[0] : $singular;
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param integer $count number of items
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 				isset($translated->translations[$index]))
 			return $translated->translations[$index];
 		else
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return void
 	 **/
 	function merge_with(&$other) {
-		foreach( $other->entries as $entry ) {
+		foreach ($other->entries as $entry) {
 			$this->entries[$entry->key()] = $entry;
 		}
 	}
@@ -153,8 +153,8 @@ 
 	 * @param object $other
 	 */
 	function merge_originals_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
+		foreach ($other->entries as $entry) {
+			if ( ! isset($this->entries[$entry->key()]))
 				$this->entries[$entry->key()] = $entry;
 			else
 				$this->entries[$entry->key()]->merge_with($entry);
@@ -172,8 +172,8 @@ 
 	 * @param int $count
 	 */
 	function gettext_select_plural_form($count) {
-		if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+		if ( ! isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	function nplurals_and_expression_from_header($header) {
 		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-			$nplurals = (int)$matches[1];
+			$nplurals = (int) $matches[1];
 			$expression = trim($this->parenthesize_plural_exression($matches[2]));
 			return array($nplurals, $expression);
 		} else {
@@ -230,8 +230,8 @@ 
 					$res .= ') : (';
 					break;
 				case ';':
-					$res .= str_repeat(')', $depth) . ';';
-					$depth= 0;
+					$res .= str_repeat(')', $depth).';';
+					$depth = 0;
 					break;
 				default:
 					$res .= $char;
@@ -249,9 +249,9 @@ 
 		// sometimes \ns are used instead of real new lines
 		$translation = str_replace('\n', "\n", $translation);
 		$lines = explode("\n", $translation);
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
+			if ( ! isset($parts[1])) continue;
 			$headers[trim($parts[0])] = trim($parts[1]);
 		}
 		return $headers;
@@ -264,7 +264,7 @@ 
 	function set_header($header, $value) {
 		parent::set_header($header, $value);
 		if ('Plural-Forms' == $header) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
+			list($nplurals, $expression) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
 			$this->_nplurals = $nplurals;
 			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
 		}
@@ -272,7 +272,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'NOOP_Translations', false ) ):
+if ( ! class_exists('NOOP_Translations', false)):
 /**
  * Provides the same interface as Translations, but doesn't do anything
  */
@@ -319,7 +319,7 @@ 
 	 * @param string $singular
 	 * @param string $context
 	 */
-	function translate($singular, $context=null) {
+	function translate($singular, $context = null) {
 		return $singular;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @return bool
 	 */
 	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
+		return 1 == $count ? 0 : 1;
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 * @param string $context
 	 */
 	function translate_plural($singular, $plural, $count, $context = null) {
-			return 1 == $count? $singular : $plural;
+			return 1 == $count ? $singular : $plural;
 	}
 
 	/**

src/wp-includes/post-formats.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
  * @since 3.1.0
  *
  * @param string $format The post format slug.
- * @return string|WP_Error|false The post format term link.
+ * @return string The post format term link.
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );

Braces +35 added lines, -25 removed lines

@@ -15,16 +15,19 @@ 
  * @return string|false The format if successful. False otherwise.
  */
 function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
-		return false;
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
+			return false;
+	}
 
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
-	if ( empty( $_format ) )
-		return false;
+	if ( empty( $_format ) ) {
+			return false;
+	}
 
 	$format = reset( $_format );
 
@@ -64,15 +67,17 @@ 
 function set_post_format( $post, $format ) {
 	$post = get_post( $post );
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if ( empty( $post ) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	}
 
 	if ( ! empty( $format ) ) {
 		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
-			$format = '';
-		else
-			$format = 'post-format-' . $format;
+		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
+					$format = '';
+		} else {
+					$format = 'post-format-' . $format;
+		}
 	}
 
 	return wp_set_post_terms( $post->ID, $format, 'post_format' );
@@ -123,11 +128,12 @@ 
  */
 function get_post_format_string( $slug ) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
-		return $strings['standard'];
-	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
-}
+	if ( !$slug ) {
+			return $strings['standard'];
+	} else {
+			return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+	}
+	}
 
 /**
  * Returns a link to a post format index.
@@ -139,8 +145,9 @@ 
  */
 function get_post_format_link( $format ) {
 	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
-		return false;
+	if ( ! $term || is_wp_error( $term ) ) {
+			return false;
+	}
 	return get_term_link( $term );
 }
 
@@ -154,14 +161,17 @@ 
  * @return array
  */
 function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
-		return $qvs;
+	if ( ! isset( $qvs['post_format'] ) ) {
+			return $qvs;
+	}
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
+			$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	}
 	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
-		$qvs['post_type'] = $tax->object_type;
+	if ( ! is_admin() ) {
+			$qvs['post_type'] = $tax->object_type;
+	}
 	return $qvs;
 }
 

Spacing +67 added lines, -67 removed lines

@@ -14,21 +14,21 @@ 
  * @param int|object|null $post Post ID or post object. Optional, default is the current post from the loop.
  * @return string|false The format if successful. False otherwise.
  */
-function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_format($post = null) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( ! post_type_supports($post->post_type, 'post-formats'))
 		return false;
 
-	$_format = get_the_terms( $post->ID, 'post_format' );
+	$_format = get_the_terms($post->ID, 'post_format');
 
-	if ( empty( $_format ) )
+	if (empty($_format))
 		return false;
 
-	$format = reset( $_format );
+	$format = reset($_format);
 
-	return str_replace('post-format-', '', $format->slug );
+	return str_replace('post-format-', '', $format->slug);
 }
 
 /**
@@ -40,16 +40,16 @@ 
  * @param object|int|null $post   Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
  * @return bool True if the post has any of the given formats (or any format, if no format specified), false otherwise.
  */
-function has_post_format( $format = array(), $post = null ) {
+function has_post_format($format = array(), $post = null) {
 	$prefixed = array();
 
-	if ( $format ) {
-		foreach ( (array) $format as $single ) {
-			$prefixed[] = 'post-format-' . sanitize_key( $single );
+	if ($format) {
+		foreach ((array) $format as $single) {
+			$prefixed[] = 'post-format-'.sanitize_key($single);
 		}
 	}
 
-	return has_term( $prefixed, 'post_format', $post );
+	return has_term($prefixed, 'post_format', $post);
 }
 
 /**
@@ -61,21 +61,21 @@ 
  * @param string     $format A format to assign. Use an empty string or array to remove all formats from the post.
  * @return array|WP_Error|false WP_Error on error. Array of affected term IDs on success.
  */
-function set_post_format( $post, $format ) {
-	$post = get_post( $post );
+function set_post_format($post, $format) {
+	$post = get_post($post);
 
-	if ( empty( $post ) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	if (empty($post))
+		return new WP_Error('invalid_post', __('Invalid post.'));
 
-	if ( ! empty( $format ) ) {
-		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+	if ( ! empty($format)) {
+		$format = sanitize_key($format);
+		if ('standard' === $format || ! in_array($format, get_post_format_slugs()))
 			$format = '';
 		else
-			$format = 'post-format-' . $format;
+			$format = 'post-format-'.$format;
 	}
 
-	return wp_set_post_terms( $post->ID, $format, 'post_format' );
+	return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
 /**
@@ -87,16 +87,16 @@ 
  */
 function get_post_format_strings() {
 	$strings = array(
-		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'standard' => _x('Standard', 'Post format'), // Special case. any value that evals to false will be considered standard
+		'aside'    => _x('Aside', 'Post format'),
+		'chat'     => _x('Chat', 'Post format'),
+		'gallery'  => _x('Gallery', 'Post format'),
+		'link'     => _x('Link', 'Post format'),
+		'image'    => _x('Image', 'Post format'),
+		'quote'    => _x('Quote', 'Post format'),
+		'status'   => _x('Status', 'Post format'),
+		'video'    => _x('Video', 'Post format'),
+		'audio'    => _x('Audio', 'Post format'),
 	);
 	return $strings;
 }
@@ -109,8 +109,8 @@ 
  * @return array The array of post format slugs.
  */
 function get_post_format_slugs() {
-	$slugs = array_keys( get_post_format_strings() );
-	return array_combine( $slugs, $slugs );
+	$slugs = array_keys(get_post_format_strings());
+	return array_combine($slugs, $slugs);
 }
 
 /**
@@ -121,12 +121,12 @@ 
  * @param string $slug A post format slug.
  * @return string The translated post format name.
  */
-function get_post_format_string( $slug ) {
+function get_post_format_string($slug) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
+	if ( ! $slug)
 		return $strings['standard'];
 	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+		return (isset($strings[$slug])) ? $strings[$slug] : '';
 }
 
 /**
@@ -137,11 +137,11 @@ 
  * @param string $format The post format slug.
  * @return string|WP_Error|false The post format term link.
  */
-function get_post_format_link( $format ) {
-	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
+function get_post_format_link($format) {
+	$term = get_term_by('slug', 'post-format-'.$format, 'post_format');
+	if ( ! $term || is_wp_error($term))
 		return false;
-	return get_term_link( $term );
+	return get_term_link($term);
 }
 
 /**
@@ -153,14 +153,14 @@ 
  * @param array $qvs
  * @return array
  */
-function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
+function _post_format_request($qvs) {
+	if ( ! isset($qvs['post_format']))
 		return $qvs;
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
-		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
-	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
+	if (isset($slugs[$qvs['post_format']]))
+		$qvs['post_format'] = 'post-format-'.$slugs[$qvs['post_format']];
+	$tax = get_taxonomy('post_format');
+	if ( ! is_admin())
 		$qvs['post_type'] = $tax->object_type;
 	return $qvs;
 }
@@ -178,16 +178,16 @@ 
  * @param string $taxonomy
  * @return string
  */
-function _post_format_link( $link, $term, $taxonomy ) {
+function _post_format_link($link, $term, $taxonomy) {
 	global $wp_rewrite;
-	if ( 'post_format' != $taxonomy ) {
+	if ('post_format' != $taxonomy) {
 		return $link;
 	}
-	if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
-		return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
+	if ($wp_rewrite->get_extra_permastruct($taxonomy)) {
+		return str_replace("/{$term->slug}", '/'.str_replace('post-format-', '', $term->slug), $link);
 	} else {
-		$link = remove_query_arg( 'post_format', $link );
-		return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
+		$link = remove_query_arg('post_format', $link);
+		return add_query_arg('post_format', str_replace('post-format-', '', $term->slug), $link);
 	}
 }
 
@@ -200,9 +200,9 @@ 
  * @param object $term
  * @return object
  */
-function _post_format_get_term( $term ) {
-	if ( isset( $term->slug ) ) {
-		$term->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_get_term($term) {
+	if (isset($term->slug)) {
+		$term->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 	}
 	return $term;
 }
@@ -218,16 +218,16 @@ 
  * @param array        $args
  * @return array
  */
-function _post_format_get_terms( $terms, $taxonomies, $args ) {
-	if ( in_array( 'post_format', (array) $taxonomies ) ) {
-		if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
-			foreach ( $terms as $order => $name ) {
-				$terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+function _post_format_get_terms($terms, $taxonomies, $args) {
+	if (in_array('post_format', (array) $taxonomies)) {
+		if (isset($args['fields']) && 'names' == $args['fields']) {
+			foreach ($terms as $order => $name) {
+				$terms[$order] = get_post_format_string(str_replace('post-format-', '', $name));
 			}
 		} else {
-			foreach ( (array) $terms as $order => $term ) {
-				if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-					$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+			foreach ((array) $terms as $order => $term) {
+				if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+					$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 				}
 			}
 		}
@@ -244,10 +244,10 @@ 
  * @param array $terms
  * @return array
  */
-function _post_format_wp_get_object_terms( $terms ) {
-	foreach ( (array) $terms as $order => $term ) {
-		if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-			$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+function _post_format_wp_get_object_terms($terms) {
+	foreach ((array) $terms as $order => $term) {
+		if (isset($term->taxonomy) && 'post_format' == $term->taxonomy) {
+			$terms[$order]->name = get_post_format_string(str_replace('post-format-', '', $term->slug));
 		}
 	}
 	return $terms;

src/wp-includes/rss.php

Doc Comments +13 added lines, -4 removed lines

@@ -409,7 +409,7 @@ 
  * @subpackage MagpieRSS
  *
  * @param string $url URL to retrieve feed
- * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
+ * @return integer|null false on failure or MagpieRSS object on success.
  */
 function fetch_rss ($url) {
 	// initialize constants
@@ -547,7 +547,7 @@ 
  *
  * @param string $url URL to retrieve
  * @param array $headers Optional. Headers to send to the URL.
- * @return Snoopy style response
+ * @return stdClass style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
 	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
@@ -589,7 +589,7 @@ 
  * @package External
  * @subpackage MagpieRSS
  *
- * @param array $resp
+ * @param stdClass $resp
  * @return MagpieRSS|bool
  */
 function _response_to_rss ($resp) {
@@ -746,6 +746,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function set ($url, $rss) {
 		$cache_option = 'rss_' . $this->file_name( $url );
 
@@ -760,6 +763,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function get ($url) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -781,6 +787,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function check_cache ( $url ) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -936,7 +945,7 @@ 
  *
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
- * @return bool False on failure.
+ * @return null|false False on failure.
  */
 function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);

Spacing +222 added lines, -222 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0.0', WPINC . '/class-simplepie.php' );
+_deprecated_file(basename(__FILE__), '3.0.0', WPINC.'/class-simplepie.php');
 
 /**
  * Fires before MagpieRSS is loaded, to optionally replace it.
@@ -24,32 +24,32 @@ 
  * @since 2.3.0
  * @deprecated 3.0.0
  */
-do_action( 'load_feed_engine' );
+do_action('load_feed_engine');
 
 /** RSS feed constant. */
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
-define('MAGPIE_USER_AGENT', 'WordPress/' . $GLOBALS['wp_version']);
+define('MAGPIE_USER_AGENT', 'WordPress/'.$GLOBALS['wp_version']);
 
 class MagpieRSS {
 	var $parser;
-	var $current_item	= array();	// item currently being parsed
-	var $items			= array();	// collection of parsed items
-	var $channel		= array();	// hash of channel fields
-	var $textinput		= array();
+	var $current_item = array(); // item currently being parsed
+	var $items			= array(); // collection of parsed items
+	var $channel = array(); // hash of channel fields
+	var $textinput = array();
 	var $image			= array();
 	var $feed_type;
 	var $feed_version;
 
 	// parser variables
-	var $stack				= array(); // parser stack
+	var $stack = array(); // parser stack
 	var $inchannel			= false;
-	var $initem 			= false;
+	var $initem = false;
 	var $incontent			= false; // if in Atom <content mode="xml"> field
-	var $intextinput		= false;
-	var $inimage 			= false;
-	var $current_field		= '';
-	var $current_namespace	= false;
+	var $intextinput = false;
+	var $inimage = false;
+	var $current_field = '';
+	var $current_namespace = false;
 
 	//var $ERROR = "";
 
@@ -58,12 +58,12 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $source ) {
+	function __construct($source) {
 
 		# Check if PHP xml isn't compiled
 		#
-		if ( ! function_exists('xml_parser_create') ) {
-			return trigger_error( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." );
+		if ( ! function_exists('xml_parser_create')) {
+			return trigger_error("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension.");
 		}
 
 		$parser = xml_parser_create();
@@ -73,27 +73,27 @@ 
 		# pass in parser, and a reference to this object
 		# set up handlers
 		#
-		xml_set_object( $this->parser, $this );
+		xml_set_object($this->parser, $this);
 		xml_set_element_handler($this->parser,
-				'feed_start_element', 'feed_end_element' );
+				'feed_start_element', 'feed_end_element');
 
-		xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+		xml_set_character_data_handler($this->parser, 'feed_cdata');
 
-		$status = xml_parse( $this->parser, $source );
+		$status = xml_parse($this->parser, $source);
 
-		if (! $status ) {
-			$errorcode = xml_get_error_code( $this->parser );
-			if ( $errorcode != XML_ERROR_NONE ) {
-				$xml_error = xml_error_string( $errorcode );
+		if ( ! $status) {
+			$errorcode = xml_get_error_code($this->parser);
+			if ($errorcode != XML_ERROR_NONE) {
+				$xml_error = xml_error_string($errorcode);
 				$error_line = xml_get_current_line_number($this->parser);
 				$error_col = xml_get_current_column_number($this->parser);
 				$errormsg = "$xml_error at line $error_line, column $error_col";
 
-				$this->error( $errormsg );
+				$this->error($errormsg);
 			}
 		}
 
-		xml_parser_free( $this->parser );
+		xml_parser_free($this->parser);
 
 		$this->normalize();
 	}
@@ -101,8 +101,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function MagpieRSS( $source ) {
-		self::__construct( $source );
+	public function MagpieRSS($source) {
+		self::__construct($source);
 	}
 
 	function feed_start_element($p, $element, &$attrs) {
@@ -110,27 +110,27 @@ 
 		$attrs = array_change_key_case($attrs, CASE_LOWER);
 
 		// check for a namespace, and split if found
-		$ns	= false;
-		if ( strpos( $element, ':' ) ) {
-			list($ns, $el) = explode( ':', $element, 2);
+		$ns = false;
+		if (strpos($element, ':')) {
+			list($ns, $el) = explode(':', $element, 2);
 		}
-		if ( $ns and $ns != 'rdf' ) {
+		if ($ns and $ns != 'rdf') {
 			$this->current_namespace = $ns;
 		}
 
 		# if feed type isn't set, then this is first element of feed
 		# identify feed from root element
 		#
-		if (!isset($this->feed_type) ) {
-			if ( $el == 'rdf' ) {
+		if ( ! isset($this->feed_type)) {
+			if ($el == 'rdf') {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
 			}
-			elseif ( $el == 'rss' ) {
+			elseif ($el == 'rss') {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
 			}
-			elseif ( $el == 'feed' ) {
+			elseif ($el == 'feed') {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -138,14 +138,14 @@ 
 			return;
 		}
 
-		if ( $el == 'channel' )
+		if ($el == 'channel')
 		{
 			$this->inchannel = true;
 		}
-		elseif ($el == 'item' or $el == 'entry' )
+		elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
-			if ( isset($attrs['rdf:about']) ) {
+			if (isset($attrs['rdf:about'])) {
 				$this->current_item['about'] = $attrs['rdf:about'];
 			}
 		}
@@ -169,10 +169,10 @@ 
 		}
 
 		# handle atom content constructs
-		elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			// avoid clashing w/ RSS mod_content
-			if ($el == 'content' ) {
+			if ($el == 'content') {
 				$el = 'atom_content';
 			}
 
@@ -181,31 +181,31 @@ 
 		}
 
 		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
-		elseif ($this->feed_type == ATOM and $this->incontent )
+		elseif ($this->feed_type == ATOM and $this->incontent)
 		{
 			// if tags are inlined, then flatten
 			$attrs_str = join(' ',
 					array_map(array('MagpieRSS', 'map_attrs'),
 					array_keys($attrs),
-					array_values($attrs) ) );
+					array_values($attrs)));
 
-			$this->append_content( "<$element $attrs_str>"  );
+			$this->append_content("<$element $attrs_str>");
 
-			array_unshift( $this->stack, $el );
+			array_unshift($this->stack, $el);
 		}
 
 		// Atom support many links per containging element.
 		// Magpie treats link elements of type rel='alternate'
 		// as being equivalent to RSS's simple link element.
 		//
-		elseif ($this->feed_type == ATOM and $el == 'link' )
+		elseif ($this->feed_type == ATOM and $el == 'link')
 		{
-			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
+			if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
 			}
 			else {
-				$link_el = 'link_' . $attrs['rel'];
+				$link_el = 'link_'.$attrs['rel'];
 			}
 
 			$this->append($link_el, $attrs['href']);
@@ -216,11 +216,11 @@ 
 		}
 	}
 
-	function feed_cdata ($p, $text) {
+	function feed_cdata($p, $text) {
 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
-			$this->append_content( $text );
+			$this->append_content($text);
 		}
 		else {
 			$current_el = join('_', array_reverse($this->stack));
@@ -228,35 +228,35 @@ 
 		}
 	}
 
-	function feed_end_element ($p, $el) {
+	function feed_end_element($p, $el) {
 		$el = strtolower($el);
 
-		if ( $el == 'item' or $el == 'entry' )
+		if ($el == 'item' or $el == 'entry')
 		{
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
 		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
 		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
 		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		elseif ($this->feed_type == ATOM and $this->incontent) {
 			// balance tags properly
 			// note: This may not actually be necessary
-			if ( $this->stack[0] == $el )
+			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
 			}
@@ -264,97 +264,97 @@ 
 				$this->append_content("<$el />");
 			}
 
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 		else {
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 
 		$this->current_namespace = false;
 	}
 
-	function concat (&$str1, $str2="") {
-		if (!isset($str1) ) {
-			$str1="";
+	function concat(&$str1, $str2 = "") {
+		if ( ! isset($str1)) {
+			$str1 = "";
 		}
 		$str1 .= $str2;
 	}
 
 	function append_content($text) {
-		if ( $this->initem ) {
-			$this->concat( $this->current_item[ $this->incontent ], $text );
+		if ($this->initem) {
+			$this->concat($this->current_item[$this->incontent], $text);
 		}
-		elseif ( $this->inchannel ) {
-			$this->concat( $this->channel[ $this->incontent ], $text );
+		elseif ($this->inchannel) {
+			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
 
 	// smart append - field and namespace aware
 	function append($el, $text) {
-		if (!$el) {
+		if ( ! $el) {
 			return;
 		}
-		if ( $this->current_namespace )
+		if ($this->current_namespace)
 		{
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $this->current_namespace ][ $el ], $text);
+					$this->current_item[$this->current_namespace][$el], $text);
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $this->current_namespace][ $el ], $text );
+					$this->channel[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $this->current_namespace][ $el ], $text );
+					$this->textinput[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $this->current_namespace ][ $el ], $text );
+					$this->image[$this->current_namespace][$el], $text );
 			}
 		}
 		else {
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $el ], $text);
+					$this->current_item[$el], $text);
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $el ], $text );
+					$this->textinput[$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $el ], $text );
+					$this->image[$el], $text );
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $el ], $text );
+					$this->channel[$el], $text );
 			}
 
 		}
 	}
 
-	function normalize () {
+	function normalize() {
 		// if atom populate rss fields
-		if ( $this->is_atom() ) {
+		if ($this->is_atom()) {
 			$this->channel['descripton'] = $this->channel['tagline'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
+				if (isset($item['summary']))
 					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
+				if (isset($item['atom_content']))
 					$item['content']['encoded'] = $item['atom_content'];
 
 				$this->items[$i] = $item;
 			}
 		}
-		elseif ( $this->is_rss() ) {
+		elseif ($this->is_rss()) {
 			$this->channel['tagline'] = $this->channel['description'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
+				if (isset($item['description']))
 					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
+				if (isset($item['content']['encoded']))
 					$item['atom_content'] = $item['content']['encoded'];
 
 				$this->items[$i] = $item;
@@ -362,8 +362,8 @@ 
 		}
 	}
 
-	function is_rss () {
-		if ( $this->feed_type == RSS ) {
+	function is_rss() {
+		if ($this->feed_type == RSS) {
 			return $this->feed_version;
 		}
 		else {
@@ -372,7 +372,7 @@ 
 	}
 
 	function is_atom() {
-		if ( $this->feed_type == ATOM ) {
+		if ($this->feed_type == ATOM) {
 			return $this->feed_version;
 		}
 		else {
@@ -384,21 +384,21 @@ 
 		return "$k=\"$v\"";
 	}
 
-	function error( $errormsg, $lvl = E_USER_WARNING ) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		} else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
 
 }
 
-if ( !function_exists('fetch_rss') ) :
+if ( ! function_exists('fetch_rss')) :
 /**
  * Build Magpie object based on RSS from URL.
  *
@@ -409,21 +409,21 @@ 
  * @param string $url URL to retrieve feed
  * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
  */
-function fetch_rss ($url) {
+function fetch_rss($url) {
 	// initialize constants
 	init();
 
-	if ( !isset($url) ) {
+	if ( ! isset($url)) {
 		// error("fetch_rss called without a url");
 		return false;
 	}
 
 	// if cache is disabled
-	if ( !MAGPIE_CACHE_ON ) {
+	if ( ! MAGPIE_CACHE_ON) {
 		// fetch file, and parse it
-		$resp = _fetch_remote_file( $url );
-		if ( is_success( $resp->status ) ) {
-			return _response_to_rss( $resp );
+		$resp = _fetch_remote_file($url);
+		if (is_success($resp->status)) {
+			return _response_to_rss($resp);
 		}
 		else {
 			// error("Failed to fetch $url and cache is off");
@@ -438,28 +438,28 @@ 
 		// 3. if cached obj fails freshness check, fetch remote
 		// 4. if remote fails, return stale object, or error
 
-		$cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+		$cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
 		if (MAGPIE_DEBUG and $cache->ERROR) {
 			debug($cache->ERROR, E_USER_WARNING);
 		}
 
-		$cache_status 	 = 0;		// response of check_cache
+		$cache_status = 0; // response of check_cache
 		$request_headers = array(); // HTTP headers to send with fetch
-		$rss 			 = 0;		// parsed RSS object
-		$errormsg		 = 0;		// errors, if any
+		$rss = 0; // parsed RSS object
+		$errormsg = 0; // errors, if any
 
-		if (!$cache->ERROR) {
+		if ( ! $cache->ERROR) {
 			// return cache HIT, MISS, or STALE
-			$cache_status = $cache->check_cache( $url );
+			$cache_status = $cache->check_cache($url);
 		}
 
 		// if object cached, and cache is fresh, return cached obj
-		if ( $cache_status == 'HIT' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss) and $rss ) {
+		if ($cache_status == 'HIT') {
+			$rss = $cache->get($url);
+			if (isset($rss) and $rss) {
 				$rss->from_cache = 1;
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 				debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
 			}
 				return $rss;
@@ -469,47 +469,47 @@ 
 		// else attempt a conditional get
 
 		// set up headers
-		if ( $cache_status == 'STALE' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss->etag) and $rss->last_modified ) {
+		if ($cache_status == 'STALE') {
+			$rss = $cache->get($url);
+			if (isset($rss->etag) and $rss->last_modified) {
 				$request_headers['If-None-Match'] = $rss->etag;
 				$request_headers['If-Last-Modified'] = $rss->last_modified;
 			}
 		}
 
-		$resp = _fetch_remote_file( $url, $request_headers );
+		$resp = _fetch_remote_file($url, $request_headers);
 
 		if (isset($resp) and $resp) {
-			if ($resp->status == '304' ) {
+			if ($resp->status == '304') {
 				// we have the most current copy
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 					debug("Got 304 for $url");
 				}
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
 			}
-			elseif ( is_success( $resp->status ) ) {
-				$rss = _response_to_rss( $resp );
-				if ( $rss ) {
+			elseif (is_success($resp->status)) {
+				$rss = _response_to_rss($resp);
+				if ($rss) {
 					if (MAGPIE_DEBUG > 1) {
 						debug("Fetch successful");
 					}
 					// add object to cache
-					$cache->set( $url, $rss );
+					$cache->set($url, $rss);
 					return $rss;
 				}
 			}
 			else {
 				$errormsg = "Failed to fetch $url. ";
-				if ( $resp->error ) {
+				if ($resp->error) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
 				}
 				else {
-					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+					$errormsg .= "(HTTP Response: ".$resp->response_code.')';
 				}
 			}
 		}
@@ -521,7 +521,7 @@ 
 
 		// attempt to return cached object
 		if ($rss) {
-			if ( MAGPIE_DEBUG ) {
+			if (MAGPIE_DEBUG) {
 				debug("Returning STALE object for $url");
 			}
 			return $rss;
@@ -547,35 +547,35 @@ 
  * @param array $headers Optional. Headers to send to the URL.
  * @return Snoopy style response
  */
-function _fetch_remote_file($url, $headers = "" ) {
-	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
-	if ( is_wp_error($resp) ) {
+function _fetch_remote_file($url, $headers = "") {
+	$resp = wp_safe_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+	if (is_wp_error($resp)) {
 		$error = array_shift($resp->errors);
 
 		$resp = new stdClass;
 		$resp->status = 500;
 		$resp->response_code = 500;
-		$resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
+		$resp->error = $error[0]."\n"; //\n = Snoopy compatibility
 		return $resp;
 	}
 
 	// Snoopy returns headers unprocessed.
 	// Also note, WP_HTTP lowercases all keys, Snoopy did not.
 	$return_headers = array();
-	foreach ( wp_remote_retrieve_headers( $resp ) as $key => $value ) {
-		if ( !is_array($value) ) {
+	foreach (wp_remote_retrieve_headers($resp) as $key => $value) {
+		if ( ! is_array($value)) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
+			foreach ($value as $v)
 				$return_headers[] = "$key: $v";
 		}
 	}
 
 	$response = new stdClass;
-	$response->status = wp_remote_retrieve_response_code( $resp );
-	$response->response_code = wp_remote_retrieve_response_code( $resp );
+	$response->status = wp_remote_retrieve_response_code($resp);
+	$response->response_code = wp_remote_retrieve_response_code($resp);
 	$response->headers = $return_headers;
-	$response->results = wp_remote_retrieve_body( $resp );
+	$response->results = wp_remote_retrieve_body($resp);
 
 	return $response;
 }
@@ -590,14 +590,14 @@ 
  * @param array $resp
  * @return MagpieRSS|bool
  */
-function _response_to_rss ($resp) {
-	$rss = new MagpieRSS( $resp->results );
+function _response_to_rss($resp) {
+	$rss = new MagpieRSS($resp->results);
 
 	// if RSS parsed successfully
-	if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) {
+	if ($rss && ( ! isset($rss->ERROR) || ! $rss->ERROR)) {
 
 		// find Etag, and Last-Modified
-		foreach ( (array) $resp->headers as $h) {
+		foreach ((array) $resp->headers as $h) {
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
@@ -607,11 +607,11 @@ 
 				$val = "";
 			}
 
-			if ( $field == 'etag' ) {
+			if ($field == 'etag') {
 				$rss->etag = $val;
 			}
 
-			if ( $field == 'last-modified' ) {
+			if ($field == 'last-modified') {
 				$rss->last_modified = $val;
 			}
 		}
@@ -622,7 +622,7 @@ 
 		$errormsg = "Failed to parse RSS file.";
 
 		if ($rss) {
-			$errormsg .= " (" . $rss->ERROR . ")";
+			$errormsg .= " (".$rss->ERROR.")";
 		}
 		// error($errormsg);
 
@@ -637,95 +637,95 @@ 
  * @package External
  * @subpackage MagpieRSS
  */
-function init () {
-	if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+	if (defined('MAGPIE_INITALIZED')) {
 		return;
 	}
 	else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_ON') ) {
+	if ( ! defined('MAGPIE_CACHE_ON')) {
 		define('MAGPIE_CACHE_ON', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_DIR') ) {
+	if ( ! defined('MAGPIE_CACHE_DIR')) {
 		define('MAGPIE_CACHE_DIR', './cache');
 	}
 
-	if ( !defined('MAGPIE_CACHE_AGE') ) {
-		define('MAGPIE_CACHE_AGE', 60*60); // one hour
+	if ( ! defined('MAGPIE_CACHE_AGE')) {
+		define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
 	}
 
-	if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+	if ( ! defined('MAGPIE_CACHE_FRESH_ONLY')) {
 		define('MAGPIE_CACHE_FRESH_ONLY', 0);
 	}
 
-		if ( !defined('MAGPIE_DEBUG') ) {
+		if ( ! defined('MAGPIE_DEBUG')) {
 		define('MAGPIE_DEBUG', 0);
 	}
 
-	if ( !defined('MAGPIE_USER_AGENT') ) {
-		$ua = 'WordPress/' . $GLOBALS['wp_version'];
+	if ( ! defined('MAGPIE_USER_AGENT')) {
+		$ua = 'WordPress/'.$GLOBALS['wp_version'];
 
-		if ( MAGPIE_CACHE_ON ) {
-			$ua = $ua . ')';
+		if (MAGPIE_CACHE_ON) {
+			$ua = $ua.')';
 		}
 		else {
-			$ua = $ua . '; No cache)';
+			$ua = $ua.'; No cache)';
 		}
 
 		define('MAGPIE_USER_AGENT', $ua);
 	}
 
-	if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
-		define('MAGPIE_FETCH_TIME_OUT', 2);	// 2 second timeout
+	if ( ! defined('MAGPIE_FETCH_TIME_OUT')) {
+		define('MAGPIE_FETCH_TIME_OUT', 2); // 2 second timeout
 	}
 
 	// use gzip encoding to fetch rss files if supported?
-	if ( !defined('MAGPIE_USE_GZIP') ) {
+	if ( ! defined('MAGPIE_USE_GZIP')) {
 		define('MAGPIE_USE_GZIP', true);
 	}
 }
 
-function is_info ($sc) {
+function is_info($sc) {
 	return $sc >= 100 && $sc < 200;
 }
 
-function is_success ($sc) {
+function is_success($sc) {
 	return $sc >= 200 && $sc < 300;
 }
 
-function is_redirect ($sc) {
+function is_redirect($sc) {
 	return $sc >= 300 && $sc < 400;
 }
 
-function is_error ($sc) {
+function is_error($sc) {
 	return $sc >= 400 && $sc < 600;
 }
 
-function is_client_error ($sc) {
+function is_client_error($sc) {
 	return $sc >= 400 && $sc < 500;
 }
 
-function is_server_error ($sc) {
+function is_server_error($sc) {
 	return $sc >= 500 && $sc < 600;
 }
 
 class RSSCache {
-	var $BASE_CACHE;	// where the cache files are stored
-	var $MAX_AGE	= 43200;  		// when are files stale, default twelve hours
-	var $ERROR 		= '';			// accumulate error messages
+	var $BASE_CACHE; // where the cache files are stored
+	var $MAX_AGE	= 43200; // when are files stale, default twelve hours
+	var $ERROR 		= ''; // accumulate error messages
 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $base = '', $age = '' ) {
-		$this->BASE_CACHE = WP_CONTENT_DIR . '/cache';
-		if ( $base ) {
+	function __construct($base = '', $age = '') {
+		$this->BASE_CACHE = WP_CONTENT_DIR.'/cache';
+		if ($base) {
 			$this->BASE_CACHE = $base;
 		}
-		if ( $age ) {
+		if ($age) {
 			$this->MAX_AGE = $age;
 		}
 
@@ -734,8 +734,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function RSSCache( $base = '', $age = '' ) {
-		self::__construct( $base, $age );
+	public function RSSCache($base = '', $age = '') {
+		self::__construct($base, $age);
 	}
 
 /*=======================================================================*\
@@ -744,8 +744,8 @@ 
 	Input:		url from which the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
-	function set ($url, $rss) {
-		$cache_option = 'rss_' . $this->file_name( $url );
+	function set($url, $rss) {
+		$cache_option = 'rss_'.$this->file_name($url);
 
 		set_transient($cache_option, $rss, $this->MAX_AGE);
 
@@ -758,11 +758,11 @@ 
 	Input:		url from which the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function get ($url) {
+	function get($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( ! $rss = get_transient( $cache_option ) ) {
+		if ( ! $rss = get_transient($cache_option)) {
 			$this->debug(
 				"Cache doesn't contain: $url (cache option: $cache_option)"
 			);
@@ -779,11 +779,11 @@ 
 	Input:		url from which the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function check_cache ( $url ) {
+	function check_cache($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( get_transient($cache_option) ) {
+		if (get_transient($cache_option)) {
 			// object exists and is current
 				return 'HIT';
 		} else {
@@ -795,15 +795,15 @@ 
 /*=======================================================================*\
 	Function:	serialize
 \*=======================================================================*/
-	function serialize ( $rss ) {
-		return serialize( $rss );
+	function serialize($rss) {
+		return serialize($rss);
 	}
 
 /*=======================================================================*\
 	Function:	unserialize
 \*=======================================================================*/
-	function unserialize ( $data ) {
-		return unserialize( $data );
+	function unserialize($data) {
+		return unserialize($data);
 	}
 
 /*=======================================================================*\
@@ -812,64 +812,64 @@ 
 	Input:		url from which the rss file was fetched
 	Output:		a file name
 \*=======================================================================*/
-	function file_name ($url) {
-		return md5( $url );
+	function file_name($url) {
+		return md5($url);
 	}
 
 /*=======================================================================*\
 	Function:	error
 	Purpose:	register error
 \*=======================================================================*/
-	function error ($errormsg, $lvl=E_USER_WARNING) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
 		$this->ERROR = $errormsg;
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		}
 		else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
-			function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-		if ( MAGPIE_DEBUG ) {
+			function debug($debugmsg, $lvl = E_USER_NOTICE) {
+		if (MAGPIE_DEBUG) {
 			$this->error("MagpieRSS [debug] $debugmsg", $lvl);
 		}
 	}
 }
 
-if ( !function_exists('parse_w3cdtf') ) :
-function parse_w3cdtf ( $date_str ) {
+if ( ! function_exists('parse_w3cdtf')) :
+function parse_w3cdtf($date_str) {
 
 	# regex to match wc3dtf
 	$pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-	if ( preg_match( $pat, $date_str, $match ) ) {
-		list( $year, $month, $day, $hours, $minutes, $seconds) =
-			array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
+	if (preg_match($pat, $date_str, $match)) {
+		list($year, $month, $day, $hours, $minutes, $seconds) =
+			array($match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
 
 		# calc epoch for current date assuming GMT
-		$epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+		$epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
 		$offset = 0;
-		if ( $match[11] == 'Z' ) {
+		if ($match[11] == 'Z') {
 			# zulu time, aka GMT
 		}
 		else {
-			list( $tz_mod, $tz_hour, $tz_min ) =
-				array( $match[8], $match[9], $match[10]);
+			list($tz_mod, $tz_hour, $tz_min) =
+				array($match[8], $match[9], $match[10]);
 
 			# zero out the variables
-			if ( ! $tz_hour ) { $tz_hour = 0; }
-			if ( ! $tz_min ) { $tz_min = 0; }
+			if ( ! $tz_hour) { $tz_hour = 0; }
+			if ( ! $tz_min) { $tz_min = 0; }
 
-			$offset_secs = (($tz_hour*60)+$tz_min)*60;
+			$offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
 			# is timezone ahead of GMT?  then subtract offset
 			#
-			if ( $tz_mod == '+' ) {
+			if ($tz_mod == '+') {
 				$offset_secs = $offset_secs * -1;
 			}
 
@@ -884,7 +884,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_rss') ) :
+if ( ! function_exists('wp_rss')) :
 /**
  * Display all RSS items in a HTML ordered list.
  *
@@ -895,31 +895,31 @@ 
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
  */
-function wp_rss( $url, $num_items = -1 ) {
-	if ( $rss = fetch_rss( $url ) ) {
+function wp_rss($url, $num_items = -1) {
+	if ($rss = fetch_rss($url)) {
 		echo '<ul>';
 
-		if ( $num_items !== -1 ) {
-			$rss->items = array_slice( $rss->items, 0, $num_items );
+		if ($num_items !== -1) {
+			$rss->items = array_slice($rss->items, 0, $num_items);
 		}
 
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			printf(
 				'<li><a href="%1$s" title="%2$s">%3$s</a></li>',
-				esc_url( $item['link'] ),
-				esc_attr( strip_tags( $item['description'] ) ),
-				esc_html( $item['title'] )
+				esc_url($item['link']),
+				esc_attr(strip_tags($item['description'])),
+				esc_html($item['title'])
 			);
 		}
 
 		echo '</ul>';
 	} else {
-		_e( 'An error has occurred, which probably means the feed is down. Try again later.' );
+		_e('An error has occurred, which probably means the feed is down. Try again later.');
 	}
 }
 endif;
 
-if ( !function_exists('get_rss') ) :
+if ( ! function_exists('get_rss')) :
 /**
  * Display RSS items in HTML list items.
  *
@@ -936,11 +936,11 @@ 
  * @param int $num_items Optional. Number of items to display, default is all.
  * @return bool False on failure.
  */
-function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
+function get_rss($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);
-	if ( $rss ) {
+	if ($rss) {
 		$rss->items = array_slice($rss->items, 0, $num_items);
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			echo "<li>\n";
 			echo "<a href='$item[link]' title='$item[description]'>";
 			echo esc_html($item['title']);

Braces +50 added lines, -81 removed lines

@@ -125,12 +125,10 @@ 
 			if ( $el == 'rdf' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
-			}
-			elseif ( $el == 'rss' ) {
+			} elseif ( $el == 'rss' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ( $el == 'feed' ) {
+			} elseif ( $el == 'feed' ) {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -141,8 +139,7 @@ 
 		if ( $el == 'channel' )
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry' )
+		} elseif ($el == 'item' or $el == 'entry' )
 		{
 			$this->initem = true;
 			if ( isset($attrs['rdf:about']) ) {
@@ -158,9 +155,7 @@ 
 			$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 			$this->feed_type == RSS and
 			$this->current_namespace == '' and
 			$el == 'image' )
@@ -203,8 +198,7 @@ 
 			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
 			{
 				$link_el = 'link';
-			}
-			else {
+			} else {
 				$link_el = 'link_' . $attrs['rel'];
 			}
 
@@ -221,8 +215,7 @@ 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
 			$this->append_content( $text );
-		}
-		else {
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -236,37 +229,30 @@ 
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		} elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		} elseif ($el == 'channel' or $el == 'feed' )
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		} elseif ($this->feed_type == ATOM and $this->incontent  ) {
 			// balance tags properly
 			// note: This may not actually be necessary
 			if ( $this->stack[0] == $el )
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift( $this->stack );
-		}
-		else {
+		} else {
 			array_shift( $this->stack );
 		}
 
@@ -283,8 +269,7 @@ 
 	function append_content($text) {
 		if ( $this->initem ) {
 			$this->concat( $this->current_item[ $this->incontent ], $text );
-		}
-		elseif ( $this->inchannel ) {
+		} elseif ( $this->inchannel ) {
 			$this->concat( $this->channel[ $this->incontent ], $text );
 		}
 	}
@@ -299,34 +284,27 @@ 
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $this->current_namespace ][ $el ], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $this->current_namespace ][ $el ], $text );
 			}
-		}
-		else {
+		} else {
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $el ], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $el ], $text );
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $el ], $text );
 			}
@@ -340,22 +318,25 @@ 
 			$this->channel['descripton'] = $this->channel['tagline'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
-					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
-					$item['content']['encoded'] = $item['atom_content'];
+				if ( isset($item['summary']) ) {
+									$item['description'] = $item['summary'];
+				}
+				if ( isset($item['atom_content'])) {
+									$item['content']['encoded'] = $item['atom_content'];
+				}
 
 				$this->items[$i] = $item;
 			}
-		}
-		elseif ( $this->is_rss() ) {
+		} elseif ( $this->is_rss() ) {
 			$this->channel['tagline'] = $this->channel['description'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
-					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
-					$item['atom_content'] = $item['content']['encoded'];
+				if ( isset($item['description'])) {
+									$item['summary'] = $item['description'];
+				}
+				if ( isset($item['content']['encoded'] ) ) {
+									$item['atom_content'] = $item['content']['encoded'];
+				}
 
 				$this->items[$i] = $item;
 			}
@@ -365,8 +346,7 @@ 
 	function is_rss () {
 		if ( $this->feed_type == RSS ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -374,8 +354,7 @@ 
 	function is_atom() {
 		if ( $this->feed_type == ATOM ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -424,8 +403,7 @@ 
 		$resp = _fetch_remote_file( $url );
 		if ( is_success( $resp->status ) ) {
 			return _response_to_rss( $resp );
-		}
-		else {
+		} else {
 			// error("Failed to fetch $url and cache is off");
 			return false;
 		}
@@ -488,8 +466,7 @@ 
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
-			}
-			elseif ( is_success( $resp->status ) ) {
+			} elseif ( is_success( $resp->status ) ) {
 				$rss = _response_to_rss( $resp );
 				if ( $rss ) {
 					if (MAGPIE_DEBUG > 1) {
@@ -499,21 +476,18 @@ 
 					$cache->set( $url, $rss );
 					return $rss;
 				}
-			}
-			else {
+			} else {
 				$errormsg = "Failed to fetch $url. ";
 				if ( $resp->error ) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
-				}
-				else {
+				} else {
 					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
 				}
 			}
-		}
-		else {
+		} else {
 			$errormsg = "Unable to retrieve RSS file for unknown reasons.";
 		}
 
@@ -566,8 +540,9 @@ 
 		if ( !is_array($value) ) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
-				$return_headers[] = "$key: $v";
+			foreach ( $value as $v ) {
+							$return_headers[] = "$key: $v";
+			}
 		}
 	}
 
@@ -601,8 +576,7 @@ 
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
-			}
-			else {
+			} else {
 				$field = $h;
 				$val = "";
 			}
@@ -640,8 +614,7 @@ 
 function init () {
 	if ( defined('MAGPIE_INITALIZED') ) {
 		return;
-	}
-	else {
+	} else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
@@ -670,8 +643,7 @@ 
 
 		if ( MAGPIE_CACHE_ON ) {
 			$ua = $ua . ')';
-		}
-		else {
+		} else {
 			$ua = $ua . '; No cache)';
 		}
 
@@ -828,8 +800,7 @@ 
 		$this->ERROR = $errormsg;
 		if ( MAGPIE_DEBUG ) {
 			trigger_error( $errormsg, $lvl);
-		}
-		else {
+		} else {
 			error_log( $errormsg, 0);
 		}
 	}
@@ -856,8 +827,7 @@ 
 		$offset = 0;
 		if ( $match[11] == 'Z' ) {
 			# zulu time, aka GMT
-		}
-		else {
+		} else {
 			list( $tz_mod, $tz_hour, $tz_min ) =
 				array( $match[8], $match[9], $match[10]);
 
@@ -877,8 +847,7 @@ 
 		}
 		$epoch = $epoch + $offset;
 		return $epoch;
-	}
-	else {
+	} else {
 		return -1;
 	}
 }

src/wp-includes/SimplePie/Decode/HTML/Entities.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 	 * Consume the next byte
 	 *
 	 * @access private
-	 * @return mixed The next byte, or false, if there is no more data
+	 * @return string|false The next byte, or false, if there is no more data
 	 */
 	public function consume()
 	{
@@ -129,7 +129,7 @@ 
 	 *
 	 * @access private
 	 * @param string $chars Characters to consume
-	 * @return mixed A series of characters that match the range, or false
+	 * @return string|false A series of characters that match the range, or false
 	 */
 	public function consume_range($chars)
 	{

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}
 
-					if (!in_array($this->consume(), array(';', false), true))
+					if ( ! in_array($this->consume(), array(';', false), true))
 					{
 						$this->unconsume();
 					}

Braces +4 added lines, -8 removed lines

@@ -117,8 +117,7 @@ 
 		{
 			$this->consumed .= $this->data[$this->position];
 			return $this->data[$this->position++];
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -139,8 +138,7 @@ 
 			$this->consumed .= $data;
 			$this->position += $len;
 			return $data;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -200,8 +198,7 @@ 
 					if ($hex)
 					{
 						$codepoint = hexdec($codepoint);
-					}
-					else
+					} else
 					{
 						$codepoint = intval($codepoint);
 					}
@@ -209,8 +206,7 @@ 
 					if (isset($windows_1252_specials[$codepoint]))
 					{
 						$replacement = $windows_1252_specials[$codepoint];
-					}
-					else
+					} else
 					{
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}

src/wp-includes/SimplePie/Enclosure.php

Doc Comments +1 added lines, -1 removed lines

@@ -647,7 +647,7 @@
 	/**
 	 * Get length
 	 *
-	 * @return float Length in bytes
+	 * @return string|null Length in bytes
 	 */
 	public function get_length()
 	{

Spacing +19 added lines, -19 removed lines

@@ -813,7 +813,7 @@ 
 		$length = $this->get_length();
 		if ($length !== null)
 		{
-			return round($length/1048576, 2);
+			return round($length / 1048576, 2);
 		}
 		else
 		{
@@ -917,7 +917,7 @@ 
 	 * @param array|string $options See first paramter to {@see embed}
 	 * @return string HTML string to output
 	 */
-	public function native_embed($options='')
+	public function native_embed($options = '')
 	{
 		return $this->embed($options, true);
 	}
@@ -991,7 +991,7 @@ 
 		else
 		{
 			$options = explode(',', $options);
-			foreach($options as $option)
+			foreach ($options as $option)
 			{
 				$opt = explode(':', $option, 2);
 				if (isset($opt[0], $opt[1]))
@@ -1058,11 +1058,11 @@ 
 				}
 				elseif ($widescreen)
 				{
-					$width = round((intval($height)/9)*16);
+					$width = round((intval($height) / 9) * 16);
 				}
 				else
 				{
-					$width = round((intval($height)/3)*4);
+					$width = round((intval($height) / 3) * 4);
 				}
 			}
 			else
@@ -1092,11 +1092,11 @@ 
 				}
 				elseif ($widescreen)
 				{
-					$height = round((intval($width)/16)*9);
+					$height = round((intval($width) / 16) * 9);
 				}
 				else
 				{
-					$height = round((intval($width)/4)*3);
+					$height = round((intval($width) / 4) * 3);
 				}
 			}
 			else
@@ -1126,11 +1126,11 @@ 
 		{
 			if ($native)
 			{
-				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+				$embed .= "<embed src=\"".$this->get_link()."\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
 			}
 		}
 
@@ -1141,11 +1141,11 @@ 
 			$height += 20;
 			if ($native)
 			{
-				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
 		}
 
@@ -1158,16 +1158,16 @@ 
 			{
 				if ($placeholder !== '')
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"".$this->get_link()."\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 				else
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"".$this->get_link()."\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
 			}
 		}
 
@@ -1177,16 +1177,16 @@ 
 			$height += 45;
 			if ($native)
 			{
-				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"".$this->get_link()."\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>';
 
 		return $embed;
 	}
@@ -1206,7 +1206,7 @@ 
 	{
 		// Mime-types by handler.
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
 		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
 		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
 		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
@@ -1221,7 +1221,7 @@ 
 		}
 
 		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
-		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
+		if ( ! in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
 		{
 			switch (strtolower($this->get_extension()))
 			{

Braces +61 added lines, -117 removed lines

@@ -282,8 +282,7 @@ 
 		if ($this->bitrate !== null)
 		{
 			return $this->bitrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -301,8 +300,7 @@ 
 		if (isset($captions[$key]))
 		{
 			return $captions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -318,8 +316,7 @@ 
 		if ($this->captions !== null)
 		{
 			return $this->captions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -337,8 +334,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -354,8 +350,7 @@ 
 		if ($this->categories !== null)
 		{
 			return $this->categories;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -371,8 +366,7 @@ 
 		if ($this->channels !== null)
 		{
 			return $this->channels;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -388,8 +382,7 @@ 
 		if ($this->copyright !== null)
 		{
 			return $this->copyright;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -407,8 +400,7 @@ 
 		if (isset($credits[$key]))
 		{
 			return $credits[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -424,8 +416,7 @@ 
 		if ($this->credits !== null)
 		{
 			return $this->credits;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -441,8 +432,7 @@ 
 		if ($this->description !== null)
 		{
 			return $this->description;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -462,13 +452,11 @@ 
 			{
 				$time = SimplePie_Misc::time_hms($this->duration);
 				return $time;
-			}
-			else
+			} else
 			{
 				return $this->duration;
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -484,8 +472,7 @@ 
 		if ($this->expression !== null)
 		{
 			return $this->expression;
-		}
-		else
+		} else
 		{
 			return 'full';
 		}
@@ -519,8 +506,7 @@ 
 		if ($this->framerate !== null)
 		{
 			return $this->framerate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -549,8 +535,7 @@ 
 		if (isset($hashes[$key]))
 		{
 			return $hashes[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -566,8 +551,7 @@ 
 		if ($this->hashes !== null)
 		{
 			return $this->hashes;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -583,8 +567,7 @@ 
 		if ($this->height !== null)
 		{
 			return $this->height;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -601,8 +584,7 @@ 
 		if ($this->lang !== null)
 		{
 			return $this->lang;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -620,8 +602,7 @@ 
 		if (isset($keywords[$key]))
 		{
 			return $keywords[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -637,8 +618,7 @@ 
 		if ($this->keywords !== null)
 		{
 			return $this->keywords;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -654,8 +634,7 @@ 
 		if ($this->length !== null)
 		{
 			return $this->length;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -671,8 +650,7 @@ 
 		if ($this->link !== null)
 		{
 			return urldecode($this->link);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -689,8 +667,7 @@ 
 		if ($this->medium !== null)
 		{
 			return $this->medium;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -707,8 +684,7 @@ 
 		if ($this->player !== null)
 		{
 			return $this->player;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -726,8 +702,7 @@ 
 		if (isset($ratings[$key]))
 		{
 			return $ratings[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -743,8 +718,7 @@ 
 		if ($this->ratings !== null)
 		{
 			return $this->ratings;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -762,8 +736,7 @@ 
 		if (isset($restrictions[$key]))
 		{
 			return $restrictions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -779,8 +752,7 @@ 
 		if ($this->restrictions !== null)
 		{
 			return $this->restrictions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -796,8 +768,7 @@ 
 		if ($this->samplingrate !== null)
 		{
 			return $this->samplingrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -814,8 +785,7 @@ 
 		if ($length !== null)
 		{
 			return round($length/1048576, 2);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -833,8 +803,7 @@ 
 		if (isset($thumbnails[$key]))
 		{
 			return $thumbnails[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -850,8 +819,7 @@ 
 		if ($this->thumbnails !== null)
 		{
 			return $this->thumbnails;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -867,8 +835,7 @@ 
 		if ($this->title !== null)
 		{
 			return $this->title;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -885,8 +852,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -902,8 +868,7 @@ 
 		if ($this->width !== null)
 		{
 			return $this->width;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -987,8 +952,7 @@ 
 		if (is_array($options))
 		{
 			extract($options);
-		}
-		else
+		} else
 		{
 			$options = explode(',', $options);
 			foreach($options as $option)
@@ -1055,17 +1019,14 @@ 
 				if ($height === 'auto')
 				{
 					$width = 480;
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$width = round((intval($height)/9)*16);
-				}
-				else
+				} else
 				{
 					$width = round((intval($height)/3)*4);
 				}
-			}
-			else
+			} else
 			{
 				$width = '100%';
 			}
@@ -1076,35 +1037,29 @@ 
 			if ($mime === 'audio')
 			{
 				$height = 0;
-			}
-			elseif ($mime === 'video')
+			} elseif ($mime === 'video')
 			{
 				if ($width === 'auto')
 				{
 					if ($widescreen)
 					{
 						$height = 270;
-					}
-					else
+					} else
 					{
 						$height = 360;
 					}
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$height = round((intval($width)/16)*9);
-				}
-				else
+				} else
 				{
 					$height = round((intval($width)/4)*3);
 				}
-			}
-			else
+			} else
 			{
 				$height = 376;
 			}
-		}
-		elseif ($mime === 'audio')
+		} elseif ($mime === 'audio')
 		{
 			$height = 0;
 		}
@@ -1113,8 +1068,7 @@ 
 		if ($mime === 'audio')
 		{
 			$placeholder = $audio;
-		}
-		elseif ($mime === 'video')
+		} elseif ($mime === 'video')
 		{
 			$placeholder = $video;
 		}
@@ -1127,8 +1081,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
 			}
@@ -1142,8 +1095,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
@@ -1159,13 +1111,11 @@ 
 				if ($placeholder !== '')
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-				}
-				else
+				} else
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
 			}
@@ -1178,15 +1128,16 @@ 
 			if ($native)
 			{
 				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else {
+			$embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		}
 
 		return $embed;
 	}
@@ -1214,8 +1165,7 @@ 
 		if ($this->get_type() !== null)
 		{
 			$type = strtolower($this->type);
-		}
-		else
+		} else
 		{
 			$type = null;
 		}
@@ -1349,29 +1299,23 @@ 
 			if (in_array($type, $types_flash))
 			{
 				return 'flash';
-			}
-			elseif (in_array($type, $types_fmedia))
+			} elseif (in_array($type, $types_fmedia))
 			{
 				return 'fmedia';
-			}
-			elseif (in_array($type, $types_quicktime))
+			} elseif (in_array($type, $types_quicktime))
 			{
 				return 'quicktime';
-			}
-			elseif (in_array($type, $types_wmedia))
+			} elseif (in_array($type, $types_wmedia))
 			{
 				return 'wmedia';
-			}
-			elseif (in_array($type, $types_mp3))
+			} elseif (in_array($type, $types_mp3))
 			{
 				return 'mp3';
-			}
-			else
+			} else
 			{
 				return null;
 			}
-		}
-		else
+		} else
 		{
 			return $type;
 		}

src/wp-includes/SimplePie/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -264,7 +264,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param SimplePie_IRI $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -1119,6 +1119,7 @@ 
 	/**
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
+	 * @param false|string $string
 	 * @return string
 	 */
 	public function to_uri($string)

Spacing +42 added lines, -42 removed lines

@@ -148,9 +148,9 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), $value);
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -161,7 +161,7 @@ 
 			|| $name === 'ifragment'
 		)
 		{
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -191,7 +191,7 @@ 
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
 		{
 			$name = $prop;
 			$return = $this->$prop;
@@ -204,7 +204,7 @@ 
 		}
 		else
 		{
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -226,7 +226,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		if (method_exists($this, 'get_'.$name) || isset($this->$name))
 		{
 			return true;
 		}
@@ -243,9 +243,9 @@ 
 	 */
 	public function __unset($name)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), '');
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -270,11 +270,11 @@ 
 	 */
 	public static function absolutize($base, $relative)
 	{
-		if (!($relative instanceof SimplePie_IRI))
+		if ( ! ($relative instanceof SimplePie_IRI))
 		{
 			$relative = new SimplePie_IRI($relative);
 		}
-		if (!$relative->is_valid())
+		if ( ! $relative->is_valid())
 		{
 			return false;
 		}
@@ -284,7 +284,7 @@ 
 		}
 		else
 		{
-			if (!($base instanceof SimplePie_IRI))
+			if ( ! ($base instanceof SimplePie_IRI))
 			{
 				$base = new SimplePie_IRI($base);
 			}
@@ -312,11 +312,11 @@ 
 							}
 							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
-								$target->ipath = '/' . $relative->ipath;
+								$target->ipath = '/'.$relative->ipath;
 							}
 							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
-								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 							}
 							else
 							{
@@ -370,19 +370,19 @@ 
 			{
 				$match['scheme'] = null;
 			}
-			if (!isset($match[3]) || $match[3] === '')
+			if ( ! isset($match[3]) || $match[3] === '')
 			{
 				$match['authority'] = null;
 			}
-			if (!isset($match[5]))
+			if ( ! isset($match[5]))
 			{
 				$match['path'] = '';
 			}
-			if (!isset($match[6]) || $match[6] === '')
+			if ( ! isset($match[6]) || $match[6] === '')
 			{
 				$match['query'] = null;
 			}
-			if (!isset($match[8]) || $match[8] === '')
+			if ( ! isset($match[8]) || $match[8] === '')
 			{
 				$match['fragment'] = null;
 			}
@@ -452,7 +452,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -551,7 +551,7 @@ 
 			// Percent encode anything invalid or not in ucschar
 			if (
 				// Invalid sequences
-				!$valid
+				! $valid
 				// Non-shortest form sequences are invalid
 				|| $length > 1 && $character <= 0x7F
 				|| $length > 2 && $character <= 0x7FF
@@ -568,7 +568,7 @@ 
 				)
 				&& (
 					// Everything not in iprivate, if it applies
-					   !$iprivate
+					   ! $iprivate
 					|| $character < 0xE000
 					|| $character > 0x10FFFD
 				)
@@ -618,7 +618,7 @@ 
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining)
+			if ( ! $remaining)
 			{
 				// Start position
 				$start = $i;
@@ -679,12 +679,12 @@ 
 			}
 
 			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining)
+			if ( ! $remaining)
 			{
 				// Percent encode anything invalid or not in iunreserved
 				if (
 					// Invalid sequences
-					!$valid
+					! $valid
 					// Non-shortest form sequences are invalid
 					|| $length > 1 && $character <= 0x7F
 					|| $length > 2 && $character <= 0x7FF
@@ -706,7 +706,7 @@ 
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else
@@ -725,7 +725,7 @@ 
 		{
 			for ($j = $start; $j < $len; $j++)
 			{
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -777,7 +777,7 @@ 
 				) ||
 				(
 					$this->scheme === null &&
-					!$isauthority &&
+					! $isauthority &&
 					strpos($this->ipath, ':') !== false &&
 					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
 				)
@@ -800,7 +800,7 @@ 
 	public function set_iri($iri)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 		{
 			$cache = array();
 		}
@@ -824,7 +824,7 @@ 
 		else
 		{
 			$parsed = $this->parse_iri((string) $iri);
-			if (!$parsed)
+			if ( ! $parsed)
 			{
 				return false;
 			}
@@ -860,7 +860,7 @@ 
 		{
 			$this->scheme = null;
 		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		elseif ( ! preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
 		{
 			$this->scheme = null;
 			return false;
@@ -882,7 +882,7 @@ 
 	public function set_authority($authority)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 			$cache = array();
 
 		if ($authority === null)
@@ -978,7 +978,7 @@ 
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
-				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+				$this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else
 			{
@@ -1052,7 +1052,7 @@ 
 	public function set_path($ipath)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 		{
 			$cache = array();
 		}
@@ -1069,7 +1069,7 @@ 
 			$removed = $this->remove_dot_segments($valid);
 
 			$cache[$ipath] = array($valid, $removed);
-			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
 		}
 
 		$this->scheme_normalization();
@@ -1124,7 +1124,7 @@ 
 	public function to_uri($string)
 	{
 		static $non_ascii;
-		if (!$non_ascii)
+		if ( ! $non_ascii)
 		{
 			$non_ascii = implode('', range("\x80", "\xFF"));
 		}
@@ -1148,7 +1148,7 @@ 
 	 */
 	public function get_iri()
 	{
-		if (!$this->is_valid())
+		if ( ! $this->is_valid())
 		{
 			return false;
 		}
@@ -1156,27 +1156,27 @@ 
 		$iri = '';
 		if ($this->scheme !== null)
 		{
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null)
 		{
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
 		}
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		elseif ( ! empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
 		if ($this->iquery !== null)
 		{
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null)
 		{
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -1204,7 +1204,7 @@ 
 			$iauthority = '';
 			if ($this->iuserinfo !== null)
 			{
-				$iauthority .= $this->iuserinfo . '@';
+				$iauthority .= $this->iuserinfo.'@';
 			}
 			if ($this->ihost !== null)
 			{
@@ -1212,7 +1212,7 @@ 
 			}
 			if ($this->port !== null)
 			{
-				$iauthority .= ':' . $this->port;
+				$iauthority .= ':'.$this->port;
 			}
 			return $iauthority;
 		}

Braces +53 added lines, -92 removed lines

@@ -151,8 +151,7 @@ 
 		if (method_exists($this, 'set_' . $name))
 		{
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -185,8 +184,7 @@ 
 		)
 		{
 			$return = $this->{"get_$name"}();
-		}
-		elseif (array_key_exists($name, $props))
+		} elseif (array_key_exists($name, $props))
 		{
 			$return = $this->$name;
 		}
@@ -201,8 +199,7 @@ 
 		{
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else
+		} else
 		{
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
@@ -211,8 +208,7 @@ 
 		if ($return === null && isset($this->normalization[$this->scheme][$name]))
 		{
 			return $this->normalization[$this->scheme][$name];
-		}
-		else
+		} else
 		{
 			return $return;
 		}
@@ -229,8 +225,7 @@ 
 		if (method_exists($this, 'get_' . $name) || isset($this->$name))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -277,12 +272,10 @@ 
 		if (!$relative->is_valid())
 		{
 			return false;
-		}
-		elseif ($relative->scheme !== null)
+		} elseif ($relative->scheme !== null)
 		{
 			return clone $relative;
-		}
-		else
+		} else
 		{
 			if (!($base instanceof SimplePie_IRI))
 			{
@@ -296,8 +289,7 @@ 
 					{
 						$target = clone $relative;
 						$target->scheme = $base->scheme;
-					}
-					else
+					} else
 					{
 						$target = new SimplePie_IRI;
 						$target->scheme = $base->scheme;
@@ -309,46 +301,39 @@ 
 							if ($relative->ipath[0] === '/')
 							{
 								$target->ipath = $relative->ipath;
-							}
-							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+							} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
 								$target->ipath = '/' . $relative->ipath;
-							}
-							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+							} elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
 								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-							}
-							else
+							} else
 							{
 								$target->ipath = $relative->ipath;
 							}
 							$target->ipath = $target->remove_dot_segments($target->ipath);
 							$target->iquery = $relative->iquery;
-						}
-						else
+						} else
 						{
 							$target->ipath = $base->ipath;
 							if ($relative->iquery !== null)
 							{
 								$target->iquery = $relative->iquery;
-							}
-							elseif ($base->iquery !== null)
+							} elseif ($base->iquery !== null)
 							{
 								$target->iquery = $base->iquery;
 							}
 						}
 						$target->ifragment = $relative->ifragment;
 					}
-				}
-				else
+				} else
 				{
 					$target = clone $base;
 					$target->ifragment = null;
 				}
 				$target->scheme_normalization();
 				return $target;
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -387,8 +372,7 @@ 
 				$match['fragment'] = null;
 			}
 			return $match;
-		}
-		else
+		} else
 		{
 			// This can occur when a paragraph is accidentally parsed as a URI
 			return false;
@@ -410,8 +394,7 @@ 
 			if (strpos($input, '../') === 0)
 			{
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0)
+			} elseif (strpos($input, './') === 0)
 			{
 				$input = substr($input, 2);
 			}
@@ -419,8 +402,7 @@ 
 			elseif (strpos($input, '/./') === 0)
 			{
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.')
+			} elseif ($input === '/.')
 			{
 				$input = '/';
 			}
@@ -429,8 +411,7 @@ 
 			{
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..')
+			} elseif ($input === '/..')
 			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
@@ -445,8 +426,7 @@ 
 			{
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else
+			} else
 			{
 				$output .= $input;
 				$input = '';
@@ -540,8 +520,7 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					$position = $strlen - 1;
 					$valid = false;
@@ -575,8 +554,9 @@ 
 			)
 			{
 				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid)
-					$position--;
+				if ($valid) {
+									$position--;
+				}
 
 				for ($j = $start; $j <= $position; $j++)
 				{
@@ -708,8 +688,7 @@ 
 					{
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else
+				} else
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
@@ -808,8 +787,7 @@ 
 		if ($iri === null)
 		{
 			return true;
-		}
-		elseif (isset($cache[$iri]))
+		} elseif (isset($cache[$iri]))
 		{
 			list($this->scheme,
 				 $this->iuserinfo,
@@ -820,8 +798,7 @@ 
 				 $this->ifragment,
 				 $return) = $cache[$iri];
 			return $return;
-		}
-		else
+		} else
 		{
 			$parsed = $this->parse_iri((string) $iri);
 			if (!$parsed)
@@ -859,13 +836,11 @@ 
 		if ($scheme === null)
 		{
 			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
 		{
 			$this->scheme = null;
 			return false;
-		}
-		else
+		} else
 		{
 			$this->scheme = strtolower($scheme);
 		}
@@ -882,8 +857,9 @@ 
 	public function set_authority($authority)
 	{
 		static $cache;
-		if (!$cache)
-			$cache = array();
+		if (!$cache) {
+					$cache = array();
+		}
 
 		if ($authority === null)
 		{
@@ -891,8 +867,7 @@ 
 			$this->ihost = null;
 			$this->port = null;
 			return true;
-		}
-		elseif (isset($cache[$authority]))
+		} elseif (isset($cache[$authority]))
 		{
 			list($this->iuserinfo,
 				 $this->ihost,
@@ -900,16 +875,14 @@ 
 				 $return) = $cache[$authority];
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$remaining = $authority;
 			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
 			{
 				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 				$remaining = substr($remaining, $iuserinfo_end + 1);
-			}
-			else
+			} else
 			{
 				$iuserinfo = null;
 			}
@@ -920,8 +893,7 @@ 
 					$port = null;
 				}
 				$remaining = substr($remaining, 0, $port_start);
-			}
-			else
+			} else
 			{
 				$port = null;
 			}
@@ -950,8 +922,7 @@ 
 		if ($iuserinfo === null)
 		{
 			$this->iuserinfo = null;
-		}
-		else
+		} else
 		{
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
@@ -973,20 +944,17 @@ 
 		{
 			$this->ihost = null;
 			return true;
-		}
-		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		} elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
 				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else
+			} else
 			{
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
@@ -1000,8 +968,7 @@ 
 				if ($ihost[$position] === '%')
 				{
 					$position += 3;
-				}
-				else
+				} else
 				{
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
@@ -1029,14 +996,12 @@ 
 		{
 			$this->port = null;
 			return true;
-		}
-		elseif (strspn($port, '0123456789') === strlen($port))
+		} elseif (strspn($port, '0123456789') === strlen($port))
 		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
 			return true;
-		}
-		else
+		} else
 		{
 			$this->port = null;
 			return false;
@@ -1062,8 +1027,7 @@ 
 		if (isset($cache[$ipath]))
 		{
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else
+		} else
 		{
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
@@ -1087,8 +1051,7 @@ 
 		if ($iquery === null)
 		{
 			$this->iquery = null;
-		}
-		else
+		} else
 		{
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
@@ -1107,8 +1070,7 @@ 
 		if ($ifragment === null)
 		{
 			$this->ifragment = null;
-		}
-		else
+		} else
 		{
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
@@ -1165,8 +1127,7 @@ 
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
-		}
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		} elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
@@ -1215,8 +1176,7 @@ 
 				$iauthority .= ':' . $this->port;
 			}
 			return $iauthority;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1230,9 +1190,10 @@ 
 	protected function get_authority()
 	{
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority))
-			return $this->to_uri($iauthority);
-		else
-			return $iauthority;
+		if (is_string($iauthority)) {
+					return $this->to_uri($iauthority);
+		} else {
+					return $iauthority;
+		}
 	}
 }

src/wp-includes/SimplePie/Item.php

Doc Comments +5 added lines, -5 removed lines

@@ -860,7 +860,7 @@ 
 	 * @since 1.0
 	 *
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
-	 * @return int|string|null
+	 * @return string|null
 	 */
 	public function get_local_date($date_format = '%c')
 	{
@@ -883,7 +883,7 @@ 
 	 *
 	 * @see get_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -901,7 +901,7 @@ 
 	 *
 	 * @see get_updated_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_updated_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -2893,7 +2893,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()
 	{
@@ -2921,7 +2921,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()
 	{

Spacing +26 added lines, -26 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	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'))
 		{
 			unset($this->feed);
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	public function get_id($hash = false)
 	{
-		if (!$hash)
+		if ( ! $hash)
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
 			{
@@ -249,7 +249,7 @@ 
 		}
 		if ($this->get_permalink() !== null || $this->get_title() !== null)
 		{
-			return md5($this->get_permalink() . $this->get_title());
+			return md5($this->get_permalink().$this->get_title());
 		}
 		else
 		{
@@ -267,7 +267,7 @@ 
 	 */
 	public function get_title()
 	{
-		if (!isset($this->data['title']))
+		if ( ! isset($this->data['title']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 			{
@@ -359,7 +359,7 @@ 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
 		}
 
-		elseif (!$description_only)
+		elseif ( ! $description_only)
 		{
 			return $this->get_content(true);
 		}
@@ -397,7 +397,7 @@ 
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
 		}
-		elseif (!$content_only)
+		elseif ( ! $content_only)
 		{
 			return $this->get_description(true);
 		}
@@ -482,7 +482,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);
 		}
@@ -588,7 +588,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -670,7 +670,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);
 		}
@@ -732,7 +732,7 @@ 
 	 */
 	public function get_date($date_format = 'j F Y, g:i a')
 	{
-		if (!isset($this->data['date']))
+		if ( ! isset($this->data['date']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
 			{
@@ -767,7 +767,7 @@ 
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
 
-			if (!empty($this->data['date']['raw']))
+			if ( ! empty($this->data['date']['raw']))
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
@@ -811,14 +811,14 @@ 
 	 */
 	public function get_updated_date($date_format = 'j F Y, g:i a')
 	{
-		if (!isset($this->data['updated']))
+		if ( ! isset($this->data['updated']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['updated']['raw'] = $return[0]['data'];
 			}
 
-			if (!empty($this->data['updated']['raw']))
+			if ( ! empty($this->data['updated']['raw']))
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
@@ -864,7 +864,7 @@ 
 	 */
 	public function get_local_date($date_format = '%c')
 	{
-		if (!$date_format)
+		if ( ! $date_format)
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -974,7 +974,7 @@ 
 	 */
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
@@ -1008,7 +1008,7 @@ 
 			}
 			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
-				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
+				if ( ! isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
 				{
 					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 				}
@@ -1019,19 +1019,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]);
 			}
@@ -1085,7 +1085,7 @@ 
 	 */
 	public function get_enclosures()
 	{
-		if (!isset($this->data['enclosures']))
+		if ( ! isset($this->data['enclosures']))
 		{
 			$this->data['enclosures'] = array();
 
@@ -1732,7 +1732,7 @@ 
 			// If we have media:group tags, loop through them.
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
 			{
-				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
 				{
 					// If we have media:content tags, loop through them.
 					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
@@ -2762,7 +2762,7 @@ 
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				if (isset($link['attribs']['']['href']) && ! empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -2797,7 +2797,7 @@ 
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				if (isset($link['attribs']['']['href']) && ! empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -2873,7 +2873,7 @@ 
 
 			$this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
 		}
-		if (!empty($this->data['enclosures']))
+		if ( ! empty($this->data['enclosures']))
 		{
 			return $this->data['enclosures'];
 		}

Braces +147 added lines, -295 removed lines

@@ -147,8 +147,7 @@ 
 		if (isset($this->data['child'][$namespace][$tag]))
 		{
 			return $this->data['child'][$namespace][$tag];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -217,32 +216,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+			} elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
 			{
 				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif (($return = $this->get_permalink()) !== null)
+			} elseif (($return = $this->get_permalink()) !== null)
 			{
 				return $return;
-			}
-			elseif (($return = $this->get_title()) !== null)
+			} elseif (($return = $this->get_title()) !== null)
 			{
 				return $return;
 			}
@@ -250,8 +242,7 @@ 
 		if ($this->get_permalink() !== null || $this->get_title() !== null)
 		{
 			return md5($this->get_permalink() . $this->get_title());
-		}
-		else
+		} else
 		{
 			return md5(serialize($this->data));
 		}
@@ -272,32 +263,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 			{
 				$this->data['title'] = $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_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 			{
 				$this->data['title'] = $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_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$this->data['title'] = null;
 			}
@@ -325,45 +309,34 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
 		{
 			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_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
 		{
 			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_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_item_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_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
-		}
-
-		elseif (!$description_only)
+		} elseif (!$description_only)
 		{
 			return $this->get_content(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -388,20 +361,16 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
 		{
 			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_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif (!$content_only)
+		} elseif (!$content_only)
 		{
 			return $this->get_description(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -420,8 +389,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -466,8 +434,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -485,8 +452,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -505,8 +471,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -525,8 +490,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -591,8 +555,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -673,16 +636,13 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+		} elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
 		{
 			return $authors;
-		}
-		elseif ($authors = $this->feed->get_authors())
+		} elseif ($authors = $this->feed->get_authors())
 		{
 			return $authors;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -701,16 +661,13 @@ 
 		if ($return = $this->get_item_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_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -737,32 +694,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
@@ -771,8 +721,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['date'] = null;
 			}
@@ -791,8 +740,7 @@ 
 				default:
 					return date($date_format, $this->data['date']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -822,8 +770,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['updated'] = null;
 			}
@@ -842,8 +789,7 @@ 
 				default:
 					return date($date_format, $this->data['updated']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -867,12 +813,10 @@ 
 		if (!$date_format)
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (($date = $this->get_date('U')) !== null && $date !== false)
+		} elseif (($date = $this->get_date('U')) !== null && $date !== false)
 		{
 			return strftime($date_format, $date);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -931,12 +875,10 @@ 
 		if ($link !== null)
 		{
 			return $link;
-		}
-		elseif ($enclosure !== null)
+		} elseif ($enclosure !== null)
 		{
 			return $enclosure->get_link();
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -956,8 +898,7 @@ 
 		if ($links[$key] !== null)
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1023,13 +964,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];
 				}
@@ -1039,8 +978,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1062,8 +1000,7 @@ 
 		if (isset($enclosures[$key]))
 		{
 			return $enclosures[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1139,8 +1076,7 @@ 
 					}
 					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
 				}
-			}
-			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			} elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
 			{
 				foreach ($captions as $caption)
 				{
@@ -1190,8 +1126,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -1213,8 +1148,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -1266,8 +1200,7 @@ 
 					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
 				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-			}
-			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			} elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
 			{
 				$copyright_url = null;
 				$copyright_label = null;
@@ -1297,8 +1230,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1308,8 +1240,7 @@ 
 					}
 					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
 				}
-			}
-			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			} elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
 			{
 				foreach ($credits as $credit)
 				{
@@ -1323,8 +1254,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1347,8 +1277,7 @@ 
 				{
 					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			} elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
 			{
 				if (isset($description_parent[0]['data']))
 				{
@@ -1398,15 +1327,13 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
 					$hashes_parent[] = $algo.':'.$value;
 				}
-			}
-			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			} elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
 			{
 				foreach ($hashes_iterator as $hash)
 				{
@@ -1419,8 +1346,7 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
@@ -1444,8 +1370,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1456,8 +1381,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1468,8 +1392,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1493,8 +1416,7 @@ 
 				{
 					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 				}
-			}
-			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			} elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
 			{
 				if (isset($player_parent[0]['attribs']['']['url']))
 				{
@@ -1512,8 +1434,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1523,8 +1444,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1536,8 +1456,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1546,8 +1465,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1557,8 +1475,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1598,8 +1515,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1612,8 +1528,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1634,8 +1549,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1652,8 +1566,7 @@ 
 			if (is_array($restrictions_parent))
 			{
 				$restrictions_parent = array_values(array_unique($restrictions_parent));
-			}
-			else
+			} else
 			{
 				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
 			}
@@ -1668,8 +1581,7 @@ 
 						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 					}
 				}
-			}
-			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			} elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
 			{
 				foreach ($thumbnails as $thumbnail)
 				{
@@ -1687,8 +1599,7 @@ 
 				{
 					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			} elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
 			{
 				if (isset($title_parent[0]['data']))
 				{
@@ -1781,8 +1692,7 @@ 
 							if (isset($content['attribs']['']['duration']))
 							{
 								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$duration = $duration_parent;
 							}
@@ -1862,8 +1772,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
 								{
@@ -1898,8 +1807,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							else
+							} else
 							{
 								$captions = $captions_parent;
 							}
@@ -1919,8 +1827,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -1945,8 +1852,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -1960,12 +1866,10 @@ 
 							if (is_array($categories) && is_array($categories_parent))
 							{
 								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-							}
-							elseif (is_array($categories))
+							} elseif (is_array($categories))
 							{
 								$categories = array_values(array_unique($categories));
-							}
-							elseif (is_array($categories_parent))
+							} elseif (is_array($categories_parent))
 							{
 								$categories = array_values(array_unique($categories_parent));
 							}
@@ -1984,8 +1888,7 @@ 
 									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
 							{
 								$copyright_url = null;
 								$copyright_label = null;
@@ -1998,8 +1901,7 @@ 
 									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							else
+							} else
 							{
 								$copyrights = $copyrights_parent;
 							}
@@ -2019,8 +1921,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2034,8 +1935,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
 								{
@@ -2049,8 +1949,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2064,8 +1963,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							else
+							} else
 							{
 								$credits = $credits_parent;
 							}
@@ -2074,12 +1972,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$description = $description_parent;
 							}
@@ -2098,8 +1994,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2109,8 +2004,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
 								{
@@ -2123,8 +2017,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2134,8 +2027,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							else
+							} else
 							{
 								$hashes = $hashes_parent;
 							}
@@ -2156,8 +2048,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
 							{
 								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
 								{
@@ -2172,8 +2063,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							else
+							} else
 							{
 								$keywords = $keywords_parent;
 							}
@@ -2182,12 +2072,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							else
+							} else
 							{
 								$player = $player_parent;
 							}
@@ -2202,8 +2090,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2217,8 +2104,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
 								{
@@ -2227,8 +2113,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2242,8 +2127,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							else
+							} else
 							{
 								$ratings = $ratings_parent;
 							}
@@ -2274,8 +2158,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
 								{
@@ -2300,8 +2183,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							else
+							} else
 							{
 								$restrictions = $restrictions_parent;
 							}
@@ -2317,8 +2199,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
 								{
@@ -2328,8 +2209,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							else
+							} else
 							{
 								$thumbnails = $thumbnails_parent;
 							}
@@ -2338,12 +2218,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$title = $title_parent;
 							}
@@ -2403,8 +2281,7 @@ 
 						if (isset($content['attribs']['']['duration']))
 						{
 							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$duration = $duration_parent;
 						}
@@ -2486,8 +2363,7 @@ 
 							{
 								$captions = array_values(array_unique($captions));
 							}
-						}
-						else
+						} else
 						{
 							$captions = $captions_parent;
 						}
@@ -2507,8 +2383,7 @@ 
 								if (isset($category['attribs']['']['scheme']))
 								{
 									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$scheme = 'http://search.yahoo.com/mrss/category_schema';
 								}
@@ -2522,16 +2397,13 @@ 
 						if (is_array($categories) && is_array($categories_parent))
 						{
 							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-						}
-						elseif (is_array($categories))
+						} elseif (is_array($categories))
 						{
 							$categories = array_values(array_unique($categories));
-						}
-						elseif (is_array($categories_parent))
+						} elseif (is_array($categories_parent))
 						{
 							$categories = array_values(array_unique($categories_parent));
-						}
-						else
+						} else
 						{
 							$categories = null;
 						}
@@ -2550,8 +2422,7 @@ 
 								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 							}
 							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-						}
-						else
+						} else
 						{
 							$copyrights = $copyrights_parent;
 						}
@@ -2571,8 +2442,7 @@ 
 								if (isset($credit['attribs']['']['scheme']))
 								{
 									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$credit_scheme = 'urn:ebu';
 								}
@@ -2586,8 +2456,7 @@ 
 							{
 								$credits = array_values(array_unique($credits));
 							}
-						}
-						else
+						} else
 						{
 							$credits = $credits_parent;
 						}
@@ -2596,8 +2465,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 						{
 							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$description = $description_parent;
 						}
@@ -2616,8 +2484,7 @@ 
 								if (isset($hash['attribs']['']['algo']))
 								{
 									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$algo = 'md5';
 								}
@@ -2627,8 +2494,7 @@ 
 							{
 								$hashes = array_values(array_unique($hashes));
 							}
-						}
-						else
+						} else
 						{
 							$hashes = $hashes_parent;
 						}
@@ -2649,8 +2515,7 @@ 
 							{
 								$keywords = array_values(array_unique($keywords));
 							}
-						}
-						else
+						} else
 						{
 							$keywords = $keywords_parent;
 						}
@@ -2659,8 +2524,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 						{
 							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						else
+						} else
 						{
 							$player = $player_parent;
 						}
@@ -2675,8 +2539,7 @@ 
 								if (isset($rating['attribs']['']['scheme']))
 								{
 									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$rating_scheme = 'urn:simple';
 								}
@@ -2690,8 +2553,7 @@ 
 							{
 								$ratings = array_values(array_unique($ratings));
 							}
-						}
-						else
+						} else
 						{
 							$ratings = $ratings_parent;
 						}
@@ -2722,8 +2584,7 @@ 
 							{
 								$restrictions = array_values(array_unique($restrictions));
 							}
-						}
-						else
+						} else
 						{
 							$restrictions = $restrictions_parent;
 						}
@@ -2739,8 +2600,7 @@ 
 							{
 								$thumbnails = array_values(array_unique($thumbnails));
 							}
-						}
-						else
+						} else
 						{
 							$thumbnails = $thumbnails_parent;
 						}
@@ -2749,8 +2609,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 						{
 							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$title = $title_parent;
 						}
@@ -2876,8 +2735,7 @@ 
 		if (!empty($this->data['enclosures']))
 		{
 			return $this->data['enclosures'];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2900,12 +2758,10 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_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;
 		}
@@ -2928,16 +2784,13 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_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;
 		}
@@ -2954,8 +2807,7 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
 		{
 			return $this->registry->create('Source', array($this, $return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Locator.php

Doc Comments +3 added lines

@@ -210,6 +210,9 @@
 		}
 	}
 
+	/**
+	 * @param string $name
+	 */
 	protected function search_elements_by_tag($name, &$done, $feeds)
 	{
 		if ($this->dom === null)

Spacing +3 added lines, -3 removed lines

@@ -200,7 +200,7 @@ 
 		$feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds));
 		$feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds));
 
-		if (!empty($feeds))
+		if ( ! empty($feeds))
 		{
 			return array_values($feeds);
 		}
@@ -242,7 +242,7 @@ 
 					continue;
 				}
 
-				if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))
+				if ( ! in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && ! in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('application/rss+xml', 'application/atom+xml'))) && ! isset($feeds[$href]))
 				{
 					$this->checked_feeds++;
 					$headers = array(
@@ -305,7 +305,7 @@ 
 		}
 		$this->local = array_unique($this->local);
 		$this->elsewhere = array_unique($this->elsewhere);
-		if (!empty($this->local) || !empty($this->elsewhere))
+		if ( ! empty($this->local) || ! empty($this->elsewhere))
 		{
 			return true;
 		}

Braces +10 added lines, -20 removed lines

@@ -79,8 +79,7 @@ 
 			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
 			$this->dom->loadHTML($this->file->body);
 			restore_error_handler();
-		}
-		else
+		} else
 		{
 			$this->dom = null;
 		}
@@ -151,17 +150,14 @@ 
 			if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
 			{
 				return true;
-			}
-			else
+			} else
 			{
 				return false;
 			}
-		}
-		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+		} elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -203,8 +199,7 @@ 
 		if (!empty($feeds))
 		{
 			return array_values($feeds);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -232,8 +227,7 @@ 
 				if ($this->base_location < $line)
 				{
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-				}
-				else
+				} else
 				{
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 				}
@@ -280,8 +274,7 @@ 
 					if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo())
 					{
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-					}
-					else
+					} else
 					{
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
 					}
@@ -295,8 +288,7 @@ 
 					if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
 					{
 						$this->local[] = $href;
-					}
-					else
+					} else
 					{
 						$this->elsewhere[] = $href;
 					}
@@ -331,8 +323,7 @@ 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
 				{
 					return $feed;
-				}
-				else
+				} else
 				{
 					unset($array[$key]);
 				}
@@ -359,8 +350,7 @@ 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
 				{
 					return $feed;
-				}
-				else
+				} else
 				{
 					unset($array[$key]);
 				}