Changeset 27854 for trunk/src/wp-includes/class-wp-customize-widgets.php

Timestamp:

03/29/2014 09:43:39 PM (12 years ago)

Author:

ocean90

Message:

Widget Customizer: Remove strings from WP_Error returns and go with just IDs.

fixes #27419.

File:

• trunk/src/wp-includes/class-wp-customize-widgets.php (modified) (5 diffs)

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

@@ -509 +509 @@
         public function parse_widget_setting_id( $setting_id ) {
                 if ( ! preg_match( '/^(widget_(.+?))(?:\[(\d+)\])?$/', $setting_id, $matches ) ) {
-                        return new WP_Error( 'invalid_setting_id', 'Invalid widget setting ID' );
+                        return new WP_Error( 'widget_setting_invalid_id' );
                 }
 
@@ -1058 +1058 @@
                         if ( empty( $sanitized_widget_setting ) ) {
                                 $this->stop_capturing_option_updates();
-                                return new WP_Error( 'malformed_data', 'Malformed sanitized_widget_setting' );
+                                return new WP_Error( 'widget_setting_malformed' );
                         }
 
@@ -1064 +1064 @@
                         if ( is_null( $instance ) ) {
                                 $this->stop_capturing_option_updates();
-                                return new WP_Error( 'unsanitary_data', 'Unsanitary sanitized_widget_setting' );
+                                return new WP_Error( 'widget_setting_unsanitized' );
                         }
 
@@ -1101 +1101 @@
                         if ( $this->count_captured_options() > 1 ) {
                                 $this->stop_capturing_option_updates();
-                                return new WP_Error( 'unexpected_update', 'Widget unexpectedly updated more than one option.' );
+                                return new WP_Error( 'widget_setting_too_many_options' );
                         }
 
@@ -1107 +1107 @@
                         if ( $updated_option_name !== $option_name ) {
                                 $this->stop_capturing_option_updates();
-                                return new WP_Error( 'wrong_option', sprintf( 'Widget updated option "%1$s", but expected "%2$s".', $updated_option_name, $option_name ) );
+                                return new WP_Error( 'widget_setting_unexpected_option' );
                         }
                 }