From 92fe29daa7a54eeaae7f45c0e6c07f3004e0620a Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 28 Jan 2011 22:56:32 +0000 Subject: 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 --- admin/include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin/include/functions.php') diff --git a/admin/include/functions.php b/admin/include/functions.php index 409cf43a0..f736902b0 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -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'], -- cgit v1.2.3