mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 12:19:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug 2119 fixed: no crash when calling pwg.categories.delete on an empty album

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@8848 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-01-23 00:10:29 +00:00
parent 7954694d73
commit dff8596f66
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
admin/include/functions.php
View file

@ -97,26 +97,29 @@ SELECT
WHERE category_id IN ('.implode(',', $ids).')
;';
$image_ids_linked = array_from_query($query, 'image_id');
if ('delete_orphans' == $photo_deletion_mode)
if (count($image_ids_linked) > 0)
{
$query = '
if ('delete_orphans' == $photo_deletion_mode)
{
$query = '
SELECT
DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE image_id IN ('.implode(',', $image_ids_linked).')
AND category_id NOT IN ('.implode(',', $ids).')
;';
$image_ids_not_orphans = array_from_query($query, 'image_id');
$image_ids_to_delete = array_diff($image_ids_linked, $image_ids_not_orphans);
}
$image_ids_not_orphans = array_from_query($query, 'image_id');
$image_ids_to_delete = array_diff($image_ids_linked, $image_ids_not_orphans);
}
if ('force_delete' == $photo_deletion_mode)
{
$image_ids_to_delete = $image_ids_linked;
}
if ('force_delete' == $photo_deletion_mode)
{
$image_ids_to_delete = $image_ids_linked;
}
delete_elements($image_ids_to_delete, true);
delete_elements($image_ids_to_delete, true);
}
}
// destruction of the links between images and this category