aboutsummaryrefslogtreecommitdiffstats
path: root/include/queue.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-19 19:54:18 +0000
committerThomas Willingham <founder@kakste.com>2012-12-19 19:54:18 +0000
commita2b30f9411f537d9eb15d697970d682869c76a0e (patch)
treeb96702d7ece5d564aaf00cdd950270b0b67ac3e6 /include/queue.php
parent2cfd1a3f085e44d4513fd969bb01be74a59d5784 (diff)
parent44e70bdca367344c441b1e26e790ac0465953734 (diff)
downloadvolse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.tar.gz
volse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.tar.bz2
volse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/tpl/nav.tpl
Diffstat (limited to 'include/queue.php')
-rw-r--r--include/queue.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/queue.php b/include/queue.php
index a45d3ed63..b0728503e 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -22,7 +22,13 @@ function queue_run($argv, $argc){
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
- $r = q("select * from deliverq where 1");
+// $r = q("select * from deliverq where 1");
+//FIXME
+ $r = array();
+
+return;
+
+
if(count($r)) {
foreach($r as $rr) {
logger('queue: deliverq');