Ticket #4169: wp-includes_widgets.php.20070430.diff

wp-admin/upgrade-functions.php

@@ -189 +189 @@
                 upgrade_230();
         }
         
-        maybe_disable_automattic_widgets();
-
         $wp_rewrite->flush_rules();
 
         update_option('db_version', $wp_db_version);
@@ -1113 +1111 @@
                 die(sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
 }
 
-function maybe_disable_automattic_widgets() {
-        $plugins = __get_option( 'active_plugins' );
-        
-        foreach ( $plugins as $plugin ) {
-                if ( basename( $plugin ) == 'widgets.php' ) {
-                        array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
-                        update_option( 'active_plugins', $plugins );
-                        break;
-                }
-        }
-}
-
 

wp-includes/widgets.php

@@ -10 +10 @@
 
 /* Template tags & API functions */
 
-if ( !function_exists( 'register_sidebars' ) ):
+function maybe_disable_automattic_widgets() {
+        $plugins = get_option( 'active_plugins' );
+        
+        foreach ( $plugins as $plugin ) {
+                if ( basename( $plugin ) == 'widgets.php' ) {
+                        array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
+                        update_option( 'active_plugins', $plugins );
+                        break;
+                }
+        }
+}
+
+maybe_disable_automattic_widgets();
+
 function register_sidebars($number = 1, $args = array()) {
         $number = (int) $number;
 
@@ -31 +44 @@
                 ++$i;
         }
 }
-endif;
 
-if ( !function_exists( 'register_sidebar' ) ):
 function register_sidebar($args = array()) {
         global $wp_registered_sidebars;
 
@@ -57 +68 @@
 
         return $sidebar['id'];
 }
-endif;
 
-if ( !function_exists( 'unregister_sidebar' ) ):
 function unregister_sidebar( $name ) {
         global $wp_registered_sidebars;
                 
         if ( isset( $wp_registered_sidebars[$name] ) )
                 unset( $wp_registered_sidebars[$name] );
 }
-endif;
 
-if ( !function_exists( 'register_sidebar_widget' ) ):
 function register_sidebar_widget($name, $output_callback, $classname = '', $id = '') {
         global $wp_registered_widgets, $wp_register_widget_defaults;
 
@@ -100 +107 @@
         elseif ( is_callable($output_callback) && ( !isset($wp_registered_widgets[$id]) || !$wp_register_widget_defaults) )
                 $wp_registered_widgets[$id] = $widget;
 }
-endif;
 
-if ( !function_exists( 'unregister_sidebar_widget' ) ):
 function unregister_sidebar_widget($id) {
         $id = sanitize_title($id);
         register_sidebar_widget('', '', '', $id);
         unregister_widget_control($id);
 }
-endif;
 
-if ( !function_exists( 'register_widget_control' ) ):
 function register_widget_control($name, $control_callback, $width = 300, $height = 200, $id = '') {
         global $wp_registered_widget_controls, $wp_register_widget_defaults;
 
@@ -142 +145 @@
                         'params' => array_slice(func_get_args(), 5)
                 );
 }
-endif;
 
-if ( !function_exists( 'unregister_widget_control' ) ):
 function unregister_widget_control($id) {
         $id = sanitize_title($id);
         return register_widget_control($id, '');
 }
-endif;
 
-if ( !function_exists( 'dynamic_sidebar' ) ):
 function dynamic_sidebar($index = 1) {
         global $wp_registered_sidebars, $wp_registered_widgets;
 
@@ -185 +184 @@
 
         return $did_one;
 }
-endif;
 
-if ( !function_exists( 'is_active_widget' ) ):
 function is_active_widget($callback) {
         global $wp_registered_widgets;
 
@@ -200 +197 @@
 
         return false;
 }
-endif;
 
-if ( !function_exists( 'is_dynamic_sidebar' ) ):
 function is_dynamic_sidebar() {
         global $wp_registered_widgets, $wp_registered_sidebars;
         $sidebars_widgets = get_option('sidebars_widgets');
@@ -215 +210 @@
         }
         return false;
 }
-endif;
 
 /* Internal Functions */