Changeset 21315

Timestamp:

07/24/2012 03:13:46 PM (13 years ago)

Author:

ryan

Message:

For get_settings_errors(), make sure errors from transient get added to the global variable and not unset when checking for an error of a specific setting. Also always return an array, as noted in the documentation. Props obenland. fixes #20833

File:

• trunk/wp-admin/includes/template.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -1225 +1225 @@
     // any settings errors you want to show by default.
     if ( $sanitize )
-        sanitize_option( $setting, get_option($setting));
+        sanitize_option( $setting, get_option( $setting ) );
 
     // If settings were passed back from options.php then use them
-    // Ignore transients if $sanitize is true, we don't want the old values anyway
-    if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
-        $settings_errors = get_transient('settings_errors');
-        delete_transient('settings_errors');
-    // Otherwise check global in case validation has been run on this pageload
-    } elseif ( count( $wp_settings_errors ) ) {
-        $settings_errors = $wp_settings_errors;
-    } else {
-        return;
+    if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
+        $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
+        delete_transient( 'settings_errors' );
+    }
+
+    // Check global in case errors have been added on this pageload
+    if ( ! count( $wp_settings_errors ) ) {
+        return array();
     }
 
     // Filter the results to those of a specific setting if one was set
     if ( $setting ) {
-        foreach ( (array) $settings_errors as $key => $details )
-            if ( $setting != $details['setting'] )
-                unset( $settings_errors[$key] );
-    }
-    return $settings_errors;
+        foreach ( (array) $wp_settings_errors as $key => $details ) {
+            debug_log( $details['setting'] );
+            if ( $setting == $details['setting'] )
+                $setting_errors[] = $wp_settings_errors[$key];
+        }
+        return $setting_errors;
+    }
+
+    return $wp_settings_errors;
 }
 
@@ -1277 +1280 @@
     $settings_errors = get_settings_errors( $setting, $sanitize );
 
-    if ( ! is_array( $settings_errors ) )
+    if ( empty( $settings_errors ) )
         return;