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

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

diff --git a/classes/User.php b/classes/User.php
index 0b25b71a032a0476516089990467cc5edde97eb9..16c256535b7ffe22efd01ecec492cbc0316f6378 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -213,6 +213,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);