Changeset 22366 for trunk/wp-includes/SimplePie/Locator.php

Timestamp:

11/05/2012 02:25:25 PM (14 years ago)

Author:

ryan

Message:

Update SimplePie to 1.3.1. Props rmccue, ocean90. fixes #22321

File:

• trunk/wp-includes/SimplePie/Locator.php (modified) (8 diffs)

trunk/wp-includes/SimplePie/Locator.php

@@ -34 +34 @@
  *
  * @package SimplePie
- * @version 1.3
+ * @version 1.3.1
  * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
@@ -73 +73 @@
                 $this->max_checked_feeds = $max_checked_feeds;
 
-                $this->dom = new DOMDocument();
-
-                set_error_handler(array('SimplePie_Misc', 'silence_errors'));
-                $this->dom->loadHTML($this->file->body);
-                restore_error_handler();
+                if (class_exists('DOMDocument'))
+                {
+                        $this->dom = new DOMDocument();
+
+                        set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+                        $this->dom->loadHTML($this->file->body);
+                        restore_error_handler();
+                }
+                else
+                {
+                        $this->dom = null;
+                }
         }
 
@@ -163 +170 @@
         public function get_base()
         {
+                if ($this->dom === null)
+                {
+                        throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+                }
                 $this->http_base = $this->file->url;
                 $this->base = $this->http_base;
@@ -170 +181 @@
                         if ($element->hasAttribute('href'))
                         {
-                                $this->base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+                                $base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+                                if ($base === false)
+                                {
+                                        continue;
+                                }
+                                $this->base = $base;
                                 $this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
                                 break;
@@ -197 +213 @@
         protected function search_elements_by_tag($name, &$done, $feeds)
         {
+                if ($this->dom === null)
+                {
+                        throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+                }
+
                 $links = $this->dom->getElementsByTagName($name);
                 foreach ($links as $link)
@@ -216 +237 @@
                                 {
                                         $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+                                }
+                                if ($href === false)
+                                {
+                                        continue;
                                 }
 
@@ -239 +264 @@
         public function get_links()
         {
+                if ($this->dom === null)
+                {
+                        throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+                }
+
                 $links = $this->dom->getElementsByTagName('a');
                 foreach ($links as $link)
@@ -255 +285 @@
                                         {
                                                 $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+                                        }
+                                        if ($href === false)
+                                        {
+                                                continue;
                                         }