Blacklist plugin enabled by default (bug fixes will come)

diff --git a/lib/default.php b/lib/default.php
index 74ab982958e1eb6ce7483b754b3860cfec916913..83dc58f898fac9d9f52146e72d03235d5fdba79e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -345,6 +345,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),

diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index 31929fcadc215b612cc949f1348eb9c8c2272790..66ea408165bcb884bad31f19cff4cd9def5603e1 100644 (file)
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Plugin to prevent use of nicknames or URLs on a blacklist
@@ -483,7 +481,7 @@ class BlacklistPlugin extends Plugin
      */
     function onStartSubscribe(Profile $subscriber, Profile $other)
     {
-        foreach (array($other->profileurl, $other->homepage) as $url) {
+        foreach ([$other->getUrl(), $other->getHomepage()] as $url) {
 
             if (empty($url)) {
                 continue;
@@ -499,7 +497,7 @@ class BlacklistPlugin extends Plugin
             }
         }
 
-        $nickname = $other->nickname;
+        $nickname = $other->getNickname();
 
         if (!empty($nickname)) {
             if (!$this->_checkNickname($nickname)) {