From 82cbb8c7cb6e0170e8dc923b3f4a8eedb061571c Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Mon, 20 Jul 2009 21:11:03 +0000
Subject: [PATCH] fixed getParameterString to handle null/undefined values
 correctly. r=elemoine (closes #2157)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@9573 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Util.js | 6 +++++-
 tests/Util.html        | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index caa0a59e75..96e7e2ab50 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -608,8 +608,12 @@ OpenLayers.Util.getParameterString = function(params) {
         if (typeof value == 'object' && value.constructor == Array) {
           /* value is an array; encode items and separate with "," */
           var encodedItemArray = [];
+          var item;
           for (var itemIndex=0, len=value.length; itemIndex<len; itemIndex++) {
-            encodedItemArray.push(encodeURIComponent(value[itemIndex]));
+            item = value[itemIndex];
+            encodedItemArray.push(encodeURIComponent(
+                (item === null || item === undefined) ? "" : item)
+            );
           }
           encodedValue = encodedItemArray.join(",");
         }
diff --git a/tests/Util.html b/tests/Util.html
index 00a1f57779..1dbdbfe4ef 100644
--- a/tests/Util.html
+++ b/tests/Util.html
@@ -225,7 +225,7 @@
     }
 
     function test_Util_getParameterString(t) {
-        t.plan( 4 );
+        t.plan( 5 );
 
         var params = { 
             'foo': "bar",
@@ -242,7 +242,10 @@
         t.eq( OpenLayers.Util.getParameterString(params), "foo=bar%2Cbaz", "getParameterString encodes , correctly in arrays");    
         
         var params = { foo: ["bar","baz,"] };
-        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. ");    
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. ");
+        
+        var params = { foo: [null, undefined, 0, "", "bar"] }
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=,,0,,bar", "getParameterString works fine with null values in array.");
     }
 
     function test_Util_createAlphaImageDiv(t) {