Changeset 2344 for trunk/admin

Timestamp:

May 16, 2008, 10:03:30 PM (16 years ago)

Author:

vdigital

Message:

Logical merge from 1.7.1 Revison 2193
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.

File:

• trunk/admin/site_update.php (modified) (1 diff)

trunk/admin/site_update.php

@@ -236 +236 @@
     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