X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=aa027a860b43fc69eb0d0a102926a24bb7ba4723;hb=624e4c192c7f837ac0587a50da6e1409081eb519;hp=3a453cc87522c08f245207aab790c393bdeb4396;hpb=1fae0123ec0f20d085b87b468a8a0bee32754ecf;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 3a453cc875..aa027a860b 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -35,7 +35,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Network\HTTPClient\Client\HttpClient;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
@@ -220,7 +220,7 @@ class Profile
 	public static function load(App $a, string $nickname, bool $show_contacts = true)
 	{
 		$profile = User::getOwnerDataByNick($nickname);
-		if (empty($profile)) {
+		if (empty($profile) || $profile['account_removed']) {
 			Logger::info('profile error: ' . DI::args()->getQueryString());
 			return [];
 		}
@@ -235,7 +235,7 @@ class Profile
 
 		DI::page()['title'] = $profile['name'] . ' @ ' . DI::config()->get('config', 'sitename');
 
-		if (!DI::pConfig()->get(local_user(), 'system', 'always_my_theme')) {
+		if (!local_user()) {
 			$a->setCurrentTheme($profile['theme']);
 			$a->setCurrentMobileTheme(DI::pConfig()->get($a->getProfileOwner(), 'system', 'mobile_theme'));
 		}
@@ -751,7 +751,7 @@ class Profile
 			$magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
 			// We have to check if the remote server does understand /magic without invoking something
-			$serverret = DI::httpClient()->get($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClient::ACCEPT_DEFAULT]);
+			$serverret = DI::httpClient()->head($basepath . '/magic', [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::HTML]);
 			if ($serverret->isSuccess()) {
 				Logger::info('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path);
 				System::externalRedirect($magic_path);
@@ -880,23 +880,17 @@ class Profile
 	 *
 	 * Used from within PCSS themes to set theme parameters. If there's a
 	 * profile_uid variable set in App, that is the "page owner" and normally their theme
-	 * settings take precedence; unless a local user sets the "always_my_theme"
-	 * system pconfig, which means they don't want to see anybody else's theme
-	 * settings except their own while on this site.
+	 * settings take precedence; unless a local user is logged in which means they don't
+	 * want to see anybody else's theme settings except their own while on this site.
 	 *
+	 * @param App $a
 	 * @return int user ID
 	 *
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note Returns local_user instead of user ID if "always_my_theme" is set to true
 	 */
-	public static function getThemeUid(App $a)
+	public static function getThemeUid(App $a): int
 	{
-		$uid = !empty($a->getProfileOwner()) ? intval($a->getProfileOwner()) : 0;
-		if (local_user() && (DI::pConfig()->get(local_user(), 'system', 'always_my_theme') || !$uid)) {
-			return local_user();
-		}
-
-		return $uid;
+		return local_user() ?: $a->getProfileOwner();
 	}
 
 	/**