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

libs/plugins/function.html_image.php

Browse Source
This commit is contained in:
messju
2003-06-30 15:41:25 +00:00
parent 0b3b79e9c6
commit f866f04d66
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/Smarty_Compiler.class.php
View File

@@ -1606,7 +1606,7 @@ class Smarty_Compiler extends Smarty {
} }
// get [foo] and .foo and ->foo and (...) pieces // get [foo] and .foo and ->foo and (...) pieces
preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\w+|\.\$?\w+|\S+!', $_var_ref, $match); preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+!', $_var_ref, $match);
$_indexes = $match[0]; $_indexes = $match[0];
$_var_name = array_shift($_indexes); $_var_name = array_shift($_indexes);
@@ -1659,8 +1659,15 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__); $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
} elseif($this->security && substr($_index, 2, 1) == '_') { } elseif($this->security && substr($_index, 2, 1) == '_') {
$this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__); $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
} elseif ($_index{2} == '$') {
if ($this->security) {
$this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
} else {
$_output .= '->{$this->_tpl_vars[\''.substr($_index,3).'\']}';
} }
} else {
$_output .= $_index; $_output .= $_index;
}
} elseif ($_index{0} == '(') { } elseif ($_index{0} == '(') {
$_index = $this->_parse_parenth_args($_index); $_index = $this->_parse_parenth_args($_index);
$_output .= $_index; $_output .= $_index;

2
libs/core/core.write_file.php
View File

@@ -38,7 +38,7 @@ function smarty_core_write_file($params, &$smarty)
@unlink($params['filename']); @unlink($params['filename']);
} }
@rename($_tmp_file, $params['filename']); @rename($_tmp_file, $params['filename']);
chmod($params['filename'], $smarty->_file_perms); @chmod($params['filename'], $smarty->_file_perms);
return true; return true;
} }

2
libs/plugins/function.html_image.php
View File

@@ -94,7 +94,7 @@ function smarty_function_html_image($params, &$smarty)
return; return;
} }
if(substr($file,0,1) == DIRECTORY_SEPARATOR) { if (substr($file,0,1) == '/') {
$_image_path = $basedir . $file; $_image_path = $basedir . $file;
} else { } else {
$_image_path = $file; $_image_path = $file;