From 537164fd020dbbf86bd9cbbc1d93b5330fa29329 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 13 Nov 2018 16:01:01 -0500
Subject: [PATCH 1/2] Convert remaining instances of "contacts" in mod/unfollow

---
 mod/unfollow.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 9b1049286..433a4782f 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -16,7 +16,7 @@ use Friendica\Util\Strings;
 
 function unfollow_post(App $a)
 {
-	$return_path = 'contacts';
+	$base_return_path = 'contact';
 
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.'));
@@ -34,17 +34,17 @@ function unfollow_post(App $a)
 
 	if (!DBA::isResult($contact)) {
 		notice(L10n::t("You aren't following this contact."));
-		$a->internalRedirect($return_path);
+		$a->internalRedirect($base_return_path);
 		// NOTREACHED
 	}
 
 	if (!empty($_REQUEST['cancel'])) {
-		$a->internalRedirect($return_path . '/' . $contact['id']);
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
 	}
 
 	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
-		$a->internalRedirect($return_path . '/' . $contact['id']);
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
 
@@ -58,10 +58,10 @@ function unfollow_post(App $a)
 	// Sharing-only contacts get deleted as there no relationship any more
 	if ($dissolve) {
 		Contact::remove($contact['id']);
-		$return_path = 'contacts';
+		$return_path = $base_return_path;
 	} else {
 		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-		$return_path = 'contact/' . $contact['id'];
+		$return_path = $base_return_path . '/' . $contact['id'];
 	}
 
 	info(L10n::t('Contact unfollowed'));
@@ -71,7 +71,7 @@ function unfollow_post(App $a)
 
 function unfollow_content(App $a)
 {
-	$return_path = 'contacts';
+	$base_return_path = 'contact';
 
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.'));
@@ -90,13 +90,13 @@ function unfollow_content(App $a)
 
 	if (!DBA::isResult($contact)) {
 		notice(L10n::t("You aren't following this contact."));
-		$a->internalRedirect($return_path);
+		$a->internalRedirect($base_return_path);
 		// NOTREACHED
 	}
 
 	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
-		$a->internalRedirect('contact/' . $contact['id']);
+		$a->internalRedirect($base_return_path . '/' . $contact['id']);
 		// NOTREACHED
 	}
 
@@ -107,7 +107,7 @@ function unfollow_content(App $a)
 
 	if (!DBA::isResult($self)) {
 		notice(L10n::t('Permission denied.'));
-		$a->internalRedirect($return_path);
+		$a->internalRedirect($base_return_path);
 		// NOTREACHED
 	}
 

From d697dbd794c4caed5b5802509aef735e9e5df35c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 13 Nov 2018 16:02:33 -0500
Subject: [PATCH 2/2] Convert remaining instances of "contacts" in mod/follow

---
 mod/follow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/follow.php b/mod/follow.php
index b92424c20..1ee61ce9e 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -22,7 +22,7 @@ function follow_post(App $a)
 	}
 
 	if (isset($_REQUEST['cancel'])) {
-		$a->internalRedirect('contacts');
+		$a->internalRedirect('contact');
 	}
 
 	$uid = local_user();
@@ -52,7 +52,7 @@ function follow_post(App $a)
 
 function follow_content(App $a)
 {
-	$return_path = 'contacts';
+	$return_path = 'contact';
 
 	if (!local_user()) {
 		notice(L10n::t('Permission denied.'));