Rename Photo::newResource() result variable from $hash to $resource_id

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index f6b03aa3cbcd564badbb81449b889b826ae99d94..e0630e7dc9635266efb22d165125770f8a4ca28e 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -749,9 +749,9 @@ function photos_post(App $a)
 
        $smallest = 0;
 
-       $photo_hash = Photo::newResource();
+       $resource_id = Photo::newResource();
 
-       $r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+       $r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
        if (!$r) {
                Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
@@ -761,13 +761,13 @@ function photos_post(App $a)
 
        if ($width > 640 || $height > 640) {
                $image->scaleDown(640);
-               Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 1;
        }
 
        if ($width > 320 || $height > 320) {
                $image->scaleDown(320);
-               Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+               Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
                $smallest = 2;
        }
 
@@ -791,7 +791,7 @@ function photos_post(App $a)
        $arr['parent-uri']    = $uri;
        $arr['type']          = 'photo';
        $arr['wall']          = 1;
-       $arr['resource-id']   = $photo_hash;
+       $arr['resource-id']   = $resource_id;
        $arr['contact-id']    = $owner_record['id'];
        $arr['owner-name']    = $owner_record['name'];
        $arr['owner-link']    = $owner_record['url'];
@@ -807,8 +807,8 @@ function photos_post(App $a)
        $arr['visible']       = $visible;
        $arr['origin']        = 1;
 
-       $arr['body']          = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
-                               . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$image->getExt() . '[/img]'
+       $arr['body']          = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
+                               . '[img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
                                . '[/url]';
 
        $item_id = Item::insert($arr);