smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove show_info_include and show_info_header functions

Browse Source
This commit is contained in:
mohrt
2002-03-14 20:59:41 +00:00
parent b32fc83b26
commit d2416b1571
2 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Smarty.class.php
View File

@@ -130,10 +130,6 @@ class Smarty
var $left_delimiter = '{'; // template tag delimiters. var $left_delimiter = '{'; // template tag delimiters.
var $right_delimiter = '}'; var $right_delimiter = '}';
var $show_info_header = false; // display HTML info header at top of page output
var $show_info_include = false; // display HTML comments at top & bottom of
// each included template
var $compiler_class = 'Smarty_Compiler'; // the compiler class used by var $compiler_class = 'Smarty_Compiler'; // the compiler class used by
// Smarty to compile templates // Smarty to compile templates
@@ -548,44 +544,20 @@ class Smarty
$this->_config = array(array('vars' => array(), $this->_config = array(array('vars' => array(),
'files' => array())); 'files' => array()));
if ($this->show_info_header) {
$_smarty_info_header = '<!-- Smarty '.$this->_version.' '.strftime("%Y-%m-%d %H:%M:%S %Z").' -->'."\n\n";
} else {
$_smarty_info_header = '';
}
$compile_path = $this->_get_compile_path($_smarty_tpl_file); $compile_path = $this->_get_compile_path($_smarty_tpl_file);
// if we just need to display the results, don't perform output // if we just need to display the results, don't perform output
// buffering - for speed // buffering - for speed
if ($_smarty_display && !$this->caching) { if ($_smarty_display && !$this->caching) {
echo $_smarty_info_header;
if ($this->_process_template($_smarty_tpl_file, $compile_path)) if ($this->_process_template($_smarty_tpl_file, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_tpl_file." -->\n";
}
} }
} else { } else {
ob_start(); ob_start();
echo $_smarty_info_header;
if ($this->_process_template($_smarty_tpl_file, $compile_path)) if ($this->_process_template($_smarty_tpl_file, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_tpl_file." -->\n";
}
} }
$_smarty_results = ob_get_contents(); $_smarty_results = ob_get_contents();
ob_end_clean(); ob_end_clean();
@@ -653,13 +625,7 @@ function _generate_debug_output() {
$compile_path = $this->_get_compile_path($this->debug_tpl); $compile_path = $this->_get_compile_path($this->debug_tpl);
if ($this->_process_template($this->debug_tpl, $compile_path)) if ($this->_process_template($this->debug_tpl, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$this->debug_tpl." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$this->debug_tpl." -->\n";
}
} }
$results = ob_get_contents(); $results = ob_get_contents();
$this->force_compile = $force_compile_orig; $this->force_compile = $force_compile_orig;
@@ -997,13 +963,7 @@ function _generate_debug_output() {
$compile_path = $this->_get_compile_path($_smarty_include_tpl_file); $compile_path = $this->_get_compile_path($_smarty_include_tpl_file);
if ($this->_process_template($_smarty_include_tpl_file, $compile_path)) { if ($this->_process_template($_smarty_include_tpl_file, $compile_path)) {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_include_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_include_tpl_file." -->\n";
}
} }
array_shift($this->_config); array_shift($this->_config);

40
libs/Smarty.class.php
View File

@@ -130,10 +130,6 @@ class Smarty
var $left_delimiter = '{'; // template tag delimiters. var $left_delimiter = '{'; // template tag delimiters.
var $right_delimiter = '}'; var $right_delimiter = '}';
var $show_info_header = false; // display HTML info header at top of page output
var $show_info_include = false; // display HTML comments at top & bottom of
// each included template
var $compiler_class = 'Smarty_Compiler'; // the compiler class used by var $compiler_class = 'Smarty_Compiler'; // the compiler class used by
// Smarty to compile templates // Smarty to compile templates
@@ -548,44 +544,20 @@ class Smarty
$this->_config = array(array('vars' => array(), $this->_config = array(array('vars' => array(),
'files' => array())); 'files' => array()));
if ($this->show_info_header) {
$_smarty_info_header = '<!-- Smarty '.$this->_version.' '.strftime("%Y-%m-%d %H:%M:%S %Z").' -->'."\n\n";
} else {
$_smarty_info_header = '';
}
$compile_path = $this->_get_compile_path($_smarty_tpl_file); $compile_path = $this->_get_compile_path($_smarty_tpl_file);
// if we just need to display the results, don't perform output // if we just need to display the results, don't perform output
// buffering - for speed // buffering - for speed
if ($_smarty_display && !$this->caching) { if ($_smarty_display && !$this->caching) {
echo $_smarty_info_header;
if ($this->_process_template($_smarty_tpl_file, $compile_path)) if ($this->_process_template($_smarty_tpl_file, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_tpl_file." -->\n";
}
} }
} else { } else {
ob_start(); ob_start();
echo $_smarty_info_header;
if ($this->_process_template($_smarty_tpl_file, $compile_path)) if ($this->_process_template($_smarty_tpl_file, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_tpl_file." -->\n";
}
} }
$_smarty_results = ob_get_contents(); $_smarty_results = ob_get_contents();
ob_end_clean(); ob_end_clean();
@@ -653,13 +625,7 @@ function _generate_debug_output() {
$compile_path = $this->_get_compile_path($this->debug_tpl); $compile_path = $this->_get_compile_path($this->debug_tpl);
if ($this->_process_template($this->debug_tpl, $compile_path)) if ($this->_process_template($this->debug_tpl, $compile_path))
{ {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$this->debug_tpl." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$this->debug_tpl." -->\n";
}
} }
$results = ob_get_contents(); $results = ob_get_contents();
$this->force_compile = $force_compile_orig; $this->force_compile = $force_compile_orig;
@@ -997,13 +963,7 @@ function _generate_debug_output() {
$compile_path = $this->_get_compile_path($_smarty_include_tpl_file); $compile_path = $this->_get_compile_path($_smarty_include_tpl_file);
if ($this->_process_template($_smarty_include_tpl_file, $compile_path)) { if ($this->_process_template($_smarty_include_tpl_file, $compile_path)) {
if ($this->show_info_include) {
echo "\n<!-- SMARTY_BEGIN: ".$_smarty_include_tpl_file." -->\n";
}
include($compile_path); include($compile_path);
if ($this->show_info_include) {
echo "\n<!-- SMARTY_END: ".$_smarty_include_tpl_file." -->\n";
}
} }
array_shift($this->_config); array_shift($this->_config);