Merge remote-tracking branch 'friendica/master'

1 files changed, 8 insertions, 2 deletions

diff --git a/mod/suggest.php b/mod/suggest.php
index aedf3fd46..b8ca423c5 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -29,6 +29,8 @@ function suggest_content(&$a) {
 		return;
 	}
 
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
 	$a->page['aside'] .= follow_widget();
 	$a->page['aside'] .= findpeople_widget();
 
@@ -39,19 +41,23 @@ function suggest_content(&$a) {
 	$r = suggestion_query(local_user());
 
 	if(! count($r)) {
-		$o .= t('No suggestions. This works best when you have more than one contact/friend.');
+		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
 	$tpl = get_markup_template('suggest_friends.tpl');
 
 	foreach($r as $rr) {
-			
+
+		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);			
+
 		$o .= replace_macros($tpl,array(
 			'$url' => $rr['url'],
 			'$name' => $rr['name'],
 			'$photo' => $rr['photo'],
 			'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+			'$conntxt' => t('Connect'),
+			'$connlnk' => $connlnk,
 			'$ignore' => t('Ignore/Hide')
 		));
 	}