Merge branch 'MDL-29173_calc_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE

2012-05-28 12:16:26 +08:00
parent 5a3f6eb468 6dbe8ddbd8
commit a66bb4213e
1 changed files with 2 additions and 2 deletions
@@ -107,13 +107,13 @@ class EvalMath {
        'sin','sinh','arcsin','asin','arcsinh','asinh',
        'cos','cosh','arccos','acos','arccosh','acosh',
        'tan','tanh','arctan','atan','arctanh','atanh',
-        'sqrt','abs','ln','log','exp','floor','ceil','round');
+        'sqrt','abs','ln','log','exp','floor','ceil');

    var $fc = array( // calc functions emulation
        'average'=>array(-1), 'max'=>array(-1),  'min'=>array(-1),
        'mod'=>array(2),      'pi'=>array(0),    'power'=>array(2),
        'round'=>array(1, 2), 'sum'=>array(-1), 'rand_int'=>array(2),
-        'rand_float'=>array(0));
+        'rand_float'=>array(0), 'round'=>array(2));

    var $allowimplicitmultiplication;