Fixes #324 bootstrap v4-dev regression

leafo · Sep 12, 2015 · 2977aa4 · 2977aa4
1 parent c41ae5b
commit 2977aa4
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1270,10 +1270,7 @@ protected function compileChild($child, $out)
 
                 // push scope, apply args
                 $this->pushEnv();
-
-                if ($this->env->depth > 0) {
-                    $this->env->depth--;
-                }
+                $this->env->depth--;
 
                 if (isset($content)) {
                     $content->scope = $callingScope;
@@ -1285,7 +1282,7 @@ protected function compileChild($child, $out)
                     $this->applyArguments($mixin->args, $argValues);
                 }
 
-                //$this->env->marker = 'mixin';
+                $this->env->marker = 'mixin';
 
                 foreach ($mixin->children as $child) {
                     $this->compileChild($child, $out);
@@ -1305,17 +1302,14 @@ protected function compileChild($child, $out)
                     break;
                 }
 
-                $strongTypes = array('include', 'block', 'for', 'while');
+                $this->storeEnv = $content->scope;
 
                 foreach ($content->children as $child) {
-                    $this->storeEnv = (in_array($child[0], $strongTypes))
-                        ? null
-                        : $content->scope;
-
                     $this->compileChild($child, $out);
                 }
 
-                unset($this->storeEnv);
+                $this->storeEnv = null;
+
                 break;
 
             case 'debug':