Ticket #6896: 6896.salutation.patch

src/bp-core/bp-core-template.php

@@ -3682 +3682 @@
                 return $nav_menu;
         }
 }
+
+/**
+ * Prints the Recipient Salutation.
+ *
+ * @since  2.5.0
+ *
+ * @param  array $settings Email Settings.
+ */
+function bp_email_the_salutation( $settings = array() ) {
+        echo bp_email_get_salutation( $settings );
+}
+
+        /**
+         * Gets the Recipient Salutation.
+         *
+         * @since  2.5.0
+         *
+         * @param  array  $settings Email Settings.
+         * @return string The Recipient Salutation.
+         */
+        function bp_email_get_salutation( $settings = array() ) {
+                $token = '{{recipient.name}}';
+
+                /**
+                 * Filters The Recipient Salutation inside the Email Template.
+                 *
+                 * @since  2.5.0
+                 *
+                 * @param string $value    The Recipient Salutation.
+                 * @param array  $settings Email Settings.
+                 * @param string $token    The Recipient token.
+                 */
+                return apply_filters( 'bp_email_get_salutation', sprintf( _x( 'Hi %s,', 'recipient salutation', 'buddypress' ), $token ), $settings, $token );
+        }

src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php

@@ -170 +170 @@
                                                 <table cellspacing="0" cellpadding="0" border="0" width="100%">
                                                   <tr>
                                                                 <td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
-                                                                        <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome">Hi {{recipient.name}},</span>
+                                                                        <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
                                                                         <hr color="<?php echo esc_attr( $settings['email_bg'] ); ?>"><br>
                                                                         {{{content}}}
                                                                 </td>