aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-02 15:49:50 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-02 15:49:50 -0700
commit69fc10d5adfa0640792376ad4f417bd7f28fc7f7 (patch)
tree89bbc85acbb82e9da7cea24c73f0ae5c7b4d7f63 /include/zot.php
parent9328edfdcdba589c69ce2b26f249458c57ef42d8 (diff)
parent3647b74d338ffb5c85c40cf01bcaa76593e4cb18 (diff)
downloadvolse-hubzilla-69fc10d5adfa0640792376ad4f417bd7f28fc7f7.tar.gz
volse-hubzilla-69fc10d5adfa0640792376ad4f417bd7f28fc7f7.tar.bz2
volse-hubzilla-69fc10d5adfa0640792376ad4f417bd7f28fc7f7.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php
index 16336ad54..8a8b74860 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1637,10 +1637,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
}
}
-
- $ab = q("select abook.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d
- and abook_self = 0",
- intval($channel['channel_id'])
+ $ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
+ intval($channel['channel_id']),
+ dbesc($arr['owner_xchan'])
);
$abook = (($ab) ? $ab[0] : null);