Changeset 17765

Timestamp:

04/29/2011 02:44:43 PM (14 years ago)

Author:

nacin

Message:

Update the self-referential destruction sequence in WP_Widget_RSS to account for trailing slashes. TODO: Strengthen our validation here.

Location:

trunk

Files:

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

trunk/wp-admin/includes/dashboard.php

@@ -926 +926 @@
  */
 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/' );
+    ob_start();
+    $check_urls = array(
+        'http://wordpress.org/extend/plugins/rss/browse/popular/',
+        'http://wordpress.org/extend/plugins/rss/browse/new/',
+        'http://wordpress.org/extend/plugins/rss/browse/updated/'
+    );
+    $transient_key = __FUNCTION__ . serialize( '' ) . implode( '|', $check_urls );
+
+    $popular = fetch_feed( $check_urls[0] );
+    $new     = fetch_feed( $check_urls[1] );
+    $updated = fetch_feed( $check_urls[2] );
 
     if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
@@ -999 +1007 @@
         unset($$feed);
     }
+    set_transient( $transient_key, ob_get_flush() );
 }
 
@@ -1019 +1028 @@
     $loading = '<p class="widget-loading">' . __( 'Loading&#8230;' ) . '</p>';
 
+    $widgets = get_option( 'dashboard_widget_options' );
+    $output_cache = 'dashboard_' . md5( $callback . serialize( isset( $widgets[$widget_id] ) ? $widgets[$widget_id] : '' ) . implode( '|', $check_urls ) );
+
     if ( empty($check_urls) ) {
-        $widgets = get_option( 'dashboard_widget_options' );
         if ( empty($widgets[$widget_id]['url']) ) {
             echo $loading;
+            delete_transient( $output_cache );
             return false;
         }
@@ -1033 +1045 @@
         if ( ! $cache->load() ) {
             echo $loading;
+            delete_transient( $output_cache );
             return false;
         }
     }
 
+    if ( false === $cache = get_transient( $output_cache ) ) {
+        echo $loading;
+        return false;
+    }
+
+    echo $cache;
+    return true;
+    /*      
     if ( $callback && is_callable( $callback ) ) {
         $args = array_slice( func_get_args(), 2 );
@@ -1044 +1065 @@
 
     return true;
+    */
 }
 

trunk/wp-includes/default-widgets.php

@@ -714 +714 @@
 
         // self-url destruction sequence
-        if ( $url == site_url() || $url == home_url() )
+        if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
             return;