Changeset 12209

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/includes/dashboard.php (modified) (3 diffs)
• wp-includes/default-widgets.php (modified) (2 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 );

trunk/wp-includes/default-widgets.php

@@ -773 +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;
         }
@@ -954 +952 @@
                         while ( stristr($link, 'http') != $link )
                                 $link = substr($link, 1);
-                }
-                $rss->__destruct(); 
-                unset($rss);
+
+                        $rss->__destruct();
+                        unset($rss);
+                }
         }