aboutsummaryrefslogtreecommitdiffstats
path: root/admin/picture_modify.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-09-18 11:46:56 +0000
committerplegall <plg@piwigo.org>2012-09-18 11:46:56 +0000
commitb43df041d4fec796f8fa9a9db367fb40bd61fd8b (patch)
tree20098d7cdd8825d28f46d37d38fbbd577138d109 /admin/picture_modify.php
parent081566eb83c8be9924612afb1cda6e4a55bf4cb0 (diff)
merge r17980 from trunk to branch 2.4
little code refactoring over r17424 bug fixed on Edit Photo page when associating with no album. git-svn-id: http://piwigo.org/svn/branches/2.4@17982 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/picture_modify.php')
-rw-r--r--admin/picture_modify.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index acc7c010c..6dd218f80 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -171,6 +171,10 @@ if (isset($_POST['submit']) and count($page['errors']) == 0)
set_tags($tag_ids, $_GET['image_id']);
// association to albums
+ if (!isset($_POST['associate']))
+ {
+ $_POST['associate'] = array();
+ }
move_images_to_categories(array($_GET['image_id']), $_POST['associate']);
// thumbnail for albums