Merge branch '1.5' into 2.0

zikula · Oct 2, 2017 · e2eccea · e2eccea
2 parents 7e5fef5 + e661d1c
commit e2eccea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -6,6 +6,7 @@ CHANGELOG - ZIKULA 2.0.x
  - Fixes:
     - Allow hooks to be managed in display (#3793).
     - Improved detection and naming of available PDO drivers (#3785).
+    - Use uncached JS routes (#3807).
 
  - Vendor updates:
     - composer/ca-bundle updated from 1.0.7 to 1.0.8

diff --git a/src/system/ThemeModule/EventListener/DefaultPageAssetSetterListener.php b/src/system/ThemeModule/EventListener/DefaultPageAssetSetterListener.php
@@ -148,18 +148,19 @@ private function addJquery()
 
     private function addFosJsRouting()
     {
-        if ($this->params['env'] != 'dev' && file_exists(realpath('web/js/fos_js_routes.js'))) {
+        // commented out as a workaround for #3807 until #3804 is solved
+        /*if ($this->params['env'] != 'dev' && file_exists(realpath('web/js/fos_js_routes.js'))) {
             $this->jsAssetBag->add([
                 $this->assetHelper->resolve('bundles/fosjsrouting/js/router.js') => AssetBag::WEIGHT_ROUTER_JS,
                 $this->assetHelper->resolve('js/fos_js_routes.js') => AssetBag::WEIGHT_ROUTES_JS
             ]);
-        } else {
-            $routeScript = $this->router->generate('fos_js_routing_js', ['callback' => 'fos.Router.setData']);
-            $this->jsAssetBag->add([
-                $this->assetHelper->resolve('bundles/fosjsrouting/js/router.js') => AssetBag::WEIGHT_ROUTER_JS,
-                $routeScript => AssetBag::WEIGHT_ROUTES_JS
-            ]);
-        }
+        } else {*/
+        $routeScript = $this->router->generate('fos_js_routing_js', ['callback' => 'fos.Router.setData']);
+        $this->jsAssetBag->add([
+            $this->assetHelper->resolve('bundles/fosjsrouting/js/router.js') => AssetBag::WEIGHT_ROUTER_JS,
+            $routeScript => AssetBag::WEIGHT_ROUTES_JS
+        ]);
+        /*}*/
     }
 
     private function addJsTranslation()