diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-02 20:25:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-02 20:25:17 +0100 |
| commit | 7c5f1e814bd60b326ede8d2511089d1da66b4854 (patch) | |
| tree | 07172b5871945e897a5693241c881245d63325ce /include/follow.php | |
| parent | 5c46e66694ecab4e986cada35527ae4bf599b630 (diff) | |
| parent | dcfe9bc64f822af02021767bf8c70fbe9d847bda (diff) | |
| download | volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.tar.gz volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.tar.bz2 volse-hubzilla-7c5f1e814bd60b326ede8d2511089d1da66b4854.zip | |
Merge remote-tracking branch 'mike/master' into dev
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. |