Changeset 12209 for trunk/wp-admin/includes/dashboard.php

Timestamp:

11/18/2009 09:52:38 PM (15 years ago)

Author:

ryan

Message:

Don't destruct if WP_Error. Props scribu. fixes #11168

File:

• trunk/wp-admin/includes/dashboard.php (modified) (3 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -625 +625 @@
             echo '</p>';
         }
-        $rss->__destruct(); 
-        unset($rss);
         return;
     }
@@ -743 +741 @@
             echo '</p></div>';
         }
-        $rss->__destruct(); 
-        unset($rss);
     } elseif ( !$rss->get_item_quantity() ) {
         $rss->__destruct(); 
@@ -933 +929 @@
         if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
             $rss = fetch_feed($widget_options[$widget_id]['url']);
-            if ( ! is_wp_error($rss) )
-                $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
-            else
+            if ( is_wp_error($rss) ) {
                 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
-            $rss->__destruct(); 
-            unset($rss);
+            } else {
+                $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title())); 
+                $rss->__destruct();
+                unset($rss);                
+            }
         }
         update_option( 'dashboard_widget_options', $widget_options );