Changeset 12842

Timestamp:

08/15/2023 02:12:34 AM (3 years ago)

Author:

dd32

Message:

HelpScout: If an email comes from 'example+auto-reply@' try looking for 'example@' if the former didn't match.

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

@@ -247 +247 @@
         if ( $user ) {
             return $user;
+        }
+
+        // If the email is a plus address, try without. This is common with auto-responders it seems.
+        if ( str_contains( $maybe_email, '+' ) ) {
+            $maybe_email = preg_replace( '/[+].+@/', '@', $maybe_email );
+            $user        = get_user_by( 'email', $maybe_email );
+            if ( $user ) {
+                return $user;
+            }
         }
     }