Changes in trunk/wp-includes/default-widgets.php [17260:17825]

File:

• trunk/wp-includes/default-widgets.php (modified) (16 diffs)

trunk/wp-includes/default-widgets.php

@@ -14 +14 @@
 class WP_Widget_Pages extends WP_Widget {
 
-    function WP_Widget_Pages() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site’s WordPress Pages') );
-        $this->WP_Widget('pages', __('Pages'), $widget_ops);
+        parent::__construct('pages', __('Pages'), $widget_ops);
     }
 
@@ -90 +90 @@
 class WP_Widget_Links extends WP_Widget {
 
-    function WP_Widget_Links() {
+    function __construct() {
         $widget_ops = array('description' => __( "Your blogroll" ) );
-        $this->WP_Widget('links', __('Links'), $widget_ops);
+        parent::__construct('links', __('Links'), $widget_ops);
     }
 
@@ -171 +171 @@
 class WP_Widget_Search extends WP_Widget {
 
-    function WP_Widget_Search() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") );
-        $this->WP_Widget('search', __('Search'), $widget_ops);
+        parent::__construct('search', __('Search'), $widget_ops);
     }
 
@@ -214 +214 @@
 class WP_Widget_Archives extends WP_Widget {
 
-    function WP_Widget_Archives() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') );
-        $this->WP_Widget('archives', __('Archives'), $widget_ops);
+        parent::__construct('archives', __('Archives'), $widget_ops);
     }
 
@@ -279 +279 @@
 class WP_Widget_Meta extends WP_Widget {
 
-    function WP_Widget_Meta() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );
-        $this->WP_Widget('meta', __('Meta'), $widget_ops);
+        parent::__construct('meta', __('Meta'), $widget_ops);
     }
 
@@ -327 +327 @@
 class WP_Widget_Calendar extends WP_Widget {
 
-    function WP_Widget_Calendar() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site’s posts') );
-        $this->WP_Widget('calendar', __('Calendar'), $widget_ops);
+        parent::__construct('calendar', __('Calendar'), $widget_ops);
     }
 
@@ -368 +368 @@
 class WP_Widget_Text extends WP_Widget {
 
-    function WP_Widget_Text() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML'));
         $control_ops = array('width' => 400, 'height' => 350);
-        $this->WP_Widget('text', __('Text'), $widget_ops, $control_ops);
+        parent::__construct('text', __('Text'), $widget_ops, $control_ops);
     }
 
@@ -418 +418 @@
 class WP_Widget_Categories extends WP_Widget {
 
-    function WP_Widget_Categories() {
+    function __construct() {
         $widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories" ) );
-        $this->WP_Widget('categories', __('Categories'), $widget_ops);
+        parent::__construct('categories', __('Categories'), $widget_ops);
     }
 
@@ -510 +510 @@
 class WP_Widget_Recent_Posts extends WP_Widget {
 
-    function WP_Widget_Recent_Posts() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
-        $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
+        parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
         $this->alt_option_name = 'widget_recent_entries';
 
@@ -538 +538 @@
             $number = 10;
 
-        $r = new WP_Query(array('posts_per_page' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
+        $r = new WP_Query(array('posts_per_page' => $number, 'no_found_rows' => true, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
         if ($r->have_posts()) :
 ?>
@@ -596 +596 @@
 class WP_Widget_Recent_Comments extends WP_Widget {
 
-    function WP_Widget_Recent_Comments() {
+    function __construct() {
         $widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'The most recent comments' ) );
-        $this->WP_Widget('recent-comments', __('Recent Comments'), $widget_ops);
+        parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
         $this->alt_option_name = 'widget_recent_comments';
 
@@ -641 +641 @@
             $number = 5;
 
-        $comments = get_comments( array( 'number' => $number, 'status' => 'approve' ) );
+        $comments = get_comments( array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) );
         $output .= $before_widget;
         if ( $title )
@@ -693 +693 @@
 class WP_Widget_RSS extends WP_Widget {
 
-    function WP_Widget_RSS() {
+    function __construct() {
         $widget_ops = array( 'description' => __('Entries from any RSS or Atom feed') );
         $control_ops = array( 'width' => 400, 'height' => 200 );
-        $this->WP_Widget( 'rss', __('RSS'), $widget_ops, $control_ops );
+        parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops );
     }
 
@@ -714 +714 @@
 
         // self-url destruction sequence
-        if ( $url == site_url() || $url == home_url() )
+        if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
             return;
 
@@ -986 +986 @@
 class WP_Widget_Tag_Cloud extends WP_Widget {
 
-    function WP_Widget_Tag_Cloud() {
+    function __construct() {
         $widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
-        $this->WP_Widget('tag_cloud', __('Tag Cloud'), $widget_ops);
+        parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
     }
 
@@ -1053 +1053 @@
  class WP_Nav_Menu_Widget extends WP_Widget {
 
-    function WP_Nav_Menu_Widget() {
+    function __construct() {
         $widget_ops = array( 'description' => __('Use this widget to add one of your custom menus as a widget.') );
-        parent::WP_Widget( 'nav_menu', __('Custom Menu'), $widget_ops );
+        parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
     }