aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-11-08 14:37:43 +0000
committerplegall <plg@piwigo.org>2011-11-08 14:37:43 +0000
commit16c1226ad3cb138f1b87a8521d714639322c4913 (patch)
tree78aaaf51de5b7415ae8766fece65eb598b3f1125 /admin
parent87aa694561c2d3dae192322694559ee24840360d (diff)
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
Diffstat (limited to 'admin')
-rw-r--r--admin/cat_modify.php5
1 files changed, 3 insertions, 2 deletions
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'] );
}