Ticket #6900: 6900.patch

src/bp-settings/bp-settings-template.php

@@ -88 +88 @@
 
         <div id="message" class="bp-template-notice error">
                 <p><?php printf(
-                        __( 'There is a pending change of your email address to %1$s.<br />Check your email (%2$s) for the verification link. <a href="%3$s">Cancel</a>', 'buddypress' ),
-                        '<code>' . $pending_email['newemail'] . '</code>',
-                        '<code>' . $pending_email['newemail'] . '</code>',
-                        esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss_email_change=1' )
-                );
-                ?></p>
+                        __( 'There is a pending change of your email address to %s.', 'buddypress' ),
+                        '<code>' . $pending_email['newemail'] . '</code>'
+                ); ?>
+                <br />
+                <?php printf(
+                        __( 'Check your email (%s) for the verification link.', 'buddypress' ),
+                        '<code>' . $pending_email['newemail'] . '</code>'
+                ); ?>
+                <a href="<?php echo esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss_email_change=1' ); ?>"><?php __( 'Cancel', 'buddypress' ); ?></a>
+                </p>
         </div>
 
         <?php