v.1.1.3

* default block text if empty
foo123 · Mar 23, 2024 · 3122922 · 3122922
1 parent 0e13d74
commit 3122922
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/InTpl.php b/src/InTpl.php
@@ -2,16 +2,16 @@
 /**
 *
 * InTpl: simple php templates supporting template inheritance
-* @version 1.1.2
+* @version 1.1.3
 * https://github.com/foo123/InTpl
 *
 **/
 
-if ( !class_exists('InTpl', false) )
+if (!class_exists('InTpl', false))
 {
 class InTpl
 {
-    const VERSION = '1.1.2';
+    const VERSION = '1.1.3';
 
     private $_super = null;
     private $_sprout = null;
@@ -92,9 +92,9 @@ public function end($name/*, $echo = true*/)
         return $this;
     }
 
-    public function block($name, $echo = true)
+    public function block($name, $echo = true, $defaultText = null)
     {
-        $output = isset($this->_blocks[$name]) ? $this->_blocks[$name] : '';
+        $output = isset($this->_blocks[$name]) && strlen($this->_blocks[$name]) ? $this->_blocks[$name] : (is_string($defaultText) ? $defaultText : '');
         if ($echo)
         {
             echo $output;
@@ -108,8 +108,7 @@ public function block($name, $echo = true)
 
     public function render($data = array())
     {
-        if (empty($this->tpl))
-            return '';
+        if (empty($this->tpl)) return '';
 
         if (null === $this->found)
         {
@@ -129,8 +128,7 @@ public function render($data = array())
             }
         }
 
-        if (! $this->found)
-            return '';
+        if (!$this->found) return '';
 
         $this->data = (array) $data;
         unset($data);

diff --git a/test/out b/test/out
diff --git a/test/tpl1.php b/test/tpl1.php
@@ -6,3 +6,4 @@
 
 <?php $this->start("b3") ?>(1 3)<?php $this->end("b3"); ?>
 
+<?php $this->start("b4") ?><?php $this->end("b4"); ?>
diff --git a/test/tpl2.php b/test/tpl2.php
@@ -6,3 +6,4 @@
 
 <?php $this->start("b3"); ?>(2 3)<?php $this->super()->block("b3"); ?><?php $this->end("b3"); ?>
 
+<?php $this->start("b4"); ?>(2 4)<?php $this->super()->block("b4", true, " default text"); ?><?php $this->end("b4"); ?>
diff --git a/test/tpl3.php b/test/tpl3.php
@@ -6,3 +6,4 @@
 
 <?php $this->start("b3"); ?>(3 3)<?php $this->super()->block("b3"); ?><?php $this->end("b3"); ?>
 
+<?php $this->start("b4"); ?>(3 4)<?php $this->super()->block("b4"); ?><?php $this->end("b4"); ?>