Fix tokenizing when mbstring.func_overload enabled.

Fixes #144
This commit is contained in:
Justin Hileman
2013-04-24 09:24:27 -07:00
parent 5d186b134b
commit 2327f3839f
+7 -5
View File
@@ -107,10 +107,11 @@ class Mustache_Tokenizer
$this->flushBuffer(); $this->flushBuffer();
$this->state = self::IN_TAG_TYPE; $this->state = self::IN_TAG_TYPE;
} else { } else {
if ($text[$i] == "\n") { $char = substr($text, $i, 1);
if ($char == "\n") {
$this->filterLine(); $this->filterLine();
} else { } else {
$this->buffer .= $text[$i]; $this->buffer .= $char;
} }
} }
break; break;
@@ -118,8 +119,9 @@ class Mustache_Tokenizer
case self::IN_TAG_TYPE: case self::IN_TAG_TYPE:
$i += strlen($this->otag) - 1; $i += strlen($this->otag) - 1;
if (isset(self::$tagTypes[$text[$i + 1]])) { $char = substr($text, $i + 1, 1);
$tag = $text[$i + 1]; if (isset(self::$tagTypes[$char])) {
$tag = $char;
$this->tagType = $tag; $this->tagType = $tag;
} else { } else {
$tag = null; $tag = null;
@@ -166,7 +168,7 @@ class Mustache_Tokenizer
} }
} }
} else { } else {
$this->buffer .= $text[$i]; $this->buffer .= substr($text, $i, 1);
} }
break; break;
} }