Changeset 12220

Timestamp:

09/07/2018 01:45:37 PM (7 years ago)

Author:

djpaul

Message:

Users, Registration: fix Log In link on account activation screen.

Refactoring the message to remove HTML from the original sentance has made it
easier to keep the correct HTML escaping and keep the link.

Props imath

Fixes #7894 (trunk)

Location:

trunk/src

Files:

• bp-members/bp-members-adminbar.php (modified) (1 diff)
• bp-templates/bp-nouveau/buddypress/members/activate.php (modified) (2 diffs)

trunk/src/bp-members/bp-members-adminbar.php

@@ -53 +53 @@
         $wp_admin_bar->add_menu( array(
             'id'    => 'bp-login',
-            'title' => __( 'Log in', 'buddypress' ),
+            'title' => __( 'Log In', 'buddypress' ),
             'href'  => wp_login_url( bp_get_requested_url() )
         ) );

trunk/src/bp-templates/bp-nouveau/buddypress/members/activate.php

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 ?>
@@ -21 +21 @@
                 <p><?php esc_html_e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
             <?php else : ?>
-                <p>
-                    <?php
-                    echo esc_html(
-                        sprintf(
-                            __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ),
-                            wp_login_url( bp_get_root_domain() )
-                        )
-                    );
-                    ?>
-                </p>
+                <p><?php esc_html_e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ); ?></p>
             <?php endif; ?>
+
+            <?php
+            printf(
+                '<p><a href="%1$s">%2$s</a></p>',
+                esc_url( wp_login_url( bp_get_root_domain() ) ),
+                esc_html__( 'Log In', 'buddypress' )
+            );
+            ?>
 
         <?php else : ?>