merge r8966 from branch 2.1 to trunk

bug 2142 fixed: make sure you cannot move a category into itself git-svn-id: http://piwigo.org/svn/trunk@8967 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jan 28, 2011 · 92fe29d · 92fe29d
1 parent ec169f1
commit 92fe29d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -1135,7 +1135,7 @@ function move_categories($category_ids, $new_parent = -1)
     {
       // technically, you can't move a category with uppercats 12,125,13,14
       // into a new parent category with uppercats 12,125,13,14,24
-      if (preg_match('/^'.$category['uppercats'].',/', $new_parent_uppercats))
+      if (preg_match('/^'.$category['uppercats'].'(,|$)/', $new_parent_uppercats))
       {
         array_push(
           $page['errors'],