https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f081f15
)
Fixed SQL error
author
Michael
<heluecht@pirati.ca>
Sun, 3 Jun 2018 09:19:27 +0000
(09:19 +0000)
committer
Michael
<heluecht@pirati.ca>
Sun, 3 Jun 2018 09:19:27 +0000
(09:19 +0000)
include/api.php
patch
|
blob
|
history
diff --git
a/include/api.php
b/include/api.php
index
54176da
..
2892dfe
100644
(file)
--- a/
include/api.php
+++ b/
include/api.php
@@
-2066,7
+2066,7
@@
function api_conversation_show($type)
$sql_extra = ' AND `item`.`id` <= ' . intval($max_id);
}
- $r = q("SELECT `
*
FROM `item`
+ $r = q("SELECT `
item`.`*`
FROM `item`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`parent` = %d AND `item`.`visible`