Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 330da039b4b32f0a58820f59c6be499777d4e46d..77091fad5d72e65513b82a75155e3bbcae5903db 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -211,6 +211,7 @@ class User extends Memcached_DataObject
         if(! User::allowed_nickname($nickname)){
             common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname),
                        __FILE__);
+            return false;
         }
         $profile->profileurl = common_profile_url($nickname);