Update to Smarty 3.1.15
This commit is contained in:
parent
bea18b03e2
commit
1c9cd9208f
119 changed files with 5232 additions and 4641 deletions
|
|
@ -12,7 +12,7 @@
|
|||
/**
|
||||
* @ignore
|
||||
*/
|
||||
include ("smarty_internal_parsetree.php");
|
||||
include 'smarty_internal_parsetree.php';
|
||||
|
||||
/**
|
||||
* Class SmartyTemplateCompiler
|
||||
|
|
@ -20,8 +20,8 @@ include ("smarty_internal_parsetree.php");
|
|||
* @package Smarty
|
||||
* @subpackage Compiler
|
||||
*/
|
||||
class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
|
||||
|
||||
class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
|
||||
{
|
||||
/**
|
||||
* Lexer class name
|
||||
*
|
||||
|
|
@ -84,7 +84,7 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
|
|||
* Methode to compile a Smarty template
|
||||
*
|
||||
* @param mixed $_content template source
|
||||
* @return bool true if compiling succeeded, false if it failed
|
||||
* @return bool true if compiling succeeded, false if it failed
|
||||
*/
|
||||
protected function doCompile($_content)
|
||||
{
|
||||
|
|
@ -94,6 +94,10 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
|
|||
// init the lexer/parser to compile the template
|
||||
$this->lex = new $this->lexer_class($_content, $this);
|
||||
$this->parser = new $this->parser_class($this->lex, $this);
|
||||
if ($this->inheritance_child) {
|
||||
// start state on child templates
|
||||
$this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
|
||||
}
|
||||
if ($this->smarty->_parserdebug)
|
||||
$this->parser->PrintTrace();
|
||||
// get tokens from lexer and parse them
|
||||
|
|
@ -115,7 +119,7 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
|
|||
if (count($this->_tag_stack) > 0) {
|
||||
// get stacked info
|
||||
list($openTag, $_data) = array_pop($this->_tag_stack);
|
||||
$this->trigger_template_error("unclosed {" . $openTag . "} tag");
|
||||
$this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag . "{$this->smarty->right_delimiter} tag");
|
||||
}
|
||||
// return compiled code
|
||||
// return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
|
||||
|
|
@ -123,5 +127,3 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
Reference in a new issue