Changeset 39276 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

11/17/2016 08:17:57 AM (7 years ago)

Author:

westonruter

Message:

Customize: Add unit tests for importing theme starter content.

Props welcher, westonruter.
See #38114, #38533, #38615.
Fixes #38540.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (10 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -896 +896 @@
      * @var array
      */
-    protected $starter_content_settings_ids = array();
+    protected $pending_starter_content_settings_ids = array();
 
     /**
@@ -954 +954 @@
                 if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
                     $this->set_post_value( $setting_id, $setting_value );
-                    $this->starter_content_settings_ids[] = $setting_id;
+                    $this->pending_starter_content_settings_ids[] = $setting_id;
                 }
                 $sidebar_widget_ids[] = $widget_id;
@@ -962 +962 @@
             if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
                 $this->set_post_value( $setting_id, $sidebar_widget_ids );
-                $this->starter_content_settings_ids[] = $setting_id;
+                $this->pending_starter_content_settings_ids[] = $setting_id;
             }
         }
@@ -1016 +1016 @@
                 $nav_menus_created_posts = array_unique( array_merge( $nav_menus_created_posts, wp_list_pluck( $posts, 'ID' ) ) );
                 $this->set_post_value( $setting_id, array_values( $nav_menus_created_posts ) );
-                $this->starter_content_settings_ids[] = $setting_id;
+                $this->pending_starter_content_settings_ids[] = $setting_id;
             }
         }
@@ -1057 +1057 @@
                 'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
             ) );
-            $this->starter_content_settings_ids[] = $nav_menu_setting_id;
+            $this->pending_starter_content_settings_ids[] = $nav_menu_setting_id;
 
             // @todo Add support for menu_item_parent.
@@ -1084 +1084 @@
                 if ( empty( $changeset_data[ $nav_menu_item_setting_id ] ) || ! empty( $changeset_data[ $nav_menu_item_setting_id ]['starter_content'] ) ) {
                     $this->set_post_value( $nav_menu_item_setting_id, $nav_menu_item );
-                    $this->starter_content_settings_ids[] = $nav_menu_item_setting_id;
+                    $this->pending_starter_content_settings_ids[] = $nav_menu_item_setting_id;
                 }
             }
@@ -1091 +1091 @@
             if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
                 $this->set_post_value( $setting_id, $nav_menu_term_id );
-                $this->starter_content_settings_ids[] = $setting_id;
+                $this->pending_starter_content_settings_ids[] = $setting_id;
             }
         }
@@ -1103 +1103 @@
             if ( empty( $changeset_data[ $name ] ) || ! empty( $changeset_data[ $name ]['starter_content'] ) ) {
                 $this->set_post_value( $name, $value );
-                $this->starter_content_settings_ids[] = $name;
+                $this->pending_starter_content_settings_ids[] = $name;
             }
         }
@@ -1115 +1115 @@
             if ( empty( $changeset_data[ $name ] ) || ! empty( $changeset_data[ $name ]['starter_content'] ) ) {
                 $this->set_post_value( $name, $value );
-                $this->starter_content_settings_ids[] = $name;
-            }
-        }
-
-        if ( ! empty( $this->starter_content_settings_ids ) ) {
+                $this->pending_starter_content_settings_ids[] = $name;
+            }
+        }
+
+        if ( ! empty( $this->pending_starter_content_settings_ids ) ) {
             if ( did_action( 'customize_register' ) ) {
                 $this->_save_starter_content_changeset();
@@ -1136 +1136 @@
     public function _save_starter_content_changeset() {
 
-        if ( empty( $this->starter_content_settings_ids ) ) {
+        if ( empty( $this->pending_starter_content_settings_ids ) ) {
             return;
         }
 
         $this->save_changeset_post( array(
-            'data' => array_fill_keys( $this->starter_content_settings_ids, array( 'starter_content' => true ) ),
+            'data' => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
             'starter_content' => true,
         ) );
+
+        $this->pending_starter_content_settings_ids = array();
     }