Changes from branches/2.8/wp-includes/widgets.php at r11690 to trunk/wp-includes/widgets.php at r11510

File:

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

trunk/wp-includes/widgets.php

@@ -886 +886 @@
     global $wp_registered_widgets;
 
-    $sidebars_widgets = wp_get_sidebars_widgets();
+    $sidebars_widgets = wp_get_sidebars_widgets(false);
 
     if ( is_array($sidebars_widgets) ) {
@@ -936 +936 @@
 function is_active_sidebar( $index ) {
     $index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
-    $sidebars_widgets = wp_get_sidebars_widgets();
+    $sidebars_widgets = get_option( 'sidebars_widgets', array() );
     if ( isset($sidebars_widgets[$index]) && !empty($sidebars_widgets[$index]) )
         return true;
@@ -954 +954 @@
  * @access private
  *
- * @param bool $update Optional, deprecated.
- * @return array Upgraded list of widgets to version 3 array format when called from the admin.
- */
-function wp_get_sidebars_widgets($deprecated = true) {
+ * @param bool $update Optional, default is true. Whether to save upgrade of widget array list.
+ * @return array Upgraded list of widgets to version 2 array format.
+ */
+function wp_get_sidebars_widgets($update = true) {
     global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
 
     // If loading from front page, consult $_wp_sidebars_widgets rather than options
     // to see if wp_convert_widget_settings() has made manipulations in memory.
-    if ( !is_admin() ) {
+    if ( is_admin() ) {
+        $sidebars_widgets = get_option('sidebars_widgets', array());
+    } else {
         if ( empty($_wp_sidebars_widgets) )
-            $_wp_sidebars_widgets = get_option('sidebars_widgets', array());
-
-        $sidebars_widgets = $_wp_sidebars_widgets;
-    } else {
-        $sidebars_widgets = get_option('sidebars_widgets', array());
-        $_sidebars_widgets = array();
-
-        if ( isset($sidebars_widgets['wp_inactive_widgets']) )
-            $sidebars_widgets['array_version'] = 3;
-        elseif ( !isset($sidebars_widgets['array_version']) )
-            $sidebars_widgets['array_version'] = 1;
-
-        switch ( $sidebars_widgets['array_version'] ) {
-            case 1 :
-                foreach ( (array) $sidebars_widgets as $index => $sidebar )
-                if ( is_array($sidebar) )
-                foreach ( (array) $sidebar as $i => $name ) {
-                    $id = strtolower($name);
-                    if ( isset($wp_registered_widgets[$id]) ) {
-                        $_sidebars_widgets[$index][$i] = $id;
-                        continue;
+            $sidebars_widgets = get_option('sidebars_widgets', array());
+        else
+            $sidebars_widgets = &$_wp_sidebars_widgets;
+    }
+    $_sidebars_widgets = array();
+
+    if ( !isset($sidebars_widgets['array_version']) )
+        $sidebars_widgets['array_version'] = 1;
+
+    switch ( $sidebars_widgets['array_version'] ) {
+        case 1 :
+            foreach ( (array) $sidebars_widgets as $index => $sidebar )
+            if ( is_array($sidebar) )
+            foreach ( (array) $sidebar as $i => $name ) {
+                $id = strtolower($name);
+                if ( isset($wp_registered_widgets[$id]) ) {
+                    $_sidebars_widgets[$index][$i] = $id;
+                    continue;
+                }
+                $id = sanitize_title($name);
+                if ( isset($wp_registered_widgets[$id]) ) {
+                    $_sidebars_widgets[$index][$i] = $id;
+                    continue;
+                }
+
+                $found = false;
+
+                foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+                    if ( strtolower($widget['name']) == strtolower($name) ) {
+                        $_sidebars_widgets[$index][$i] = $widget['id'];
+                        $found = true;
+                        break;
+                    } elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+                        $_sidebars_widgets[$index][$i] = $widget['id'];
+                        $found = true;
+                        break;
                     }
-                    $id = sanitize_title($name);
-                    if ( isset($wp_registered_widgets[$id]) ) {
-                        $_sidebars_widgets[$index][$i] = $id;
-                        continue;
+                }
+
+                if ( $found )
+                    continue;
+
+                unset($_sidebars_widgets[$index][$i]);
+            }
+            $_sidebars_widgets['array_version'] = 2;
+            $sidebars_widgets = $_sidebars_widgets;
+            unset($_sidebars_widgets);
+
+        case 2 :
+            $sidebars = array_keys( $wp_registered_sidebars );
+            if ( !empty( $sidebars ) ) {
+                // Move the known-good ones first
+                foreach ( (array) $sidebars as $id ) {
+                    if ( array_key_exists( $id, $sidebars_widgets ) ) {
+                        $_sidebars_widgets[$id] = $sidebars_widgets[$id];
+                        unset($sidebars_widgets[$id], $sidebars[$id]);
                     }
-
-                    $found = false;
-
-                    foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-                        if ( strtolower($widget['name']) == strtolower($name) ) {
-                            $_sidebars_widgets[$index][$i] = $widget['id'];
-                            $found = true;
-                            break;
-                        } elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
-                            $_sidebars_widgets[$index][$i] = $widget['id'];
-                            $found = true;
-                            break;
-                        }
-                    }
-
-                    if ( $found )
-                        continue;
-
-                    unset($_sidebars_widgets[$index][$i]);
                 }
-                $_sidebars_widgets['array_version'] = 2;
+
+                // Assign to each unmatched registered sidebar the first available orphan
+                unset( $sidebars_widgets[ 'array_version' ] );
+                while ( ( $sidebar = array_shift( $sidebars ) ) && $widgets = array_shift( $sidebars_widgets ) )
+                    $_sidebars_widgets[ $sidebar ] = $widgets;
+
+                $_sidebars_widgets['array_version'] = 3;
                 $sidebars_widgets = $_sidebars_widgets;
                 unset($_sidebars_widgets);
-
-            case 2 :
-                $sidebars = array_keys( $wp_registered_sidebars );
-                if ( !empty( $sidebars ) ) {
-                    // Move the known-good ones first
-                    foreach ( (array) $sidebars as $id ) {
-                        if ( array_key_exists( $id, $sidebars_widgets ) ) {
-                            $_sidebars_widgets[$id] = $sidebars_widgets[$id];
-                            unset($sidebars_widgets[$id], $sidebars[$id]);
-                        }
-                    }
-
-                    // move the rest to wp_inactive_widgets
-                    if ( !isset($_sidebars_widgets['wp_inactive_widgets']) )
-                        $_sidebars_widgets['wp_inactive_widgets'] = array();
-
-                    if ( !empty($sidebars_widgets) ) {
-                        foreach ( $sidebars_widgets as $lost => $val ) {
-                            if ( is_array($val) )
-                                $_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val );
-                        }
-                    }
-
-                    $sidebars_widgets = $_sidebars_widgets;
-                    unset($_sidebars_widgets);
-                }
-        }
+            }
+
+            if ( $update && is_admin() )
+                update_option('sidebars_widgets', $sidebars_widgets);
     }
 
@@ -1091 +1087 @@
  */
 function wp_convert_widget_settings($base_name, $option_name, $settings) {
+    global $_wp_sidebars_widgets;
     // This test may need expanding.
-    $single = $changed = false;
+    $single = false;
     if ( empty($settings) ) {
         $single = true;
@@ -1114 +1111 @@
         } else {
             if ( empty($GLOBALS['_wp_sidebars_widgets']) )
-                $GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+                $GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets');
             $sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
         }
@@ -1123 +1120 @@
                     if ( $base_name == $name ) {
                         $sidebars_widgets[$index][$i] = "$name-2";
-                        $changed = true;
                         break 2;
                     }
@@ -1130 +1126 @@
         }
 
-        if ( is_admin() && $changed )
+        if ( is_admin() )
             update_option('sidebars_widgets', $sidebars_widgets);
     }