diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-04 06:45:07 -0500 |
| commit | 058f7277b52bdcdb80dc3e28bf0ec93a573195a7 (patch) | |
| tree | 32ca12ca4eb390396e429b1e86fd79de614f2551 /include/follow.php | |
| parent | 39fe80a196ee626dda15b5b844dd1d05893f7646 (diff) | |
| parent | 471c3c4d068d1c6d4e149098d400d792fb3550a6 (diff) | |
| download | volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.gz volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.tar.bz2 volse-hubzilla-058f7277b52bdcdb80dc3e28bf0ec93a573195a7.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/follow.php b/include/follow.php index 0843802c5..a63fe66ea 100644 --- a/include/follow.php +++ b/include/follow.php @@ -88,9 +88,18 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // Premium channel, set confirm before callback to avoid recursion - if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm)) - goaway(zid($j['connect_url'])); - + if(array_key_exists('connect_url',$j) && (! $confirm)) { + if($interactive) { + goaway(zid($j['connect_url'])); + } + else { + $result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']); + logger('mod_follow: ' . $result['message']); + return $result; + } + } + + // do we have an xchan and hubloc? // If not, create them. |