miarau / rssfeed

autoloader.php

Spacing +3 added lines, -3 removed lines

@@ -11,14 +11,14 @@ 
  * @param string $class The fully-qualified class name.
  * @return void
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
 
     // project-specific namespace prefix
     //$prefix = 'Foo\\Bar\\';
     $prefix = 'Miax\\';
 
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/src/';
+    $base_dir = __DIR__.'/src/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
@@ -33,7 +33,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

test/config.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-include __DIR__ . "/../autoloader.php";
+include __DIR__."/../autoloader.php";
 //include __DIR__ . "/../src/CRSSFeed.php";
\ No newline at end of file

src/RSSFeed/CRSSFeed.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@
       $feedItems = $this->object->get_items();
       $html = '<article>';
 	  $html .= "<h1>Senaste nytt fran IDG</h1>";
-      foreach($feedItems as $content) {
+      foreach ($feedItems as $content) {
           $html .= '<div class="feed-content">';
-		  $html .= "<h2>" . $content->get_title() . "</h2>" ;
-		  $html .= "<small>Postad ". $content->get_date('Y-m-d | H:i:s')."</small>";
+		  $html .= "<h2>".$content->get_title()."</h2>";
+		  $html .= "<small>Postad ".$content->get_date('Y-m-d | H:i:s')."</small>";
           $html .= "<p>{$content->get_content()}</p>";
-          $html .= "<p><a href='" . $content->get_permalink() . "'>Läs mer</a>";
+          $html .= "<p><a href='".$content->get_permalink()."'>Läs mer</a>";
           $html .= '</div>';
       }
       $html .= "</article>";

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
 class CRSSFeed {
   
   // constructor - initialize SimplePie.
+
+  /**
+   * @param SimplePie $feedArr
+   */
   public function __construct($feedArr, $duration = 3600) {
       $this->object = new SimplePie();
       $this->object->set_cache_location(CACHE);

test/RSSFeed/CRSSFeedTest.php

Spacing +4 added lines, -4 removed lines

@@ -23,14 +23,14 @@ 
 	 private $feed;
 	 
 	
-	 public function setUp(){
+	 public function setUp() {
 		$rss = new SimplePie();
-		$rss->get_items(1,1);
+		$rss->get_items(1, 1);
 	  	$this->feed = new CRSSFeed($rss);
 	 }
 	 
 	 
-	 public function testAssertTags(){		
+	 public function testAssertTags() {		
 		$matcher = array(
 		'tag' => 'h1', 'content' => 'regexp:/<h1>.*<\/h1>/',
 		'parent' => array('tag' => 'article')
@@ -45,7 +45,7 @@ 
 	 }
 	 
 	 
-	 public function testGetFeed(){
+	 public function testGetFeed() {
 		$this->assertInternalType('string', 'regexp:/<article>.*<\/article>/');
 	 }
 }
\ No newline at end of file

src/RSSFeed/simplepie/simplepie_1.3.1.mini.php

Doc Comments +137 added lines

@@ -960,6 +960,10 @@ 
         return null;
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_channel_tags($namespace, $tag)
     {
         $type = $this->get_type();
@@ -1003,6 +1007,10 @@ 
         return null;
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_image_tags($namespace, $tag)
     {
         $type = $this->get_type();
@@ -1039,6 +1047,9 @@ 
         return null;
     }
     
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
@@ -1316,6 +1327,9 @@ 
         }
     }
     
+    /**
+     * @return string
+     */
     public function get_link($key = 0, $rel = 'alternate')
     {
         $links = $this->get_links($rel);
@@ -1960,6 +1974,9 @@ 
 abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
 {
     
+    /**
+     * @param SimplePie $data
+     */
     protected static function prepare_simplepie_object_for_cache($data)
     {
         $items = $data->get_items();
@@ -3049,6 +3066,9 @@ 
         }
     }
     
+    /**
+     * @param string $chars
+     */
     public function consume_range($chars)
     {
         if ($len = strspn($this->data, $chars, $this->position))
@@ -4682,6 +4702,9 @@ 
         trigger_error("Cannot write property $name", E_USER_ERROR);
     }
     
+    /**
+     * @param string $data
+     */
     public function __construct($data)
     {
         $this->compressed_data = $data;
@@ -5295,6 +5318,9 @@ 
         $this->set_iri($iri);
     }
     
+    /**
+     * @param SimplePie_IRI $base
+     */
     public static function absolutize($base, $relative)
     {
         if (!($relative instanceof SimplePie_IRI))
@@ -5382,6 +5408,9 @@ 
         }
     }
     
+    /**
+     * @param string $iri
+     */
     protected function parse_iri($iri)
     {
         $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
@@ -5470,6 +5499,9 @@ 
         return $output . $input;
     }
     
+    /**
+     * @param string $extra_chars
+     */
     protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
     {
         // Normalize as many pct-encoded sections as possible
@@ -5808,6 +5840,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $scheme
+     */
     public function set_scheme($scheme)
     {
         if ($scheme === null)
@@ -5826,6 +5861,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $authority
+     */
     public function set_authority($authority)
     {
         static $cache;
@@ -5881,6 +5919,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $iuserinfo
+     */
     public function set_userinfo($iuserinfo)
     {
         if ($iuserinfo === null)
@@ -5940,6 +5981,9 @@ 
         return true;
     }
     
+    /**
+     * @param null|string $port
+     */
     public function set_port($port)
     {
         if ($port === null)
@@ -5960,6 +6004,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $ipath
+     */
     public function set_path($ipath)
     {
         static $cache;
@@ -5983,6 +6030,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $iquery
+     */
     public function set_query($iquery)
     {
         if ($iquery === null)
@@ -5997,6 +6047,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $ifragment
+     */
     public function set_fragment($ifragment)
     {
         if ($ifragment === null)
@@ -6011,6 +6064,9 @@ 
         return true;
     }
     
+    /**
+     * @param false|string $string
+     */
     public function to_uri($string)
     {
         static $non_ascii;
@@ -6135,6 +6191,10 @@ 
         }
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_item_tags($namespace, $tag)
     {
         if (isset($this->data['child'][$namespace][$tag]))
@@ -6147,11 +6207,17 @@ 
         }
     }
     
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         return $this->feed->get_base($element);
     }
     
+    /**
+     * @return string
+     */
     public function sanitize($data, $type, $base = '')
     {
         return $this->feed->sanitize($data, $type, $base);
@@ -8755,6 +8821,10 @@ 
             return null;
         }
     }
+
+    /**
+     * @param string $name
+     */
     protected function search_elements_by_tag($name, &$done, $feeds)
     {
         if ($this->dom === null)
@@ -9102,6 +9172,11 @@ 
         return strtr($string, $convert_table);
     }
     
+    /**
+     * @param string $data
+     * @param string $input
+     * @param string $output
+     */
     public static function change_encoding($data, $input, $output)
     {
         $input = SimplePie_Misc::encoding($input);
@@ -10243,6 +10318,10 @@ 
                 return $charset;
         }
     }
+
+    /**
+     * @return string
+     */
     public static function get_curl_version()
     {
         if (is_array($curl = curl_version()))
@@ -10287,6 +10366,9 @@ 
         return $parser->parse($dt);
     }
     
+    /**
+     * @param string|false $data
+     */
     public static function entities_decode($data)
     {
         $decoder = new SimplePie_Decode_HTML_Entities($data);
@@ -10766,6 +10848,9 @@ 
         return $ip;
     }
     
+    /**
+     * @param string $ip
+     */
     public static function compress($ip)
     {
         // Prepare the IP to be compressed
@@ -11852,6 +11937,10 @@ 
     {
         return $this->data;
     }
+
+    /**
+     * @param string $tag
+     */
     public function tag_open($parser, $tag, $attributes)
     {
         list($this->namespace[], $this->element[]) = $this->split_ns($tag);
@@ -11914,6 +12003,10 @@ 
             }
         }
     }
+
+    /**
+     * @param string $cdata
+     */
     public function cdata($parser, $cdata)
     {
         if ($this->current_xhtml_construct >= 0)
@@ -11925,6 +12018,10 @@ 
             $this->data['data'] .= $cdata;
         }
     }
+
+    /**
+     * @param string $tag
+     */
     public function tag_close($parser, $tag)
     {
         if ($this->current_xhtml_construct >= 0)
@@ -12057,6 +12154,10 @@ 
     
     public function __construct() { }
     
+    /**
+     * @param string $type
+     * @param string $class
+     */
     public function register($type, $class, $legacy = false)
     {
         if (!is_subclass_of($class, $this->default[$type]))
@@ -12084,6 +12185,9 @@ 
         return null;
     }
     
+    /**
+     * @param string $type
+     */
     public function &create($type, $parameters = array())
     {
         $class = $this->get_class($type);
@@ -12115,6 +12219,10 @@ 
         return $instance;
     }
     
+    /**
+     * @param string $type
+     * @param string $method
+     */
     public function &call($type, $method, $parameters = array())
     {
         $class = $this->get_class($type);
@@ -12146,6 +12254,10 @@ 
     
     var $value;
     
+    /**
+     * @param string $relationship
+     * @param string $value
+     */
     public function __construct($relationship = null, $type = null, $value = null)
     {
         $this->relationship = $relationship;
@@ -12472,6 +12584,10 @@ 
         }
         return $data;
     }
+
+    /**
+     * @param string $html
+     */
     protected function preprocess($html, $type)
     {
         $ret = '';
@@ -12493,6 +12609,10 @@ 
         $ret .= '</head><body>' . $html . '</body></html>';
         return $ret;
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     public function replace_urls($document, $tag, $attributes)
     {
         if (!is_array($attributes))
@@ -12542,6 +12662,10 @@ 
             return '';
         }
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     protected function strip_tag($tag, $document, $type)
     {
         $xpath = new DOMXPath($document);
@@ -12617,6 +12741,10 @@ 
             }
         }
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     protected function strip_attr($attrib, $document)
     {
         $xpath = new DOMXPath($document);
@@ -12645,6 +12773,11 @@ 
     {
         return md5(serialize($this->data));
     }
+
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_source_tags($namespace, $tag)
     {
         if (isset($this->data['child'][$namespace][$tag]))
@@ -12656,6 +12789,10 @@ 
             return null;
         }
     }
+
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         return $this->item->get_base($element);

Spacing +159 added lines, -159 removed lines

@@ -50,8 +50,8 @@ 
 define('SIMPLEPIE_VERSION', '1.3.1');
 define('SIMPLEPIE_BUILD', '20121030175911');
 define('SIMPLEPIE_URL', 'http://simplepie.org');
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 define('SIMPLEPIE_LOCATOR_NONE', 0);
 define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
 define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
@@ -256,7 +256,7 @@ 
         if ($file instanceof SimplePie_File)
         {
             $this->feed_url = $file->url;
-            $this->file =& $file;
+            $this->file = & $file;
             return true;
         }
         return false;
@@ -483,7 +483,7 @@ 
     {
         if ($page !== false)
         {
-            $this->sanitize->set_image_handler($page . '?' . $qs . '=');
+            $this->sanitize->set_image_handler($page.'?'.$qs.'=');
         }
         else
         {
@@ -713,7 +713,7 @@ 
                         {
                             $headers['if-none-match'] = $this->data['headers']['etag'];
                         }
-                        $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+                        $file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen));
                         if ($file->success)
                         {
                             if ($file->status_code === 304)
@@ -747,7 +747,7 @@ 
         {
             if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
             {
-                $file =& $this->file;
+                $file = & $this->file;
             }
             else
             {
@@ -775,7 +775,7 @@ 
                 {
                     if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
                     {
-                        $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+                        $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or ".SIMPLEPIE_NAME." was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
                         $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
                         return false;
                     }
@@ -829,7 +829,7 @@ 
             $header = "Content-type: $mime;";
             if ($this->get_encoding())
             {
-                $header .= ' charset=' . $this->get_encoding();
+                $header .= ' charset='.$this->get_encoding();
             }
             else
             {
@@ -1378,19 +1378,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]);
             }
@@ -1803,7 +1803,7 @@ 
         trigger_error('Favicon handling has been removed, please use your own handling', $level);
         if (($url = $this->get_link()) !== null)
         {
-            return 'http://g.etfv.co/' . urlencode($url);
+            return 'http://g.etfv.co/'.urlencode($url);
         }
         return false;
     }
@@ -1981,19 +1981,19 @@ 
             }
             if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
             }
             else
             {
@@ -2126,7 +2126,7 @@ 
         $this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host'];
         $this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port'];
         $this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']);
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+        $this->name = $this->options['extras']['prefix'].md5("$name:$type");
         $this->cache = new Memcache();
         $this->cache->addServer($this->options['host'], (int) $this->options['port']);
     }
@@ -2209,7 +2209,7 @@ 
             $this->mysql = null;
             return;
         }
-        $this->id = $name . $type;
+        $this->id = $name.$type;
         if (!$query = $this->mysql->query('SHOW TABLES'))
         {
             $this->mysql = null;
@@ -2220,17 +2220,17 @@ 
         {
             $db[] = $row;
         }
-        if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+        if (!in_array($this->options['extras']['prefix'].'cache_data', $db))
         {
-            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+            $query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
             if ($query === false)
             {
                 $this->mysql = null;
             }
         }
-        if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+        if (!in_array($this->options['extras']['prefix'].'items', $db))
         {
-            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+            $query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
             if ($query === false)
             {
                 $this->mysql = null;
@@ -2248,7 +2248,7 @@ 
         {
             $data = clone $data;
             $prepared = self::prepare_simplepie_object_for_cache($data);
-            $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
             $query->bindValue(':feed', $this->id);
             if ($query->execute())
             {
@@ -2257,13 +2257,13 @@ 
                     $items = count($prepared[1]);
                     if ($items)
                     {
-                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
                         $query->bindValue(':items', $items);
                     }
                     else
                     {
-                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
                     }
                     $query->bindValue(':data', $prepared[0]);
@@ -2276,7 +2276,7 @@ 
                 }
                 else
                 {
-                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+                    $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
                     $query->bindValue(':feed', $this->id);
                     $query->bindValue(':count', count($prepared[1]));
                     $query->bindValue(':data', $prepared[0]);
@@ -2293,7 +2293,7 @@ 
                     {
                         $database_ids[] = $this->mysql->quote($id);
                     }
-                    $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+                    $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
                     $query->bindValue(':feed', $this->id);
                     if ($query->execute())
                     {
@@ -2309,7 +2309,7 @@ 
                             {
                                 $date = time();
                             }
-                            $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+                            $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
                             $query->bindValue(':feed', $this->id);
                             $query->bindValue(':id', $new_id);
                             $query->bindValue(':data', serialize($prepared[1][$new_id]->data));
@@ -2330,13 +2330,13 @@ 
         }
         else
         {
-            $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
             $query->bindValue(':feed', $this->id);
             if ($query->execute())
             {
                 if ($query->rowCount() > 0)
                 {
-                    $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+                    $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
                     $query->bindValue(':data', serialize($data));
                     $query->bindValue(':time', time());
                     $query->bindValue(':feed', $this->id);
@@ -2347,7 +2347,7 @@ 
                 }
                 else
                 {
-                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+                    $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
                     $query->bindValue(':id', $this->id);
                     $query->bindValue(':data', serialize($data));
                     $query->bindValue(':time', time());
@@ -2367,7 +2367,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
         if ($query->execute() && ($row = $query->fetch()))
         {
@@ -2384,19 +2384,19 @@ 
             {
                 if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
                 }
                 else
                 {
@@ -2404,10 +2404,10 @@ 
                 }
                 if ($feed !== null)
                 {
-                    $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+                    $sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
                     if ($items > 0)
                     {
-                        $sql .= ' LIMIT ' . $items;
+                        $sql .= ' LIMIT '.$items;
                     }
                     $query = $this->mysql->prepare($sql);
                     $query->bindValue(':feed', $this->id);
@@ -2435,7 +2435,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
         if ($query->execute() && ($time = $query->fetchColumn()))
         {
@@ -2453,7 +2453,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+        $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
         $query->bindValue(':time', time());
         $query->bindValue(':id', $this->id);
         if ($query->execute() && $query->rowCount() > 0)
@@ -2472,9 +2472,9 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
-        $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+        $query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
         $query2->bindValue(':id', $this->id);
         if ($query->execute() && $query2->execute())
         {
@@ -3985,7 +3985,7 @@ 
         $length = $this->get_length();
         if ($length !== null)
         {
-            return round($length/1048576, 2);
+            return round($length / 1048576, 2);
         }
         else
         {
@@ -4054,7 +4054,7 @@ 
         }
     }
     
-    public function native_embed($options='')
+    public function native_embed($options = '')
     {
         return $this->embed($options, true);
     }
@@ -4082,7 +4082,7 @@ 
         else
         {
             $options = explode(',', $options);
-            foreach($options as $option)
+            foreach ($options as $option)
             {
                 $opt = explode(':', $option, 2);
                 if (isset($opt[0], $opt[1]))
@@ -4138,11 +4138,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
@@ -4171,11 +4171,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
@@ -4202,11 +4202,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>";
             }
         }
         // Flash Media Player file types.
@@ -4216,11 +4216,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>";
             }
         }
         // QuickTime 7 file types.  Need to test with QuickTime 6.
@@ -4232,16 +4232,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>";
             }
         }
         // Windows Media
@@ -4250,15 +4250,15 @@ 
             $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;
     }
     
@@ -4266,7 +4266,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
@@ -4481,7 +4481,7 @@ 
                 }
                 if (curl_errno($fp))
                 {
-                    $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+                    $this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
                     $this->success = false;
                 }
                 else
@@ -4523,7 +4523,7 @@ 
                 $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
                 if (!$fp)
                 {
-                    $this->error = 'fsockopen error: ' . $errstr;
+                    $this->error = 'fsockopen error: '.$errstr;
                     $this->success = false;
                 }
                 else
@@ -4553,7 +4553,7 @@ 
                     }
                     if (isset($url_parts['user']) && isset($url_parts['pass']))
                     {
-                        $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+                        $out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
                     }
                     foreach ($headers as $key => $value)
                     {
@@ -4961,7 +4961,7 @@ 
             // We should only use the last Content-Type header. c.f. issue #1
             if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
             {
-                $this->headers[$this->name] .= ', ' . $this->value;
+                $this->headers[$this->name] .= ', '.$this->value;
             }
             else
             {
@@ -5137,7 +5137,7 @@ 
         $encoded = $this->body;
         while (true)
         {
-            $is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+            $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
             if (!$is_chunked)
             {
                 // Looks like it's not chunked after all
@@ -5208,9 +5208,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'
@@ -5221,7 +5221,7 @@ 
             || $name === 'ifragment'
         )
         {
-            call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+            call_user_func(array($this, 'set_'.substr($name, 1)), $value);
         }
     }
     
@@ -5244,7 +5244,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;
@@ -5257,7 +5257,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;
         }
         if ($return === null && isset($this->normalization[$this->scheme][$name]))
@@ -5272,7 +5272,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;
         }
@@ -5284,9 +5284,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), '');
         }
     }
     
@@ -5339,11 +5339,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
                             {
@@ -5467,7 +5467,7 @@ 
                 $input = '';
             }
         }
-        return $output . $input;
+        return $output.$input;
     }
     
     protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
@@ -5687,7 +5687,7 @@ 
                 {
                     for ($j = $start; $j <= $i; $j++)
                     {
-                        $string .= '%' . strtoupper($bytes[$j]);
+                        $string .= '%'.strtoupper($bytes[$j]);
                     }
                 }
                 else
@@ -5705,7 +5705,7 @@ 
         {
             for ($j = $start; $j < $len; $j++)
             {
-                $string .= '%' . strtoupper($bytes[$j]);
+                $string .= '%'.strtoupper($bytes[$j]);
             }
         }
         return $string;
@@ -5906,7 +5906,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
             {
@@ -5977,7 +5977,7 @@ 
             $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
             $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();
         return true;
@@ -6038,11 +6038,11 @@ 
         $iri = '';
         if ($this->scheme !== null)
         {
-            $iri .= $this->scheme . ':';
+            $iri .= $this->scheme.':';
         }
         if (($iauthority = $this->get_iauthority()) !== null)
         {
-            $iri .= '//' . $iauthority;
+            $iri .= '//'.$iauthority;
         }
         if ($this->ipath !== '')
         {
@@ -6054,11 +6054,11 @@ 
         }
         if ($this->iquery !== null)
         {
-            $iri .= '?' . $this->iquery;
+            $iri .= '?'.$this->iquery;
         }
         if ($this->ifragment !== null)
         {
-            $iri .= '#' . $this->ifragment;
+            $iri .= '#'.$this->ifragment;
         }
         return $iri;
     }
@@ -6075,7 +6075,7 @@ 
             $iauthority = '';
             if ($this->iuserinfo !== null)
             {
-                $iauthority .= $this->iuserinfo . '@';
+                $iauthority .= $this->iuserinfo.'@';
             }
             if ($this->ihost !== null)
             {
@@ -6083,7 +6083,7 @@ 
             }
             if ($this->port !== null)
             {
-                $iauthority .= ':' . $this->port;
+                $iauthority .= ':'.$this->port;
             }
             return $iauthority;
         }
@@ -6201,7 +6201,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
         {
@@ -6787,19 +6787,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]);
             }
