aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-20 16:55:24 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-20 16:55:24 -0700
commitb240c15014ec440c414407dd2b73567b39391e0e (patch)
tree935d34c65b90230269654e4e9e0ea30430ad4687
parent996cd7e2aba37ce2c4613753a68552c92dcb9be9 (diff)
parent9de8df496a98019d4b4a3e7549e0d5047dd87024 (diff)
downloadvolse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.tar.gz
volse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.tar.bz2
volse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index f6816ee7c..2fbd4574c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -490,7 +490,7 @@ function zot_refresh($them, $channel = null, $force = false) {
// Send a clone sync packet and a permissions update if permissions have changed
- $new_connection = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
+ $new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
dbesc($x['hash']),
intval($channel['channel_id'])
);