Changeset 20332

Timestamp:

03/30/2012 09:04:48 PM (14 years ago)

Author:

nacin

Message:

Clean up cap checks for autocompletes for sites and users in a network. see #19810.

Location:

trunk/wp-admin

Files:

• includes/ajax-actions.php (modified) (2 diffs)
• includes/dashboard.php (modified) (1 diff)
• network/users.php (modified) (1 diff)
• user-new.php (modified) (1 diff)
• users.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -151 +151 @@
 
 function wp_ajax_autocomplete_user() {
-        if ( ! is_multisite()
-                || ! current_user_can( 'promote_users' )
-                || wp_is_large_network( 'users' )
-                || ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
-        ) {
-                wp_die( -1 );
-        }
+        if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) )
+                wp_die( -1 );
+
+        if ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
+                wp_die( -1 );
 
         $return = array();
@@ -216 +214 @@
 
 function wp_ajax_autocomplete_site() {
-        if ( ! is_multisite()
-                || ! current_user_can( 'manage_sites' )
-                || wp_is_large_network( 'sites' )
-                || ! is_super_admin()
-        ) {
-                wp_die( -1 );
-        }
+        if ( ! is_multisite() || ! current_user_can( 'manage_sites' ) || wp_is_large_network( 'sites' ) )
+                wp_die( -1 );
 
         $return = array();

trunk/wp-admin/includes/dashboard.php

@@ -417 +417 @@
                 $actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
 
-        if ( is_multisite()
-                && current_user_can( 'promote_users' )
-                && ! wp_is_large_network( 'users' )
-                && is_super_admin()
-                && is_network_admin()
-        ) {
+        if ( ! wp_is_large_network( 'users' ) )
                 wp_enqueue_script( 'user-search' );
-        }
-        if ( is_multisite()
-                && current_user_can( 'manage_sites' )
-                && ! wp_is_large_network( 'sites' )
-                && is_super_admin()
-                && is_network_admin()
-        ) {
+
+        if ( ! wp_is_large_network( 'sites' ) )
                 wp_enqueue_script( 'site-search' );
-        }
 
         $c_users = get_user_count();

trunk/wp-admin/network/users.php

@@ -246 +246 @@
 );
 
-if ( is_multisite()
-        && current_user_can( 'promote_users' )
-        && ! wp_is_large_network( 'users' )
-        && is_super_admin()
-) {
+if ( ! wp_is_large_network( 'users' ) )
         wp_enqueue_script( 'user-search' );
-}
 
 require_once( '../admin-header.php' );

trunk/wp-admin/user-new.php

@@ -179 +179 @@
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
-if ( is_multisite()
-        && current_user_can( 'promote_users' )
-        && ! wp_is_large_network( 'users' )
+
+if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
         && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
 ) {

trunk/wp-admin/users.php

@@ -340 +340 @@
         }
 
-        if ( is_multisite()
-                && current_user_can( 'promote_users' )
-                && ! wp_is_large_network( 'users' )
+        if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
                 && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
         ) {