summaryrefslogtreecommitdiffstats
path: root/wp-includes/wpmu-functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-22 12:53:06 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-22 12:53:06 +0000
commit87ac457a9eb1e74bd7d45852e719e83b1b76cebc (patch)
treef6968783b38f8351238a6cc74b49c557454e9ea6 /wp-includes/wpmu-functions.php
parentcafa7fe7871b006b2c3478c1e2203e3dfa140dbc (diff)
downloadwordpress-mu-87ac457a9eb1e74bd7d45852e719e83b1b76cebc.tar.gz
wordpress-mu-87ac457a9eb1e74bd7d45852e719e83b1b76cebc.tar.xz
wordpress-mu-87ac457a9eb1e74bd7d45852e719e83b1b76cebc.zip
No need for these globals (fixes #285)
Skip blank domains in banned email domains check git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@930 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wpmu-functions.php')
-rw-r--r--wp-includes/wpmu-functions.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index 1ab7b1d..6050025 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -27,7 +27,6 @@ add_action('publish_post', 'wpmu_update_blogs_date');
function wpmu_checkAvailableSpace($action) {
// Using the action.
// Set the action to 'not-writable' to block the upload
- global $wpblog, $blog_id;
// Default space allowed is 10 MB
$spaceAllowed = get_site_option( "blog_upload_space" );
@@ -821,6 +820,8 @@ function is_email_address_unsafe( $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( $banned_domain == '' )
+ continue;
if (
strstr( $email_domain, $banned_domain ) ||
(