Ticket #18088: 18088.diff

src/wp-admin/includes/template.php

@@ -1405 +1405 @@
                 sanitize_option( $setting, get_option( $setting ) );
 
         // If settings were passed back from options.php then use them.
-        if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
+        if ( ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] || is_network_admin() && isset( $_GET['updated'] ) && $_GET['updated'] ) && get_transient( 'settings_errors' ) ) {
                 $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
                 delete_transient( 'settings_errors' );
         }

src/wp-admin/network/settings.php

@@ -86 +86 @@
          */
         do_action( 'update_wpmu_options' );
 
+        // If no settings errors were registered add a general 'updated' message.
+        if ( !count( get_settings_errors() ) )
+                add_settings_error( 'general', 'settings_updated', __( 'Options saved.' ), 'updated' );
+
+        set_transient( 'settings_errors', get_settings_errors(), 30 );
+
         wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
         exit();
 }
@@ -93 +99 @@
 include( ABSPATH . 'wp-admin/admin-header.php' );
 
 if ( isset( $_GET['updated'] ) ) {
-        ?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Options saved.' ) ?></p></div><?php
+        settings_errors();
 }
 ?>