Ticket #11074: 11074.patch

wp-admin/includes/dashboard.php

@@ -620 +620 @@
                         printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
                         echo '</p>';
                 }
+                $rss->__destruct(); 
+                unset($rss);
                 return;
         }
 
         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;
         }
 
@@ -678 +682 @@
         }
 
         echo "</ul>\n";
-
+        $rss->__destruct(); 
+        unset($rss);
 }
 
 function wp_dashboard_incoming_links_control() {
@@ -733 +738 @@
                         printf(__('<strong>RSS Error</strong>: %s'), $rss->get_error_message());
                         echo '</p></div>';
                 }
+                $rss->__destruct(); 
+                unset($rss);
         } elseif ( !$rss->get_item_quantity() ) {
+                $rss->__destruct(); 
+                unset($rss);
                 return false;
         } else {
                 echo '<div class="rss-widget">';
                 wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
                 echo '</div>';
+                $rss->__destruct(); 
+                unset($rss);
         }
 }
 
@@ -822 +833 @@
                 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";
         }
+        $popular->__destruct(); $new->__destruct(); $updated->__destruct(); 
+        unset($popular, $new, $updated);
 }
 
 /**
@@ -918 +931 @@
                                 $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
                         else
                                 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
+                        $rss->__destruct(); 
+                        unset($rss);
                 }
                 update_option( 'dashboard_widget_options', $widget_options );
         }

wp-includes/default-widgets.php

@@ -732 +732 @@
                         echo $before_title . $title . $after_title;
                 wp_widget_rss_output( $rss, $instance );
                 echo $after_widget;
+                $rss->__destruct(); 
+                unset($rss);
         }
 
         function update($new_instance, $old_instance) {
@@ -770 +772 @@
         if ( is_wp_error($rss) ) {
                 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;
         }
 
@@ -787 +790 @@
 
         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;
         }
 
@@ -838 +843 @@
                 }
         }
         echo '</ul>';
+        $rss->__destruct(); 
+        unset($rss);
 }
 
 
@@ -947 +954 @@
                         while ( stristr($link, 'http') != $link )
                                 $link = substr($link, 1);
                 }
+                $rss->__destruct(); 
+                unset($rss);
         }
 
         return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' );