From 60f36126845b5341444ccb54ab8f6adf65e9f207 Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Fri, 20 Jan 2017 17:32:13 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@39932 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/dashboard.php | 2 +- src/wp-includes/option.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php index 0ecf0a23f0..40035f8ba3 100644 --- a/src/wp-admin/includes/dashboard.php +++ b/src/wp-admin/includes/dashboard.php @@ -487,7 +487,7 @@ function wp_dashboard_quick_press( $error_msg = false ) { $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 ) ) ) ) ) + 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 } diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php index fa935cec85..67df23f9db 100644 --- a/src/wp-includes/option.php +++ b/src/wp-includes/option.php @@ -808,7 +808,7 @@ function wp_user_settings() { return; } - if ( is_super_admin() && ! is_user_member_of_blog() ) { + if ( ! is_user_member_of_blog() ) { return; } @@ -972,7 +972,7 @@ function wp_set_all_user_settings( $user_settings ) { return false; } - if ( is_super_admin() && ! is_user_member_of_blog() ) { + if ( ! is_user_member_of_blog() ) { return; }