<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13506] trunk/wp-admin/includes/ms.php: more ms delete user tweaks,
props ocean90, see #12386</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13506">13506</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-28 19:24:25 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>more ms delete user tweaks, props ocean90, see <a href="http://trac.wordpress.org/ticket/12386">#12386</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13505 => 13506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-28 18:41:45 UTC (rev 13505)
+++ trunk/wp-admin/includes/ms.php 2010-02-28 19:24:25 UTC (rev 13506)
</span><span class="lines">@@ -180,19 +180,18 @@
</span><span class="cx"> $site_admins = get_site_option( 'site_admins', array( 'admin' ) );
</span><span class="cx"> $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
</span><span class="cx">
</span><del>- foreach ( (array) $_POST['allusers'] as $key => $val ) {
</del><ins>+ foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
</ins><span class="cx"> if ( $val != '' && $val != '0' ) {
</span><del>- $allusers[] = $val;
- $user = new WP_User( $val );
</del><ins>+ $delete_user = new WP_User( $val );
</ins><span class="cx">
</span><del>- 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 ) );
</del><ins>+ 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 ) );
</ins><span class="cx">
</span><span class="cx"> echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
</span><span class="cx"> $blogs = get_blogs_of_user( $val, true );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $blogs ) ) {
</span><del>- echo '<p><strong>' . sprintf( __( 'Blogs from %s:' ), $user->user_login ) . '</strong></p>';
</del><ins>+ echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';
</ins><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><span class="cx"> $blog_users = get_users_of_blog( $details->userblog_id );
</span><span class="cx"> if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</span><span class="lines">@@ -200,7 +199,7 @@
</span><span class="cx"> echo "<select name='blog[$val][{$key}]'>";
</span><span class="cx"> $out = '';
</span><span class="cx"> foreach ( $blog_users as $user ) {
</span><del>- if ( $user->user_id != $val && !in_array( $val, $allusers ) )
</del><ins>+ if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )
</ins><span class="cx"> $out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
</span><span class="cx"> }
</span><span class="cx"> if ( $out == '' )
</span></span></pre>
</div>
</div>
</body>
</html>