summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-04 09:25:16 +0000
committerSarven Capadisli <csarven@status.net>2009-11-04 09:25:16 +0000
commit6f7e3053baefce2a27fba376b020c2ed555821b7 (patch)
tree73b93f32d667be45e2a5d9ff323572404f1e44cc /classes
parent00e7214720cab8b65a39dbea357aaaa58ac9b3bf (diff)
parent01795bd615a67d6ad71b3b8240e0151f4c90a374 (diff)
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
Diffstat (limited to 'classes')
-rw-r--r--classes/User.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/classes/User.php b/classes/User.php
index 007662131..7ab9f307a 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -120,15 +120,11 @@ class User extends Memcached_DataObject
function allowed_nickname($nickname)
{
// XXX: should already be validated for size, content, etc.
-
- $blacklist = array();
-
- //all directory and file names should be blacklisted
- $d = dir(INSTALLDIR);
- while (false !== ($entry = $d->read())) {
- $blacklist[]=$entry;
- }
- $d->close();
+ static $blacklist = array('rss', 'xrds', 'doc', 'main',
+ 'settings', 'notice', 'user',
+ 'search', 'avatar', 'tag', 'tags',
+ 'api', 'message', 'group', 'groups',
+ 'local');
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
return !in_array($nickname, $merged);
}