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

Timestamp:

09/02/2016 10:34:48 PM (9 years ago)

Author:

westonruter

Message:

Customize: Fix php warning due to WP_Customize_Manager::prepare_setting_validity_for_js() incorrectly assuming that WP_Error will only ever have arrays in its $error_data.

• Eliminates the server mutating the a WP_Error's $error_data to merge-in a $from_server flag (since it may not be an array to begin with). Instead it defers to the client to add a fromServer param on any Notification instances created from server-sent errors.
• Ensures that notifications will be re-rendered if a notification's message changes but the data and type remain the same.
• Adds explicit support for the Notification class to have a setting property, ensuring that the property is set whereas previously it was dropped.

Fixes #37890.
Props westonruter, dlh.

File:

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

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

@@ -1047 +1047 @@
             $notification = array();
             foreach ( $validity->errors as $error_code => $error_messages ) {
-                $error_data = $validity->get_error_data( $error_code );
-                if ( is_null( $error_data ) ) {
-                    $error_data = array();
-                }
-                $error_data = array_merge(
-                    $error_data,
-                    array( 'from_server' => true )
-                );
                 $notification[ $error_code ] = array(
                     'message' => join( ' ', $error_messages ),
-                    'data' => $error_data,
+                    'data' => $validity->get_error_data( $error_code ),
                 );
             }