load hooks inside queue

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index ae69805fa7dc9306476612fc0f0a2c42769a3d11..657ba7dc2390d2bf782888869c8da0fb75508756 100644 (file)
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -662,12 +662,20 @@ function facebook_post_hook(&$a,&$b) {
 
 function fb_queue_hook(&$a,&$b) {
 
-       require_once('include/queue_fn.php');
-       if((! is_array($b)) || (! count($b)))
+       $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+               dbesc(NETWORK_FACEBOOK)
+       );
+       if(! count($qi))
                return;
-       foreach($b as $x) {
+
+       require_once('include/queue_fn.php');
+
+       foreach($qi as $x) {
                if($x['network'] !== NETWORK_FACEBOOK)
                        continue;
+
+               logger('facebook_queue: run');
+
                $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
                        WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
                        intval($x['cid'])
@@ -698,7 +706,7 @@ function fb_queue_hook(&$a,&$b) {
                                                dbesc('fb::' . $retj->id),
                                                intval($item)
                                        );
-                                       logger('facebook queue: success: ' . $j); 
+                                       logger('facebook_queue: success: ' . $j); 
                                        remove_queue_item($x['id']);
                                }
                                else {

diff --git a/include/queue.php b/include/queue.php
index cc36b2f62542da7c3014dcbd6bdf93356821bcfb..79f656017c3ebe564188dba0679143d4b4cc048d 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -24,6 +24,8 @@ function queue_run($argv, $argc){
 
        $a->set_baseurl(get_config('system','url'));
 
+       load_hooks();
+
        $deadguys = array();
 
        logger('queue: start');