Ticket #22178: 22178.2.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 ) {

wp-admin/includes/dashboard.php

@@ -490 +490 @@
                 $post = get_post( $last_post_id );
                 if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
                         $post = get_default_post_to_edit('post', true);
-                        update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+                        update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
                 } else {
                         $post->post_title = ''; // Remove the auto draft title
                 }
         } else {
-                $post = get_default_post_to_edit('post', true);
-                update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+                $post = get_default_post_to_edit( 'post' , true);
+                $user_id = get_current_user_id();
+                // Don't create an option if this is a super admin who does not belong to this site.
+                if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
+                        update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
         }
 
         $post_ID = (int) $post->ID;