aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-05-29 20:52:04 +0000
committerplegall <plg@piwigo.org>2013-05-29 20:52:04 +0000
commitc8d5ad2d770eb39c2a85f3e873fd41f57359ad1c (patch)
treef72457583b7092b9358456fbc4437db432c0c99f
parent9af70c8aa3d7c6782dac0054d0f3f2f5df73e302 (diff)
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
-rw-r--r--admin/user_perm.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/user_perm.php b/admin/user_perm.php
index 478d0386d..463c768c0 100644
--- a/admin/user_perm.php
+++ b/admin/user_perm.php
@@ -64,7 +64,9 @@ DELETE FROM '.USER_ACCESS_TABLE.'
;';
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']);
}