diff options
| author | M. Dent <dentm42@gmail.com> | 2019-11-04 19:58:01 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-11-04 19:58:01 +0100 |
| commit | 09284d512d2519ede757265c703427d1d1012469 (patch) | |
| tree | 31d1038af4e3243bd54b2d98a39ded2b796c5a3f | |
| parent | 64c6e25896bc5b8f899abdad4e52a9fe6c88a66c (diff) | |
| parent | a049664219cfffc0d0d7f41b77b7c2c036352e88 (diff) | |
| download | volse-hubzilla-09284d512d2519ede757265c703427d1d1012469.tar.gz volse-hubzilla-09284d512d2519ede757265c703427d1d1012469.tar.bz2 volse-hubzilla-09284d512d2519ede757265c703427d1d1012469.zip | |
Merge branch 'cherry-pick-03317b98' into 'dev'
fix query with protocol prefix not always picking the right xchan
See merge request hubzilla/core!1765
| -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) ); |