Changeset 19850 for trunk/wp-signup.php

Timestamp:

02/07/2012 05:12:46 PM (15 years ago)

Author:

ryan

Message:

Fix notices. Simplify checkbox logic. Props SergeyBiryukov. fixes #19670

File:

• trunk/wp-signup.php (modified) (2 diffs)

trunk/wp-signup.php

@@ -230 +230 @@
         if ( !is_wp_error($errors) )
                 $errors = new WP_Error();
-        if ( isset( $_POST[ 'signup_for' ] ) )
-                $signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
-        else
-                $signup[ 'blog' ] = 'checked="checked"';
-
-        //TODO - This doesn't seem to do anything do we really need it?
-        $signup['user'] = isset( $signup['user'] ) ? $signup['user'] : '';
+
+        $signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
 
         // allow definition of default variables
@@ -258 +253 @@
                         <input id="signupblog" type="hidden" name="signup_for" value="user" />
                 <?php } else { ?>
-                        <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
+                        <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
                         <label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
                         <br />
-                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
+                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
                         <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
                 <?php } ?>