Changeset 12484

Timestamp:

03/20/2023 04:11:45 AM (3 years ago)

Author:

dd32

Message:

Helpscout: Remove +... from email addresses to work around HS limitations around email addresses needing to be unique on every instance.

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

@@ -328 +328 @@
     $emails = array_unique( array_merge( $hs_user->alternateEmails, [ $hs_user->email ] ) );
 
+    // Allow add plus-addresses without the sub-routing to the list of emails to check.
+    foreach ( $emails as $email ) {
+        $e = preg_replace( '!^([^+]+)[+][^+]+@(.+)$!', '$1@$2', $email );
+        if ( $e != $email ) {
+            $emails[] = $e;
+        }
+    }
+
     // Sort emails by string length
     usort( $emails, function( $a, $b ) {