Merge branch '6.5'

ezsystems · Oct 13, 2016 · 949e773 · 949e773
2 parents 17178e8 + d17ce1d
commit 949e773
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content.html.twig b/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content.html.twig
@@ -13,7 +13,8 @@
                 {
                     "contentId": embedParams.id,
                     "viewType": embedParams.viewType,
-                    "params": params
+                    "params": params,
+                    "layout": false
                 }
             )
         )

diff --git a/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline.html.twig b/...dle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/content_inline.html.twig
@@ -12,7 +12,8 @@
             {
                 "contentId": embedParams.id,
                 "viewType": embedParams.viewType,
-                "params": params
+                "params": params,
+                "layout": false
             }
         )
     )

diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location.html.twig b/eZ/Bundle/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location.html.twig
@@ -13,7 +13,8 @@
                 {
                     "locationId": embedParams.id,
                     "viewType": embedParams.viewType,
-                    "params": params
+                    "params": params,
+                    "layout": false
                 }
             )
         )

diff --git a/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline.html.twig b/...le/EzPublishCoreBundle/Resources/views/FieldType/RichText/embed/location_inline.html.twig
@@ -12,7 +12,8 @@
             {
                 "locationId": embedParams.id,
                 "viewType": embedParams.viewType,
-                "params": params
+                "params": params,
+                "layout": false
             }
         )
     )