Changeset 11088

Timestamp:

04/26/2009 05:34:06 AM (16 years ago)

Author:

azaozz

Message:

Fix conversion of old widget settings for Recent Posts, see #8441

Location:

trunk/wp-includes

Files:

• default-widgets.php (modified) (5 diffs)
• widgets.php (modified) (2 diffs)

trunk/wp-includes/default-widgets.php

@@ -496 +496 @@
     function WP_Widget_Recent_Posts() {
         $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );
-        $this->WP_Widget('recent_posts', __('Recent Posts'), $widget_ops);
+        $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
+        $this->alt_option_name = 'widget_recent_entries';
 
         add_action( 'save_post', array(&$this, 'flush_widget_cache') );
@@ -504 +505 @@
 
     function widget($args, $instance) {
-        if ( $output = wp_cache_get('widget_recent_entries', 'widget') )
+        if ( $output = wp_cache_get('widget_recent_posts' . $args['widget_id'], 'widget') )
             return print($output);
 
         ob_start();
-    
         extract($args);
 
@@ -518 +518 @@
         else if ( $number > 15 )
             $number = 15;
-    
+
         $r = new WP_Query(array('showposts' => $number, 'what_to_show' => 'posts', 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
         if ($r->have_posts()) :
@@ -533 +533 @@
             wp_reset_query();  // Restore global post data stomped by the_post().
         endif;
-    
-        wp_cache_add('widget_recent_entries', ob_get_flush(), 'widget');
+
+        wp_cache_add('widget_recent_posts' . $args['widget_id'], ob_get_flush(), 'widget');
     }
 
@@ -542 +542 @@
         $instance['number'] = (int) $new_instance['number'];
         $this->flush_widget_cache();
+        
+        $alloptions = wp_cache_get( 'alloptions', 'options' );
+        if ( isset($alloptions['widget_recent_entries']) )
+            delete_option('widget_recent_entries');
 
         return $instance;

trunk/wp-includes/widgets.php

@@ -268 +268 @@
     function get_settings() {
         $settings = get_option($this->option_name);
+        
+        if ( false === $settings && isset($this->alt_option_name) )
+            $settings = get_option($this->alt_option_name);
 
         if ( !is_array($settings) )
@@ -977 +980 @@
         $single = true;
     } else {
-        if ( isset($settings['number']) )
-            unset($settings['number']);
         foreach ( array_keys($settings) as $number ) {
+            if ( 'number' == $number )
+                continue;
             if ( !is_numeric($number) ) {
                 $single = true;