From b13da18e11d5f67696906d1ecd2fc9e753d50da4 Mon Sep 17 00:00:00 2001
From: Andrew McLeod
Date: Mon, 25 Feb 2013 21:25:18 -0800
Subject: fix($http): don't encode URL query substring "null" to "+"

Fixes issue in encodeUriQuery used by $http and $resource that
treats null as a string and replaces the characters "null" with "+".
---
 src/Angular.js             | 2 +-
 src/ngResource/resource.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Angular.js b/src/Angular.js
index 5195489e..93e4f6af 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -855,7 +855,7 @@ function encodeUriQuery(val, pctEncodeSpaces) {
              replace(/%3A/gi, ':').
              replace(/%24/g, '$').
              replace(/%2C/gi, ',').
-             replace((pctEncodeSpaces ? null : /%20/g), '+');
+             replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
 }
 
 
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index eac77603..a05e3598 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -262,7 +262,7 @@ angular.module('ngResource', ['ng']).
         replace(/%3A/gi, ':').
         replace(/%24/g, '$').
         replace(/%2C/gi, ',').
-        replace((pctEncodeSpaces ? null : /%20/g), '+');
+        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
     }
 
     function Route(template, defaults) {
-- 
cgit v1.2.3