Skip to content
Permalink
Browse files

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
  • Loading branch information...
plegall committed Nov 7, 2011
1 parent 22154db commit 31689aeca1bee1c5e12c4645583e4f002d5ec17e
Showing with 9 additions and 1 deletion.
  1. +9 −1 admin/cat_modify.php
@@ -75,7 +75,15 @@
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'] );
}

0 comments on commit 31689ae

Please sign in to comment.
You can’t perform that action at this time.