friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Photo model: fix docs, don't update "created" field 

in store() if photo exists, don't update "created" timestamp
This commit is contained in:
fabrixxm 2018-11-22 17:25:43 +01:00 committed by Hypolite Petovan
parent 6f59c82978
commit 7df3f117ac
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/System.php
View File

@ -197,7 +197,7 @@ class System extends BaseObject
public static function createUUID($prefix = '') public static function createUUID($prefix = '')
{ {
$guid = System::createGUID(32, $prefix); $guid = System::createGUID(32, $prefix);
return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12); return substr($guid, 0, 8) . '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
} }
/** /**

34
src/Model/Photo.php
View File

@ -221,19 +221,19 @@ class Photo extends BaseObject
/** /**
* @brief store photo metadata in db and binary in default backend * @brief store photo metadata in db and binary in default backend
* *
* @param Image $Image image * @param Image $Image Image object with data
* @param integer $uid uid * @param integer $uid User ID
* @param integer $cid cid * @param integer $cid Contact ID
* @param integer $rid rid * @param integer $rid Resource ID
* @param string $filename filename * @param string $filename Filename
* @param string $album album name * @param string $album Album name
* @param integer $scale scale * @param integer $scale Scale
* @param integer $profile optional, default = 0 * @param integer $profile Is a profile image? optional, default = 0
* @param string $allow_cid optional, default = "" * @param string $allow_cid Permissions, allowed contacts. optional, default = ""
* @param string $allow_gid optional, default = "" * @param string $allow_gid Permissions, allowed groups. optional, default = ""
* @param string $deny_cid optional, default = "" * @param string $deny_cid Permissions, denied contacts.optional, default = ""
* @param string $deny_gid optional, default = "" * @param string $deny_gid Permissions, denied greoup.optional, default = ""
* @param string $desc optional, default = "" * @param string $desc Photo caption. optional, default = ""
* *
* @return boolean True on success * @return boolean True on success
*/ */
@ -246,7 +246,11 @@ class Photo extends BaseObject
$guid = System::createGUID(); $guid = System::createGUID();
} }
$existing_photo = self::selectFirst(["id", "backend-class", "backend-ref"], ["resource-id" => $rid, "uid" => $uid, "contact-id" => $cid, "scale" => $scale]); $existing_photo = self::selectFirst(["id", "created", "backend-class", "backend-ref"], ["resource-id" => $rid, "uid" => $uid, "contact-id" => $cid, "scale" => $scale]);
$created = DateTimeFormat::utcNow();
if (DBA::isResult($existing_photo)) {
$created = $existing_photo["created"];
}
// Get defined storage backend. // Get defined storage backend.
// if no storage backend, we use old "data" column in photo table. // if no storage backend, we use old "data" column in photo table.
@ -273,7 +277,7 @@ class Photo extends BaseObject
"contact-id" => $cid, "contact-id" => $cid,
"guid" => $guid, "guid" => $guid,
"resource-id" => $rid, "resource-id" => $rid,
"created" => DateTimeFormat::utcNow(), "created" => $created,
"edited" => DateTimeFormat::utcNow(), "edited" => DateTimeFormat::utcNow(),
"filename" => basename($filename), "filename" => basename($filename),
"type" => $Image->getType(), "type" => $Image->getType(),