From 15a016a338e7d60bdb82bb722dc2bd8fccde1049 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 25 Mar 2015 19:34:09 +1100
Subject: [PATCH] Disable route persistence for static menus

---
 modules/cms/classes/Page.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index dc0886d78..88210bde6 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -114,10 +114,7 @@ class Page extends CmsCompoundObject
          * assuming that the method is called not during the front-end
          * request processing.
          */
-        $controller = Controller::getController();
-        if (!$controller) {
-            $controller = new Controller;
-        }
+        $controller = Controller::getController() ?: new Controller;
 
         return $controller->pageUrl($page, $params, true);
     }
@@ -188,7 +185,8 @@ class Page extends CmsCompoundObject
             }
 
             $page = self::loadCached($theme, $item->reference);
-            $pageUrl = self::url($item->reference);
+            $controller = Controller::getController() ?: new Controller;
+            $pageUrl = $controller->pageUrl($item->reference, [], false);
 
             $result = [];
             $result['url'] = $pageUrl;