diff options
author | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
commit | ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9 (patch) | |
tree | c26098c1c0ebff705dc4ef4f324b8b1656c61b9a /include/follow.php | |
parent | 3706afbd01164c9f322c605d6ec242e6ca4770fa (diff) | |
parent | 478014f02a9241ec6d5b5e9672968897176302d2 (diff) | |
download | volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.gz volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.bz2 volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.zip |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!4
Diffstat (limited to 'include/follow.php')
-rw-r--r-- | include/follow.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/follow.php b/include/follow.php index 50b952881..a4d382545 100644 --- a/include/follow.php +++ b/include/follow.php @@ -142,7 +142,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : ''); - $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' $sql_options ", + $r = q("select * from xchan where (xchan_addr = '%s' or xchan_url = '%s') $sql_options ", dbesc($url), dbesc($url) ); |