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
Piwigo · Nov 7, 2011 · 31689ae · 31689ae
1 parent 22154db
commit 31689ae
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/admin/cat_modify.php b/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'] );
   }