Changeset 8967


Ignore:
Timestamp:
Jan 28, 2011, 11:56:32 PM (13 years ago)
Author:
plg
Message:

merge r8966 from branch 2.1 to trunk

bug 2142 fixed: make sure you cannot move a category into itself

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions.php

    r8848 r8967  
    11361136      // technically, you can't move a category with uppercats 12,125,13,14
    11371137      // into a new parent category with uppercats 12,125,13,14,24
    1138       if (preg_match('/^'.$category['uppercats'].',/', $new_parent_uppercats))
     1138      if (preg_match('/^'.$category['uppercats'].'(,|$)/', $new_parent_uppercats))
    11391139      {
    11401140        array_push(
Note: See TracChangeset for help on using the changeset viewer.