Fixes to ValidateDecimal and SQLDriver->ApplyParameters (thx unlight)

Emaratilicious · Sep 16, 2011 · f86f20f · f86f20f
1 parent e2a4162
commit f86f20f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/library/core/functions.validation.php b/library/core/functions.validation.php
@@ -222,7 +222,7 @@ function ValidateBoolean($Value, $Field) {
 
 if (!function_exists('ValidateDecimal')) {
    function ValidateDecimal($Value, $Field) {
-       if (is_object($Field) && $Field->AllowNull && $Value === '') return TRUE;
+       if (is_object($Field) && $Field->AllowNull && $Value === NULL) return TRUE;
        return is_numeric($Value);
    }
 }

diff --git a/library/database/class.sqldriver.php b/library/database/class.sqldriver.php
@@ -251,7 +251,10 @@ public function AndOp($SetDefault = FALSE) {
       return $this;
    }
 
-   public function ApplyParameters($Sql, $Parameters) {
+   public function ApplyParameters($Sql, $Parameters = NULL) {
+      if (!is_array($Parameters)) 
+         $Parameters = $this->_NamedParameters;
+
       // Sort the parameters so that we don't have clashes.
       krsort($Parameters);
       foreach ($Parameters as $Key => $Value) {