diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-29 15:14:51 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-29 15:14:51 -0700 |
commit | 2260d6ec7c1f2b9c63196a4d8c6c99750a89eb10 (patch) | |
tree | cac824e9986caf03fd43bd967663ab1ef4b8bede /plugins/Blacklist/Homepage_blacklist.php | |
parent | 42348bc16711316918efef634d6d83bf19b0b1fe (diff) | |
parent | 50d5f5e04c9c37eb5ba20e1dbcd8ceb832d8be81 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
index.php
Diffstat (limited to 'plugins/Blacklist/Homepage_blacklist.php')
-rw-r--r-- | plugins/Blacklist/Homepage_blacklist.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php index 32080667e..ec89ee4bd 100644 --- 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'); } /** |