Changeset 34790 for trunk/src/wp-signup.php

Timestamp:

10/03/2015 12:33:47 AM (10 years ago)

Author:

johnbillion

Message:

Use wp_login_url() for login links when signing up for a new blog or activating a new blog on Multisite.

Fixes #31495
Props GregLone for the intial patch

File:

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

trunk/src/wp-signup.php

@@ -354 +354 @@
     $meta = apply_filters( 'add_signup_meta', $meta_defaults );
 
-    wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
-    confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
+    $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
+
+    if ( is_wp_error( $blog_id ) ) {
+        return false;
+    }
+
+    confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
     return true;
 }
@@ -363 +368 @@
  *
  * @since MU
+ * @since 4.4.0 Added the `$blog_id` parameter.
  *
  * @param string $domain The domain URL
@@ -369 +375 @@
  * @param string $user_name The username
  * @param string $user_email The user's email address
- * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
- */
-function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array() ) {
-    ?>
-    <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+ * @param array  $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
+ * @param int    $blog_id The blog ID
+ */
+function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) {
+
+    if ( $blog_id ) {
+        switch_to_blog( $blog_id );
+        $home_url  = home_url( '/' );
+        $login_url = wp_login_url();
+        restore_current_blog();
+    } else {
+        $home_url  = 'http://' . $domain . $path;
+        $login_url = 'http://' . $domain . $path . 'wp-login.php';
+    }
+
+    $site = sprintf( '<a href="%1$s">%2$s</a>',
+        esc_url( $home_url ),
+        $blog_title
+    );
+
+    ?>
+    <h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2>
     <p>
-        <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
+        <?php printf(
+            __( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
+            esc_url( $home_url ),
+            untrailingslashit( $domain . $path ),
+            esc_url( $login_url ),
+            $user_name
+        ); ?>
     </p>
     <?php