iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-05 04:52:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug with no ref (and maybe 663): Currently if the "Search in subcategories" checkbox was unselected, all existing categories and elements were duplicated.

Browse Source 
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/branches/branch-1_7@2193 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital
2008-01-23 21:10:13 +00:00
parent fdf915a2c1
commit a874845d40
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin/site_update.php
View File

@@ -240,7 +240,20 @@ SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
array_push($fs_fulldirs, $basedir);
}
$inserts = array();
// 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));
}
// print_r( $fs_fulldirs ); echo "<br>";
// print_r( $db_fulldirs ); echo "<br>";
// print_r( array_diff($fs_fulldirs, array_keys($db_fulldirs)) ); echo "<br>";
// die('That\'s why dirs or files synchronizations were duplicating cats.');
$inserts = array();
// new categories are the directories not present yet in the database
foreach (array_diff($fs_fulldirs, array_keys($db_fulldirs)) as $fulldir)
{

5
template/yoga/admin/site_update.tpl
View File

@@ -97,10 +97,9 @@
</li>
<li><label>
<img class="button" src="{themeconf:icon_dir}/check.png" alt="checked checkbox">
<input type="HIDDEN" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} />
<input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} />
{lang:search_subcats_included}</label>
/ (<strong>Warning</strong>: Locked control, contact our forum if needed).</li>
</li>
</ul>
</fieldset>