Changeset 435

Timestamp:

05/09/07 13:55:00 (2 years ago)

Author:

laurentj

Message:

fix regression bug in jtpl : use of true, false and null were not allowed anymore in expression

Files:

• trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (2 diffs)
• trunk/testapp/modules/unittest/classes/utjtplexpr.class.php (modified) (1 diff)

trunk/lib/jelix/tpl/jTplCompiler.class.php

@@ -49 +49 @@
-    protected $_allowedAssign;
-    protected $_allowedInForeach;
+
+    protected $_allowedConstants = array('TRUE','FALSE','NULL', 'M_1_PI', 'M_2_PI', 'M_2_SQRTPI', 'M_E', 
+        'M_LN10', 'M_LN2', 'M_LOG10E', 'M_LOG2E', 'M_PI','M_PI_2','M_PI_4','M_SQRT1_2','M_SQRT2');
-
-    private $_pluginPath=array();
@@ -417 +420 @@
-                    $result.='$t->_vars[\''.substr($str,1).'\']';
-                }elseif($type == T_WHITESPACE || in_array($type, $allowed)){
-
+ && !in_array(strtoupper($str),$this->_allowedConstants)
-                        $this->doError2('errors.tpl.tag.constant.notallowed', $this->_currentTag, $str);
-                    }

trunk/testapp/modules/unittest/classes/utjtplexpr.class.php

@@ -99 +99 @@
-        '$aa*(234+$b)'=>'$t->_vars[\'aa\']*(234+$t->_vars[\'b\'])',
-        '$aa[$bb[4]]'=>'$t->_vars[\'aa\'][$t->_vars[\'bb\'][4]]',
+        '$aa == false'=>'$t->_vars[\'aa\'] == false',
+        '$aa == true'=>'$t->_vars[\'aa\'] == true',
+        '$aa == null'=>'$t->_vars[\'aa\'] == null',
-
-    );