diff options
author | zotlabs <mike@macgirvin.com> | 2019-05-06 04:19:54 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-05-06 04:19:54 -0700 |
commit | c0911da887d610f95c5f544d4b6f63914b1c85bb (patch) | |
tree | 293cf0addb0a33b3d57bc16656430eef1f58c1be | |
parent | 6e0bf04276074ad958024133f52a3be0ce88801a (diff) | |
download | volse-hubzilla-c0911da887d610f95c5f544d4b6f63914b1c85bb.tar.gz volse-hubzilla-c0911da887d610f95c5f544d4b6f63914b1c85bb.tar.bz2 volse-hubzilla-c0911da887d610f95c5f544d4b6f63914b1c85bb.zip |
review of last commit
-rw-r--r-- | include/follow.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/follow.php b/include/follow.php index 7e0e1644a..50b952881 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 limit 1", + $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' $sql_options ", dbesc($url), dbesc($url) ); @@ -194,7 +194,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $allowed = (($is_zot || in_array($xchan['xchan_network'],['rss','zot6'])) ? 1 : 0); - $x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => $allowed, 'singleton' => 0); + $x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $xchan, 'allowed' => $allowed, 'singleton' => 0); call_hooks('follow_allow',$x); |