Ticket #6896: 6896.patch

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

@@ -3682 +3682 @@
                 return $nav_menu;
         }
 }
+
+/**
+ * Prints the Site name.
+ *
+ * @since  2.5.0
+ *
+ * @param  array $settings Email Settings.
+ */
+function bp_email_the_site_name( $settings = array() ) {
+        echo bp_email_get_site_name( $settings );
+}
+
+        /**
+         * Gets the Site name.
+         *
+         * @since  2.5.0
+         *
+         * @param  array  $settings Email Settings.
+         * @return string The site name.
+         */
+        function bp_email_get_site_name( $settings = array() ) {
+                /**
+                 * Filters the Site Name inside the Email Template.
+                 *
+                 * @since  2.5.0
+                 *
+                 * @param string $value The Site Name.
+                 * @param array  $settings Email Settings.
+                 */
+                return apply_filters( 'bp_email_get_site_name', bp_get_option( 'blogname' ), $settings );
+        }
+
+/**
+ * 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 );
+        }
+
+/**
+ * Prints the Unsubscribe mention.
+ *
+ * @since  2.5.0
+ *
+ * @param  array $settings Email Settings.
+ */
+function bp_email_the_unsubsribe_mention( $settings = array() ) {
+        echo bp_email_get_unsubsribe_mention( $settings );
+}
+
+        /**
+         * Gets the Unsubscribe mention.
+         *
+         * @since  2.5.0
+         *
+         * @param  array  $settings Email Settings.
+         * @return string The Unsubscribe mention.
+         */
+        function bp_email_get_unsubsribe_mention( $settings = array() ) {
+                /**
+                 * Filters The Unsubscribe mention inside the Email Template.
+                 *
+                 * @since  2.5.0
+                 *
+                 * @param string $value    The Unsubscribe mention.
+                 * @param array  $settings Email Settings.
+                 */
+                return apply_filters( 'bp_email_get_unsubsribe_mention', _x( 'unsubscribe', 'email', 'buddypress' ), $settings );
+        }

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

@@ -114 +114 @@
                         color: inherit !important;
                         text-decoration: underline !important;
                 }
+
+                <?php if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) : ?>
+
+                        body.wp-customizer-unloading {
+                                opacity: 0.25;
+                                cursor: progress !important;
+                                -webkit-transition: opacity 0.5s;
+                                transition: opacity 0.5s;
+                        }
+                        body.wp-customizer-unloading * {
+                                pointer-events: none !important;
+                        }
+
+                <?php endif; ?>
         </style>
 
 </head>
@@ -138 +152 @@
                         <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 600px; border-top: 7px solid <?php echo esc_attr( $settings['highlight_color'] ); ?>" class="header_bg">
                                 <tr>
                                         <td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
-                                                <?php echo bp_get_option( 'blogname' ); ?>
+                                                <?php bp_email_the_site_name( $settings ); ?>
                                         </td>
                                 </tr>
                         </table>
@@ -153 +167 @@
                                                 <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>
@@ -173 +187 @@
                                         <td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: left; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
                                                 <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
                                                 <br><br>
-                                                <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
+                                                <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php bp_email_the_unsubsribe_mention( $settings ); ?></a>
                                         </td>
                                 </tr>
                         </table>