aboutsummaryrefslogtreecommitdiffstats
path: root/include/taxonomy.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-22 14:18:58 -0800
committerzotlabs <mike@macgirvin.com>2016-11-22 14:18:58 -0800
commit11b4d98f37c2f2daeb2fb19e1b4c8ab5190ea3c5 (patch)
tree22d82f384a9bd986a47215f3a9ee918f3d888cf2 /include/taxonomy.php
parent6e016c439caa444c4b3aca55e39a5dfa7294c684 (diff)
parentd1af4a5582a1a0fa0a97261e04a13edb1f8f32c0 (diff)
downloadvolse-hubzilla-11b4d98f37c2f2daeb2fb19e1b4c8ab5190ea3c5.tar.gz
volse-hubzilla-11b4d98f37c2f2daeb2fb19e1b4c8ab5190ea3c5.tar.bz2
volse-hubzilla-11b4d98f37c2f2daeb2fb19e1b4c8ab5190ea3c5.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/taxonomy.php')
-rw-r--r--include/taxonomy.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 067bd3246..0b4b2aa9a 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -386,7 +386,7 @@ function get_things($profile_hash,$uid) {
$things[$k] = null;
foreach($r as $rr) {
- $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on likee = xchan_hash where
+ $l = q("select xchan_name, xchan_photo_s, xchan_url from likes left join xchan on liker = xchan_hash where
target_type = '%s' and target_id = '%s' and channel_id = %d",
dbesc(ACTIVITY_OBJ_THING),
dbesc($rr['obj_obj']),