From 459a0764ea5814afbfed58e4837dcd602eb9d20a Mon Sep 17 00:00:00 2001 From: Chris Sedlmayr Date: Thu, 7 Jun 2012 23:45:55 +0100 Subject: [PATCH] The Compiler outdent method will now only reduce the indentation if it's OK to do so, It moves and modifies the check up above the indentation modification. --- lib/Twig/Compiler.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Twig/Compiler.php b/lib/Twig/Compiler.php index 5cd1b31..30cba80 100644 --- a/lib/Twig/Compiler.php +++ b/lib/Twig/Compiler.php @@ -239,12 +239,13 @@ class Twig_Compiler implements Twig_CompilerInterface */ public function outdent($step = 1) { - $this->indentation -= $step; - - if ($this->indentation < 0) { + // can't outdent by more steps that the current indentation level + if ($this->indentation < $step) { throw new Twig_Error('Unable to call outdent() as the indentation would become negative'); } + $this->indentation -= $step; + return $this; } } -- 1.7.2.5