Changeset 5363

Timestamp:

05/01/2007 01:58:18 AM (19 years ago)

Author:

rob1n

Message:

New way of loading widgets that works with PHP 5. Thanks to filosofo for testing. see #4169

Files:

• branches/2.2/wp-includes/default-filters.php (modified) (1 diff)
• branches/2.2/wp-includes/functions.php (modified) (1 diff)
• branches/2.2/wp-includes/widgets.php (modified) (1 diff)
• trunk/wp-includes/default-filters.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (1 diff)
• trunk/wp-includes/widgets.php (modified) (1 diff)

branches/2.2/wp-includes/default-filters.php

@@ -175 +175 @@
 add_action('init', 'smilies_init', 5);
 
-add_action( 'plugins_loaded', 'wp_load_widgets', 0 );
+add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
 
 ?>

branches/2.2/wp-includes/functions.php

@@ -1469 +1469 @@
 }
 
-function wp_load_widgets() {
-    require_once ABSPATH . WPINC . '/widgets.php';
+function wp_maybe_load_widgets() {
+    if ( !function_exists( 'dynamic_sidebar' ) ) {
+        require_once ABSPATH . WPINC . '/widgets.php';
+    }
 }
 

branches/2.2/wp-includes/widgets.php

@@ -1 +1 @@
 <?php
-
-/*
-    Check if another widget plugin is active. If this is so, 
-    then bail out.
-*/
-
-if ( function_exists( 'dynamic_sidebars' ) ) {
-    return;
-}
 
 /* Global Variables */

trunk/wp-includes/default-filters.php

@@ -175 +175 @@
 add_action('init', 'smilies_init', 5);
 
-add_action( 'plugins_loaded', 'wp_load_widgets', 0 );
+add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
 
 ?>

trunk/wp-includes/functions.php

@@ -1503 +1503 @@
 }
 
-function wp_load_widgets() {
-    require_once ABSPATH . WPINC . '/widgets.php';
+function wp_maybe_load_widgets() {
+    if ( !function_exists( 'dynamic_sidebar' ) ) {
+        require_once ABSPATH . WPINC . '/widgets.php';
+    }
 }
 

trunk/wp-includes/widgets.php

@@ -1 +1 @@
 <?php
-
-/*
-    Check if another widget plugin is active. If this is so, 
-    then bail out.
-*/
-
-if ( function_exists( 'dynamic_sidebar' ) ) {
-    return;
-}
 
 /* Global Variables */