From 6827de6cd991210db489901ce7f6c0a84e91ecb9 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 18 Apr 2011 21:46:57 +0000 Subject: [PATCH] Remove PHP4 constructors. Props scribu. fixes #16768 git-svn-id: http://svn.automattic.com/wordpress/trunk@17655 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-widgets.php | 52 ++++++++++++++++----------------- wp-includes/widgets.php | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index a36990515a..8f3ad310f7 100644 --- a/wp-includes/default-widgets.php +++ b/wp-includes/default-widgets.php @@ -13,9 +13,9 @@ */ 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); } function widget( $args, $instance ) { @@ -89,9 +89,9 @@ class WP_Widget_Pages extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -170,9 +170,9 @@ class WP_Widget_Links extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -213,9 +213,9 @@ class WP_Widget_Search extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -278,9 +278,9 @@ class WP_Widget_Archives extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -326,9 +326,9 @@ class WP_Widget_Meta extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -367,10 +367,10 @@ class WP_Widget_Calendar extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -417,9 +417,9 @@ class WP_Widget_Text extends WP_Widget { */ 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); } function widget( $args, $instance ) { @@ -509,9 +509,9 @@ class WP_Widget_Categories extends WP_Widget { */ 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'; add_action( 'save_post', array(&$this, 'flush_widget_cache') ); @@ -595,9 +595,9 @@ class WP_Widget_Recent_Posts extends WP_Widget { */ 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'; if ( is_active_widget(false, false, $this->id_base) ) @@ -692,10 +692,10 @@ class WP_Widget_Recent_Comments extends WP_Widget { */ 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 ); } function widget($args, $instance) { @@ -985,9 +985,9 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) { */ 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); } function widget( $args, $instance ) { @@ -1052,9 +1052,9 @@ class WP_Widget_Tag_Cloud extends WP_Widget { */ 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 ); } function widget($args, $instance) { diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 60cfa2f3e9..e5dc68d286 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -74,7 +74,7 @@ class WP_Widget { * PHP4 constructor */ function WP_Widget( $id_base = false, $name, $widget_options = array(), $control_options = array() ) { - $this->__construct( $id_base, $name, $widget_options, $control_options ); + WP_Widget::__construct( $id_base, $name, $widget_options, $control_options ); } /**