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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml

core/lib/Thelia/Model/Category.php

@@ -13,6 +13,8 @@ class Category extends BaseCategory
 {
     use \Thelia\Model\Tools\ModelEventDispatcherTrait;
 
+    use \Thelia\Model\Tools\PositionManagementTrait;
+
     /**
      * @return int number of child for the current category
      */
@@ -23,7 +25,7 @@ class Category extends BaseCategory
 
     public function getUrl($locale)
     {
-        return URL::init()->retrieve('category', $this->getId(), $locale);
+        return URL::getInstance()->retrieve('category', $this->getId(), $locale);
     }
 
     /**
@@ -46,18 +48,6 @@ class Category extends BaseCategory
     	$this->save();
      }
 
-     public function getNextPosition($parent) {
-
-		$last = CategoryQuery::create()
-			->filterByParent($parent)
-			->orderByPosition(Criteria::DESC)
-			->limit(1)
-			->findOne()
-		;
-
-		return $last != null ? $last->getPosition() + 1 : 1;
-     }
-
     /**
      *
      * count all products for current category and sub categories

core/lib/Thelia/Model/Content.php

@@ -9,6 +9,6 @@ class Content extends BaseContent
 {
     public function getUrl($locale)
     {
-        return URL::init()->retrieve('content', $this->getId(), $locale);
+        return URL::getInstance()->retrieve('content', $this->getId(), $locale);
     }
 }

core/lib/Thelia/Model/Currency.php

@@ -11,6 +11,8 @@ class Currency extends BaseCurrency {
 
     use \Thelia\Model\Tools\ModelEventDispatcherTrait;
 
+    use \Thelia\Model\Tools\PositionManagementTrait;
+
     /**
      * {@inheritDoc}
      */

core/lib/Thelia/Model/Folder.php

@@ -17,7 +17,7 @@ class Folder extends BaseFolder
 
     public function getUrl($locale)
     {
-        return URL::init()->retrieve('folder', $this->getId(), $locale);
+        return URL::getInstance()->retrieve('folder', $this->getId(), $locale);
     }
 
     /**

core/lib/Thelia/Model/Product.php

@@ -9,6 +9,6 @@ class Product extends BaseProduct
 {
     public function getUrl($locale)
     {
-        return URL::init()->retrieve('product', $this->getId(), $locale);
+        return URL::getInstance()->retrieve('product', $this->getId(), $locale);
     }
 }