Changeset 11658

Timestamp:

06/27/2009 10:13:01 PM (17 years ago)

Author:

ryan

Message:

Fix compat with zend.ze1_compatibility_mode. Props gsnedders. fixes #10222 for 2.8.1

File:

• branches/2.8/wp-includes/class-simplepie.php (modified) (16 diffs)

branches/2.8/wp-includes/class-simplepie.php

@@ -752 +752 @@
         function __destruct()
         {
-                if (version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled())
+                if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
                 {
                         if (!empty($this->data['items']))
@@ -1687 +1687 @@
                                 $headers = $file->headers;
                                 $data = $file->body;
-                                $sniffer = new $this->content_type_sniffer_class($file);
+                                $sniffer =& new $this->content_type_sniffer_class($file);
                                 $sniffed = $sniffer->get_type();
                         }
@@ -1965 +1965 @@
                                         if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
                                         {
-                                                $sniffer = new $this->content_type_sniffer_class($file);
+                                                $sniffer =& new $this->content_type_sniffer_class($file);
                                                 if (substr($sniffer->get_type(), 0, 6) === 'image/')
                                                 {
@@ -3086 +3086 @@
         function __destruct()
         {
-                if (version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled())
+                if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
                 {
                         unset($this->feed);
@@ -7745 +7745 @@
                                                                         case 'gzip':
                                                                         case 'x-gzip':
-                                                                                $decoder = new SimplePie_gzdecode($this->body);
+                                                                                $decoder =& new SimplePie_gzdecode($this->body);
                                                                                 if (!$decoder->parse())
                                                                                 {
@@ -10543 +10543 @@
         function entities_decode($data)
         {
-                $decoder = new SimplePie_Decode_HTML_Entities($data);
+                $decoder =& new SimplePie_Decode_HTML_Entities($data);
                 return $decoder->parse();
         }
@@ -10939 +10939 @@
                         if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
                         {
-                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
+                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -10952 +10952 @@
                         if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
                         {
-                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
+                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -10965 +10965 @@
                         if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
                         {
-                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
+                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -10978 +10978 @@
                         if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
                         {
-                                $parser = new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
+                                $parser =& new SimplePie_XML_Declaration_Parser(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'));
                                 if ($parser->parse())
                                 {
@@ -10991 +10991 @@
                         if ($pos = strpos($data, "\x3F\x3E"))
                         {
-                                $parser = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
+                                $parser =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
                                 if ($parser->parse())
                                 {
@@ -11717 +11717 @@
                 if (!isset($cache[get_class($this)]))
                 {
-                        if (extension_loaded('Reflection'))
-                        {
-                                $class = new ReflectionClass(get_class($this));
-                                $methods = $class->getMethods();
-                                $all_methods = array();
-                                foreach ($methods as $method)
-                                {
-                                        $all_methods[] = $method->getName();
-                                }
-                        }
-                        else
-                        {
-                                $all_methods = get_class_methods($this);
-                        }
+                        $all_methods = get_class_methods($this);
 
                         foreach ($all_methods as $method)
@@ -11757 +11744 @@
                 if (!$object)
                 {
-                        $object = new SimplePie_Parse_Date;
+                        $object =& new SimplePie_Parse_Date;
                 }
                 return $object;
@@ -12792 +12779 @@
                 if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
                 {
-                        $sniffer = new $this->content_type_sniffer_class($this->file);
+                        $sniffer =& new $this->content_type_sniffer_class($this->file);
                         if ($sniffer->get_type() !== 'text/html')
                         {
@@ -12838 +12825 @@
                 if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
                 {
-                        $sniffer = new $this->content_type_sniffer_class($file);
+                        $sniffer =& new $this->content_type_sniffer_class($file);
                         $sniffed = $sniffer->get_type();
                         if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
@@ -13066 +13053 @@
                 if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
                 {
-                        $declaration = new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
+                        $declaration =& new SimplePie_XML_Declaration_Parser(substr($data, 5, $pos - 5));
                         if ($declaration->parse())
                         {