<!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>[14226] trunk/wp-includes/ms-functions.php:
fix site administrator add user to site logic, see #12488</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14226">14226</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-04-24 18:39:22 +0000 (Sat, 24 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix site administrator add user to site logic, see <a href="http://trac.wordpress.org/ticket/12488">#12488</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14225 => 14226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-04-24 18:27:08 UTC (rev 14225)
+++ trunk/wp-includes/ms-functions.php 2010-04-24 18:39:22 UTC (rev 14226)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span><del>- if ( empty($user) )
</del><ins>+ if ( empty($user) || !$user->ID )
</ins><span class="cx"> return new WP_Error('user_does_not_exist', __('That user does not exist.'));
</span><span class="cx">
</span><span class="cx"> if ( !get_user_meta($user_id, 'primary_blog', true) ) {
</span><span class="lines">@@ -1317,16 +1317,21 @@
</span><span class="cx"> $key = array_pop( $parts );
</span><span class="cx">
</span><span class="cx"> $details = get_option( 'new_user_' . $key );
</span><del>- add_existing_user_to_blog( $details );
- delete_option( 'new_user_' . $key );
- wp_die( sprintf(__('You have been added to this blog. Please visit the <a href="%s">homepage</a> or <a href="%s">login</a> using your username and password.'), site_url(), admin_url() ) );
</del><ins>+ if ( !empty( $details ) )
+ delete_option( 'new_user_' . $key );
+
+ if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
+ wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), site_url() ) );
+
+ wp_die( sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">login</a> using your username and password.'), site_url(), admin_url() ), __('Success') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_existing_user_to_blog( $details = false ) {
</span><span class="cx"> if ( is_array( $details ) ) {
</span><del>- add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] );
- do_action( 'added_existing_user', $details[ 'user_id' ] );
</del><ins>+ $result = add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] );
+ do_action( 'added_existing_user', $details[ 'user_id' ], $result );
</ins><span class="cx"> }
</span><ins>+ return $result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_new_user_to_blog( $user_id, $email, $meta ) {
</span></span></pre>
</div>
</div>
</body>
</html>