diff options
author | Max Kostikov <max@kostikov.co> | 2019-01-13 20:49:03 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-01-13 20:49:03 +0100 |
commit | e78fd09e07f8c8be082c7c968969ef2c9a685511 (patch) | |
tree | 8fdc723ef5589efe88b063a9366fee8ddf8952d8 /include | |
parent | 9e42dfd09426e8621098d17a5eef17674345f374 (diff) | |
parent | b4c1ca88f32420cc1653e11811bad74d6f0231a5 (diff) | |
download | volse-hubzilla-e78fd09e07f8c8be082c7c968969ef2c9a685511.tar.gz volse-hubzilla-e78fd09e07f8c8be082c7c968969ef2c9a685511.tar.bz2 volse-hubzilla-e78fd09e07f8c8be082c7c968969ef2c9a685511.zip |
Merge branch 'patch-20190113b' into 'dev'
FIX: aggregated query error in MYSQL
See merge request hubzilla/core!1468
Diffstat (limited to 'include')
-rw-r--r-- | include/queue_fn.php | 4 | ||||
-rw-r--r-- | include/zot.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php index f7e2922c6..85f98aaf9 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -13,7 +13,7 @@ function update_queue_item($id, $add_priority = 0) { return; - $y = q("select min(outq_created) as earliest from outq where outq_posturl = '%s'", + $y = q("select outq_created as earliest from outq where outq_posturl = '%s' order by earliest limit 1", dbesc($x[0]['outq_posturl']) ); @@ -311,4 +311,4 @@ function queue_deliver($outq, $immediate = false) { return; } -}
\ No newline at end of file +} diff --git a/include/zot.php b/include/zot.php index 6d9b6aeec..df54f2b27 100644 --- a/include/zot.php +++ b/include/zot.php @@ -4959,7 +4959,7 @@ function zot_reply_pickup($data) { // It's possible that we have more than 100 messages waiting to be sent. // See if there are any more messages in the queue. - $x = q("select *,min(outq_created) as earliest from outq where outq_posturl = '%s'", + $x = q("select * from outq where outq_posturl = '%s' order by outq_created limit 1", dbesc($data['callback']) ); |