Merge branch 'master' into develop

Conflicts:
	docs/ru/syntax.md
	sandbox/fenom.php
This commit is contained in:
bzick
2015-01-02 22:48:56 +03:00
20 changed files with 184 additions and 95 deletions

View File

@@ -193,7 +193,7 @@ class Template extends Render
$this->_src = call_user_func($filter, $this, $this->_src);
}
while (($start = strpos($this->_src, '{', $pos)) !== false) { // search open-symbol of tags
switch ($this->_src[$start + 1]) { // check next character
switch (substr($this->_src, $start + 1, 1)) { // check next character
case "\n":
case "\r":
case "\t":