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 (cherry picked from commit 17869bb) Conflicts: Resources/views/pagelayout.html.twig
ezsystems · Apr 1, 2015 · bc257c8 · bc257c8
1 parent d8cb61d
commit bc257c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Resources/views/pagelayout.html.twig b/Resources/views/pagelayout.html.twig
@@ -16,9 +16,9 @@
 </head>
 <body>
 <!-- Complete page area: START -->
-{% if location is defined and not location.isDraft %}
-    {{ render( controller( "ezpublish_legacy.website_toolbar.controller:websiteToolbarAction", { 'locationId': location.id} ) ) }}
-{% endif %}
+
+    {{ render( controller( "ezpublish_legacy.website_toolbar.controller:websiteToolbarAction", { 'locationId': location.id|default( null ) } ) ) }}
+
 <div id="page" class="">
     <!-- Header area: START -->
     {% block header %}