mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Fix escaping

Browse Source
This commit is contained in:
bzick
2013-07-07 11:29:26 +04:00
parent 733bae6ac0
commit 0bb82d9898
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Fenom/Compiler.php
View File

@@ -875,21 +875,24 @@ class Compiler {
* @return string
*/
public static function tagRaw(Tokenizer $tokens, Template $tpl) {
$escape = $tpl->escape;
$tpl->escape = false;
if($tokens->is(':')) {
$func = $tokens->getNext(Tokenizer::MACRO_STRING);
$tag = $tpl->getStorage()->getFunction($func);
if($tag["type"] == \Fenom::INLINE_FUNCTION) {
return $tpl->parseAct($tokens);
$code = $tpl->parseAct($tokens);
} elseif ($tag["type"] == \Fenom::BLOCK_FUNCTION) {
$code = $tpl->parseAct($tokens);
$tpl->getLastScope()->escape = false;
return $code;
} else {
throw new InvalidUsageException("Raw mode allow for expressions or functions");
}
throw new InvalidUsageException("Raw mode allow for expressions or functions");
} else {
return $tpl->out($tpl->parseExp($tokens, true));
$code = $tpl->out($tpl->parseExp($tokens, true), false);
}
$tpl->escape = $escape;
return $code;
}
/**

2
src/Fenom/Scope.php
View File

@@ -29,7 +29,7 @@ class Scope extends \ArrayObject {
private $_action;
private $_body;
private $_offset;
private $_global_escape = false;
public $_global_escape = false;
/**
* Creating cope

4
src/Fenom/Template.php
View File

@@ -452,7 +452,6 @@ class Template extends Render {
* @throws TokenizeException
*/
private function _end(Tokenizer $tokens) {
//return "end";
$name = $tokens->getNext(Tokenizer::MACRO_STRING);
$tokens->next();
if(!$this->_stack) {
@@ -466,8 +465,9 @@ class Template extends Render {
if($scope->is_compiler) {
return $scope->close($tokens);
} else {
$code = $this->out($scope->close($tokens));
$scope->tpl->escape = $scope->escape;
return $this->out($scope->close($tokens));
return $code;
}
}