Changeset 12576 for trunk/admin

Timestamp:

Nov 7, 2011, 11:53:23 AM (13 years ago)

Author:

plg

Message:

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.

File:

• trunk/admin/cat_modify.php (modified) (1 diff)

trunk/admin/cat_modify.php

@@ -76 +76 @@
   }
 
-  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'] );