Changeset 10808

Timestamp:

03/17/2009 11:44:36 PM (16 years ago)

Author:

ryan

Message:

Introduce singleton widget factory

Location:

trunk

Files:

• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (4 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/default-widgets.php

@@ -1220 +1220 @@
         return;
 
-    new WP_Widget_Pages();
-
-    new WP_Widget_Calendar();
-
-    new WP_Widget_Archives();
-
-    new WP_Widget_Links();
-
-    new WP_Widget_Meta();
-
-    new WP_Widget_Search();
-
-    new WP_Widget_Text();
+    register_widget('WP_Widget_Pages');
+
+    register_widget('WP_Widget_Calendar');
+
+    register_widget('WP_Widget_Archives');
+
+    register_widget('WP_Widget_Links');
+
+    register_widget('WP_Widget_Meta');
+
+    register_widget('WP_Widget_Search');
+
+    register_widget('WP_Widget_Text');
 
     $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );

trunk/wp-includes/widgets.php

@@ -43 +43 @@
 $wp_registered_widget_controls = array();
 $wp_registered_widget_updates = array();
+
+/**
+ * Singleton that registers and instantiates WP_Widget classes.
+ * 
+ * @package WordPress
+ * @subpackage Widgets
+ * @since 2.8
+ */
+class WP_Widget_Factory {
+    var $widgets = array();
+
+    function WP_Widget_Factory() {
+        add_action( 'widgets_init', array( &$this, '_register_widgets' ), 100 );
+    }
+
+    function register($widget_class) {
+        $this->widgets[] = new $widget_class();
+    }
+
+    function _register_widgets() {
+        foreach ( $this->widgets as $widget )
+            $widget->_register();
+    }
+}
 
 /**
@@ -108 +132 @@
         $this->control_options = wp_parse_args( $control_options, array('id_base' => $this->id_base) );
 
-        add_action( 'widgets_init', array( &$this, 'register' ) );
+        //add_action( 'widgets_init', array( &$this, '_register' ) );
     }
 
@@ -125 +149 @@
     /** Registers this widget-type.
      *  Called during the 'widgets_init' action. */
-    function register() {
+    function _register() {
         $settings = $this->get_settings();
 
@@ -288 +312 @@
 
 /* Template tags & API functions */
+
+/**
+ * Register a widget
+ * 
+ * Registers a WP_Widget widget
+ * 
+ * @since 2.8.0
+ * 
+ * @see WP_Widget
+ * @see WP_Widget_Factory
+ * @uses WP_Widget_Factory
+ * 
+ * @param string $widget_class The name of a class that extends WP_Widget
+ */
+function register_widget($widget_class) {
+    global $wp_widget_factory;
+
+    $wp_widget_factory->register($widget_class);
+}
 
 /**

trunk/wp-settings.php

@@ -590 +590 @@
 $wp           =& new WP();
 
+/**
+ * WordPress Widget Factory Object
+ * @global object $wp_widget_factory
+ * @since 2.8.0
+ */
+$wp_widget_factory =& new WP_Widget_Factory();
+
 do_action('setup_theme');