Changeset 13905

Timestamp:

06/04/2024 10:47:30 PM (6 months ago)

Author:

dcavins

Message:

Ensure that bp_email_set_content_type filter is run.

This patch sets the email type explicitly when the BP_Email class is constructed. This ensures that
the filter is run.

It is still possible to set the type after
instantiation using the set_content_type() method.

Props vapvarun.

Fixes #9169.

Location:

trunk

Files:

• src/bp-core/classes/class-bp-email.php (modified) (1 diff)
• tests/phpunit/testcases/core/class-bp-email.php (modified) (2 diffs)

trunk/src/bp-core/classes/class-bp-email.php

@@ -197 +197 @@
         $this->set_from( $from_address, $from_name );
         $this->set_reply_to( bp_get_option( 'admin_email' ), $from_name );
+
+        // Prefer HTML emails unless filtered to plaintext.
+        $this->set_content_type( $this->content_type );
 
         /**

trunk/tests/phpunit/testcases/core/class-bp-email.php

@@ -30 +30 @@
     }
 
+    /**
+     * @ticket BP9169
+     */
+    public function test_default_content_type() {
+        $email = new BP_Email( 'activity-at-message' );
+
+        $this->assertSame( 'html', $email->get_content_type() );
+    }
+
+    /**
+     * @ticket BP9169
+     */
+    public function test_set_content_type_to_plaintext() {
+        $email = new BP_Email( 'activity-at-message' );
+        $email->set_content_type( 'plaintext' );
+
+        $this->assertSame( 'plaintext', $email->get_content_type() );
+    }
+
+    /**
+     * @ticket BP9169
+     */
+    public function test_set_content_type_to_plaintext_via_filter() {
+        add_filter( 'bp_email_set_content_type', array( $this, 'bp_disable_html_emails' ) );
+        $email = new BP_Email( 'activity-at-message' );
+        remove_filter( 'bp_email_set_content_type', array( $this, 'bp_disable_html_emails' ) );
+
+        $this->assertSame( 'plaintext', $email->get_content_type() );
+    }
+    public function bp_disable_html_emails( $content_type ) {
+        return 'plaintext';
+    }
+
     public function test_valid_html_content() {
         $message = '<b>test</b>';
@@ -48 +81 @@
 
         $this->assertSame( $message, $email->get_content() );
+    }
+
+    /**
+     * @ticket BP9169
+     */
+    public function test_plaintext_strip_tags() {
+        $message  = '<b>test</b>';
+        $plainmsg = 'test';
+        $email    = new BP_Email( 'activity-at-message' );
+
+        $email->set_content_plaintext( $message );
+        $email->set_content_type( 'plaintext' );
+
+        $this->assertSame( $plainmsg, $email->get_content() );
     }