summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-09-08 20:06:50 -0400
committerZach Copley <zach@controlyourself.ca>2008-09-08 20:06:50 -0400
commit6eb84f0f0362e0b804c4c39b429e3dc8ce27acc3 (patch)
treef5748ed9a53aa49a7fe3a9fdb88b6a0496ee6e59 /classes
parent2fcc9ff65f8ea8ab80d7f13cb198e995f9ac9e4c (diff)
Disallow 'api' nickname
darcs-hash:20080909000650-7b5ce-c7eb990db81620b83201c0e361af9dfcdd9c2b89.gz
Diffstat (limited to 'classes')
-rw-r--r--classes/User.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php
index 84a980db4..9251a9a84 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -110,7 +110,8 @@ class User extends DB_DataObject
# XXX: should already be validated for size, content, etc.
static $blacklist = array('rss', 'xrds', 'doc', 'main',
'settings', 'notice', 'user',
- 'search', 'avatar', 'tag', 'tags');
+ 'search', 'avatar', 'tag', 'tags',
+ 'api');
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
return !in_array($nickname, $merged);
}