diff options
author | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
commit | 75804d7ce57a476c85a486c807ea1f5a75235a0e (patch) | |
tree | 13794288d5ffca739248d9ec017ef1a4cef9b93d /Zotlabs/Module/Connedit.php | |
parent | d4af870bb6500747790e6f196afeb4d75011185d (diff) | |
parent | 0600817ef75d19d1ec91ba822f8a6938d442824e (diff) | |
download | volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.gz volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.bz2 volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
-rw-r--r-- | Zotlabs/Module/Connedit.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 23c5282e3..e0511b0d3 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -567,7 +567,7 @@ class Connedit extends \Zotlabs\Web\Controller { $contact_id = \App::$poi['abook_id']; $contact = \App::$poi; - $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 order by xchan_name", + $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name", intval(local_channel()) ); |