From 05663d3bee70006afd90d16e256dc405e6e8c311 Mon Sep 17 00:00:00 2001
From: flop25 <flop25@piwigo.org>
Date: Mon, 2 Jan 2012 16:41:18 +0000
Subject: merge r12825 from trunk to branch 2.3 bug:2546 fixed: checkbox "apply
 on sub" after the button better "if isset" to avoid errors if no user have
 been selected

git-svn-id: http://piwigo.org/svn/branches/2.3@12826 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/cat_perm.php                         | 4 +++-
 admin/themes/default/template/cat_perm.tpl | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index c6e26462a..f2dbb3b4a 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -148,7 +148,9 @@ DELETE
 ;';
   pwg_query($query);
 }
-else if (isset($_POST['grant_users_submit']))
+else if (isset($_POST['grant_users_submit'])
+         and isset($_POST['grant_users'])
+         and count($_POST['grant_users']) > 0)
 {
   add_permission_on_category($page['cat'], $_POST['grant_users']);
 }
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index 03a2822d9..0d0120938 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -25,8 +25,8 @@
       <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li>
       {/foreach}
     </ul>
-    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
     <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}">
+    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
   </fieldset>
 
   <h4>{'Users'|@translate}</h4>
@@ -59,9 +59,9 @@
       <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li>
       {/foreach}
     </ul>
-    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
     <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
-  </fieldset>
+    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
+ </fieldset>
 
 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 </form>
-- 
cgit v1.2.3