Changeset 19934

Timestamp:

02/16/2012 05:12:10 PM (13 years ago)

Author:

duck_

Message:

Correct faulty logic when dealing with autocomplete_users_for_site_admins, and break logic into multiple lines. See #19810.

Location:

trunk/wp-admin

Files:

• includes/ajax-actions.php (modified) (1 diff)
• user-new.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' )
+        || ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
+    ) {
+        wp_die( -1 );
+    }
     
     $return = array();

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' ) && is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+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_enqueue_script( 'user-search' );
+}
 
 require_once( 'admin-header.php' );