Ticket #6936: 6936.diff

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

@@ -538 +538 @@
                 'post_type'   => bp_get_email_post_type(),
         );
 
-        $emails = array(
+        $emails       = bp_core_email_schema();
+        $descriptions = bp_core_email_type_schema();
+
+        // Add these emails to the database.
+        foreach ( $emails as $id => $email ) {
+                $post_id = wp_insert_post( bp_parse_args( $email, $defaults, 'install_email_' . $id ) );
+                if ( ! $post_id ) {
+                        continue;
+                }
+
+                $tt_ids = wp_set_object_terms( $post_id, $id, bp_get_email_tax_type() );
+                foreach ( $tt_ids as $tt_id ) {
+                        $term = get_term_by( 'term_taxonomy_id', (int) $tt_id, bp_get_email_tax_type() );
+                        wp_update_term( (int) $term->term_id, bp_get_email_tax_type(), array(
+                                'description' => $descriptions[ $id ],
+                        ) );
+                }
+        }
+
+        /**
+         * Fires after BuddyPress adds the posts for its emails.
+         *
+         * @since 2.5.0
+         */
+        do_action( 'bp_core_install_emails' );
+}
+
+/**
+ * Get a list of emails for populating the email post type.
+ *
+ * @since 2.5.1
+ *
+ * @return array
+ */
+function bp_core_email_schema() {
+        return array(
                 'activity-comment' => array(
                         /* translators: do not remove {} brackets or translate its contents. */
                         'post_title'   => __( '[{{{site.name}}}] {{poster.name}} replied to one of your updates', 'buddypress' ),
@@ -668 +703 @@
                         'post_excerpt' => __( "Your membership request for the group "{{group.name}}" has been rejected.\n\nTo request membership again, visit: {{{group.url}}}", 'buddypress' ),
                 ),
         );
+}
 
-        $descriptions = array(
+/**
+ * Get a list of emails for populating email type taxonomy terms.
+ *
+ * @since 2.5.1
+ *
+ * @return array
+ */
+function bp_core_email_type_schema() {
+        return array(
                 'activity-comment'                   => __( 'A member has replied to an activity update that the recipient posted.', 'buddypress' ),
                 'activity-comment-author'            => __( 'A member has replied to a comment on an activity update that the recipient posted.', 'buddypress' ),
                 'activity-at-message'                => __( 'Recipient was mentioned in an activity update.', 'buddypress' ),
@@ -687 +731 @@
                 'groups-membership-request-accepted' => __( 'Recipient had requested to join a group, which was accepted.', 'buddypress' ),
                 'groups-membership-request-rejected' => __( 'Recipient had requested to join a group, which was rejected.', 'buddypress' ),
         );
-
-        // Add these emails to the database.
-        foreach ( $emails as $id => $email ) {
-                $post_id = wp_insert_post( bp_parse_args( $email, $defaults, 'install_email_' . $id ) );
-                if ( ! $post_id ) {
-                        continue;
-                }
-
-                $term_ids = wp_set_post_terms( $post_id, $id, bp_get_email_tax_type() );
-                foreach ( $term_ids as $term_id ) {
-                        wp_update_term( (int) $term_id, bp_get_email_tax_type(), array(
-                                'description' => $descriptions[ $id ],
-                        ) );
-                }
-        }
-
-        /**
-         * Fires after BuddyPress adds the posts for its emails.
-         *
-         * @since 2.5.0
-         */
-        do_action( 'bp_core_install_emails' );
 }

tests/phpunit/testcases/admin/functions.php

@@ -218 +218 @@
                 $bp->pages = $reset_bp_pages;
                 $bp->admin->notices = $reset_admin_notices;
         }
+
+        /**
+         * @ticket BP6936
+         */
+        public function test_email_type_descriptions_should_match_when_split_terms_exist() {
+                global $wpdb;
+
+                // Delete all existing email types and descriptions.
+                $emails = get_posts( array(
+                        'fields' => 'ids',
+                        'post_type' => bp_get_email_post_type(),
+                ) );
+                foreach ( $emails as $email ) {
+                        wp_delete_post( $email, true );
+                }
+
+                $descriptions = get_terms( bp_get_email_tax_type(), array(
+                        'fields' => 'ids',
+                        'hide_empty' => false,
+                ) );
+                foreach ( $descriptions as $description ) {
+                        wp_delete_term( (int) $description, bp_get_email_tax_type() );
+                }
+
+                // Fake the existence of split terms by offsetting the term_taxonomy table.
+                $wpdb->insert( $wpdb->term_taxonomy, array( 'term_id' => 9999, 'taxonomy' => 'post_tag', 'description' => 'foo description', 'parent' => 0, 'count' => 0 ) );
+
+                require_once( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-admin-schema.php' );
+                bp_core_install_emails();
+
+                $d_terms = get_terms( bp_get_email_tax_type(), array(
+                        'hide_empty' => false,
+                ) );
+
+                $correct_descriptions = bp_core_email_type_schema();
+                foreach ( $d_terms as $d_term ) {
+                        $correct_description = $correct_descriptions[ $d_term->slug ];
+                        $this->assertSame( $correct_description, $d_term->description );
+                }
+        }
 }