diff options
author | mrjive <mrjive@mrjive.it> | 2018-03-13 10:59:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 10:59:21 +0100 |
commit | 790660e61264ed884a8c600f407cf75893ffe977 (patch) | |
tree | 8fb3e4263cd7cdf4b34e0d7bb859c2f290c8ab39 /include/follow.php | |
parent | 2bcfa0c12687d47c11e8c445a5a38ffe96d5c135 (diff) | |
parent | 53c1d3775cc140ecda50d837752adac851d9e0b2 (diff) | |
download | volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.tar.gz volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.tar.bz2 volse-hubzilla-790660e61264ed884a8c600f407cf75893ffe977.zip |
Merge pull request #18 from redmatrix/dev
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. |