X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FBlacklist%2FHomepage_blacklist.php;h=2820294fa26f108a4d3610896fa0db78fdab4d24;hb=c97048d01bea468e0cf8865b60c3c250b4515c39;hp=32080667e1e7bf1889f9f5a52d0731e3816b71b8;hpb=6e644f77a43ea7028e0aafb2d83059d0f19db701;p=quix0rs-gnu-social.git diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php index 32080667e1..2820294fa2 100644 --- a/plugins/Blacklist/Homepage_blacklist.php +++ b/plugins/Blacklist/Homepage_blacklist.php @@ -44,7 +44,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; * * @see DB_DataObject */ - class Homepage_blacklist extends Memcached_DataObject { public $__table = 'homepage_blacklist'; // table name @@ -62,7 +61,6 @@ class Homepage_blacklist extends Memcached_DataObject * @return Homepage_blacklist object found, or null for no hits * */ - function staticGet($k, $v=null) { return Memcached_DataObject::staticGet('Homepage_blacklist', $k, $v); @@ -76,7 +74,6 @@ class Homepage_blacklist extends Memcached_DataObject * * @return array array of column definitions */ - function table() { return array('pattern' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, @@ -91,10 +88,9 @@ class Homepage_blacklist extends Memcached_DataObject * * @return array key definitions */ - function keys() { - return array('pattern' => 'K'); + return array_keys($this->keyTypes()); } /** @@ -105,10 +101,9 @@ class Homepage_blacklist extends Memcached_DataObject * * @return array key definitions */ - function keyTypes() { - return $this->keys(); + return array('pattern' => 'K'); } /** @@ -116,7 +111,6 @@ class Homepage_blacklist extends Memcached_DataObject * * @return array string patterns to check */ - static function getPatterns() { $patterns = self::cacheGet('homepage_blacklist:patterns'); @@ -144,17 +138,14 @@ class Homepage_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) {