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
This commit is contained in:
plegall 2011-01-28 22:56:32 +00:00
commit 92fe29daa7

View file

@ -1135,7 +1135,7 @@ SELECT uppercats
{
// 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'],