added type checking of setting

yhpark · Sep 16, 2012 · caeb773 · caeb773
1 parent bf6862b
commit caeb773
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/application.js b/lib/application.js
@@ -259,7 +259,7 @@ app.set = function(setting, val){
       } else if (this.parent) {
         return this.parent.set(setting);
       }
-    } else {
+    } else if ('object' == typeof setting) {
       utils.merge(this.settings, setting);
       return this;
     }