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
This commit is contained in:
franck
2013-09-11 11:08:50 +02:00
parent 77d7587fb7 d7f789188c
commit 9473f2752f
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,7 @@ class BaseAdminController extends BaseController
* *
* @see \Thelia\Controller\BaseController::getRouteFromRouter() * @see \Thelia\Controller\BaseController::getRouteFromRouter()
*/ */
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH) protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_URL)
{ {
return $this->getRouteFromRouter( return $this->getRouteFromRouter(
'router.admin', 'router.admin',

2
core/lib/Thelia/Controller/BaseController.php
View File

@@ -235,7 +235,7 @@ class BaseController extends ContainerAware
* @throws \InvalidArgumentException When the router doesn't exist * @throws \InvalidArgumentException When the router doesn't exist
* @return string The generated URL * @return string The generated URL
*/ */
protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::RELATIVE_PATH) protected function getRouteFromRouter($routerName, $routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_URL)
{ {
/** @var Router $router */ /** @var Router $router */
$router = $this->container->get($routerName); $router = $this->container->get($routerName);

1
core/lib/Thelia/Tools/URL.php
View File

@@ -90,7 +90,6 @@ class URL
$schemeAuthority = "$scheme://$host"."$port"; $schemeAuthority = "$scheme://$host"."$port";
} }
return $schemeAuthority.$this->requestContext->getBaseUrl(); return $schemeAuthority.$this->requestContext->getBaseUrl();
} }