X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=c5652c6f7a2e992f6561acefe799c9bab3f2253c;hb=8d999f54d025cebcaeef9386ae9910def7af52c3;hp=3cd3afe6cbea0f654bfad4648935522181d30df6;hpb=fc2340d4afe6466c58e35afd64fe9010bf185b04;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 3cd3afe6cb..c5652c6f7a 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -166,7 +166,7 @@ class Profile
 			}
 		}
 
-		$profile = User::getOwnerDataById($user['uid'], false);
+		$profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
 
 		if (empty($profile) && empty($profiledata)) {
 			Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -304,7 +304,7 @@ class Profile
 
 		$profile_is_dfrn = $profile['network'] == Protocol::DFRN;
 		$profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
-		$local_user_is_self = local_user() && local_user() == ($profile['uid'] ?? 0);
+		$local_user_is_self = self::getMyURL() && ($profile['url'] == self::getMyURL());
 		$visitor_is_authenticated = (bool)self::getMyURL();
 		$visitor_is_following =
 			in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
@@ -322,9 +322,9 @@ class Profile
 				}
 			} elseif ($profile_is_native) {
 				if ($visitor_is_following) {
-					$unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+					$unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1';
 				} else {
-					$follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url);
+					$follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1';
 				}
 			}
 
@@ -354,13 +354,7 @@ class Profile
 		// Fetch the account type
 		$account_type = Contact::getAccountType($profile);
 
-		if (!empty($profile['address'])
-			|| !empty($profile['location'])
-			|| !empty($profile['locality'])
-			|| !empty($profile['region'])
-			|| !empty($profile['postal-code'])
-			|| !empty($profile['country-name'])
-		) {
+		if (!empty($profile['address'])	|| !empty($profile['location'])) {
 			$location = DI::l10n()->t('Location:');
 		}
 
@@ -412,6 +406,7 @@ class Profile
 					'pending' => false,
 					'hidden' => false,
 					'archive' => false,
+					'failed' => false,
 					'network' => Protocol::FEDERATED,
 				]);
 			}
@@ -427,10 +422,6 @@ class Profile
 			$p['about'] = BBCode::convert($p['about']);
 		}
 
-		if (empty($p['address']) && !empty($p['location'])) {
-			$p['address'] = $p['location'];
-		}
-
 		if (isset($p['address'])) {
 			$p['address'] = BBCode::convert($p['address']);
 		}