Changeset 29554

Timestamp:

08/20/2014 05:29:36 PM (12 years ago)

Author:

wonderboymusic

Message:

wpmu_activate_signup() returns an array or WP_Error. The array keys it returns can be different based on context of $signup. The return value was previously extract()'d, so the value of $blog_id was secretly undefined when being passed to get_blogaddress_by_id() in some cases.

If $result['blog_id'] is not set, make sure $url is set to an empty string so that the proper "activated" message is shown to the user.

Props imath.
See [28373].
Fixes #29191.

File:

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

trunk/src/wp-activate.php

@@ -106 +106 @@
                         }
                 } else {
-                        $url = get_blogaddress_by_id( (int) $result['blog_id'] );
+                        $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
                         $user = get_userdata( (int) $result['user_id'] );
                         ?>
@@ -116 +116 @@
                         </div>
 
-                        <?php if ( $url != network_home_url('', 'http') ) : ?>
+                        <?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
                                 <p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
                         <?php else: ?>