Ticket #11597: 11597.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'))
                 {

wp-admin/includes/dashboard.php

@@ -636 +636 @@
 
         if ( !$rss->get_item_quantity() ) {
                 echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links&hellip; yet. It&#8217;s okay &#8212; there is no rush.') . "</p>\n";
-                $rss->__destruct(); 
+                $rss->destroy(); 
                 unset($rss);
                 return;
         }
@@ -691 +691 @@
         }
 
         echo "</ul>\n";
-        $rss->__destruct(); 
+        $rss->destroy(); 
         unset($rss);
 }
 
@@ -748 +748 @@
                         echo '</p></div>';
                 }
         } elseif ( !$rss->get_item_quantity() ) {
-                $rss->__destruct(); 
+                $rss->destroy(); 
                 unset($rss);
                 return false;
         } else {
                 echo '<div class="rss-widget">';
                 wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
                 echo '</div>';
-                $rss->__destruct(); 
+                $rss->destroy(); 
                 unset($rss);
         }
 }
@@ -769 +769 @@
  *
  * @since unknown
  */
-function wp_dashboard_plugins_output() {
+function wp_dashboard_plugins_output() {        
         $popular = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/popular/' );
         $new     = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
         $updated = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
@@ -840 +840 @@
                 echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
                 echo "<p>$description</p>\n";
                 
-                $$feed->__destruct();
+                $$feed->destroy();
                 unset($$feed);
         }
 }
@@ -939 +939 @@
                                 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
                         } else {
                                 $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));     
-                                $rss->__destruct();
+                                $rss->destroy();
                                 unset($rss);                            
                         }
                 }