Changeset 10682

Timestamp:

03/23/2016 03:30:10 PM (9 years ago)

Author:

boonebgorges

Message:

Improve the way blog signup confirmation strings are built.

• Remove markup from the strings, where possible.
• Use core functions to generate URLs, rather than manually concatenating.
• Pass $blog_id to bp_blogs_confirm_blog_signup().

Props ramiy, boonebgorges.
Fixes #6909.

File:

• trunk/src/bp-blogs/bp-blogs-template.php (modified) (3 diffs)

trunk/src/bp-blogs/bp-blogs-template.php

@@ -1111 +1111 @@
         $domain = $blogname . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
 
-    wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
-    bp_blogs_confirm_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 );
+    bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
     return true;
 }
@@ -1133 +1133 @@
 /**
  * Display a message after successful blog registration.
+ *
+ * @since 2.6.0 Introduced `$blog_id` parameter.
  *
  * @param string       $domain     The new blog's domain.
@@ -1140 +1142 @@
  * @param string       $user_email The email of the user who created the blog. Unused.
  * @param string|array $meta       Meta values associated with the new blog. Unused.
- */
-function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
-    $protocol = is_ssl() ? 'https://' : 'http://';
-    $blog_url = $protocol . $domain . $path; ?>
-
+ * @param int          $blog_id    ID of the newly created blog.
+ */
+function bp_blogs_confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '', $blog_id = null ) {
+    switch_to_blog( $blog_id );
+    $blog_url  = set_url_scheme( home_url() );
+    $login_url = set_url_scheme( wp_login_url() );
+    restore_current_blog();
+
+    ?>
     <p><?php _e( 'Congratulations! You have successfully registered a new site.', 'buddypress' ) ?></p>
     <p>
-        <?php printf(__( '<a href="%1$s">%2$s</a> is your new site.  <a href="%3$s">Login</a> as "%4$s" using your existing password.', 'buddypress' ), $blog_url, $blog_url, $blog_url . "wp-login.php", $user_name ); ?>
+        <?php printf(
+            '%s %s',
+            sprintf(
+                __( '%s is your new site.', 'buddypress' ),
+                sprintf( '<a href="%s">%s</a>', esc_url( $blog_url ), esc_url( $blog_url ) )
+            ),
+            sprintf(
+                /* translators: 1: Login URL, 2: User name */
+                __( '<a href="%1$s">Log in</a> as "%2$s" using your existing password.', 'buddypress' ),
+                esc_url( $login_url ),
+                esc_html( $user_name )
+            )
+        ); ?>
     </p>