merge r22949 from branch 2.5 to trunk

bug 2909 fixed: make sure the selection of private album is not empty before adding permission to user. The good test had been removed in r11729 git-svn-id: http://piwigo.org/svn/trunk@22950 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · May 29, 2013 · c8d5ad2 · c8d5ad2
1 parent 9af70c8
commit c8d5ad2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/admin/user_perm.php b/admin/user_perm.php
@@ -64,7 +64,9 @@
 ;';
   pwg_query($query);
 }
-else if (isset($_POST['trueify']))
+elseif (isset($_POST['trueify'])
+    and isset($_POST['cat_false'])
+    and count($_POST['cat_false']) > 0)
 {
   add_permission_on_category($_POST['cat_false'], $page['user']);
 }