diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-07 11:35:00 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-07 11:35:00 -0400 |
| commit | 84e676b68702084d70794fbaf8871105588c79c1 (patch) | |
| tree | e83ecc3ebe7c6d15adcd80a0d4864290cb1351f9 /classes | |
| parent | dd705ddaf751ee8132cdd52e47aeef259477912c (diff) | |
| parent | 23e6dafff6d82492aa7ab2addc2fae99bd609b57 (diff) | |
Merge branch 'queuemanager' into 0.8.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | classes/Queue_item.php | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 8a018068a..5ec0692d9 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1210,7 +1210,7 @@ class Notice extends Memcached_DataObject $window = explode(',', $laststr); $last_id = $window[0]; $new_ids = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW, - $last_id, 0, null, $tag))); + $last_id, 0, null))); $new_window = array_merge($new_ids, $window); @@ -1225,7 +1225,7 @@ class Notice extends Memcached_DataObject } $window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW, - 0, 0, null, $tag))); + 0, 0, null))); $windowstr = implode(',', $window); diff --git a/classes/Queue_item.php b/classes/Queue_item.php index 9b909ec22..295c321b5 100644 --- a/classes/Queue_item.php +++ b/classes/Queue_item.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Queue_item extends Memcached_DataObject +class Queue_item extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -13,7 +13,7 @@ class Queue_item extends Memcached_DataObject public $notice_id; // int(4) primary_key not_null public $transport; // varchar(8) primary_key not_null public $created; // datetime() not_null - public $claimed; // datetime() + public $claimed; // datetime() /* Static get */ function staticGet($k,$v=null) @@ -24,7 +24,7 @@ class Queue_item extends Memcached_DataObject function sequenceKey() { return array(false, false); } - + static function top($transport) { $qi = new Queue_item(); @@ -54,4 +54,9 @@ class Queue_item extends Memcached_DataObject $qi = null; return null; } + + function &pkeyGet($kv) + { + return Memcached_DataObject::pkeyGet('Queue_item', $kv); + } } |