Merge branch 'master' into v3.1

cutting-room-floor · Jul 14, 2014 · 36a92da · 36a92da
2 parents eddfcc9 + 53d256e
commit 36a92da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/validate.js b/lib/validate.js
@@ -129,7 +129,7 @@ function value(key, val, constants, ref, spec, errors) {
         if (!valid) sub.forEach(function(err) { errors.push(err); });
         return valid;
     // Val is a function.
-    } else if (spec.function && typeof val === 'object' && val.fn) {
+    } else if (spec.function && typeof val === 'object' && !Array.isArray(val)) {
         return value(key, val, constants, ref, ref.function, errors);
     // Val must be one of enumerated values.
     } else if (spec.type === 'enum') {