Revert [5121] causing buggy referrer keywords when accents/umlauts etc. as per report in http://forum.piwik.org/read.php?2,81827 Refs #2631

git-svn-id: http://dev.piwik.org/svn/trunk@5324 59fd770c-687e-43c8-a1e3-f5a4ff64c105

2 files changed, 1 insertions, 4 deletions

diff --git a/js/piwik.js b/js/piwik.js
index 07eec0ad42..7472e0dc82 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -651,9 +651,6 @@ var
 				referrer = documentAlias.referrer;
 			}
 
-			// urldecode %xx
-			referrer = urldecode(referrer);
-
 			return referrer;
 		}
 
diff --git a/piwik.js b/piwik.js
index 619ef7536f..328b9631c4 100644
--- a/piwik.js
+++ b/piwik.js
@@ -11,7 +11,7 @@ if(!this.JSON2){this.JSON2={}}(function(){function d(f){return f<10?"0"+f:f}func
 function a(f){i.lastIndex=0;return i.test(f)?'"'+f.replace(i,function(m){var n=k[m];return typeof n==="string"?n:"\\u"+("0000"+m.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+f+'"'}function g(s,p){var n,m,t,f,q=j,o,r=p[s];if(r&&typeof r==="object"){r=l(r,s)}if(typeof h==="function"){r=h.call(p,s,r)}switch(typeof r){case"string":return a(r);case"number":return isFinite(r)?String(r):"null";case"boolean":case"null":return String(r);case"object":if(!r){return"null"}j+=b;o=[];if(Object.prototype.toString.apply(r)==="[object Array]"){f=r.length;for(n=0;n<f;n+=1){o[n]=g(n,r)||"null"}t=o.length===0?"[]":j?"[\n"+j+o.join(",\n"+j)+"\n"+q+"]":"["+o.join(",")+"]";j=q;return t}if(h&&typeof h==="object"){f=h.length;for(n=0;n<f;n+=1){if(typeof h[n]==="string"){m=h[n];t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}else{for(m in r){if(Object.prototype.hasOwnProperty.call(r,m)){t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}t=o.length===0?"{}":j?"{\n"+j+o.join(",\n"+j)+"\n"+q+"}":"{"+o.join(",")+"}";j=q;
 return t}}if(typeof JSON2.stringify!=="function"){JSON2.stringify=function(o,m,n){var f;j="";b="";if(typeof n==="number"){for(f=0;f<n;f+=1){b+=" "}}else{if(typeof n==="string"){b=n}}h=m;if(m&&typeof m!=="function"&&(typeof m!=="object"||typeof m.length!=="number")){throw new Error("JSON.stringify")}return g("",{"":o})}}if(typeof JSON2.parse!=="function"){JSON2.parse=function(o,f){var n;function m(s,r){var q,p,t=s[r];if(t&&typeof t==="object"){for(q in t){if(Object.prototype.hasOwnProperty.call(t,q)){p=m(t,q);if(p!==undefined){t[q]=p}else{delete t[q]}}}}return f.call(s,r,t)}o=String(o);c.lastIndex=0;if(c.test(o)){o=o.replace(c,function(p){return"\\u"+("0000"+p.charCodeAt(0).toString(16)).slice(-4)})}if((new RegExp("^[\\],:{}\\s]*$")).test(o.replace(new RegExp('\\\\(?:["\\\\/bfnrt]|u[0-9a-fA-F]{4})',"g"),"@").replace(new RegExp('"[^"\\\\\n\r]*"|true|false|null|-?\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d+)?',"g"),"]").replace(new RegExp("(?:^|:|,)(?:\\s*\\[)+","g"),""))){n=eval("("+o+")");
 return typeof f==="function"?m({"":n},""):n}throw new SyntaxError("JSON.parse")}}}());var _paq=_paq||[],Piwik=Piwik||(function(){var m,w={},d=document,j=navigator,v=screen,I=window,h=false,C=[],e=I.encodeURIComponent,J=I.decodeURIComponent,E=unescape,H,D;function b(i){return typeof i!=="undefined"}function a(i){return typeof i==="function"}function n(i){return typeof i==="object"}function q(i){return typeof i==="string"||i instanceof String}function z(){var K,M,L;for(K=0;K<arguments.length;K+=1){L=arguments[K];M=L.shift();if(q(M)){H[M].apply(H,L)}else{M.apply(H,L)}}}function t(M,L,K,i){if(M.addEventListener){M.addEventListener(L,K,i);return true}if(M.attachEvent){return M.attachEvent("on"+L,K)}M["on"+L]=K}function g(L,O){var K="",N,M;for(N in w){if(Object.prototype.hasOwnProperty.call(w,N)){M=w[N][L];if(a(M)){K+=M(O)}}}return K}function B(){var i;g("unload");if(m){do{i=new Date()}while(i.getTime()<m)}}function k(){var K;if(!h){h=true;g("load");for(K=0;K<C.length;K++){C[K]()}}return true
-}function x(){var K;if(d.addEventListener){t(d,"DOMContentLoaded",function i(){d.removeEventListener("DOMContentLoaded",i,false);k()})}else{if(d.attachEvent){d.attachEvent("onreadystatechange",function i(){if(d.readyState==="complete"){d.detachEvent("onreadystatechange",i);k()}});if(d.documentElement.doScroll&&I===I.top){(function i(){if(!h){try{d.documentElement.doScroll("left")}catch(L){setTimeout(i,0);return}k()}}())}}}if((new RegExp("WebKit")).test(j.userAgent)){K=setInterval(function(){if(h||/loaded|complete/.test(d.readyState)){clearInterval(K);k()}},10)}t(I,"load",k,false)}function f(){var i="";try{i=I.top.document.referrer}catch(L){if(I.parent){try{i=I.parent.document.referrer}catch(K){i=""}}}if(i===""){i=d.referrer}i=E(i);return i}function A(i){var L=new RegExp("^([a-z]+):"),K=L.exec(i);return K?K[1]:null}function y(i){var L=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),K=L.exec(i);return K?K[1]:i}function p(L,K){var O=new RegExp("^(?:https?|ftp)(?::/*(?:[^?]+)[?])([^#]+)"),N=O.exec(L),M=new RegExp("(?:^|&)"+K+"=([^&]*)"),i=N?M.exec(N[1]):0;
+}function x(){var K;if(d.addEventListener){t(d,"DOMContentLoaded",function i(){d.removeEventListener("DOMContentLoaded",i,false);k()})}else{if(d.attachEvent){d.attachEvent("onreadystatechange",function i(){if(d.readyState==="complete"){d.detachEvent("onreadystatechange",i);k()}});if(d.documentElement.doScroll&&I===I.top){(function i(){if(!h){try{d.documentElement.doScroll("left")}catch(L){setTimeout(i,0);return}k()}}())}}}if((new RegExp("WebKit")).test(j.userAgent)){K=setInterval(function(){if(h||/loaded|complete/.test(d.readyState)){clearInterval(K);k()}},10)}t(I,"load",k,false)}function f(){var i="";try{i=I.top.document.referrer}catch(L){if(I.parent){try{i=I.parent.document.referrer}catch(K){i=""}}}if(i===""){i=d.referrer}return i}function A(i){var L=new RegExp("^([a-z]+):"),K=L.exec(i);return K?K[1]:null}function y(i){var L=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),K=L.exec(i);return K?K[1]:i}function p(L,K){var O=new RegExp("^(?:https?|ftp)(?::/*(?:[^?]+)[?])([^#]+)"),N=O.exec(L),M=new RegExp("(?:^|&)"+K+"=([^&]*)"),i=N?M.exec(N[1]):0;
 return i?J(i[1]):""}function s(P,M,L,O,K,N){var i;if(L){i=new Date();i.setTime(i.getTime()+L)}d.cookie=P+"="+e(M)+(L?";expires="+i.toGMTString():"")+";path="+(O||"/")+(K?";domain="+K:"")+(N?";secure":"")}function G(L){var i=new RegExp("(^|;)[ ]*"+L+"=([^;]*)"),K=i.exec(d.cookie);return K?J(K[2]):0}function r(i){return E(e(i))}function u(aa){var M=function(W,i){return(W<<i)|(W>>>(32-i))},ab=function(ah){var ag="",af,W;for(af=7;af>=0;af--){W=(ah>>>(af*4))&15;ag+=W.toString(16)}return ag},P,ad,ac,L=[],T=1732584193,R=4023233417,Q=2562383102,O=271733878,N=3285377520,Z,Y,X,V,U,ae,K,S=[];aa=r(aa);K=aa.length;for(ad=0;ad<K-3;ad+=4){ac=aa.charCodeAt(ad)<<24|aa.charCodeAt(ad+1)<<16|aa.charCodeAt(ad+2)<<8|aa.charCodeAt(ad+3);S.push(ac)}switch(K&3){case 0:ad=2147483648;break;case 1:ad=aa.charCodeAt(K-1)<<24|8388608;break;case 2:ad=aa.charCodeAt(K-2)<<24|aa.charCodeAt(K-1)<<16|32768;break;case 3:ad=aa.charCodeAt(K-3)<<24|aa.charCodeAt(K-2)<<16|aa.charCodeAt(K-1)<<8|128;break}S.push(ad);while((S.length&15)!==14){S.push(0)
 }S.push(K>>>29);S.push((K<<3)&4294967295);for(P=0;P<S.length;P+=16){for(ad=0;ad<16;ad++){L[ad]=S[P+ad]}for(ad=16;ad<=79;ad++){L[ad]=M(L[ad-3]^L[ad-8]^L[ad-14]^L[ad-16],1)}Z=T;Y=R;X=Q;V=O;U=N;for(ad=0;ad<=19;ad++){ae=(M(Z,5)+((Y&X)|(~Y&V))+U+L[ad]+1518500249)&4294967295;U=V;V=X;X=M(Y,30);Y=Z;Z=ae}for(ad=20;ad<=39;ad++){ae=(M(Z,5)+(Y^X^V)+U+L[ad]+1859775393)&4294967295;U=V;V=X;X=M(Y,30);Y=Z;Z=ae}for(ad=40;ad<=59;ad++){ae=(M(Z,5)+((Y&X)|(Y&V)|(X&V))+U+L[ad]+2400959708)&4294967295;U=V;V=X;X=M(Y,30);Y=Z;Z=ae}for(ad=60;ad<=79;ad++){ae=(M(Z,5)+(Y^X^V)+U+L[ad]+3395469782)&4294967295;U=V;V=X;X=M(Y,30);Y=Z;Z=ae}T=(T+Z)&4294967295;R=(R+Y)&4294967295;Q=(Q+X)&4294967295;O=(O+V)&4294967295;N=(N+U)&4294967295}ae=ab(T)+ab(R)+ab(Q)+ab(O)+ab(N);return ae.toLowerCase()}function o(L,i,K){if(L==="translate.googleusercontent.com"){if(K===""){K=i}i=p(i,"u");L=y(i)}else{if(L==="cc.bingj.com"||L==="webcache.googleusercontent.com"||L.slice(0,5)==="74.6."){i=d.links[0].href;L=y(i)}}return[L,i,K]}function l(K){var i=K.length;
 if(K.charAt(--i)==="."){K=K.slice(0,i)}if(K.slice(0,2)==="*."){K=K.slice(1)}return K}function F(ac,ay){var N=o(d.domain,I.location.href,f()),aQ=l(N[0]),a3=N[1],aE=N[2],aC="GET",M=ac||"",aU=ay||"",ao,ag=d.title,ai="7z|aac|ar[cj]|as[fx]|avi|bin|csv|deb|dmg|doc|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|ppt|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xls|xml|z|zip",aA=[aQ],Q=[],at=[],ab=[],az=500,R,ad,S,T,ak=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],af=["pk_kwd","piwik_kwd","utm_term"],a1="_pk_",V,a2,aW,an,Z=63072000000,aa=1800000,ap=15768000000,Y=d.location.protocol==="https",P=false,au={},aX=200,aK={},aV={},aH=false,aF=false,aD,av,W,aj=u,aG,am;function aY(a6){var a7;if(S){a7=new RegExp("#.*");return a6.replace(a7,"")}return a6}function aP(a8,a6){var a9=A(a6),a7;if(a9){return a6}if(a6.slice(0,1)==="/"){return A(a8)+"://"+y(a8)+a6}a8=aY(a8);if((a7=a8.indexOf("?"))>=0){a8=a8.slice(0,a7)