From a8812346c4a2962182b66345bf93144bc13c16ad Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 31 Dec 2012 15:47:51 -0800
Subject: couple of fixes to follow, prepare for default connection permissions

---
 mod/follow.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'mod/follow.php')

diff --git a/mod/follow.php b/mod/follow.php
index 05d1eee73..fd2f8af19 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,21 +1,19 @@
 <?php
 
-require_once('Scrape.php');
+
 require_once('include/follow.php');
 
 function follow_init(&$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
-		// NOTREACHED
+		return;
 	}
 
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
 	$return_url = $_SESSION['return_url'];
 
-
 	$result = new_contact($uid,$url,$a->get_channel(),true);
 
 	if($result['success'] == false) {
@@ -26,9 +24,6 @@ function follow_init(&$a) {
 
 	info( t('Channel added') . EOL);
 
-	if(strstr($return_url,'channel'))
-		goaway($a->get_baseurl() . '/channel/' . $result['channel_id']);
+	goaway(z_root() . '/connection/' . $result['abook']['abook_id']);
 
-	goaway($return_url);
-	// NOTREACHED
 }
-- 
cgit v1.2.3