diff --git a/src/wp-activate.php b/src/wp-activate.php
index 5150c29..07bd456 100644
a
|
b
|
get_header( 'wp-activate' ); |
99 | 99 | <h2><?php _e( 'Your account is now active!' ); ?></h2> |
100 | 100 | <?php |
101 | 101 | echo '<p class="lead-in">'; |
102 | | if ( $signup->domain . $signup->path == '' ) { |
| 102 | if ( '' == $signup->domain . $signup->path ) { |
103 | 103 | printf( |
104 | 104 | /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */ |
105 | 105 | __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ), |
… |
… |
get_header( 'wp-activate' ); |
137 | 137 | </div> |
138 | 138 | |
139 | 139 | <?php |
140 | | if ( $url && $url != network_home_url( '', 'http' ) ) : |
| 140 | if ( $url && network_home_url( '', 'http' ) != $url ) : |
141 | 141 | switch_to_blog( (int) $result['blog_id'] ); |
142 | 142 | $login_url = wp_login_url(); |
143 | 143 | restore_current_blog(); |
diff --git a/src/wp-cron.php b/src/wp-cron.php
index acf5ded..5108274 100644
a
|
b
|
foreach ( $crons as $timestamp => $cronhooks ) { |
114 | 114 | |
115 | 115 | $schedule = $v['schedule']; |
116 | 116 | |
117 | | if ( $schedule != false ) { |
| 117 | if ( false != $schedule ) { |
118 | 118 | $new_args = array( $timestamp, $schedule, $hook, $v['args'] ); |
119 | 119 | call_user_func_array( 'wp_reschedule_event', $new_args ); |
120 | 120 | } |
diff --git a/src/wp-login.php b/src/wp-login.php
index 4453f82..b2e118e 100644
a
|
b
|
if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set |
441 | 441 | } |
442 | 442 | |
443 | 443 | $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) ); |
444 | | if ( $url != get_option( 'siteurl' ) ) { |
| 444 | if ( get_option( 'siteurl' ) != $url ) { |
445 | 445 | update_option( 'siteurl', $url ); |
446 | 446 | } |
447 | 447 | } |
… |
… |
switch ( $action ) { |
949 | 949 | exit; |
950 | 950 | } |
951 | 951 | |
952 | | if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) { |
| 952 | if ( ( empty( $redirect_to ) || 'wp-admin/' == $redirect_to || admin_url() == $redirect_to ) ) { |
953 | 953 | // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile. |
954 | 954 | if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) { |
955 | 955 | $redirect_to = user_admin_url(); |
diff --git a/src/wp-mail.php b/src/wp-mail.php
index 977ed0f..f64c7a5 100644
a
|
b
|
for ( $i = 1; $i <= $count; $i++ ) { |
101 | 101 | $content_transfer_encoding = explode( ';', $content_transfer_encoding ); |
102 | 102 | $content_transfer_encoding = $content_transfer_encoding[0]; |
103 | 103 | } |
104 | | if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) { |
| 104 | if ( ( 'multipart/alternative' == $content_type ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) { |
105 | 105 | $boundary = trim( $line ); |
106 | 106 | $boundary = explode( '"', $boundary ); |
107 | 107 | $boundary = $boundary[1]; |
… |
… |
for ( $i = 1; $i <= $count; $i++ ) { |
162 | 162 | |
163 | 163 | $subject = trim( $subject ); |
164 | 164 | |
165 | | if ( $content_type == 'multipart/alternative' ) { |
| 165 | if ( 'multipart/alternative' == $content_type ) { |
166 | 166 | $content = explode( '--' . $boundary, $content ); |
167 | 167 | $content = $content[2]; |
168 | 168 | |
… |
… |
for ( $i = 1; $i <= $count; $i++ ) { |
212 | 212 | |
213 | 213 | $post_title = xmlrpc_getposttitle( $content ); |
214 | 214 | |
215 | | if ( $post_title == '' ) { |
| 215 | if ( '' == $post_title ) { |
216 | 216 | $post_title = $subject; |
217 | 217 | } |
218 | 218 | |
diff --git a/src/wp-signup.php b/src/wp-signup.php
index cecaf98..57ce56a 100644
a
|
b
|
function signup_user( $user_name = '', $user_email = '', $errors = '' ) { |
573 | 573 | <?php show_user_form( $user_name, $user_email, $errors ); ?> |
574 | 574 | |
575 | 575 | <p> |
576 | | <?php if ( $active_signup == 'blog' ) { ?> |
| 576 | <?php if ( 'blog' == $active_signup ) { ?> |
577 | 577 | <input id="signupblog" type="hidden" name="signup_for" value="blog" /> |
578 | | <?php } elseif ( $active_signup == 'user' ) { ?> |
| 578 | <?php } elseif ( 'user' == $active_signup ) { ?> |
579 | 579 | <input id="signupblog" type="hidden" name="signup_for" value="user" /> |
580 | 580 | <?php } else { ?> |
581 | 581 | <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> /> |
… |
… |
if ( current_user_can( 'manage_network' ) ) { |
898 | 898 | $newblogname = isset( $_GET['new'] ) ? strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) ) : null; |
899 | 899 | |
900 | 900 | $current_user = wp_get_current_user(); |
901 | | if ( $active_signup == 'none' ) { |
| 901 | if ( 'none' == $active_signup ) { |
902 | 902 | _e( 'Registration has been disabled.' ); |
903 | | } elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) { |
| 903 | } elseif ( 'blog' == $active_signup && ! is_user_logged_in() ) { |
904 | 904 | $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) ); |
905 | 905 | /* translators: %s: login URL */ |
906 | 906 | printf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url ); |
… |
… |
if ( $active_signup == 'none' ) { |
908 | 908 | $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; |
909 | 909 | switch ( $stage ) { |
910 | 910 | case 'validate-user-signup': |
911 | | if ( $active_signup == 'all' || $_POST['signup_for'] == 'blog' && $active_signup == 'blog' || $_POST['signup_for'] == 'user' && $active_signup == 'user' ) { |
| 911 | if ( 'all' == $active_signup || 'blog' == $_POST['signup_for'] && 'blog' == $active_signup || 'user' == $_POST['signup_for'] && 'user' == $active_signup ) { |
912 | 912 | validate_user_signup(); |
913 | 913 | } else { |
914 | 914 | _e( 'User registration has been disabled.' ); |
915 | 915 | } |
916 | 916 | break; |
917 | 917 | case 'validate-blog-signup': |
918 | | if ( $active_signup == 'all' || $active_signup == 'blog' ) { |
| 918 | if ( 'all' == $active_signup || 'blog' == $active_signup ) { |
919 | 919 | validate_blog_signup(); |
920 | 920 | } else { |
921 | 921 | _e( 'Site registration has been disabled.' ); |
… |
… |
if ( $active_signup == 'none' ) { |
933 | 933 | * @since 3.0.0 |
934 | 934 | */ |
935 | 935 | do_action( 'preprocess_signup_form' ); |
936 | | if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) { |
| 936 | if ( is_user_logged_in() && ( 'all' == $active_signup || 'blog' == $active_signup ) ) { |
937 | 937 | signup_another_blog( $newblogname ); |
938 | | } elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) { |
| 938 | } elseif ( ! is_user_logged_in() && ( 'all' == $active_signup || 'user' == $active_signup ) ) { |
939 | 939 | signup_user( $newblogname, $user_email ); |
940 | | } elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) { |
| 940 | } elseif ( ! is_user_logged_in() && ( 'blog' == $active_signup ) ) { |
941 | 941 | _e( 'Sorry, new registrations are not allowed at this time.' ); |
942 | 942 | } else { |
943 | 943 | _e( 'You are logged in already. No need to register again!' ); |
… |
… |
if ( $active_signup == 'none' ) { |
946 | 946 | if ( $newblogname ) { |
947 | 947 | $newblog = get_blogaddress_by_name( $newblogname ); |
948 | 948 | |
949 | | if ( $active_signup == 'blog' || $active_signup == 'all' ) { |
| 949 | if ( 'blog' == $active_signup || 'all' == $active_signup ) { |
950 | 950 | /* translators: %s: site address */ |
951 | 951 | printf( |
952 | 952 | '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>', |