keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-08-28 23:01:42 -07:00
commit 88e6e4699a
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/delivery.php
View file

@ -37,6 +37,19 @@ function delivery_run($argv, $argc){
$item_id = intval($argv[2]); $item_id = intval($argv[2]);
$contact_id = intval($argv[3]); $contact_id = intval($argv[3]);
// Some other process may have delivered this item already.
$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
dbesc($cmd),
dbesc($item_id),
dbesc($contact_id)
);
if(! count($r)) {
return;
}
// It's ours to deliver. Remove it from the queue.
q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1", q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
dbesc($cmd), dbesc($cmd),
dbesc($item_id), dbesc($item_id),

1
include/queue.php
View file

@ -42,7 +42,6 @@ function queue_run($argv, $argc){
if(! $interval) if(! $interval)
$interval = 2; $interval = 2;
$r = q("select * from deliverq where 1"); $r = q("select * from deliverq where 1");
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {