From 974a52a16d3440b6d361b883412c00edd15e770b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 01:08:32 -0800
Subject: add connect link to friend suggest

---
 mod/follow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/follow.php')

diff --git a/mod/follow.php b/mod/follow.php
index 2d643400a..5fdb93815 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -10,7 +10,7 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = $orig_url = notags(trim($_POST['url']));
+	$url = $orig_url = notags(trim($_REQUEST['url']));
 
 	// remove ajax junk, e.g. Twitter
 
-- 
cgit v1.2.3


From 622886a33c459e5290bdfcf491a1c8f9ed132207 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 12:41:46 -0800
Subject: make mod-follow "get"-able

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

(limited to 'mod/follow.php')

diff --git a/mod/follow.php b/mod/follow.php
index 5fdb93815..f99d91757 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,7 +2,7 @@
 
 require_once('Scrape.php');
 
-function follow_post(&$a) {
+function follow_init(&$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -202,7 +202,9 @@ function follow_post(&$a) {
 		}
 	}
 
-	goaway($a->get_baseurl() . '/contacts/' . $contact_id);
-//	goaway($_SESSION['return_url']);
+	if(strstr($_SESSION['return_url'],'contacts'))
+		goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
+	goaway($_SESSION['return_url']);
 	// NOTREACHED
 }
-- 
cgit v1.2.3


From eb05d00794055dcd895ff9c3f73c55d7d7a13d10 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 12:51:45 -0800
Subject: connect on suggest/match - added to testbubble

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

(limited to 'mod/follow.php')

diff --git a/mod/follow.php b/mod/follow.php
index f99d91757..f8964885e 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -22,6 +22,14 @@ function follow_init(&$a) {
 		// NOTREACHED
 	}
 
+
+	if(! $url) {
+		notice( t('Connect URL missing.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+
 	$ret = probe_url($url);
 
 	if($ret['network'] === NETWORK_DFRN) {
-- 
cgit v1.2.3