Changeset 41243

Timestamp:

08/12/2017 09:20:23 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix PHP warning raised when deleting a setting from changeset via passing null as params in WP_Customize_Manager::save_changeset_post().

Props dlh.
Fixes #41621.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (1 diff)

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

@@ -2279 +2279 @@
         // Amend post values with any supplied data.
         foreach ( $args['data'] as $setting_id => $setting_params ) {
-            if ( array_key_exists( 'value', $setting_params ) ) {
+            if ( is_array( $setting_params ) && array_key_exists( 'value', $setting_params ) ) {
                 $this->set_post_value( $setting_id, $setting_params['value'] ); // Add to post values so that they can be validated and sanitized.
             }

trunk/tests/phpunit/tests/customize/manager.php

@@ -1247 +1247 @@
 
     /**
+     * Test passing `null` for a setting ID to remove it from the changeset.
+     *
+     * @ticket 41621
+     * @covers WP_Customize_Manager::save_changeset_post()
+     */
+    function test_remove_setting_from_changeset_post() {
+        $uuid = wp_generate_uuid4();
+
+        $manager = $this->create_test_manager( $uuid );
+        $manager->save_changeset_post( array(
+            'data' => array(
+                'scratchpad' => array(
+                    'value' => 'foo',
+                ),
+            ),
+        ) );
+
+        // Create a new manager so post values are unset.
+        $manager = $this->create_test_manager( $uuid );
+
+        $this->assertArrayHasKey( 'scratchpad', $manager->changeset_data() );
+
+        $manager->save_changeset_post( array(
+            'data' => array(
+                'scratchpad' => null,
+            ),
+        ) );
+
+        $this->assertArrayNotHasKey( 'scratchpad', $manager->changeset_data() );
+    }
+
+    /**
      * Test writing changesets and publishing with users who can unfiltered_html and those who cannot.
      *