iqltechnologies / brighty

wp/wp-includes/ID3/module.audio.flac.php

Braces +2 added lines, -4 removed lines

@@ -181,8 +181,7 @@ 
 
 			if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
 				$this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
-			}
-			else {
+			} else {
 				$info['md5_data_source'] = '';
 				$md5 = $info['flac']['STREAMINFO']['audio_signature'];
 				for ($i = 0; $i < strlen($md5); $i++) {
@@ -251,8 +250,7 @@ 
 			if ($info['playtime_seconds'] > 0) {
 				if (!$this->isDependencyFor('matroska')) {
 					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-				}
-				else {
+				} else {
 					$this->warning('Cannot determine audio bitrate because total stream size is unknown');
 				}
 			}

wp/wp-includes/ID3/module.audio.mp3.php

Braces +2 added lines, -4 removed lines

@@ -952,11 +952,9 @@
 			if ($ExpectedNumberOfAudioBytes > ($info['avdataend'] - $info['avdataoffset'])) {
 				if ($this->isDependencyFor('matroska') || $this->isDependencyFor('riff')) {
 					// ignore, audio data is broken into chunks so will always be data "missing"
-				}
-				elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
+				} elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
 					$this->warning('Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)');
-				}
-				else {
+				} else {
 					$this->warning('Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)');
 				}
 			} else {

wp/wp-includes/ID3/module.audio-video.matroska.php

Braces +5 added lines, -10 removed lines

@@ -378,8 +378,7 @@ 
 								$getid3_audio = new $class($getid3_temp, __CLASS__);
 								if ($track_info['dataformat'] == 'flac') {
 									$getid3_audio->AnalyzeString($trackarray['CodecPrivate']);
-								}
-								else {
+								} else {
 									$getid3_audio->Analyze();
 								}
 								if (!empty($getid3_temp->info[$header_data_key])) {
@@ -389,8 +388,7 @@ 
 											$track_info[$sub_key] = $value;
 										}
 									}
-								}
-								else {
+								} else {
 									$this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because '.$class.'::Analyze() failed at offset '.$getid3_temp->info['avdataoffset']);
 								}
 
@@ -1486,16 +1484,14 @@ 
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
 			$block_data['flags']['keyframe']  = (($block_data['flags_raw'] & 0x80) >> 7);
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0x70) >> 4);
-		}
-		else {
+		} else {
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0xF0) >> 4);
 		}
 		$block_data['flags']['invisible'] = (bool)(($block_data['flags_raw'] & 0x08) >> 3);
 		$block_data['flags']['lacing']    =       (($block_data['flags_raw'] & 0x06) >> 1);  // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
 			$block_data['flags']['discardable'] = (($block_data['flags_raw'] & 0x01));
-		}
-		else {
+		} else {
 			//$block_data['flags']['reserved2'] = (($block_data['flags_raw'] & 0x01) >> 0);
 		}
 		$block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
@@ -1507,8 +1503,7 @@ 
 				for ($i = 1; $i < $block_data['lace_frames']; $i ++) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
 					if ($block_data['flags']['lacing'] == 0x03) { // EBML lacing
 						$block_data['lace_frames_size'][$i] = $this->readEBMLint(); // TODO: read size correctly, calc size for the last frame. For now offsets are deteminded OK with readEBMLint() and that's the most important thing.
-					}
-					else { // Xiph lacing
+					} else { // Xiph lacing
 						$block_data['lace_frames_size'][$i] = 0;
 						do {
 							$size = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));

wp/wp-includes/comment-template.php

Braces +6 added lines, -2 removed lines

@@ -2560,7 +2560,8 @@ 
 			 */
 			do_action( 'comment_form_must_log_in_after' );
 
