diff options
-rw-r--r-- | admin/site_update.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/admin/site_update.php b/admin/site_update.php index 8dcf601d2..e6fb6d4ef 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -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) |