Merge remote-tracking branch 'jeremyevans/patch-1'

brianc · brianc · commit 25ac3519970a · 2012-03-06T19:09:14.000-06:00
diff --git a/lib/arrayParser.js b/lib/arrayParser.js
@@ -35,7 +35,7 @@ ArrayParser.prototype.newEntry = function(includeEmpty) {
   var entry;
   if (this.recorded.length > 0 || includeEmpty) {
     entry = this.recorded.join("");
-    if (entry === "NULL") {
+    if (entry === "NULL" && !includeEmpty) {
       entry = null;
     }
     if (entry !== null) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ ArrayParser.prototype.newEntry = function(includeEmpty) {`
`35`	`35`	`var entry;`
`36`	`36`	`if (this.recorded.length > 0 \|\| includeEmpty) {`
`37`	`37`	`entry = this.recorded.join("");`
`38`		`- if (entry === "NULL") {`
	`38`	`+ if (entry === "NULL" && !includeEmpty) {`
`39`	`39`	`entry = null;`
`40`	`40`	`}`
`41`	`41`	`if (entry !== null) {`