cvs: pear /HTML_Template_Flexy/Flexy/Compiler Standard.php
| From: | Alan Knowles | Date: | Sat, 01 May 2004 03:24:57 +0000 |
| Subject: | cvs: pear /HTML_Template_Flexy/Flexy/Compiler Standard.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-19057@lists.php.net to get a copy of this message | ||
alan_k Fri Apr 30 23:24:57 2004 EDT
Modified files:
/pear/HTML_Template_Flexy/Flexy/Compiler Standard.php
Log:
fix for bug #1274
http://cvs.php.net/diff.php/pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php?r1=1.28&r2=1.29&ty=u
Index: pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php
diff -u pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php:1.28
pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php:1.29
--- pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php:1.28 Fri Apr 23 22:05:48 2004
+++ pear/HTML_Template_Flexy/Flexy/Compiler/Standard.php Fri Apr 30 23:24:57 2004
@@ -16,12 +16,14 @@
// | Authors: Alan Knowles <alan@akbkhome.com> |
// +----------------------------------------------------------------------+
//
-// $Id: Standard.php,v 1.28 2004/04/24 02:05:48 alan_k Exp $
+// $Id: Standard.php,v 1.29 2004/05/01 03:24:57 alan_k Exp $
//
// Base Compiler Class
// Standard 'Original Flavour' Flexy compiler
-
+// this does the main conversion, (eg. for {vars and methods})
+// it relays into Compiler/Tag & Compiler/Flexy for tags and namespace handling.
+
require_once 'HTML/Template/Flexy/Tokenizer.php';
@@ -377,8 +379,9 @@
return $loopon;
}
- $ret = 'if (is_array('. $loopon. ") || " .
- 'is_object(' . $loopon . ')) ' .
+ $ret = 'if ($this->options[\'strict\'] || ('.
+ 'is_array('. $loopon. ') || ' .
+ 'is_object(' . $loopon . '))) ' .
'foreach(' . $loopon . " ";
$ret .= "as \${$element->key}";
@@ -531,8 +534,8 @@
// we should check if they something weird like: GLOBALS.xxxx[sdf](....)
$var = $method;
} else {
- $prefix = 'if (isset('.$var.
- ') && method_exists('.$var .",'{$method}')) "
. $prefix;
+ $prefix = 'if ($this->options[\'strict\'] || (isset('.$var.
+ ') && method_exists('.$var .",'{$method}')))
" . $prefix;
$var = $element->toVar($element->method);
}