diff options
author | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
commit | 670ad53215eaaa40a55a1977b373a62940c50a42 (patch) | |
tree | 5030420047361499de6d434d5a9315de4662e212 /plugins/Blacklist/Nickname_blacklist.php | |
parent | 1ceb93cce483794582f1a928de27592acb4f89cf (diff) | |
parent | dffec9f223c1e45832d274c34f7bd6624cbf87ea (diff) |
Merge branch '0.9.x' into activityexport
Diffstat (limited to 'plugins/Blacklist/Nickname_blacklist.php')
-rw-r--r-- | plugins/Blacklist/Nickname_blacklist.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php index e8545292d..d5d46a949 100644 --- a/plugins/Blacklist/Nickname_blacklist.php +++ b/plugins/Blacklist/Nickname_blacklist.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * * @see DB_DataObject */ - class Nickname_blacklist extends Memcached_DataObject { public $__table = 'nickname_blacklist'; // table name @@ -62,7 +61,6 @@ class Nickname_blacklist extends Memcached_DataObject * @return Nickname_blacklist object found, or null for no hits * */ - function staticGet($k, $v=null) { return Memcached_DataObject::staticGet('Nickname_blacklist', $k, $v); @@ -73,7 +71,6 @@ class Nickname_blacklist extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('pattern' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, @@ -85,7 +82,6 @@ class Nickname_blacklist extends Memcached_DataObject * * @return array key definitions */ - function keys() { return array_keys($this->keyTypes()); @@ -96,7 +92,6 @@ class Nickname_blacklist extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { return array('pattern' => 'K'); @@ -107,7 +102,6 @@ class Nickname_blacklist extends Memcached_DataObject * * @return array string patterns to check */ - static function getPatterns() { $patterns = self::cacheGet('nickname_blacklist:patterns'); @@ -135,17 +129,14 @@ class Nickname_blacklist extends Memcached_DataObject * * @return array of patterns to check */ - static function saveNew($newPatterns) { $oldPatterns = self::getPatterns(); // Delete stuff that's old that not in new - $toDelete = array_diff($oldPatterns, $newPatterns); // Insert stuff that's in new and not in old - $toInsert = array_diff($newPatterns, $oldPatterns); foreach ($toDelete as $pattern) { |