Merge branch 'master' into template

core/lib/Thelia/Model/Folder.php

@@ -44,8 +44,8 @@ class Folder extends BaseFolder
 
         foreach($children as $child)
         {
-            $contentsCount += ProductQuery::create()
-                ->filterByCategory($child)
+            $contentsCount += ContentQuery::create()
+                ->filterByFolder($child)
                 ->count();
         }
 

core/lib/Thelia/Model/Tools/UrlRewritingTrait.php

@@ -44,8 +44,11 @@ trait UrlRewritingTrait {
      *
      * @param string $locale a valid locale (e.g. en_US)
      */
-    public function getUrl($locale)
+    public function getUrl($locale = null)
     {
+        if(null === $locale) {
+            $locale = $this->getLocale();
+        }
         return URL::getInstance()->retrieve($this->getRewrittenUrlViewName(), $this->getId(), $locale)->toString();
     }