From cdd5da80f03a5b3666fda821cc1c547544ccf85d Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 7 Apr 2015 13:05:12 +0200 Subject: [PATCH] Use Url::getRelativeUrl() when updating dashlets fixes #8363 --- application/forms/Dashboard/DashletForm.php | 6 +++--- application/views/scripts/dashboard/settings.phtml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/forms/Dashboard/DashletForm.php b/application/forms/Dashboard/DashletForm.php index 59ae41582..d25001a23 100644 --- a/application/forms/Dashboard/DashletForm.php +++ b/application/forms/Dashboard/DashletForm.php @@ -148,9 +148,9 @@ class DashletForm extends Form $this->populate(array( 'pane' => $dashlet->getPane()->getName(), 'org_pane' => $dashlet->getPane()->getName(), - 'dashlet' => $dashlet->getTitle(), - 'org_dashlet' => $dashlet->getTitle(), - 'url' => $dashlet->getUrl() + 'dashlet' => $dashlet->getTitle(), + 'org_dashlet' => $dashlet->getTitle(), + 'url' => $dashlet->getUrl()->getRelativeUrl() )); } } diff --git a/application/views/scripts/dashboard/settings.phtml b/application/views/scripts/dashboard/settings.phtml index 2c638c318..3376da835 100644 --- a/application/views/scripts/dashboard/settings.phtml +++ b/application/views/scripts/dashboard/settings.phtml @@ -55,8 +55,8 @@ qlink( - $dashlet->getUrl(), - $dashlet->getUrl(), + $dashlet->getUrl()->getRelativeUrl(), + $dashlet->getUrl()->getRelativeUrl(), null, array('title' => sprintf($this->translate('Show dashlet %s'), $dashlet->getTitle())) ); ?> @@ -78,4 +78,4 @@ - \ No newline at end of file +