-		else :
+		else {
+		    :
 
 			printf(
 				'<form action="%s" method="post" id="%s" class="%s"%s>',
@@ -2569,6 +2570,7 @@ 
 				esc_attr( $args['class_form'] ),
 				( $html5 ? ' novalidate' : '' )
 			);
+		}
 
 			/**
 			 * Fires at the top of the comment form, inside the form tag.
@@ -2604,9 +2606,11 @@ 
 				 */
 				do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 
-			else :
+			else {
+			    :
 
 				echo $args['comment_notes_before'];
+			}
 
 			endif;
 

wp/wp-includes/IXR/class-IXR-server.php

Braces +10 added lines, -8 removed lines

@@ -136,16 +136,18 @@
     function output($xml)
     {
         $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
+        if ($charset) {
+                    $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+        } else {
+                    $xml = '<?xml version="1.0"?>'."\n".$xml;
+        }
         $length = strlen($xml);
         header('Connection: close');
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
+        if ($charset) {
+                    header('Content-Type: text/xml; charset='.$charset);
+        } else {
+                    header('Content-Type: text/xml');
+        }
         header('Date: '.gmdate('r'));
         echo $xml;
         exit;

wp/wp-includes/SimplePie/XML/Declaration/Parser.php

Braces +13 added lines, -26 removed lines

@@ -191,8 +191,7 @@ 
 		if ($this->skip_whitespace())
 		{
 			$this->state = 'version_name';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -205,8 +204,7 @@ 
 			$this->position += 7;
 			$this->skip_whitespace();
 			$this->state = 'version_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -219,8 +217,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'version_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -234,13 +231,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'encoding_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -253,8 +248,7 @@ 
 			$this->position += 8;
 			$this->skip_whitespace();
 			$this->state = 'encoding_equals';
-		}
-		else
+		} else
 		{
 			$this->state = 'standalone_name';
 		}
@@ -267,8 +261,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'encoding_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -282,13 +275,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = 'standalone_name';
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -301,8 +292,7 @@ 
 			$this->position += 10;
 			$this->skip_whitespace();
 			$this->state = 'standalone_equals';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -315,8 +305,7 @@ 
 			$this->position++;
 			$this->skip_whitespace();
 			$this->state = 'standalone_value';
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}
@@ -345,13 +334,11 @@ 
 			if ($this->has_data())
 			{
 				$this->state = false;
-			}
-			else
+			} else
 			{
 				$this->state = 'emit';
 			}
-		}
-		else
+		} else
 		{
 			$this->state = false;
 		}

wp/wp-includes/SimplePie/Registry.php

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 		if (!method_exists($class, '__construct'))
 		{
 			$instance = new $class;
-		}
-		else
+		} else
 		{
 			$reflector = new ReflectionClass($class);
 			$instance = $reflector->newInstanceArgs($parameters);

wp/wp-includes/SimplePie/Parse/Date.php

Braces +8 added lines, -16 removed lines

@@ -673,8 +673,7 @@ 
 		if (is_callable($callback))
 		{
 			$this->user[] = $callback;
-		}
-		else
+		} else
 		{
 			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
 		}
@@ -736,8 +735,7 @@ 
 				{
 					$timezone = 0 - $timezone;
 				}
-			}
-			else
+			} else
 			{
 				$timezone = 0;
 			}
@@ -781,8 +779,7 @@ 
 					{
 						$position++;
 						continue;
-					}
-					elseif (isset($string[$position]))
+					} elseif (isset($string[$position]))
 					{
 						switch ($string[$position])
 						{
@@ -795,14 +792,12 @@ 
 								break;
 						}
 						$position++;
-					}
-					else
+					} else
 					{
 						break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$output .= '(';
 			}
@@ -881,8 +876,7 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			elseif ($match[4] < 1000)
+			} elseif ($match[4] < 1000)
 			{
 				$match[4] += 1900;
 			}
@@ -891,8 +885,7 @@ 
 			if ($match[7] !== '')
 			{
 				$second = $match[7];
-			}
-			else
+			} else
 			{
 				$second = 0;
 			}
@@ -954,8 +947,7 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			else
+			} else
 			{
 				$match[4] += 1900;
 			}

