From 876fdebec9713e7c4a3f644e29df2bcce8b2e5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Junod?= <frederic.junod@camptocamp.com>
Date: Wed, 17 Feb 2010 06:59:49 +0000
Subject: [PATCH] OpenLayers.Util.getParameters: decodeURIComponent the keys,
 not only the values. r=elemoine (closes #2327)

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

diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index 6fb345ba4f..f4716ffb7d 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -980,10 +980,7 @@ OpenLayers.Util.getParameters = function(url) {
             var value = keyValue[1] || ''; //empty string if no value
 
             //decode individual values
-            value = value.split(",");
-            for(var j=0, jlen=value.length; j<jlen; j++) {
-                value[j] = decodeURIComponent(value[j]);
-            }
+            value = decodeURIComponent(value).split(",");
 
             //if there's only one value, do not return as array                    
             if (value.length == 1) {
diff --git a/tests/Util.html b/tests/Util.html
index 9f3a20a58f..935318c524 100644
--- a/tests/Util.html
+++ b/tests/Util.html
@@ -892,7 +892,7 @@
     }
 
     function test_Util_getParameters(t) {
-        t.plan(6);
+        t.plan(8);
 
         t.eq(OpenLayers.Util.getParameters('http://www.example.com'), {},
              "getParameters works when args = ''");
@@ -907,9 +907,15 @@
         t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar#bugssucks'),
              {'foo': 'bar'},
              "getParameters works when using a fragment identifier");
-        t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'),
-             {'foo': ['bar', 'pub', 'disco']},
+        t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar%3Aone'),
+             {'foo': 'bar:one'},
+             "getParameters works with percent encoded values");
+        t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar:one,pub,disco'),
+             {'foo': ['bar:one', 'pub', 'disco']},
              "getParameters works with a comma-separated value (parses into array)");
+        t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar%3Aone%2Cpub%2Cdisco'),
+             {'foo': ['bar:one', 'pub', 'disco']},
+             "getParameters works with a URL encoded comma-separated values (parses into array)");
     }
 
     function test_Util_getArgs(t) {