Merge branch 'master' of github.com:thelia/thelia

2013-09-07 16:40:14 +02:00
parent b036f16437 3bd3a4d943
commit 525e449fb2
45 changed files with 1600 additions and 1019 deletions
--- a/core/lib/Thelia/Model/Tools/PositionManagementTrait.php
+++ b/core/lib/Thelia/Model/Tools/PositionManagementTrait.php
@@ -55,7 +55,7 @@ trait PositionManagementTrait {
            ->orderByPosition(Criteria::DESC)
            ->limit(1);

-            if ($parent !== null) $last->filterByParent($parent);
+            if ($parent !== null) $query->filterByParent($parent);

            $last = $query->findOne()
        ;