Merge branch 'fix/template-inheritance-whitespace' into dev

bobthecow · Apr 1, 2015 · c4b1712 · c4b1712
2 parents 7b57d9b + 7cb9fdf
commit c4b1712
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Mustache/Compiler.php b/src/Mustache/Compiler.php
@@ -263,7 +263,7 @@ private function blockVar($nodes, $id, $start, $end, $otag, $ctag, $level)
 
     const BLOCK_ARG = '
         // %s block_arg
-        $value = $this->section%s($context, $indent, true);
+        $value = $this->section%s($context, \'\', true);
         $newContext[%s] = %s$value;
     ';
 

diff --git a/test/Mustache/Test/Functional/InheritanceTest.php b/test/Mustache/Test/Functional/InheritanceTest.php
@@ -286,6 +286,29 @@ public function testInheritIndentationWhenOverridingAPartial()
         );
     }
 
+    public function testInheritSpacingWhenOverridingAPartial()
+    {
+        $partials = array(
+            'parent' => 'collaborate_and{{$id}}{{/id}}',
+            'child'  => '{{<parent}}{{$id}}_listen{{/id}}{{/parent}}',
+        );
+
+        $this->mustache->setPartials($partials);
+
+        $tpl = $this->mustache->loadTemplate(
+            'stop:
+              {{>child}}'
+        );
+
+        $data = array();
+
+        $this->assertEquals(
+            'stop:
+              collaborate_and_listen',
+            $tpl->render($data)
+        );
+    }
+
     public function testOverrideOneSubstitutionButNotTheOther()
     {
         $partials = array(