diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-07 20:03:58 +0200 |
| commit | e036434b8a2dbd8594c0ac5ac7233f4700e4e475 (patch) | |
| tree | 0d37048ec06d603e45fd9852f208478a89e84476 /include/queue.php | |
| parent | 0e8b2092a0c30a8eb898a8f0e7130251300e8d47 (diff) | |
| parent | c1b2e90e3720961c280f6378e48fda7bad7c3ad0 (diff) | |
| download | volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.gz volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.tar.bz2 volse-hubzilla-e036434b8a2dbd8594c0ac5ac7233f4700e4e475.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/queue.php')
| -rw-r--r-- | include/queue.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/queue.php b/include/queue.php index cc36b2f62..cbda196da 100644 --- 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'); @@ -53,7 +55,11 @@ function queue_run($argv, $argc){ require_once('include/salmon.php'); foreach($r as $q_item) { - $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1", + + // queue_predeliver hooks may have changed the queue db details, + // so check again if this entry still needs processing + + $qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ", intval($q_item['id']) ); if(! count($qi)) |