<!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" />
<title>[23535] trunk/wp-includes/ms-functions.php: Remove direct call to add_new_user_to_blog() as this is already hooked into wpmu_activate_user.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23535">23535</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-02-28 20:28:36 +0000 (Thu, 28 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove direct call to add_new_user_to_blog() as this is already hooked into wpmu_activate_user.
The second argument passed by that hook is not $email, so let's change that. It is not used.
props wonderboymusic.
fixes <a href="http://core.trac.wordpress.org/ticket/15173">#15173</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 (23534 => 23535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2013-02-28 19:51:29 UTC (rev 23534)
+++ trunk/wp-includes/ms-functions.php 2013-02-28 20:28:36 UTC (rev 23535)
</span><span class="lines">@@ -811,7 +811,6 @@
</span><span class="cx"> * @uses wp_generate_password()
</span><span class="cx"> * @uses wpmu_welcome_user_notification()
</span><span class="cx"> * @uses add_user_to_blog()
</span><del>- * @uses add_new_user_to_blog()
</del><span class="cx"> * @uses wpmu_create_user()
</span><span class="cx"> * @uses wpmu_create_blog()
</span><span class="cx"> * @uses wpmu_welcome_notification()
</span><span class="lines">@@ -857,11 +856,9 @@
</span><span class="cx"> if ( isset( $user_already_exists ) )
</span><span class="cx"> return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
</span><span class="cx">
</span><del>- wpmu_welcome_user_notification($user_id, $password, $meta);
-
- add_new_user_to_blog( $user_id, $user_email, $meta );
- do_action('wpmu_activate_user', $user_id, $password, $meta);
- return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
</del><ins>+ wpmu_welcome_user_notification( $user_id, $password, $meta );
+ do_action( 'wpmu_activate_user', $user_id, $password, $meta );
+ return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
</span><span class="lines">@@ -1677,13 +1674,17 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add a newly created user to the appropriate blog
</span><span class="cx"> *
</span><ins>+ * To add a user in general, use add_user_to_blog(). This function
+ * is specifically hooked into the wpmu_activate_user action.
+ *
</ins><span class="cx"> * @since MU
</span><ins>+ * @see add_user_to_blog()
</ins><span class="cx"> *
</span><span class="cx"> * @param int $user_id
</span><del>- * @param string $email
</del><ins>+ * @param mixed $password Ignored.
</ins><span class="cx"> * @param array $meta
</span><span class="cx"> */
</span><del>-function add_new_user_to_blog( $user_id, $email, $meta ) {
</del><ins>+function add_new_user_to_blog( $user_id, $password, $meta ) {
</ins><span class="cx"> global $current_site;
</span><span class="cx"> if ( !empty( $meta[ 'add_to_blog' ] ) ) {
</span><span class="cx"> $blog_id = $meta[ 'add_to_blog' ];
</span></span></pre>
</div>
</div>
</body>
</html>