Fix base64 window mode bug. Fixes #111 (#309)

locutusjs · Oct 5, 2016 · b0636ab · b0636ab
1 parent 5556292
commit b0636ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/php/url/base64_decode.js b/src/php/url/base64_decode.js
@@ -18,7 +18,7 @@ module.exports = function base64_decode (encodedData) { // eslint-disable-line c
 
   if (typeof window !== 'undefined') {
     if (typeof window.atob !== 'undefined') {
-      return decodeURIComponent(unescape(window.atob(encodedData)))
+      return decodeURIComponent(escape(window.atob(encodedData)))
     }
   } else {
     return new Buffer(encodedData, 'base64').toString('utf-8')

diff --git a/src/php/url/base64_encode.js b/src/php/url/base64_encode.js
@@ -16,7 +16,7 @@ module.exports = function base64_encode (stringToEncode) { // eslint-disable-lin
 
   if (typeof window !== 'undefined') {
     if (typeof window.btoa !== 'undefined') {
-      return window.btoa(escape(encodeURIComponent(stringToEncode)))
+      return window.btoa(unescape(encodeURIComponent(stringToEncode)))
     }
   } else {
     return new Buffer(stringToEncode).toString('base64')