Fix EZP-24052: Preview causes redirect to versionview not being able to

continue editing > https://jira.ez.no/browse/EZP-24052 See ezsystems/LegacyBridge#23 (cherry picked from commit a3d7e07) Conflicts: Resources/views/pagelayout.html.twig
ezsystems · Apr 1, 2015 · 17869bb · 17869bb
1 parent 1ac7720
commit 17869bb
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/Resources/views/pagelayout.html.twig b/Resources/views/pagelayout.html.twig
@@ -21,9 +21,7 @@
 {% endif %}
 
 <!-- Complete page area: START -->
-{% if currentLocation is defined %}
-    {{ render( controller( "ezpublish_legacy.website_toolbar.controller:websiteToolbarAction", { 'locationId': currentLocation.id} ) ) }}
-{% endif %}
+    {{ render( controller( "ezpublish_legacy.website_toolbar.controller:websiteToolbarAction", { 'locationId': currentLocation.id|default( null )} ) ) }}
 <div id="page" class="">
     <!-- Header area: START -->
     {% block header %}