From f1f806b8a313329536a56ebf5885bbc511c245ae Mon Sep 17 00:00:00 2001
From: flop25 <flop25@piwigo.org>
Date: Sun, 17 Aug 2014 20:01:10 +0000
Subject: feature:732 unlock sub-albums

git-svn-id: http://piwigo.org/svn/trunk@29229 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/functions.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'admin/include')

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 737f6af65..1ad514a13 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -644,8 +644,9 @@ SELECT id, id_uppercat, uppercats, rank, global_rank
  *
  * @param int[] $categories
  * @param boolean|string $value
+ * @param boolean $unlock_child optional   default false
  */
-function set_cat_visible($categories, $value)
+function set_cat_visible($categories, $value, $unlock_child = false)
 {
   if ( ($value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)) === null )
   {
@@ -656,11 +657,14 @@ function set_cat_visible($categories, $value)
   // unlocking a category => all its parent categories become unlocked
   if ($value)
   {
-    $uppercats = get_uppercat_ids($categories);
+    $cats = get_uppercat_ids($categories);
+    if ($unlock_child) {
+      $cats = array_merge($cats, get_subcat_ids($categories));
+    }
     $query = '
 UPDATE '.CATEGORIES_TABLE.'
   SET visible = \'true\'
-  WHERE id IN ('.implode(',', $uppercats).')';
+  WHERE id IN ('.implode(',', $cats).')';
     pwg_query($query);
   }
   // locking a category   => all its child categories become locked
-- 
cgit v1.2.3