@@ -7456,7 +7456,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)
@@ -8918,11 +8918,11 @@ 
         $seconds = $remainder % 60;
         if ($minutes < 10 && $hours > 0)
         {
-            $minutes = '0' . $minutes;
+            $minutes = '0'.$minutes;
         }
         if ($seconds < 10)
         {
-            $seconds = '0' . $seconds;
+            $seconds = '0'.$seconds;
         }
         $time .= $minutes.':';
         $time .= $seconds;
@@ -8942,7 +8942,7 @@ 
     {
         $return = array();
         $name = preg_quote($realname, '/');
-        if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+        if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
         {
             for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
             {
@@ -8959,7 +8959,7 @@ 
                     $return[$i]['content'] = $matches[$i][4][0];
                 }
                 $return[$i]['attribs'] = array();
-                if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+                if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' '.$matches[$i][2][0].' ', $attribs, PREG_SET_ORDER))
                 {
                     for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
                     {
@@ -8980,7 +8980,7 @@ 
         foreach ($element['attribs'] as $key => $value)
         {
             $key = strtolower($key);
-            $full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+            $full .= " $key=\"".htmlspecialchars($value['data']).'"';
         }
         if ($element['self_closing'])
         {
@@ -10279,7 +10279,7 @@ 
                 $data = '';
             }
         }
-        return $output . $data;
+        return $output.$data;
     }
     public static function parse_date($dt)
     {
@@ -10464,15 +10464,15 @@ 
         }
         else if ($codepoint <= 0x7ff)
         {
-            return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xc0 | ($codepoint >> 6)).chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0xffff)
         {
-            return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xe0 | ($codepoint >> 12)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0x10ffff)
         {
-            return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xf0 | ($codepoint >> 18)).chr(0x80 | (($codepoint >> 12) & 0x3f)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f));
         }
         else
         {
@@ -10607,7 +10607,7 @@ 
         }
         header('Content-type: text/javascript; charset: UTF-8');
         header('Cache-Control: must-revalidate');
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days
         ?>
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
     if (placeholder != '') {
@@ -10632,14 +10632,14 @@ 
     public static function get_build()
     {
         $root = dirname(dirname(__FILE__));
-        if (file_exists($root . '/.git/index'))
+        if (file_exists($root.'/.git/index'))
         {
-            return filemtime($root . '/.git/index');
+            return filemtime($root.'/.git/index');
         }
-        elseif (file_exists($root . '/SimplePie'))
+        elseif (file_exists($root.'/SimplePie'))
         {
             $time = 0;
-            foreach (glob($root . '/SimplePie/*.php') as $file)
+            foreach (glob($root.'/SimplePie/*.php') as $file)
             {
                 if (($mtime = filemtime($file)) > $time)
                 {
@@ -10648,9 +10648,9 @@ 
             }
             return $time;
         }
-        elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+        elseif (file_exists(dirname(__FILE__).'/Core.php'))
         {
-            return filemtime(dirname(__FILE__) . '/Core.php');
+            return filemtime(dirname(__FILE__).'/Core.php');
         }
         else
         {
@@ -10660,11 +10660,11 @@ 
     
     public static function debug(&$sp)
     {
-        $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
-        $info .= 'PHP ' . PHP_VERSION . "\n";
+        $info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n";
+        $info .= 'PHP '.PHP_VERSION."\n";
         if ($sp->error() !== null)
         {
-            $info .= 'Error occurred: ' . $sp->error() . "\n";
+            $info .= 'Error occurred: '.$sp->error()."\n";
         }
         else
         {
@@ -10680,20 +10680,20 @@ 
                 switch ($ext)
                 {
                     case 'pcre':
-                        $info .= '      Version ' . PCRE_VERSION . "\n";
+                        $info .= '      Version '.PCRE_VERSION."\n";
                         break;
                     case 'curl':
                         $version = curl_version();
-                        $info .= '      Version ' . $version['version'] . "\n";
+                        $info .= '      Version '.$version['version']."\n";
                         break;
                     case 'mbstring':
-                        $info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+                        $info .= '      Overloading: '.mb_get_info('func_overload')."\n";
                         break;
                     case 'iconv':
-                        $info .= '      Version ' . ICONV_VERSION . "\n";
+                        $info .= '      Version '.ICONV_VERSION."\n";
                         break;
                     case 'xml':
-                        $info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+                        $info .= '      Version '.LIBXML_DOTTED_VERSION."\n";
                         break;
                 }
             }
@@ -10759,7 +10759,7 @@ 
             // xxx::xxx
             else
             {
-                $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+                $fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
                 $ip = str_replace('::', $fill, $ip);
             }
         }
@@ -11299,8 +11299,8 @@ 
     
     public function __construct()
     {
-        $this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-        $this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+        $this->day_pcre = '('.implode(array_keys($this->day), '|').')';
+        $this->month_pcre = '('.implode(array_keys($this->month), '|').')';
         static $cache;
         if (!isset($cache[get_class($this)]))
         {
@@ -11369,7 +11369,7 @@ 
             $month = $day = $hour = $minute = $second = '([0-9]{2})';
             $decimal = '([0-9]*)';
             $zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-            $pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+            $pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11476,8 +11476,8 @@ 
         if (!$pcre)
         {
             $wsp = '[\x09\x20]';
-            $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-            $optional_fws = $fws . '?';
+            $fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
+            $optional_fws = $fws.'?';
             $day_name = $this->day_pcre;
             $month = $this->month_pcre;
             $day = '([0-9]{1,2})';
@@ -11485,8 +11485,8 @@ 
             $year = '([0-9]{2,4})';
             $num_zone = '([+\-])([0-9]{2})([0-9]{2})';
             $character_zone = '([A-Z]{1,5})';
-            $zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-            $pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+            $zone = '(?:'.$num_zone.'|'.$character_zone.')';
+            $pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
         }
         if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
         {
@@ -11563,7 +11563,7 @@ 
             $day = '([0-9]{1,2})';
             $year = $hour = $minute = $second = '([0-9]{2})';
             $zone = '([A-Z]{1,5})';
-            $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+            $pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11619,7 +11619,7 @@ 
             $hour = $sec = $min = '([0-9]{2})';
             $year = '([0-9]{4})';
             $terminator = '\x0A?\x00?';
-            $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+            $pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11720,7 +11720,7 @@ 
             if ($declaration->parse())
             {
                 $data = substr($data, $pos + 2);
-                $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
+                $data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'.$data;
             }
             else
             {
@@ -11771,7 +11771,7 @@ 
                     case constant('XMLReader::END_ELEMENT'):
                         if ($xml->namespaceURI !== '')
                         {
-                            $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                            $tagName = $xml->namespaceURI.$this->separator.$xml->localName;
                         }
                         else
                         {
@@ -11783,7 +11783,7 @@ 
                         $empty = $xml->isEmptyElement;
                         if ($xml->namespaceURI !== '')
                         {
-                            $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                            $tagName = $xml->namespaceURI.$this->separator.$xml->localName;
                         }
                         else
                         {
@@ -11794,7 +11794,7 @@ 
                         {
                             if ($xml->namespaceURI !== '')
                             {
-                                $attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+                                $attrName = $xml->namespaceURI.$this->separator.$xml->localName;
                             }
                             else
                             {
@@ -11888,12 +11888,12 @@ 
             $this->current_xhtml_construct++;
             if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
             {
-                $this->data['data'] .= '<' . end($this->element);
+                $this->data['data'] .= '<'.end($this->element);
                 if (isset($attribs['']))
                 {
                     foreach ($attribs[''] as $name => $value)
                     {
-                        $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+                        $this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
                     }
                 }
                 $this->data['data'] .= '>';
@@ -11901,8 +11901,8 @@ 
         }
         else
         {
-            $this->datas[] =& $this->data;
-            $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+            $this->datas[] = & $this->data;
+            $this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
             $this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
             if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
             || (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -11932,12 +11932,12 @@ 
             $this->current_xhtml_construct--;
             if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
             {
-                $this->data['data'] .= '</' . end($this->element) . '>';
+                $this->data['data'] .= '</'.end($this->element).'>';
             }
         }
         if ($this->current_xhtml_construct === -1)
         {
-            $this->data =& $this->datas[count($this->datas) - 1];
+            $this->data = & $this->datas[count($this->datas) - 1];
             array_pop($this->datas);
         }
         array_pop($this->element);
@@ -11969,7 +11969,7 @@ 
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-                    $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+                    $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
                 {
                     $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
                 }
@@ -12345,7 +12345,7 @@ 
         {
             if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
             {
-                if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+                if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data))
                 {
                     $type |= SIMPLEPIE_CONSTRUCT_HTML;
                 }
@@ -12411,7 +12411,7 @@ 
                             $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
                             if ($cache->load())
                             {
-                                $img->setAttribute('src', $this->image_handler . $image_url);
+                                $img->setAttribute('src', $this->image_handler.$image_url);
                             }
                             else
                             {
@@ -12421,7 +12421,7 @@ 
                                 {
                                     if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
                                     {
-                                        $img->setAttribute('src', $this->image_handler . $image_url);
+                                        $img->setAttribute('src', $this->image_handler.$image_url);
                                     }
                                     else
                                     {
@@ -12445,12 +12445,12 @@ 
                 $data = trim($document->saveHTML());
                 if ($this->remove_div)
                 {
-                    $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+                    $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
                     $data = preg_replace('/<\/div>$/', '', $data);
                 }
                 else
                 {
-                    $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+                    $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
                 }
             }
             if ($type & SIMPLEPIE_CONSTRUCT_IRI)
@@ -12479,7 +12479,7 @@ 
         {
             // Atom XHTML constructs are wrapped with a div by default
             // Note: No protection if $html contains a stray </div>!
-            $html = '<div>' . $html . '</div>';
+            $html = '<div>'.$html.'</div>';
             $ret .= '<!DOCTYPE html>';
             $content_type = 'text/html';
         }
@@ -12489,8 +12489,8 @@ 
             $content_type = 'application/xhtml+xml';
         }
         $ret .= '<html><head>';
-        $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-        $ret .= '</head><body>' . $html . '</body></html>';
+        $ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
+        $ret .= '</head><body>'.$html.'</body></html>';
         return $ret;
     }
     public function replace_urls($document, $tag, $attributes)
@@ -12545,7 +12545,7 @@ 
     protected function strip_tag($tag, $document, $type)
     {
         $xpath = new DOMXPath($document);
-        $elements = $xpath->query('body//' . $tag);
+        $elements = $xpath->query('body//'.$tag);
         if ($this->encode_instead_of_strip)
         {
             foreach ($elements as $element)
@@ -12554,7 +12554,7 @@ 
                 // For elements which aren't script or style, include the tag itself
                 if (!in_array($tag, array('script', 'style')))
                 {
-                    $text = '<' . $tag;
+                    $text = '<'.$tag;
                     if ($element->hasAttributes())
                     {
                         $attrs = array();
@@ -12573,9 +12573,9 @@ 
                                 continue;
                             }
                             // Standard attribute text
-                            $attrs[] = $name . '="' . $attr->value . '"';
+                            $attrs[] = $name.'="'.$attr->value.'"';
                         }
-                        $text .= ' ' . implode(' ', $attrs);
+                        $text .= ' '.implode(' ', $attrs);
                     }
                     $text .= '>';
                     $fragment->appendChild(new DOMText($text));
@@ -12588,7 +12588,7 @@ 
                 }
                 if (!in_array($tag, array('script', 'style')))
                 {
-                    $fragment->appendChild(new DOMText('</' . $tag . '>'));
+                    $fragment->appendChild(new DOMText('</'.$tag.'>'));
                 }
                 $element->parentNode->replaceChild($fragment, $element);
             }
@@ -12620,7 +12620,7 @@ 
     protected function strip_attr($attrib, $document)
     {
         $xpath = new DOMXPath($document);
-        $elements = $xpath->query('//*[@' . $attrib . ']');
+        $elements = $xpath->query('//*[@'.$attrib.']');
         foreach ($elements as $element)
         {
             $element->removeAttribute($attrib);
@@ -12978,19 +12978,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]);
             }