vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more ms delete user tweaks, props ocean90, see #12386

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13506 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick
2010-02-28 19:24:25 +00:00
parent 4e11ee5944
commit 697d574e68
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/includes/ms.php
View File

@@ -180,19 +180,18 @@ function confirm_delete_users( $users ) {
$site_admins = get_site_option( 'site_admins', array( 'admin' ) );
$admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
foreach ( (array) $_POST['allusers'] as $key => $val ) {
foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
if ( $val != '' && $val != '0' ) {
$allusers[] = $val;
$user = new WP_User( $val );
$delete_user = new WP_User( $val );
if ( in_array( $user->user_login, $site_admins ) )
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $user->user_login ) );
if ( in_array( $delete_user->user_login, $site_admins ) )
wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );
echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
$blogs = get_blogs_of_user( $val, true );
if ( !empty( $blogs ) ) {
echo '<p><strong>' . sprintf( __( 'Blogs from %s:' ), $user->user_login ) . '</strong></p>';
echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';
foreach ( (array) $blogs as $key => $details ) {
$blog_users = get_users_of_blog( $details->userblog_id );
if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
@@ -200,7 +199,7 @@ function confirm_delete_users( $users ) {
echo "<select name='blog[$val][{$key}]'>";
$out = '';
foreach ( $blog_users as $user ) {
if ( $user->user_id != $val && !in_array( $val, $allusers ) )
if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )
$out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
}
if ( $out == '' )