Changeset 12623

Timestamp:

06/06/2023 05:31:31 AM (3 years ago)

Author:

dd32

Message:

Helpscout: Match plugin URLs when presented within HTML <a> tags.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php

@@ -300 +300 @@
 
             // Extract matches from the email.
-            $email_body = strip_tags( str_replace( '<br>', "\n", $thread->body ) );
+            $email_text = strip_tags( str_replace( '<br>', "\n", $thread->body ) );
 
             foreach ( $regexes as $regex ) {
-                if ( ! preg_match_all( $regex, $email_body, $m ) ) {
+                if (
+                    // Check the email text only
+                    ! preg_match_all( $regex, $email_text, $m ) &&
+                    // ..and the full email body, which may be HTML.
+                    ! preg_match_all( $regex, $thread->body, $m )
+                ) {
                     continue;
                 }