From 7c6471da8677ffa281b17fb383538037985793ca Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 23 Nov 2015 10:34:46 +0100 Subject: [PATCH] Action: Return the new url if it has been resolved This was already part of the 2.0 release, but was working however. Got revealed by a restructuring commit a few weeks ago. fixes #10702 --- .../monitoring/library/Monitoring/Web/Navigation/Action.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Web/Navigation/Action.php b/modules/monitoring/library/Monitoring/Web/Navigation/Action.php index 1b17106ee..68bb01a2f 100644 --- a/modules/monitoring/library/Monitoring/Web/Navigation/Action.php +++ b/modules/monitoring/library/Monitoring/Web/Navigation/Action.php @@ -89,9 +89,10 @@ class Action extends NavigationItem if (! $this->resolved && $url !== null) { $this->setUrl(Macro::resolveMacros($url->getAbsoluteUrl(), $this->getObject())); $this->resolved = true; + return parent::getUrl(); + } else { + return $url; } - - return $url; } /**