X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=271740a4f5d28eddec6ffba15ae6883a4ef423e7;hb=2a881cc2e71b1677cc9ce98001ae3f157743e542;hp=0eb912e00a7b962d5c5f13bfcedc623d643f4f19;hpb=664afbcafbaab91f767dbdd47334db53333f080c;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 0eb912e00a..271740a4f5 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -66,9 +66,9 @@ class Contact extends BaseModule
 		if (DBA::isResult($contact)) {
 			if ($contact['self']) {
 				if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
-					goaway('profile/' . $contact['nick']);
+					$a->internalRedirect('profile/' . $contact['nick']);
 				} else {
-					goaway('profile/' . $contact['nick'] . '?tab=profile');
+					$a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
 				}
 			}
 
@@ -168,7 +168,7 @@ class Contact extends BaseModule
 			info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
 		}
 
-		goaway('contact');
+		$a->internalRedirect('contact');
 	}
 
 	public static function post()
@@ -191,7 +191,7 @@ class Contact extends BaseModule
 
 		if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
 			notice(L10n::t('Could not access contact record.') . EOL);
-			goaway('contact');
+			$a->internalRedirect('contact');
 			return; // NOTREACHED
 		}
 
@@ -374,19 +374,19 @@ class Contact extends BaseModule
 			$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
 			if (!DBA::isResult($orig_record)) {
 				notice(L10n::t('Could not access contact record.') . EOL);
-				goaway('contact');
+				$a->internalRedirect('contact');
 				return; // NOTREACHED
 			}
 
 			if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromPoll($contact_id);
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				goaway('crepair/' . $contact_id);
+				$a->internalRedirect('crepair/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -396,7 +396,7 @@ class Contact extends BaseModule
 				$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
 				info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -406,7 +406,7 @@ class Contact extends BaseModule
 				$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
 				info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -417,7 +417,7 @@ class Contact extends BaseModule
 					info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
 				}
 
-				goaway('contact/' . $contact_id);
+				$a->internalRedirect('contact/' . $contact_id);
 				return; // NOTREACHED
 			}
 
@@ -451,13 +451,13 @@ class Contact extends BaseModule
 				}
 				// Now check how the user responded to the confirmation query
 				if (!empty($_REQUEST['canceled'])) {
-					goaway('contact');
+					$a->internalRedirect('contact');
 				}
 
 				self::dropContact($orig_record);
 				info(L10n::t('Contact has been removed.') . EOL);
 
-				goaway('contact');
+				$a->internalRedirect('contact');
 				return; // NOTREACHED
 			}
 			if ($cmd === 'posts') {
@@ -468,7 +468,7 @@ class Contact extends BaseModule
 			}
 		}
 
-		$_SESSION['return_url'] = $a->query_string;
+		$_SESSION['return_path'] = $a->query_string;
 
 		if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
 			$contact_id = $a->data['contact']['id'];