aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-01-28 22:56:32 +0000
committerplegall <plg@piwigo.org>2011-01-28 22:56:32 +0000
commit92fe29daa7a54eeaae7f45c0e6c07f3004e0620a (patch)
treedec3a3be6892f11f6233bf1479ea1b80fb58db82 /admin/include
parentec169f12ff1300d9f4a1c334f1cea647f7296fbb (diff)
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
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions.php2
1 files changed, 1 insertions, 1 deletions
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'],