Changeset 20332 for trunk/wp-admin/includes/ajax-actions.php

Timestamp:

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

Author:

nacin

Message:

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

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

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();