Merge branch 'master' into 192_dev

LimeSurvey · Jun 27, 2012 · 2d1d424 · 2d1d424
2 parents 636fcca + f6f2ebb
commit 2d1d424
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 180 deletions.
diff --git a/classes/expressions/ExpressionManager.php b/classes/expressions/ExpressionManager.php
@@ -68,7 +68,7 @@ function __construct()
         $RDP_regex_inc_dec = '\+\+|--';
         $RDP_regex_binary = '[+*/-]';
         $RDP_regex_compare = '<=|<|>=|>|==|!=|\ble\b|\blt\b|\bge\b|\bgt\b|\beq\b|\bne\b';
-        $RDP_regex_assign = '=|\+=|-=|\*=|/=';
+        $RDP_regex_assign = '=';    // '=|\+=|-=|\*=|/=';
         $RDP_regex_sgqa = '(?:INSERTANS:)?[0-9]+X[0-9]+X[0-9]+[A-Z0-9_]*\#?[01]?(?:\.(?:' . ExpressionManager::$RDP_regex_var_attr . '))?';
         $RDP_regex_word = '(?:TOKEN:)?(?:[A-Z][A-Z0-9_]*)?(?:\.(?:' . ExpressionManager::$RDP_regex_var_attr . '))?';
         $RDP_regex_number = '[0-9]+\.?[0-9]*|\.[0-9]+';