Changeset 1499

Timestamp:

06/21/06 13:54:44 (2 years ago)

Author:

fabien

Message:

fixed sfValidatorManager::validate method must tolerate array type parameters (closes #100 - patch from brujahRg)

Files:

• trunk/lib/config/sfValidatorConfigHandler.class.php (modified) (1 diff)
• trunk/lib/util/sfToolkit.class.php (modified) (1 diff)
• trunk/lib/validator/sfValidatorManager.class.php (modified) (1 diff)

trunk/lib/config/sfValidatorConfigHandler.class.php

@@ -344 +344 @@
-        }
-      }
- false || strpos($name, '}') !
+= false || strpos($name, '}') !=
-      {
-        // name contains an invalid character

trunk/lib/util/sfToolkit.class.php

@@ -346 +346 @@
-    return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search);
-  }
+
+  public static function isArrayValuesEmpty($array)
+  {
+    static $isEmpty = true;
+    foreach($array as $value)
+    {
+      $isEmpty = (is_array($value)) ? self::isArrayValuesEmpty($value) : (strlen($value) == 0);
+      if (!$isEmpty) break;
+    }
+  
+    return $isEmpty;
+  }
-}

trunk/lib/validator/sfValidatorManager.class.php

@@ -254 +254 @@
-      ($data['is_file'] && !$value['name'])
-      ||
-$value == null || strlen($value) == 0
+is_array($value) ? sfToolkit::isArrayValuesEmpty($value) : ($value == null || strlen($value) == 0)
-    )
-    {