From 16c1226ad3cb138f1b87a8521d714639322c4913 Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 8 Nov 2011 14:37:43 +0000 Subject: merge r12590 from branch 2.3 to trunk bug 2497 fixed: never try to move a physical album git-svn-id: http://piwigo.org/svn/trunk@12591 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'admin/cat_modify.php') diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 5b29a85d9..8b83fd205 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -82,8 +82,9 @@ if (isset($_POST['submit'])) { $_POST['parent'] = null; } - - if ($cat_info['id_uppercat'] != $_POST['parent']) + + // only move virtual albums + if (empty($cat_info['dir']) and $cat_info['id_uppercat'] != $_POST['parent']) { move_categories( array($_GET['cat_id']), $_POST['parent'] ); } -- cgit v1.2.3