WordPress 4.3

[autoinstalls/wordpress.git] / wp-signup.php

diff --git a/wp-signup.php b/wp-signup.php
index a519bcc0d604d238494d2657b305a9415f3afacc..3373f8ecd86dea05790cd3b571a43c9b1210a54a 100644 (file)
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -7,7 +7,7 @@ add_action( 'wp_head', 'wp_no_robots' );
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 

-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
+if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {

        wp_redirect( network_home_url() );
        die();
 }
        wp_redirect( network_home_url() );
        die();
 }


@@ -299,8 +299,8 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
  *
  * @since MU
  *
  *
  * @since MU
  *

- * @return null|boolean True if blog signup was validated, false if error.
- *                      The function halts all execution if the user is not logged in.
+ * @return null|bool True if blog signup was validated, false if error.
+ *                   The function halts all execution if the user is not logged in.

  */
 function validate_another_blog_signup() {
        global $wpdb, $blogname, $blog_title, $errors, $domain, $path;
  */
 function validate_another_blog_signup() {
        global $wpdb, $blogname, $blog_title, $errors, $domain, $path;


@@ -700,9 +700,9 @@ if ( $active_signup == 'none' ) {
                        do_action( 'preprocess_signup_form' );
                        if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
                                signup_another_blog($newblogname);
                        do_action( 'preprocess_signup_form' );
                        if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
                                signup_another_blog($newblogname);

-                       elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
+                       elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) )

                                signup_user( $newblogname, $user_email );
                                signup_user( $newblogname, $user_email );

-                       elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
+                       elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )

                                _e( 'Sorry, new registrations are not allowed at this time.' );
                        else
                                _e( 'You are logged in already. No need to register again!' );
                                _e( 'Sorry, new registrations are not allowed at this time.' );
                        else
                                _e( 'You are logged in already. No need to register again!' );