Changeset 16706

Timestamp:

12/03/2010 10:59:20 AM (14 years ago)

Author:

markjaquith

Message:

Backwards compat for plugin use of updated=1. fixes #15660

Location:

trunk/wp-admin

Files:

• includes/template.php (modified) (3 diffs)
• options-head.php (modified) (1 diff)
• options.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -1239 +1239 @@
  * pageload and returns them.
  *
- * If changes were just submitted ($_GET['updated']) and settings errors were saved
+ * If changes were just submitted ($_GET['settings-updated']) and settings errors were saved
  * to the 'settings_errors' transient then those errors will be returned instead. This
  * is used to pass errors back across pageloads.
@@ -1266 +1266 @@
     // If settings were passed back from options.php then use them
     // Ignore transients if $sanitize is true, we dont' want the old values anyway
-    if ( isset($_GET['updated']) && $_GET['updated'] && get_transient('settings_errors') ) {
+    if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
         $settings_errors = get_transient('settings_errors');
         delete_transient('settings_errors');
@@ -1309 +1309 @@
 function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
 
-    if ($hide_on_update AND $_GET['updated']) return;
+    if ($hide_on_update AND $_GET['settings-updated']) return;
 
     $settings_errors = get_settings_errors( $setting, $sanitize );

trunk/wp-admin/options-head.php

@@ -12 +12 @@
 wp_reset_vars(array('action', 'standalone', 'option_group_id'));
 
+if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
+    // For backwards compat with plugins that don't use the Settings API and just set updated=1 in the redirect
+    add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+}
+
 settings_errors();
 

trunk/wp-admin/options.php

@@ -158 +158 @@
      * Redirect back to the settings page that was submitted
      */
-    $goback = add_query_arg( 'updated', 'true',  wp_get_referer() );
+    $goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
     wp_redirect( $goback );
     exit;