diff options
author | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
commit | 6decffb00c00fabcb4ef581084eaca038e340686 (patch) | |
tree | 34471f015e0b33007ad40059dfdd09c83a768fbb /include/connections.php | |
parent | 1dc795722a8e748ebb98e8fab778cd4686a0654f (diff) | |
parent | 6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff) | |
download | volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2 volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip |
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/connections.php')
-rw-r--r-- | include/connections.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/connections.php b/include/connections.php index c5d74d4ca..8d1b9e07f 100644 --- a/include/connections.php +++ b/include/connections.php @@ -100,7 +100,6 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { if(! $xchan) return; -// FIXME - show connect button to observer if appropriate $connect = false; if(local_channel()) { $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", |