Merge branch '0.9.x' 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 530ece1ba4ee3762e1ad80470e7731e77e080d04..96a64ccb29448cc4b898bc41aa5a4114b8cdf2c8 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -117,7 +117,6 @@ class User extends Memcached_DataObject
     function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-
         $blacklist = common_config('nickname', 'blacklist');
 
         //all directory and file names should be blacklisted