Merge pull request #7958 from tobiasd/20191216-lng

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index fd12bdaaf2f1bfab0b0e6ed4c4159f6ea18ce3c6..7ecf4a576c5405fdd16ce22f8a657e82e3400fe4 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -836,9 +836,9 @@ class User
                        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;
@@ -846,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;
@@ -854,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]);
                                }
                        }
                }