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

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

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
This commit is contained in:
franck
2013-09-04 17:34:23 +02:00
parent 02a1b5c655 b910b0af86
commit 6387182026
51 changed files with 287 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Controller/Admin/BaseAdminController.php
View File

@@ -174,7 +174,7 @@ class BaseAdminController 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));
}
/**
@@ -257,7 +257,7 @@ class BaseAdminController extends BaseController
catch (AuthenticationException $ex) {
// User is not authenticated, and templates requires authentication -> redirect to login page
// We user login_tpl as a path, not a template.
Redirect::exec(URL::absoluteUrl($ex->getLoginTemplate()));
Redirect::exec(URL::getInstance()->absoluteUrl($ex->getLoginTemplate()));
}
catch (AuthorizationException $ex) {
// User is not allowed to perform the required action. Return the error page instead of the requested page.

2
core/lib/Thelia/Controller/Admin/MessageController.php
View File

@@ -265,6 +265,6 @@ class MessageController extends BaseAdminController
$this->dispatch(TheliaEvents::MESSAGE_DELETE, $event);
$this->redirect(URL::adminViewUrl('messages'));
$this->redirect(URL::getInstance()->adminViewUrl('messages'));
}
}

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

@@ -44,6 +44,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/CustomerAddressController.php
View File

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

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 :