Check if the Sanitize class has been changed and update the registry. (…

…#532)

* Check if the Sanitize class has been changed and update the registry.

* Also preference links in the headers over links in the body to comply with WebSub specification.

library/SimplePie.php

@@ -1320,6 +1320,11 @@ public function init()
 			}
 		}
 
+		// The default sanitize class gets set in the constructor, check if it has
+		// changed.
+		if ($this->registry->get_class('Sanitize') !== 'SimplePie_Sanitize') {
+			$this->sanitize = $this->registry->create('Sanitize');
+		}
 		if (method_exists($this->sanitize, 'set_registry'))
 		{
 			$this->sanitize->set_registry($this->registry);
@@ -2606,15 +2611,15 @@ public function get_links($rel = 'alternate')
 			}
 		}
 
-		if (isset($this->data['links'][$rel]))
+		if (isset($this->data['headers']['link']) &&
+		    preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
+		               $this->data['headers']['link'], $match))
 		{
-			return $this->data['links'][$rel];
+			return array($match[1]);
 		}
-		else if (isset($this->data['headers']['link']) &&
-		         preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
-		                    $this->data['headers']['link'], $match))
+		else if (isset($this->data['links'][$rel]))
 		{
-			return array($match[1]);
+			return $this->data['links'][$rel];
 		}
 		else
 		{