Changeset 39932

Timestamp:

01/20/2017 05:32:13 PM (6 years ago)

Author:

flixos90

Message:

Multisite: Do not check for is_super_admin() when trying to set user settings.

The checks were introduced in [22256] to prevent user settings to be set for super admins that were not a member of the current site. However the latter should apply to any kind of user, so the is_super_admin() check is redundant. Furthermore, removing these checks is necessary for the ongoing effort to get rid of is_super_admin() checks in general.

Props chandrapatel for initial patch.
Fixes #39199. See #37616.

Location:

trunk/src

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/option.php (modified) (2 diffs)

trunk/src/wp-admin/includes/dashboard.php

@@ -488 +488 @@
         $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 ) ) ) ) )
+        if ( 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
     }

trunk/src/wp-includes/option.php

@@ -809 +809 @@
     }
 
-    if ( is_super_admin() && ! is_user_member_of_blog() ) {
+    if ( ! is_user_member_of_blog() ) {
         return;
     }
@@ -973 +973 @@
     }
 
-    if ( is_super_admin() && ! is_user_member_of_blog() ) {
+    if ( ! is_user_member_of_blog() ) {
         return;
     }