Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

1 files changed, 7 insertions, 2 deletions

diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 7e1227a66..9e976a80d 100644
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -60,9 +60,14 @@ class PushCallbackAction extends Action
 
         $post = file_get_contents('php://input');
 
-        // @fixme Queue this to a background process; we should return
+        // Queue this to a background process; we should return
         // as quickly as possible from a distribution POST.
-        $feedsub->receive($post, $hmac);
+        // If queues are disabled this'll process immediately.
+        $data = array('feedsub_id' => $feedsub->id,
+                      'post' => $post,
+                      'hmac' => $hmac);
+        $qm = QueueManager::get();
+        $qm->enqueue($data, 'pushinput');
     }
     
     /**