Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

This commit is contained in:
Michael Vogel 2016-07-30 10:02:39 +02:00
commit 313bc5b0d2
3 changed files with 10 additions and 5 deletions

View file

@ -1801,9 +1801,13 @@ function proc_run($cmd){
$priority = 2;
if (!$found)
q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`)
VALUES ('%s', '%s', '%s', %d)",
dbesc($funcname),
// quickfix for the delivery problems, 2106-07-28
/// @todo find better solution
//q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`)
// VALUES ('%s', '%s', '%s', %d)",
// dbesc($funcname),
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
VALUES ('%s', '%s', %d)",
dbesc($parameters),
dbesc(datetime_convert()),
intval($priority));