|
@@ -597,7 +597,11 @@ class XTemplate {
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
|
|
|
|
- //$var = trim($var);
|
|
|
|
|
|
+ if ($var !== null) {
|
|
|
|
+ $var = trim($var);
|
|
|
|
+ }else{
|
|
|
|
+ $var = "";
|
|
|
|
+ }
|
|
switch (true) {
|
|
switch (true) {
|
|
case preg_match('/^\n/', $var) && preg_match('/\n$/', $var):
|
|
case preg_match('/^\n/', $var) && preg_match('/\n$/', $var):
|
|
$var = substr($var, 1, -1);
|
|
$var = substr($var, 1, -1);
|
|
@@ -908,7 +912,13 @@ class XTemplate {
|
|
*/
|
|
*/
|
|
public function scan_globals () {
|
|
public function scan_globals () {
|
|
|
|
|
|
- reset($GLOBALS);
|
|
|
|
|
|
+ /*reset($GLOBALS);
|
|
|
|
+
|
|
|
|
+ foreach ($GLOBALS as $k => $v) {
|
|
|
|
+ $GLOB[$k] = $v;
|
|
|
|
+ }*/
|
|
|
|
+ $my_globals = $GLOBALS;
|
|
|
|
+ reset($my_globals);
|
|
|
|
|
|
foreach ($GLOBALS as $k => $v) {
|
|
foreach ($GLOBALS as $k => $v) {
|
|
$GLOB[$k] = $v;
|
|
$GLOB[$k] = $v;
|