archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 2730: multi size not deleted when physical directory deleted

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@17650 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-08-27 18:42:04 +00:00
parent a6c33e9332
commit 62452b90ce
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
admin/site_update.php
View file

@ -303,19 +303,31 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank
}
// to delete categories
$to_delete = array();
$to_delete = array(); $to_delete_derivative_dirs = array();
foreach (array_diff(array_keys($db_fulldirs), $fs_fulldirs) as $fulldir)
{
array_push($to_delete, $db_fulldirs[$fulldir]);
unset($db_fulldirs[$fulldir]);
array_push($infos, array('path' => $fulldir,
'info' => l10n('deleted')));
if (substr_compare($fulldir, '../', 0, 3)==0)
{
$fulldir = substr($fulldir, 3);
}
$to_delete_derivative_dirs[] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$fulldir;
}
if (count($to_delete) > 0)
{
if (!$simulate)
{
delete_categories($to_delete);
foreach($to_delete_derivative_dirs as $to_delete_dir)
{
if (is_dir($to_delete_dir))
{
clear_derivative_cache_rec($to_delete_dir, '#.+#');
}
}
}
$counts['del_categories'] = count($to_delete);
}