From 6d5b2c484d93cfab0aa481ebffaa7a2a5a17162f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 18 Oct 2018 07:48:34 -0400
Subject: [PATCH] Replace remaining instances of "contacts/"

---
 mod/common.php   | 4 ++--
 mod/crepair.php  | 2 +-
 mod/follow.php   | 2 +-
 mod/unfollow.php | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/common.php b/mod/common.php
index 25a6aef17a..0b51f20d73 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -48,9 +48,9 @@ function common_content(App $a)
 
 		if (DBA::isResult($contact)) {
 			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
-				'$name' => htmlentities($contact['name']),
+				'$name'  => htmlentities($contact['name']),
 				'$photo' => $contact['photo'],
-				'url' => 'contacts/' . $cid
+				'url'    => 'contact/' . $cid
 			]);
 
 			if (!x($a->page, 'aside')) {
diff --git a/mod/crepair.php b/mod/crepair.php
index 13885cb491..1cf562d64c 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -114,7 +114,7 @@ function crepair_content(App $a)
 	$warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
 	$info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
 
-	$returnaddr = "contacts/$cid";
+	$returnaddr = "contact/$cid";
 
 	$allow_remote_self = Config::get('system', 'allow_users_remote_self');
 
diff --git a/mod/follow.php b/mod/follow.php
index 04c279c5b6..70dfb627ed 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -39,7 +39,7 @@ function follow_post(App $a)
 		}
 		goaway($return_url);
 	} elseif ($result['cid']) {
-		goaway('contacts/' . $result['cid']);
+		goaway('contact/' . $result['cid']);
 	}
 
 	info(L10n::t('The contact could not be added.'));
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 9b0e206904..6a058608e7 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -59,7 +59,7 @@ function unfollow_post()
 		$return_path = 'contacts';
 	} else {
 		DBA::update('contact', ['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
-		$return_path = 'contacts/' . $contact['id'];
+		$return_path = 'contact/' . $contact['id'];
 	}
 
 	info(L10n::t('Contact unfollowed'));
@@ -94,7 +94,7 @@ function unfollow_content(App $a)
 
 	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
 		notice(L10n::t('Unfollowing is currently not supported by your network.'));
-		goaway('contacts/' . $contact['id']);
+		goaway('contact/' . $contact['id']);
 		// NOTREACHED
 	}