diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-30 18:11:49 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-10-30 18:11:49 -0700 |
| commit | 70c55da1df69d90dcbeb5a78c994b23a8456bfc9 (patch) | |
| tree | 86d39069b02ecabe4ed091514e5076a98abda43a /Zotlabs/Daemon/Master.php | |
| parent | 623aa7ea48149ca7c2bc556931f25befdf49e58a (diff) | |
| parent | f9ab7647dd660adb37464614616cb8484c500de4 (diff) | |
| download | volse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.tar.gz volse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.tar.bz2 volse-hubzilla-70c55da1df69d90dcbeb5a78c994b23a8456bfc9.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Daemon/Master.php')
| -rw-r--r-- | Zotlabs/Daemon/Master.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 3a71ee578..0656ca05b 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -60,7 +60,8 @@ class Master { $k = explode('_',$worker['k']); q("delete from config where cat='queueworkers' and k='%s'", 'workerstarted_'.$k[1]); - q("update config set k='workitem' where cat='queuework' and k='%s'", + q("update config set k='%s' where cat='queuework' and k='%s'", + dbesc(uniqid('workitem:',true)), 'workitem_'.$k[1]); unset($workers[$idx]); } @@ -69,7 +70,7 @@ class Master { return false; } } - return uniqid(); + return uniqid('',true); } |