Changeset 12722 for trunk/wp-admin/users.php
- Timestamp:
- 01/14/2010 02:02:19 AM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin
-
Property
svn:ignore
set to
.themes.php.swp
.user-edit.php.swp
.user-new.php.swp
.users.php.swp
-
Property
svn:ignore
set to
-
trunk/wp-admin/users.php
r12546 r12722 99 99 switch($_REQUEST['delete_option']) { 100 100 case 'delete': 101 wp_delete_user($id); 101 if ( !is_multisite() ) { 102 wp_delete_user($id); 103 } else { 104 remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog 105 } 102 106 break; 103 107 case 'reassign': 104 wp_delete_user($id, $_REQUEST['reassign_user']); 108 if ( !is_multisite() ) { 109 wp_delete_user($id, $_REQUEST['reassign_user']); 110 } else { 111 remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']); 112 } 105 113 break; 106 114 } … … 154 162 } 155 163 } 156 $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login"); 164 if ( !is_multisite() ) { 165 $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login"); 166 } else { 167 // WPMU only searches users of current blog 168 $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities' ORDER BY user_login"); 169 } 157 170 $user_dropdown = '<select name="reassign_user">'; 158 171 foreach ( (array) $all_logins as $login ) … … 240 253 <div class="wrap"> 241 254 <?php screen_icon(); ?> 242 <h2><?php echo esc_html( $title ); ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a> <?php255 <h2><?php echo esc_html( $title ); if ( !is_multisite() || get_site_option( 'add_new_users' ) ) { ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php } 243 256 if ( isset($_GET['usersearch']) && $_GET['usersearch'] ) 244 257 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $_GET['usersearch'] ) ); ?> … … 386 399 </div> 387 400 401 <?php 402 if ( is_multisite() ) { 403 foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) { 404 $var = 'new_' . $var; 405 $$var = isset($_REQUEST[$formpost]) ? esc_attr(stripslashes($_REQUEST[$formpost])) : ''; 406 } 407 unset($name); 408 } 409 ?> 410 388 411 <br class="clear" /> 389 412 <?php
Note: See TracChangeset
for help on using the changeset viewer.