X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=7ecf4a576c5405fdd16ce22f8a657e82e3400fe4;hb=HEAD;hp=b4da6d25685c8d608923e55d59f3f832615e3fac;hpb=aca701bef8896a1d6b829f51deecd44d933e517f;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index b4da6d2568..7ecf4a576c 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -22,6 +22,7 @@ use Friendica\Model\TwoFactor\AppSpecificPassword;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
@@ -190,7 +191,8 @@ class User
 			`user`.`page-flags`,
 			`user`.`account-type`,
 			`user`.`prvnets`,
-			`user`.`account_removed`
+			`user`.`account_removed`,
+			`user`.`hidewall`
 			FROM `contact`
 			INNER JOIN `user`
 				ON `user`.`uid` = `contact`.`uid`
@@ -828,15 +830,15 @@ class User
 			$filename = basename($photo);
 			$img_str = Network::fetchUrl($photo, true);
 			// guess mimetype from headers or filename
-			$type = Image::guessType($photo, true);
+			$type = Images::guessType($photo, true);
 
 			$Image = new Image($img_str, $type);
 			if ($Image->isValid()) {
 				$Image->scaleToSquare(300);
 
-				$hash = Photo::newResource();
+				$resource_id = Photo::newResource();
 
-				$r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 4);
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 4);
 
 				if ($r === false) {
 					$photo_failure = true;
@@ -844,7 +846,7 @@ class User
 
 				$Image->scaleDown(80);
 
-				$r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 5);
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 5);
 
 				if ($r === false) {
 					$photo_failure = true;
@@ -852,14 +854,14 @@ class User
 
 				$Image->scaleDown(48);
 
-				$r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 6);
+				$r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 6);
 
 				if ($r === false) {
 					$photo_failure = true;
 				}
 
 				if (!$photo_failure) {
-					Photo::update(['profile' => 1], ['resource-id' => $hash]);
+					Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
 				}
 			}
 		}