Merge commit 'origin/testing' into 0.9.x

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

diff --git a/classes/User.php b/classes/User.php
index aa9fbf94838f3b64427efdc4196b74c3a4624fce..fade0f35deaa28f930c346fa4c80a21d3e0d4d4f 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -206,6 +206,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);