merge r12575 from branch 2.3 to trunk

bug 2491 fixed: on album admin screen, don't display "1 album moved" message
when the album is not really moved.



git-svn-id: http://piwigo.org/svn/trunk@12576 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-11-07 10:53:23 +00:00
parent 22154db6a4
commit 31689aeca1
+9 -1
View File
@@ -75,7 +75,15 @@ if (isset($_POST['submit']))
set_cat_status(array($_GET['cat_id']), $_POST['status']);
}
if (isset($_POST['parent']) and $cat_info['id_uppercat'] != $_POST['parent'])
// in case the use moves his album to the gallery root, we force
// $_POST['parent'] from 0 to null to be compared with
// $cat_info['id_uppercat']
if (empty($_POST['parent']))
{
$_POST['parent'] = null;
}
if ($cat_info['id_uppercat'] != $_POST['parent'])
{
move_categories( array($_GET['cat_id']), $_POST['parent'] );
}