smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2026-05-04 11:44:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed locaion where outputfilters are running

Browse Source 
- fixed config file definitions at EOF
This commit is contained in:
Uwe.Tews
2009-11-14 13:02:48 +00:00
parent d482a8b137
commit 6154717b48
8 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/sysplugins/smarty_internal_compile_eval.php
+2 -2
View File
@@ -35,9 +35,9 @@ class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
$_output = "\$_template = new Smarty_Template ('string:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);";
//was there an assign attribute?
if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template));";
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate());";
} else {
$_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template);";
$_output .= "echo \$_template->getRenderedTemplate();";
}
return "<?php $_output ?>";
}
libs/sysplugins/smarty_internal_compile_function_call.php
+2 -2
View File
@@ -65,9 +65,9 @@ class Smarty_Internal_Compile_Function_Call extends Smarty_Internal_CompileBase
$_output .= "\$_template->compiled_template = \$this->smarty->template_functions['$_name']['compiled'];\n\$_template->mustCompile = false;\n";
// was there an assign attribute
if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template)); ?>";
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate()); ?>";
} else {
$_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template); ?>";
$_output .= "echo \$_template->getRenderedTemplate(); ?>";
}
return $_output;
}
libs/sysplugins/smarty_internal_compile_include.php
+2 -2
View File
@@ -149,14 +149,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
$_output .= "\$_template->caching = $_caching;";
// was there an assign attribute
if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch()); ?>";
$_output .= "\$_smarty_tpl->assign($_assign,\$_template->getRenderedTemplate()); ?>";
} else {
if ($has_compiled_template) {
$_output .= " \$_tpl_stack[] = \$_smarty_tpl; \$_smarty_tpl = \$_template;?>\n";
$_output .= $compiled_tpl . "<?php /* End of included template \"" . $tpl->getTemplateFilepath() . "\" */ ?>";
$_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>";
} else {
$_output .= " echo \$_template->fetch(); ?>";
$_output .= " echo \$_template->getRenderedTemplate(); ?>";
}
}
if ($_parent_scope != SMARTY_LOCAL_SCOPE) {
libs/sysplugins/smarty_internal_configfilelexer.php
+1
View File
@@ -265,3 +265,4 @@ class Smarty_Internal_Configfilelexer
}
}
?>
libs/sysplugins/smarty_internal_configfileparser.php
+1
View File
@@ -1160,3 +1160,4 @@ static public $yy_action = array(
} while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
}
}
?>
libs/sysplugins/smarty_internal_template.php
+1 -2
View File
@@ -517,8 +517,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$this->renderTemplate();
}
$this->updateParentVariables();
return (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))?
$this->smarty->filter_handler->execute('output', $this->rendered_content) : $this->rendered_content;
return $this->rendered_content;
}
/**