aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Channel.php
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-10-03 21:48:53 -0700
committerredmatrix <mike@macgirvin.com>2016-10-03 21:48:53 -0700
commitce6e81c68221a9f462af886626dc02fdfc26f8aa (patch)
tree9975c5271a35e532ee1e48a0e36bd4692945c4a6 /Zotlabs/Module/Channel.php
parentc44acb35757700e52db5cc4a7093b8e4624dc3fa (diff)
downloadvolse-hubzilla-ce6e81c68221a9f462af886626dc02fdfc26f8aa.tar.gz
volse-hubzilla-ce6e81c68221a9f462af886626dc02fdfc26f8aa.tar.bz2
volse-hubzilla-ce6e81c68221a9f462af886626dc02fdfc26f8aa.zip
more backticks
Diffstat (limited to 'Zotlabs/Module/Channel.php')
-rw-r--r--Zotlabs/Module/Channel.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 209d86236..a9a83adf5 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -185,7 +185,7 @@ class Channel extends \Zotlabs\Web\Controller {
$_SESSION['loadtime'] = datetime_convert();
}
else {
- $r = q("SELECT distinct parent AS `item_id`, created from item
+ $r = q("SELECT distinct parent AS item_id, created from item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
WHERE uid = %d $item_normal
AND item_wall = 1 $simple_update
@@ -251,10 +251,10 @@ class Channel extends \Zotlabs\Web\Controller {
$parents_str = ids_to_querystr($r,'item_id');
- $items = q("SELECT `item`.*, `item`.`id` AS `item_id`
- FROM `item`
- WHERE `item`.`uid` = %d $item_normal
- AND `item`.`parent` IN ( %s )
+ $items = q("SELECT item.*, item.id AS item_id
+ FROM item
+ WHERE item.uid = %d $item_normal
+ AND item.parent IN ( %s )
$sql_extra ",
intval(\App::$profile['profile_uid']),
dbesc($parents_str)