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

fixed a few warning messages

Browse Source
This commit is contained in:
mohrt
2001-03-02 18:07:51 +00:00
parent 08d9cb8971
commit 31a10c5d9a
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Smarty.class.php
View File

@@ -118,8 +118,11 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function Smarty() function Smarty()
{ {
foreach ($this->global_assign as $var_name) foreach ($this->global_assign as $var_name) {
$this->assign($var_name, $GLOBALS[$var_name]); if(isset($GLOBALS[$var_name])) {
$this->assign($var_name, $GLOBALS[$var_name]);
}
}
} }
@@ -376,10 +379,11 @@ class Smarty
} }
if ($display) { if ($display) {
echo $results; if(isset($results)) { echo $results; }
return; return;
} else } else {
return $results; if(isset($results)) { return $results; }
}
} }
/*======================================================================*\ /*======================================================================*\
@@ -1140,7 +1144,7 @@ class Smarty
} }
function _parse_vars_props(&$tokens) function _parse_vars_props(&$tokens)
{ {
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\''; $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* preg_grep() was fixed to return keys properly in 4.0.4 and later. To /* preg_grep() was fixed to return keys properly in 4.0.4 and later. To
@@ -1182,7 +1186,7 @@ class Smarty
$sections = explode('/', $var_ref); $sections = explode('/', $var_ref);
$props = explode('.', array_pop($sections)); $props = explode('.', array_pop($sections));
$var_name = array_shift($props); $var_name = array_shift($props);
$output = "\$$var_name"; $output = "\$$var_name";
foreach ($sections as $section_ref) { foreach ($sections as $section_ref) {

18
libs/Smarty.class.php
View File

@@ -118,8 +118,11 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function Smarty() function Smarty()
{ {
foreach ($this->global_assign as $var_name) foreach ($this->global_assign as $var_name) {
$this->assign($var_name, $GLOBALS[$var_name]); if(isset($GLOBALS[$var_name])) {
$this->assign($var_name, $GLOBALS[$var_name]);
}
}
} }
@@ -376,10 +379,11 @@ class Smarty
} }
if ($display) { if ($display) {
echo $results; if(isset($results)) { echo $results; }
return; return;
} else } else {
return $results; if(isset($results)) { return $results; }
}
} }
/*======================================================================*\ /*======================================================================*\
@@ -1140,7 +1144,7 @@ class Smarty
} }
function _parse_vars_props(&$tokens) function _parse_vars_props(&$tokens)
{ {
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\''; $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* preg_grep() was fixed to return keys properly in 4.0.4 and later. To /* preg_grep() was fixed to return keys properly in 4.0.4 and later. To
@@ -1182,7 +1186,7 @@ class Smarty
$sections = explode('/', $var_ref); $sections = explode('/', $var_ref);
$props = explode('.', array_pop($sections)); $props = explode('.', array_pop($sections));
$var_name = array_shift($props); $var_name = array_shift($props);
$output = "\$$var_name"; $output = "\$$var_name";
foreach ($sections as $section_ref) { foreach ($sections as $section_ref) {