Changeset 11087

Timestamp:

04/25/2009 12:43:51 PM (16 years ago)

Author:

azaozz

Message:

Move recent posts widget to WP_Widget. see #8441

Location:

trunk/wp-includes

Files:

• default-widgets.php (modified) (3 diffs)
• widgets.php (modified) (1 diff)

trunk/wp-includes/default-widgets.php

@@ -488 +488 @@
 
 /**
- * Display recent entries widget.
- *
- * @since 2.2.0
- *
- * @param array $args Widget arguments.
- * @return int Displayed cache.
- */
-function wp_widget_recent_entries($args) {
-    if ( '%BEG_OF_TITLE%' != $args['before_title'] ) {
+ * Recent_Posts widget class
+ *
+ * @since 2.8.0
+ */
+class WP_Widget_Recent_Posts extends WP_Widget {
+
+    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);
+
+        add_action( 'save_post', array(&$this, 'flush_widget_cache') );
+        add_action( 'deleted_post', array(&$this, 'flush_widget_cache') );
+        add_action( 'switch_theme', array(&$this, 'flush_widget_cache') );
+    }
+
+    function widget($args, $instance) {
         if ( $output = wp_cache_get('widget_recent_entries', 'widget') )
             return print($output);
+
         ob_start();
-    }
-
-    extract($args);
-    $options = get_option('widget_recent_entries');
-    $title = empty($options['title']) ? __('Recent Posts') : apply_filters('widget_title', $options['title']);
-    if ( !$number = (int) $options['number'] )
-        $number = 10;
-    else if ( $number < 1 )
-        $number = 1;
-    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()) :
-?>
-        <?php echo $before_widget; ?>
+    
+        extract($args);
+
+        $title = empty($instance['title']) ? __('Recent Posts') : apply_filters('widget_title', $instance['title']);
+        if ( !$number = (int) $instance['number'] )
+            $number = 10;
+        else if ( $number < 1 )
+            $number = 1;
+        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()) :
+?>
+            <?php echo $before_widget; ?>
             <?php echo $before_title . $title . $after_title; ?>
             <ul>
@@ -522 +529 @@
             <?php endwhile; ?>
             </ul>
-        <?php echo $after_widget; ?>
-<?php
-        wp_reset_query();  // Restore global post data stomped by the_post().
-    endif;
-
-    if ( '%BEG_OF_TITLE%' != $args['before_title'] )
+            <?php echo $after_widget; ?>
+<?php
+            wp_reset_query();  // Restore global post data stomped by the_post().
+        endif;
+    
         wp_cache_add('widget_recent_entries', ob_get_flush(), 'widget');
-}
-
-/**
- * Remove recent entries widget items cache.
- *
- * @since 2.2.0
- */
-function wp_flush_widget_recent_entries() {
-    wp_cache_delete('widget_recent_entries', 'widget');
-}
-
-add_action('save_post', 'wp_flush_widget_recent_entries');
-add_action('deleted_post', 'wp_flush_widget_recent_entries');
-add_action('switch_theme', 'wp_flush_widget_recent_entries');
-
-/**
- * Display and process recent entries widget options form.
- *
- * @since 2.2.0
- */
-function wp_widget_recent_entries_control() {
-    $options = $newoptions = get_option('widget_recent_entries');
-    if ( isset($_POST["recent-entries-submit"]) ) {
-        $newoptions['title'] = strip_tags(stripslashes($_POST["recent-entries-title"]));
-        $newoptions['number'] = (int) $_POST["recent-entries-number"];
-    }
-    if ( $options != $newoptions ) {
-        $options = $newoptions;
-        update_option('widget_recent_entries', $options);
-        wp_flush_widget_recent_entries();
-    }
-    $title = attribute_escape($options['title']);
-    if ( !$number = (int) $options['number'] )
-        $number = 5;
-?>
-
-            <p><label for="recent-entries-title"><?php _e('Title:'); ?> <input class="widefat" id="recent-entries-title" name="recent-entries-title" type="text" value="<?php echo $title; ?>" /></label></p>
-            <p>
-                <label for="recent-entries-number"><?php _e('Number of posts to show:'); ?> <input style="width: 25px; text-align: center;" id="recent-entries-number" name="recent-entries-number" type="text" value="<?php echo $number; ?>" /></label>
-                <br />
-                <small><?php _e('(at most 15)'); ?></small>
-            </p>
-            <input type="hidden" id="recent-entries-submit" name="recent-entries-submit" value="1" />
-<?php
+    }
+
+    function update( $new_instance, $old_instance ) {
+        $instance = $old_instance;
+        $instance['title'] = strip_tags($new_instance['title']);
+        $instance['number'] = (int) $new_instance['number'];
+        $this->flush_widget_cache();
+
+        return $instance;
+    }
+
+    function flush_widget_cache() {
+        wp_cache_delete('widget_recent_entries', 'widget');
+    }
+
+    function form( $instance ) {
+        $title = attribute_escape($instance['title']);
+        if ( !$number = (int) $instance['number'] )
+            $number = 5;
+?>
+        <p>
+            <label for="<?php echo $this->get_field_id('title'); ?>">
+                <?php _e('Title:'); ?>
+                <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
+            </label>
+        </p>
+        <p>
+            <label for="<?php echo $this->get_field_id('number'); ?>">
+                <?php _e('Number of posts to show:'); ?>
+                <input id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="text" value="<?php echo $number; ?>" />
+            </label><br />
+            <small><?php _e('(at most 15)'); ?></small>
+        </p>
+<?php
+    }
 }
 
@@ -1137 +1134 @@
     register_widget('WP_Widget_Categories');
 
-    $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );
-    wp_register_sidebar_widget('recent-posts', __('Recent Posts'), 'wp_widget_recent_entries', $widget_ops);
-    wp_register_widget_control('recent-posts', __('Recent Posts'), 'wp_widget_recent_entries_control' );
+    register_widget('WP_Widget_Recent_Posts');
 
     $widget_ops = array('classname' => 'widget_tag_cloud', 'description' => __( "Your most used tags in cloud format") );

trunk/wp-includes/widgets.php

@@ -88 +88 @@
      */
     function __construct( $id_base = false, $name, $widget_options = array(), $control_options = array() ) {
-        $this->id_base = $id_base === false ? str_replace( 'wp_widget_', '', strtolower(get_class($this)) ) : $id_base;
+        $this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : $id_base;
         $this->name = $name;
-        $this->option_name = 'widget_' . $id_base;
+        $this->option_name = 'widget_' . $this->id_base;
         $this->widget_options = wp_parse_args( $widget_options, array('classname' => $this->option_name) );
         $this->control_options = wp_parse_args( $control_options, array('id_base' => $this->id_base) );