From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 9 Mar 2015 16:07:24 +0000 (+0100)
Subject: Make 'activity' a blacklisted nickname
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f321c3c2eae3263c31826f256ee42ee7e1028576;p=quix0rs-gnu-social.git

Make 'activity' a blacklisted nickname

Will add a plugin called ActivityVerb which makes activity interaction
more standardized.
---

diff --git a/lib/installer.php b/lib/installer.php
index e69de7a33a..9e2936ca82 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -224,7 +224,7 @@ abstract class Installer
         }
         // @fixme hardcoded list; should use Nickname::isValid()
         // if/when it's safe to have loaded the infrastructure here
-        $blacklist = array('main', 'panel', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
+        $blacklist = array('main', 'panel', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook', 'activity');
         if (in_array($this->adminNick, $blacklist)) {
             $this->updateStatus('The user nickname "' . htmlspecialchars($this->adminNick) .
                          '" is reserved.', true);