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

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

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
This commit is contained in:
Manuel Raynaud
2013-09-04 17:57:41 +02:00
parent ceb02841e1 866036a0bf
commit 3f405d1ce9
162 changed files with 10966 additions and 10282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Controller/Front/AddressController.php
View File

@@ -49,7 +49,7 @@ class AddressController extends BaseFrontController
public function createAction()
{
if ($this->getSecurityContext()->hasCustomerUser() === false) {
$this->redirect(URL::getIndexPage());
$this->redirect(URL::getInstance()->getIndexPage());
}
$addressCreate = new AddressCreateForm($this->getRequest());

2
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -45,6 +45,6 @@ class BaseFrontController extends BaseController
* @param unknown $urlParameters the URL parametrs, as a var/value pair array
*/
public function redirectToRoute($routeId, $urlParameters = array()) {
$this->redirect(URL::absoluteUrl($this->getRoute($routeId), $urlParameters));
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId), $urlParameters));
}
}

2
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -202,7 +202,7 @@ class CustomerController extends BaseFrontController
}
// Redirect to home page
$this->redirect(URL::getIndexPage());
$this->redirect(URL::getInstance()->getIndexPage());
}
/**

2
core/lib/Thelia/Controller/Front/DefaultController.php
View File

@@ -49,7 +49,7 @@ class DefaultController extends BaseFrontController
if(ConfigQuery::isRewritingEnable()) {
/* Does the query GET parameters match a rewritten URL ? */
$rewrittenUrl = URL::init()->retrieveCurrent($request);
$rewrittenUrl = URL::getInstance()->retrieveCurrent();
if($rewrittenUrl->rewrittenUrl !== null) {
/* 301 redirection to rewritten URL */
$this->redirect($rewrittenUrl->rewrittenUrl, 301);

2
core/lib/Thelia/Controller/Front/UrlRewritingController.php
View File

@@ -33,7 +33,7 @@ class UrlRewritingController extends BaseFrontController
{
if(ConfigQuery::isRewritingEnable()) {
try {
$rewrittenUrlData = URL::init()->resolve($rewritten_url);
$rewrittenUrlData = URL::getInstance()->resolve($rewritten_url);
} catch(UrlRewritingException $e) {
switch($e->getCode()) {
case UrlRewritingException::URL_NOT_FOUND :