Ticket #22178: 22178.diff

wp-includes/option.php

@@ -551 +551 @@
 
                         $last_time = (int) get_user_option( 'user-settings-time', $user->ID );
                         $saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0;
-
-                        if ( $saved > $last_time ) {
+                        if ( ( $saved > $last_time ) && ! ( is_super_admin( $user->ID ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user->ID ) ) ) ) ) {
                                 update_user_option( $user->ID, 'user-settings', $cookie, false );
                                 update_user_option( $user->ID, 'user-settings-time', time() - 5, false );
                                 return;
@@ -560 +559 @@
                 }
         }
 
-        setcookie( 'wp-settings-' . $user->ID, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
-        setcookie( 'wp-settings-time-' . $user->ID, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
-        $_COOKIE['wp-settings-' . $user->ID] = $settings;
+        if ( $settings ) {
+                setcookie( 'wp-settings-' . $user->ID, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
+                setcookie( 'wp-settings-time-' . $user->ID, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH );
+                $_COOKIE['wp-settings-' . $user->ID] = $settings;
+        }
 }
 
 /**
@@ -697 +698 @@
         if ( ! $user = wp_get_current_user() )
                 return false;
 
+        if ( is_super_admin( $user->ID ) &&
+                ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user->ID ) ) )
+                )
+                return;
+
         $_updated_user_settings = $all;
         $settings = '';
         foreach ( $all as $k => $v ) {