Ticket #6900: 6900.diff

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>',
+                        __( 'There is a pending change of your email address to %s.', 'buddypress' ),
+                        '<code>' . esc_html( $pending_email['newemail'] ) . '</code>'
+                ); ?>
+                <br />
+                <?php printf(
+                        __( 'Check your email (%1$s) for the verification link, or <a href="%s">cancel the pending change</a>.', 'buddypress' ),
+                        '<code>' . esc_html( $pending_email['newemail'] ) . '</code>',
                         esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss_email_change=1' )
-                );
-                ?></p>
+                ); ?></p>
         </div>
 
         <?php