Changeset 12591


Ignore:
Timestamp:
Nov 8, 2011, 3:37:43 PM (9 years ago)
Author:
plg
Message:

merge r12590 from branch 2.3 to trunk

bug 2497 fixed: never try to move a physical album

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/cat_modify.php

    r12576 r12591  
    8383    $_POST['parent'] = null;
    8484  }
    85  
    86   if ($cat_info['id_uppercat'] != $_POST['parent'])
     85
     86  // only move virtual albums
     87  if (empty($cat_info['dir']) and $cat_info['id_uppercat'] != $_POST['parent'])
    8788  {
    8889    move_categories( array($_GET['cat_id']), $_POST['parent'] );
Note: See TracChangeset for help on using the changeset viewer.