wp/wp-includes/SimplePie/Item.php

Braces +126 added lines, -253 removed lines

@@ -214,24 +214,19 @@ 
 			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);
 			}
@@ -239,8 +234,7 @@ 
 		if ($fn === false)
 		{
 			return null;
-		}
-		elseif (!is_callable($fn))
+		} elseif (!is_callable($fn))
 		{
 			trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
 			$fn = 'md5';
@@ -264,32 +258,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;
 			}
@@ -318,49 +305,39 @@ 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
 		{
 			return $return;
-		}
-
-		elseif (!$description_only)
+		} elseif (!$description_only)
 		{
 			return $this->get_content(true);
 		}
@@ -388,18 +365,15 @@ 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
 		{
 			return $return;
-		}
-		elseif (!$content_only)
+		} elseif (!$content_only)
 		{
 			return $this->get_description(true);
 		}
@@ -422,8 +396,7 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
 			{
 				$this->data['thumbnail'] = $return[0]['attribs'][''];
-			}
-			else
+			} else
 			{
 				$this->data['thumbnail'] = null;
 			}
@@ -489,8 +462,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -690,12 +662,10 @@ 
 		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;
 		}
@@ -716,12 +686,10 @@ 
 		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);
 		}
@@ -750,32 +718,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_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'];
-			}
-			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'];
 			}
@@ -784,8 +745,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['date'] = null;
 			}
@@ -833,8 +793,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['updated'] = null;
 			}
@@ -876,8 +835,7 @@ 
 		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);
 		}
@@ -938,8 +896,7 @@ 
 		if ($link !== null)
 		{
 			return $link;
-		}
-		elseif ($enclosure !== null)
+		} elseif ($enclosure !== null)
 		{
 			return $enclosure->get_link();
 		}
@@ -1026,13 +983,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];
 				}
@@ -1138,8 +1093,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)
 				{
@@ -1189,8 +1143,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';
 				}
@@ -1212,8 +1165,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';
 				}
@@ -1265,8 +1217,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;
@@ -1296,8 +1247,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1307,8 +1257,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)
 				{
@@ -1322,8 +1271,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1346,8 +1294,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']))
 				{
@@ -1397,15 +1344,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)
 				{
@@ -1418,8 +1363,7 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
@@ -1443,8 +1387,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']))
 				{
@@ -1455,8 +1398,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']))
 				{
@@ -1467,8 +1409,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']))
 				{
@@ -1492,8 +1433,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']))
 				{
@@ -1511,8 +1451,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1522,8 +1461,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)
 				{
@@ -1535,8 +1473,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)
 				{
@@ -1545,8 +1482,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1556,8 +1492,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)
 				{
@@ -1597,8 +1532,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)
 				{
@@ -1611,8 +1545,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)
 				{
@@ -1633,8 +1566,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)
 				{
@@ -1651,8 +1583,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'));
 			}
@@ -1667,8 +1598,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)
 				{
@@ -1686,8 +1616,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']))
 				{
@@ -1780,8 +1709,7 @@ 
 							if (isset($content['attribs']['']['duration']))
 							{
 								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$duration = $duration_parent;
 							}
@@ -1861,8 +1789,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)
 								{
@@ -1897,8 +1824,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							else
+							} else
 							{
 								$captions = $captions_parent;
 							}
@@ -1918,8 +1844,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';
 									}
@@ -1944,8 +1869,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';
 									}
@@ -1959,12 +1883,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));
 							}
@@ -1983,8 +1905,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;
@@ -1997,8 +1918,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;
 							}
@@ -2018,8 +1938,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2033,8 +1952,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)
 								{
@@ -2048,8 +1966,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2063,8 +1980,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							else
+							} else
 							{
 								$credits = $credits_parent;
 							}
@@ -2073,12 +1989,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;
 							}
