Fix keys / keyTypes for Blacklist plugin - was spewing notices for undefined array...

diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php
index 32080667e1e7bf1889f9f5a52d0731e3816b71b8..ec89ee4bd884b87afa79f80eb635c87e34636d3b 100644 (file)
--- a/plugins/Blacklist/Homepage_blacklist.php
+++ b/plugins/Blacklist/Homepage_blacklist.php
@@ -94,7 +94,7 @@ class Homepage_blacklist extends Memcached_DataObject
 
     function keys()
     {
-        return array('pattern' => 'K');
+        return array_keys($this->keyTypes());
     }
 
     /**
@@ -108,7 +108,7 @@ class Homepage_blacklist extends Memcached_DataObject
 
     function keyTypes()
     {
-        return $this->keys();
+        return array('pattern' => 'K');
     }
 
     /**

diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php
index 981063144485315f4f688a207b720154c1895495..e8545292d18ce18ebb3d47aee6147d74f2346eec 100644 (file)
--- a/plugins/Blacklist/Nickname_blacklist.php
+++ b/plugins/Blacklist/Nickname_blacklist.php
@@ -88,7 +88,7 @@ class Nickname_blacklist extends Memcached_DataObject
 
     function keys()
     {
-        return array('pattern' => 'K');
+        return array_keys($this->keyTypes());
     }
 
     /**
@@ -99,7 +99,7 @@ class Nickname_blacklist extends Memcached_DataObject
 
     function keyTypes()
     {
-        return $this->keys();
+        return array('pattern' => 'K');
     }
 
     /**