Merge remote-tracking branch 'refs/remotes/origin/dev'

FoilPHP · Mar 8, 2016 · d785ffd · d785ffd
2 parents 74ffe5d + 264ae8a
commit d785ffd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,3 @@ website/
 couscous-theme/
 .couscous/
 couscous.yml
-
-
diff --git a/src/Blocks/Block.php b/src/Blocks/Block.php
@@ -67,7 +67,7 @@ public function close()
         }
         $args = $this->args;
         $this->opened--;
-        $this->args = [];
+        $this->opened === 0 and $this->args = [];
         array_unshift($args, ob_get_clean());
         $block = call_user_func_array($this->callback, $args);
 

diff --git a/src/Section/Section.php b/src/Section/Section.php
@@ -79,8 +79,7 @@ public function replace()
             $this->mode = self::MODE_REPLACE;
         }
         $buffer = ob_get_clean();
-        $this->content or $this->content = $buffer;
-        $this->content = ($this->mode & self::MODE_APPEND) ? $buffer.$this->content : $this->content;
+        $this->content = ($this->mode & self::MODE_APPEND) ? $buffer.$this->content : $buffer;
         if ($this->mode & self::MODE_OUTPUT) {
             echo $this->content();
         }