Changeset 11787

Timestamp:

01/02/2018 05:36:05 PM (8 years ago)

Author:

djpaul

Message:

Emails: install multisite-specific emails on multisite only.

Fixes #7480

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-schema.php (modified) (1 diff)
• bp-core-functions.php (modified) (2 diffs)

trunk/src/bp-core/admin/bp-core-admin-schema.php

@@ -507 +507 @@
     // Add these emails to the database.
     foreach ( $emails as $id => $email ) {
+
+        // Some emails are multisite-only.
+        if ( ! is_multisite() && isset( $email['args'] ) && ! empty( $email['args']['multisite'] ) ) {
+            continue;
+        }
+
         $post_id = wp_insert_post( bp_parse_args( $email, $defaults, 'install_email_' . $id ) );
         if ( ! $post_id ) {

trunk/src/bp-core/bp-core-functions.php

@@ -3377 +3377 @@
             /* translators: do not remove {} brackets or translate its contents. */
             'post_excerpt' => __( "Thanks for registering!\n\nTo complete the activation of your account, go to the following link: {{{activate.url}}}", 'buddypress' ),
+            'args'         => array(
+                'multisite' => true,
+            ),
         ),
         'core-user-registration-with-blog' => array(
@@ -3385 +3388 @@
             /* translators: do not remove {} brackets or translate its contents. */
             'post_excerpt' => __( "Thanks for registering!\n\nTo complete the activation of your account and site, go to the following link: {{{activate-site.url}}}\n\nAfter you activate, you can visit your site at {{{user-site.url}}}.", 'buddypress' ),
+            'args'         => array(
+                'multisite' => true,
+            ),
         ),
         'friends-request' => array(