TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  fix URL::retrieve
  global outputs in loops
This commit is contained in:
gmorel
2013-09-04 15:45:19 +02:00
parent 62c1a59f68 b910b0af86
commit a461420c67
35 changed files with 203 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Category.php
View File

@@ -23,7 +23,7 @@ class Category extends BaseCategory
public function getUrl($locale)
{
return URL::init()->retrieve('category', $this->getId(), $locale);
return URL::init()->retrieve('category', $this->getId(), $locale)->toString();
}
/**

2
core/lib/Thelia/Model/Content.php
View File

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

2
core/lib/Thelia/Model/Folder.php
View File

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

2
core/lib/Thelia/Model/Product.php
View File

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