Ticket #15706: 15706.2.patch

wp-includes/ms-functions.php

@@ -565 +565 @@
 
         $limited_email_domains = get_site_option( 'limited_email_domains' );
         if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
-                $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-                if ( in_array( $emaildomain, $limited_email_domains ) == false )
+                $email_domain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
+                $matched_domain = false; 
+
+                foreach ( (array) $limited_email_domains as $limited_domain ) {
+                        if ( $limited_domain == '' )
+                                continue;
+
+                        if ( strstr( $email_domain, $limited_domain ) || ( strstr( $limited_domain, '/' ) && preg_match( $limited_domain, $email_domain ) ) )
+                                $matched_domain = true;
+                }
+
+                if ( ! $matched_domain )
                         $errors->add('user_email', __('Sorry, that email address is not allowed!'));
         }