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

bug #407 fixed, avoid PHP warnings

Browse source 
... on formats_to_delete and caddiables variables during sync
This commit is contained in:
plegall 2016-01-26 15:41:12 +01:00
parent 74dd9b88ed
commit 7ae2094726
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
admin/site_update.php
View file

@ -488,6 +488,7 @@ SELECT id, path
$inserts = array(); $inserts = array();
$insert_links = array(); $insert_links = array();
$insert_formats = array(); $insert_formats = array();
$formats_to_delete = array();
foreach (array_diff(array_keys($fs), $db_elements) as $path) foreach (array_diff(array_keys($fs), $db_elements) as $path)
{ {
@ -593,8 +594,6 @@ SELECT *
} }
// first we search the formats that were removed // first we search the formats that were removed
$formats_to_delete = array();
foreach ($db_formats as $image_id => $formats) foreach ($db_formats as $image_id => $formats)
{ {
$image_formats_to_delete = array_diff_key($formats, $fs[ $db_elements[$image_id] ]['formats']); $image_formats_to_delete = array_diff_key($formats, $fs[ $db_elements[$image_id] ]['formats']);
@ -658,6 +657,12 @@ SELECT *
array_keys($insert_links[0]), array_keys($insert_links[0]),
$insert_links $insert_links
); );
// add new photos to caddie
if (isset($_POST['add_to_caddie']) and $_POST['add_to_caddie'] == 1)
{
fill_caddie($caddiables);
}
} }
// inserts all formats // inserts all formats
@ -679,12 +684,6 @@ DELETE
;'; ;';
pwg_query($query); pwg_query($query);
} }
// add new photos to caddie
if (isset($_POST['add_to_caddie']) and $_POST['add_to_caddie'] == 1)
{
fill_caddie($caddiables);
}
} }
$counts['new_elements'] = count($inserts); $counts['new_elements'] = count($inserts);