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

Logical merge from 1.7.1 Revison 2193

Browse source 
Bug with no ref (and maybe 663): Currently if the "Search in subcategories" checkbox was unselected, all existing categories and elements were duplicated.
Cause: Wrong comparison between fileserver directory list and already known files in tables.

Resolution: keeping only the selected directory from the file server directory list in such cases,
if that one is still allocated.

git-svn-id: http://piwigo.org/svn/trunk@2344 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital 2008-05-16 20:03:30 +00:00
commit 3e4f14d009
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
admin/site_update.php
View file

@ -235,7 +235,14 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
{
array_push($fs_fulldirs, $basedir);
}
// If $_POST['subcats-included'] != 1 ("Search in subcategories" is unchecked)
// $db_fulldirs doesn't include any subdirectories and $fs_fulldirs does
// So $fs_fulldirs will be limited to the selected basedir
// (if that one is in $fs_fulldirs)
if (!isset($_POST['subcats-included']) or $_POST['subcats-included'] != 1)
{
$fs_fulldirs = array_intersect($fs_fulldirs, array_keys($db_fulldirs));
}
$inserts = array();
// new categories are the directories not present yet in the database
foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)