<!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>[28447] trunk/src/wp-signup.php: Eliminate use of `extract()` in `validate_blog_signup()`:</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/28447">28447</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-16 14:52:04 +0000 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `validate_blog_signup()`:
* `$orig_username` does not need to be pulled from `wpmu_validate_user_signup()` as it is not used in this function.
* `$user` does not need to be pulled from `wpmu_validate_blog_signup()` as it is not used in this function.
* For the `wpmu_validate_user_signup()` portion, rename `$result` and `$errors` to $user_result` and `$user_errors` for disambiguation with the blog values below.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-signup.php (28446 => 28447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-signup.php 2014-05-16 14:46:25 UTC (rev 28446)
+++ trunk/src/wp-signup.php 2014-05-16 14:52:04 UTC (rev 28447)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> function validate_user_signup() {
</span><span class="cx"> $result = validate_user_form();
</span><span class="cx"> $user_name = $result['user_name'];
</span><del>- $user_email = $result['user_email'];
</del><ins>+ $user_email = $result['user_email'];
</ins><span class="cx"> $errors = $result['errors'];
</span><span class="cx">
</span><span class="cx"> if ( $errors->get_error_code() ) {
</span><span class="lines">@@ -593,16 +593,22 @@
</span><span class="cx"> */
</span><span class="cx"> function validate_blog_signup() {
</span><span class="cx"> // Re-validate user info.
</span><del>- $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
- extract($result);
</del><ins>+ $user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
+ $user_name = $user_result['user_name'];
+ $user_email = $user_result['user_email'];
+ $user_errors = $user_result['errors'];
</ins><span class="cx">
</span><del>- if ( $errors->get_error_code() ) {
- signup_user($user_name, $user_email, $errors);
</del><ins>+ if ( $user_errors->get_error_code() ) {
+ signup_user( $user_name, $user_email, $user_errors );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
- extract($result);
</del><ins>+ $result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
+ $domain = $result['domain'];
+ $path = $result['path'];
+ $blogname = $result['blogname'];
+ $blog_title = $result['blog_title'];
+ $errors = $result['errors'];
</ins><span class="cx">
</span><span class="cx"> if ( $errors->get_error_code() ) {
</span><span class="cx"> signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
</span><span class="lines">@@ -610,10 +616,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $public = (int) $_POST['blog_public'];
</span><del>- $meta = array ('lang_id' => 1, 'public' => $public);
</del><ins>+ $signup_meta = array ('lang_id' => 1, 'public' => $public);
</ins><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-signup.php */
</span><del>- $meta = apply_filters( 'add_signup_meta', $meta );
</del><ins>+ $meta = apply_filters( 'add_signup_meta', $signup_meta );
</ins><span class="cx">
</span><span class="cx"> wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
</span><span class="cx"> confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
</span></span></pre>
</div>
</div>
</body>
</html>