<!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>[13584] trunk/wp-signup.php: Fix some notices in wp-signup.php</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13584">13584</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-03-04 18:38:39 +0000 (Thu, 04 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some notices in wp-signup.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (13583 => 13584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-03-04 12:25:38 UTC (rev 13583)
+++ trunk/wp-signup.php 2010-03-04 18:38:39 UTC (rev 13584)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> require( 'wp-blog-header.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/registration.php' );
</span><span class="cx">
</span><del>-if ( is_array( get_site_option( 'illegal_names' )) && $_GET[ 'new' ] != '' && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
</del><ins>+if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
</ins><span class="cx"> wp_redirect( "http://{$current_site->domain}{$current_site->path}" );
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="lines">@@ -233,6 +233,9 @@
</span><span class="cx"> $signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
</span><span class="cx"> else
</span><span class="cx"> $signup[ 'blog' ] = 'checked="checked"';
</span><ins>+
+ //TODO - This doesn't seem to do anything do we really need it?
+ $signup['user'] = isset( $signup['user'] ) ? $signup['user'] : '';
</ins><span class="cx">
</span><span class="cx"> // allow definition of default variables
</span><span class="cx"> $filtered_results = apply_filters('signup_user_init', array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors ));
</span><span class="lines">@@ -393,7 +396,8 @@
</span><span class="cx"> $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
</span><span class="cx"> echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url );
</span><span class="cx"> } else {
</span><del>- switch ($_POST['stage']) {
</del><ins>+ $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
+ switch ( $stage ) {
</ins><span class="cx"> case 'validate-user-signup' :
</span><span class="cx"> if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
</span><span class="cx"> validate_user_signup();
</span><span class="lines">@@ -409,8 +413,9 @@
</span><span class="cx"> case 'gimmeanotherblog':
</span><span class="cx"> validate_another_blog_signup();
</span><span class="cx"> break;
</span><ins>+ case 'default':
</ins><span class="cx"> default :
</span><del>- $user_email = $_POST[ 'user_email' ];
</del><ins>+ $user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
</ins><span class="cx"> do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere?
</span><span class="cx"> if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
</span><span class="cx"> signup_another_blog($newblogname);
</span></span></pre>
</div>
</div>
</body>
</html>