From 557940c5cf84a17d051ef3a1d1000f21a7b1505e Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Wed, 11 Sep 2013 09:48:41 +0200 Subject: [PATCH] searching route return relative path --- core/lib/Thelia/Controller/Admin/BaseAdminController.php | 3 ++- core/lib/Thelia/Controller/BaseController.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 21fffd3d9..30d6dd9df 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -25,6 +25,7 @@ namespace Thelia\Controller\Admin; use Symfony\Component\Routing\Exception\InvalidParameterException; use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; use Symfony\Component\Routing\Exception\RouteNotFoundException; +use Symfony\Component\Routing\Router; use Thelia\Controller\BaseController; use Symfony\Component\HttpFoundation\Response; use Thelia\Core\Security\Exception\AuthorizationException; @@ -226,7 +227,7 @@ class BaseAdminController extends BaseController * * @see \Thelia\Controller\BaseController::getRouteFromRouter() */ - protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) + protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH) { return $this->getRouteFromRouter( 'router.admin', diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 36a03529b..c55dd1258 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -235,7 +235,7 @@ class BaseController extends ContainerAware * @throws \InvalidArgumentException When the router doesn't exist * @return string The generated URL */ - protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) + protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH) { /** @var Router $router */ $router = $this->container->get($routerName);