From 957dd4b86a4164e0cf4ddea71f4be162dfc71dae Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 25 Feb 2015 15:04:14 +0100 Subject: use linkToRoute instead of absolute url to not rely on the base url --- controller/pagecontroller.php | 4 +--- tests/unit/controller/PageControllerTest.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 7d754df04..88e3c9016 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -100,9 +100,7 @@ class PageController extends Controller { $exploreUrl = $this->config->getExploreUrl(); if (trim($exploreUrl) === '') { - $exploreUrl = $this->urlGenerator->getAbsoluteURL( - '/index.php/apps/news/explore' - ); + $exploreUrl = $this->urlGenerator->linkToRoute('news.page.explore'); } $result = [ diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index 47c85fdd9..3277fdc43 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -166,8 +166,8 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase { ->method('getExploreUrl') ->will($this->returnValue(' ')); $this->urlGenerator->expects($this->once()) - ->method('getAbsoluteURL') - ->with($this->equalTo('/index.php/apps/news/explore')) + ->method('linkToRoute') + ->with($this->equalTo('news.page.explore')) ->will($this->returnValue('test')); -- cgit v1.2.3