From d4bc164fb201dac679371a3f95438a397a6e386e Mon Sep 17 00:00:00 2001
From: alekseybobkov <aleksey.bobkov@gmail.com>
Date: Thu, 16 Oct 2014 22:36:00 -0700
Subject: [PATCH] Display the default placeholder content if there is no put
 tag for the placeholder

---
 modules/cms/twig/Extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index 0ac43c54f..9df3b078c 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -200,7 +200,7 @@ class Extension extends Twig_Extension
     public function displayBlock($name, $default = null)
     {
         if (($result = Block::placeholder($name)) === null)
-            return null;
+            return $default;
 
         $result = str_replace('<!-- X_OCTOBER_DEFAULT_BLOCK_CONTENT -->', trim($default), $result);
         return $result;