Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index c7e17be6e84556d56e9e55360e7aed483a274b1d..d17e512b965646d62ac7ee98c0107912531139fb 100644 (file)
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -32,7 +32,7 @@ class Queue_item extends Memcached_DataObject
         if ($transports) {
             if (is_array($transports)) {
                 // @fixme use safer escaping
-                $list = implode("','", array_map('addslashes', $transports));
+                $list = implode("','", array_map(array($qi, 'escape'), $transports));
                 $qi->whereAdd("transport in ('$list')");
             } else {
                 $qi->transport = $transports;
@@ -46,9 +46,9 @@ class Queue_item extends Memcached_DataObject
         $cnt = $qi->find(true);
 
         if ($cnt) {
-            # XXX: potential race condition
-            # can we force it to only update if claimed is still null
-            # (or old)?
+            // XXX: potential race condition
+            // can we force it to only update if claimed is still null
+            // (or old)?
             common_log(LOG_INFO, 'claiming queue item id = ' . $qi->id .
                 ' for transport ' . $qi->transport);
             $orig = clone($qi);