Ticket #11597: 11597-simplepie-only.patch

wp-includes/class-simplepie.php

@@ -764 +764 @@
         }
 
         /**
-         * Remove items that link back to this before destroying this object
+         * destroy all of this objects circular references sothat an unset operation 
+         * can free memory.
          */
-        function __destruct()
+        function destroy()
         {
                 if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
                 {
-                        if (!empty($this->data['items']))
+                        foreach ( array('items', 'ordered_items') as $key )
                         {
-                                foreach ($this->data['items'] as $item)
+                                if ( !empty($this->data[$key]) )
                                 {
-                                        $item->__destruct();
+                                        foreach( $this->data[$key] as $item )
+                                        {
+                                                $item->destroy();
+                                        }
                                 }
-                                unset($item, $this->data['items']);
                         }
-                        if (!empty($this->data['ordered_items']))
-                        {
-                                foreach ($this->data['ordered_items'] as $item)
-                                {
-                                        $item->__destruct();
-                                }
-                                unset($item, $this->data['ordered_items']);
-                        }
                 }
         }
 
@@ -3123 +3118 @@
         }
 
         /**
-         * Remove items that link back to this before destroying this object
+         * destroy all of this objects circular references sothat an unset operation 
+         * can free memory.
          */
-        function __destruct()
+        function destroy()
         {
                 if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
                 {