From 90f6899dd1ca653c16d7b937a9becc23da5c369d Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 10 Aug 2011 19:18:18 +0000 Subject: [PATCH] Use preg_match more efficiently. props solarissmoke, fixes #17287. git-svn-id: http://svn.automattic.com/wordpress/trunk@18524 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 6068de14f..c7a95ec5b 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -646,13 +646,10 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') { if (! is_subdomain_install() ) $illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) ); - if ( empty( $blogname ) ) $errors->add('blogname', __('Please enter a site name')); - $maybe = array(); - preg_match( '/[a-z0-9]+/', $blogname, $maybe ); - if ( $blogname != $maybe[0] ) + if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) $errors->add('blogname', __('Only lowercase letters and numbers allowed')); if ( in_array( $blogname, $illegal_names ) == true )