Replace remaining instances of "contacts/"

diff --git a/mod/common.php b/mod/common.php
index 25a6aef17a5cc602833514148f2be7e20639af88..0b51f20d73334190c45d98d2af1a7be86084618f 100644 (file)
--- 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 13885cb49106adc94b44a2f1d60dd4a50c5e9cdd..1cf562d64cae885e45fd9e07f3939b3041e40224 100644 (file)
--- 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 04c279c5b6ab707f5995aa0c229e412613082d50..70dfb627ed6fabc15d26e5e15424aebf6bf4c0ef 100644 (file)
--- 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 9b0e206904bad703e608d2a460d993a72f39909c..6a058608e7a0dd5c2808c580f3262fe48cb5d9aa 100644 (file)
--- 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
        }