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

Merge pull request #10058 from annando/issue-10050 

Issue 10050: Improve photo deletions
This commit is contained in:
Hypolite Petovan 2021-03-19 08:23:00 -04:00 committed by GitHub
parent c48179fbde 49919b5b1d
commit f75dbdab5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Model/Photo.php
View File

@ -364,15 +364,20 @@ class Photo
public static function delete(array $conditions, array $options = [])
{
// get photo to delete data info
$photos = self::selectToArray(['backend-class', 'backend-ref'], $conditions);
$photos = DBA::select('photo', ['id', 'backend-class', 'backend-ref'], $conditions);
foreach($photos as $photo) {
while ($photo = DBA::fetch($photos)) {
$backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
if ($backend_class !== null) {
$backend_class->delete($photo["backend-ref"] ?? '');
if ($backend_class->delete($photo["backend-ref"] ?? '')) {
// Delete the photos after they had been deleted successfully
DBA::delete("photo", ['id' => $photo['id']]);
}
}
}
DBA::close($photos);
return DBA::delete("photo", $conditions, $options);
}