mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-07-20 16:42:59 +02:00
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:
@@ -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'] );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user