<!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>[16949] trunk: Skip confirmation email fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16949">16949</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-15 16:04:19 +0000 (Wed, 15 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skip confirmation email fixes. Props ocean90, duck_. see <a href="http://trac.wordpress.org/ticket/15725">#15725</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (16948 => 16949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-12-15 13:43:30 UTC (rev 16948)
+++ trunk/wp-admin/user-new.php 2010-12-15 16:04:19 UTC (rev 16949)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
</span><span class="cx"> }
</span><span class="cx"> wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
</span><del>- if ( isset( $_POST[ 'adduser' ] ) && isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
</del><ins>+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
</ins><span class="cx"> $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
</span><span class="cx"> wpmu_activate_signup( $key );
</span><span class="cx"> $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (16948 => 16949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-12-15 13:43:30 UTC (rev 16948)
+++ trunk/wp-includes/ms-functions.php 2010-12-15 16:04:19 UTC (rev 16949)
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> if ( $meta[ 'add_to_blog' ] ) {
</span><span class="cx"> $blog_id = $meta[ 'add_to_blog' ];
</span><span class="cx"> $role = $meta[ 'new_role' ];
</span><del>- remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog.
</del><ins>+ remove_user_from_blog($user_id, $current_site->blog_id); // remove user from main blog.
</ins><span class="cx"> add_user_to_blog( $blog_id, $user_id, $role );
</span><span class="cx"> update_user_meta( $user_id, 'primary_blog', $blog_id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>