Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

[quix0rs-gnu-social.git] / classes / Queue_item.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index e54b4976bdb5b5a5de4e1158c02e5837f64c7933..9b909ec22ba8360ca1f39ee5f990cd47ed92f3e7 100644 (file)
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -16,27 +16,29 @@ class Queue_item extends Memcached_DataObject
     public $claimed;                         // datetime()  
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey() { return array(false, false); }
+    function sequenceKey()
+    { return array(false, false); }
     
     static function top($transport) {
 
         $qi = new Queue_item();
         $qi->transport = $transport;
         $qi->orderBy('created');
-        $qi->whereAdd('claimed is NULL');
+        $qi->whereAdd('claimed is null');
 
         $qi->limit(1);
 
-        $cnt = $qi->find(TRUE);
+        $cnt = $qi->find(true);
 
         if ($cnt) {
             # XXX: potential race condition
-            # can we force it to only update if claimed is still NULL
+            # can we force it to only update if claimed is still null
             # (or old)?
             common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . ' for transport ' . $transport);
             $orig = clone($qi);
@@ -49,7 +51,7 @@ class Queue_item extends Memcached_DataObject
                 common_log(LOG_INFO, 'claim failed.');
             }
         }
-        $qi = NULL;
-        return NULL;
+        $qi = null;
+        return null;
     }
 }