aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-10-08 01:30:20 +0200
committerM. Dent <dentm42@gmail.com>2018-10-08 01:30:20 +0200
commit855f4b869a039535a35ba7e5a62867fbc953c1af (patch)
tree30ae34b5d064173f1592c92cd6e07322ebb85c13 /Zotlabs
parent484d240e7eb7a70ae72e28139acc00402d15ad06 (diff)
parent60d5443f000dd77c64b425c33ed341ef822734e8 (diff)
downloadvolse-hubzilla-855f4b869a039535a35ba7e5a62867fbc953c1af.tar.gz
volse-hubzilla-855f4b869a039535a35ba7e5a62867fbc953c1af.tar.bz2
volse-hubzilla-855f4b869a039535a35ba7e5a62867fbc953c1af.zip
Merge branch 'fix-runaway-cron' into 'dev'
Fix too many arguments in ClearQueue() queries See merge request hubzilla/core!1320
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Master.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php
index 6fb674d60..ed1adf8fb 100644
--- a/Zotlabs/Daemon/Master.php
+++ b/Zotlabs/Daemon/Master.php
@@ -126,7 +126,6 @@ class Master {
static public function ClearQueue() {
$work = q("select * from config where cat='queuework' and k like '%s'",
- 'workitem_%',
dbesc('workitem%'));
foreach ($work as $workitem) {
$workinfo = unserialize($workitem['v']);
@@ -137,7 +136,6 @@ class Master {
$cls::run($argc,$argv);
}
$work = q("delete from config where cat='queuework' and k like '%s'",
- 'workitem_%',
dbesc('workitem%'));
}