@@ -2097,8 +2011,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2108,8 +2021,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)
 								{
@@ -2122,8 +2034,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2133,8 +2044,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							else
+							} else
 							{
 								$hashes = $hashes_parent;
 							}
@@ -2155,8 +2065,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']))
 								{
@@ -2171,8 +2080,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							else
+							} else
 							{
 								$keywords = $keywords_parent;
 							}
@@ -2181,12 +2089,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;
 							}
@@ -2201,8 +2107,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2216,8 +2121,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)
 								{
@@ -2226,8 +2130,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2241,8 +2144,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							else
+							} else
 							{
 								$ratings = $ratings_parent;
 							}
@@ -2273,8 +2175,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)
 								{
@@ -2299,8 +2200,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							else
+							} else
 							{
 								$restrictions = $restrictions_parent;
 							}
@@ -2316,8 +2216,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)
 								{
@@ -2327,8 +2226,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							else
+							} else
 							{
 								$thumbnails = $thumbnails_parent;
 							}
@@ -2337,12 +2235,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;
 							}
@@ -2402,8 +2298,7 @@ 
 						if (isset($content['attribs']['']['duration']))
 						{
 							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$duration = $duration_parent;
 						}
@@ -2485,8 +2380,7 @@ 
 							{
 								$captions = array_values(array_unique($captions));
 							}
-						}
-						else
+						} else
 						{
 							$captions = $captions_parent;
 						}
@@ -2506,8 +2400,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';
 								}
@@ -2521,16 +2414,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;
 						}
@@ -2549,8 +2439,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;
 						}
@@ -2570,8 +2459,7 @@ 
 								if (isset($credit['attribs']['']['scheme']))
 								{
 									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$credit_scheme = 'urn:ebu';
 								}
@@ -2585,8 +2473,7 @@ 
 							{
 								$credits = array_values(array_unique($credits));
 							}
-						}
-						else
+						} else
 						{
 							$credits = $credits_parent;
 						}
@@ -2595,8 +2482,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;
 						}
@@ -2615,8 +2501,7 @@ 
 								if (isset($hash['attribs']['']['algo']))
 								{
 									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$algo = 'md5';
 								}
@@ -2626,8 +2511,7 @@ 
 							{
 								$hashes = array_values(array_unique($hashes));
 							}
-						}
-						else
+						} else
 						{
 							$hashes = $hashes_parent;
 						}
@@ -2648,8 +2532,7 @@ 
 							{
 								$keywords = array_values(array_unique($keywords));
 							}
-						}
-						else
+						} else
 						{
 							$keywords = $keywords_parent;
 						}
@@ -2660,8 +2543,7 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 							}
-						}
-						else
+						} else
 						{
 							$player = $player_parent;
 						}
@@ -2676,8 +2558,7 @@ 
 								if (isset($rating['attribs']['']['scheme']))
 								{
 									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$rating_scheme = 'urn:simple';
 								}
@@ -2691,8 +2572,7 @@ 
 							{
 								$ratings = array_values(array_unique($ratings));
 							}
-						}
-						else
+						} else
 						{
 							$ratings = $ratings_parent;
 						}
@@ -2723,8 +2603,7 @@ 
 							{
 								$restrictions = array_values(array_unique($restrictions));
 							}
-						}
-						else
+						} else
 						{
 							$restrictions = $restrictions_parent;
 						}
@@ -2742,8 +2621,7 @@ 
 							{
 								$thumbnails = array_values(array_unique($thumbnails));
 							}
-						}
-						else
+						} else
 						{
 							$thumbnails = $thumbnails_parent;
 						}
@@ -2752,8 +2630,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;
 						}
@@ -2795,8 +2672,7 @@ 
 					if (isset($link['attribs']['']['title']))
 					{
 						$title = $this->sanitize($link['attribs']['']['title'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$title = $title_parent;
 					}
@@ -2910,8 +2786,7 @@ 
 		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];
 		}
@@ -2936,12 +2811,10 @@ 
 		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];
 		}