harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-20190113b' into 'dev'

Browse Source 
FIX: aggregated query error in MYSQL

See merge request hubzilla/core!1468
This commit is contained in:
Max Kostikov 2019-01-13 20:49:03 +01:00
commit e78fd09e07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/queue_fn.php
View File

@ -13,7 +13,7 @@ function update_queue_item($id, $add_priority = 0) {
return; 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']) dbesc($x[0]['outq_posturl'])
); );
@ -311,4 +311,4 @@ function queue_deliver($outq, $immediate = false) {
return; return;
} }
} }

2
include/zot.php
View File

@ -4959,7 +4959,7 @@ function zot_reply_pickup($data) {
// It's possible that we have more than 100 messages waiting to be sent. // It's possible that we have more than 100 messages waiting to be sent.
// See if there are any more messages in the queue. // 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']) dbesc($data['callback'])
); );