Fix bugs with the markup mode.

glavweb · Feb 6, 2017 · 3782e55 · 3782e55
1 parent 1157a69
commit 3782e55
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Extension/CmsTwigExtension.php b/src/Extension/CmsTwigExtension.php
@@ -148,6 +148,10 @@ public function getJson($url)
      */
     public function content($category, $blockName, $default = null)
     {
+        if ($this->markupMode) {
+            return $default;
+        }
+
         $contentBlockService = $this->contentBlockService;
 
         return $contentBlockService->getContentBlock($category, $blockName, $default);
@@ -160,6 +164,10 @@ public function content($category, $blockName, $default = null)
      */
     public function editable($category, $blockName)
     {
+        if ($this->markupMode) {
+            return '';
+        }
+
         $contentBlockService = $this->contentBlockService;
 
         if ($this->isEditable()) {
@@ -177,6 +185,10 @@ public function editable($category, $blockName)
      */
     public function editableObject($id)
     {
+        if ($this->markupMode) {
+            return '';
+        }
+
         $compositeObjectService = $this->compositeObjectService;
 
         if ($this->isEditable()) {
@@ -196,6 +208,10 @@ public function editableObject($id)
      */
     public function option($category, $optionName, $default = null)
     {
+        if ($this->markupMode) {
+            return $default;
+        }
+
         $optionService = $this->optionService;
 
         return $optionService->getOption($category, $optionName, $default);