summaryrefslogtreecommitdiffstats
path: root/wp-includes/wpmu-functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-11-15 11:33:11 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-11-15 11:33:11 +0000
commit7935d0bd9ef23d32ae29a95bd6c3ea0b6eab2973 (patch)
treea33c532beab97a1014abb74e06e60a55886029ca /wp-includes/wpmu-functions.php
parent3ce8913546e530500614a46ab2ffecdf3b278d01 (diff)
downloadwordpress-mu-7935d0bd9ef23d32ae29a95bd6c3ea0b6eab2973.tar.gz
wordpress-mu-7935d0bd9ef23d32ae29a95bd6c3ea0b6eab2973.tar.xz
wordpress-mu-7935d0bd9ef23d32ae29a95bd6c3ea0b6eab2973.zip
Redo the banned domain check
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@809 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wpmu-functions.php')
-rw-r--r--wp-includes/wpmu-functions.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index e7d3333..ec9746c 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -853,7 +853,13 @@ function wpmu_validate_user_signup($user_name, $user_email) {
if ( is_array( $banned_names ) && empty( $banned_names ) == false ) {
$email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
foreach( $banned_names as $banned_domain ) {
- if( strstr( $email_domain, $banned_domain ) )
+ if (
+ strstr( $email_domain, $banned_domain ) ||
+ (
+ strstr( $banned_domain, '/' ) &&
+ preg_match( $banned_domain, $email_domain )
+ )
+ )
$errors->add('user_email', __("You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider."));
}
}