Changeset 12193

Timestamp:

11/16/2009 10:42:58 PM (15 years ago)

Author:

ryan

Message:

Force destruction of SimplePie objects for versions of PHP that don't release memory properly. Props arena, scribu. fixes #11074

Location:

trunk

Files:

• wp-admin/includes/dashboard.php (modified) (7 diffs)
• wp-includes/default-widgets.php (modified) (5 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -625 +625 @@
             echo '</p>';
         }
+        $rss->__destruct(); 
+        unset($rss);
         return;
     }
@@ -630 +632 @@
     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(); 
+        unset($rss);
         return;
     }
@@ -683 +687 @@
 
     echo "</ul>\n";
-
+    $rss->__destruct(); 
+    unset($rss);
 }
 
@@ -738 +743 @@
             echo '</p></div>';
         }
+        $rss->__destruct(); 
+        unset($rss);
     } elseif ( !$rss->get_item_quantity() ) {
+        $rss->__destruct(); 
+        unset($rss);
         return false;
     } else {
@@ -744 +753 @@
         wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
         echo '</div>';
+        $rss->__destruct(); 
+        unset($rss);
     }
 }
@@ -826 +837 @@
         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();
+        unset($$feed);
     }
 }
@@ -923 +937 @@
             else
                 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
+            $rss->__destruct(); 
+            unset($rss);
         }
         update_option( 'dashboard_widget_options', $widget_options );

trunk/wp-includes/default-widgets.php

@@ -733 +733 @@
         wp_widget_rss_output( $rss, $instance );
         echo $after_widget;
+        $rss->__destruct(); 
+        unset($rss);
     }
 
@@ -771 +773 @@
         if ( is_admin() || current_user_can('manage_options') )
             echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
-
+        $rss->__destruct(); 
+        unset($rss);
         return;
     }
@@ -788 +791 @@
     if ( !$rss->get_item_quantity() ) {
         echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
+        $rss->__destruct(); 
+        unset($rss);
         return;
     }
@@ -839 +844 @@
     }
     echo '</ul>';
+    $rss->__destruct(); 
+    unset($rss);
 }
 
@@ -948 +955 @@
                 $link = substr($link, 1);
         }
+        $rss->__destruct(); 
+        unset($rss);
     }