Fixes #2671, #2659

 * Custom vars 200 length limit instead of 100
 * Now up to 5 categories tracked for Ecommerce items
 * show back trace when debug output is enabled
 * fixing previous integration test left broken (sorry Timo!)


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

1 files changed, 1 insertions, 1 deletions

diff --git a/piwik.js b/piwik.js
index 530273ad1e..164c0d934f 100644
--- a/piwik.js
+++ b/piwik.js
@@ -14,7 +14,7 @@ return typeof f==="function"?m({"":n},""):n}throw new SyntaxError("JSON.parse")}
 }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;
 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=100,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)
+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)
 }if((a7=a8.lastIndexOf("/"))!==a8.length-1){a8=a8.slice(0,a7+1)}return a8+a6}function aB(a9){var a7,a6,a8;for(a7=0;a7<aA.length;a7++){a6=l(aA[a7].toLowerCase());if(a9===a6){return true}if(a6.slice(0,1)==="."){if(a9===a6.slice(1)){return true}a8=a9.length-a6.length;if((a8>0)&&(a9.slice(a8)===a6)){return true}}}return false}function a5(a6){var a7=new Image(1,1);a7.onLoad=function(){};a7.src=M+(M.indexOf("?")<0?"?":"&")+a6}function aM(a6){try{var a8=I.XDomainRequest?new I.XDomainRequest():I.XMLHttpRequest?new I.XMLHttpRequest():I.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;a8.open("POST",M,true);a8.onreadystatechange=function(){if(this.readyState===4&&this.status!==200){a5(a6)}};a8.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");a8.send(a6)}catch(a7){a5(a6)}}function al(a8,a7){var a6=new Date();if(!aW){if(aC==="POST"){aM(a8)}else{a5(a8)}m=a6.getTime()+a7}}function aL(a6){return a1+a6+"."+aU+"."+aG}function O(){var a6=aL("testcookie");if(!b(j.cookieEnabled)){s(a6,"1");
 return G(a6)==="1"?"1":"0"}return j.cookieEnabled?"1":"0"}function aw(){aG=aj((V||aQ)+(a2||"/")).slice(0,4)}function X(){var a7=aL("cvar"),a6=G(a7);if(a6.length){a6=JSON2.parse(a6);if(n(a6)){return a6}}return{}}function L(){if(P===false){P=X()}}function aT(){var a6=new Date();aD=a6.getTime()}function U(ba,a7,a6,a9,a8,bb){s(aL("id"),ba+"."+a7+"."+a6+"."+a9+"."+a8+"."+bb,Z,a2,V,Y)}function K(){var a7=new Date(),a6=Math.round(a7.getTime()/1000),a9=G(aL("id")),a8;if(a9){a8=a9.split(".");a8.unshift("0")}else{if(!am){am=aj((j.userAgent||"")+(j.platform||"")+JSON2.stringify(aV)+a6).slice(0,16)}a8=["1",am,a6,0,a6,"",""]}return a8}function i(){var a6=G(aL("ref"));if(a6.length){try{a6=JSON2.parse(a6);if(n(a6)){return a6}}catch(a7){}}return["","",0,""]}function ah(a8,bw,bx,ba){var bu,a7=new Date(),bg=Math.round(a7.getTime()/1000),bz,bv,bc,bn,br,bf,bp,bd,bt,bb=1024,bA,bj,bq=P,bl=aL("id"),bh=aL("ses"),bi=aL("ref"),bB=aL("cvar"),bo=K(),bk=G(bh),bs=i(),by=ao||a3,be,a6;if(aW){s(bl,"",-1,a2,V);s(bh,"",-1,a2,V);
 s(bB,"",-1,a2,V);s(bi,"",-1,a2,V);return""}bz=bo[0];bv=bo[1];bn=bo[2];bc=bo[3];br=bo[4];bf=bo[5];if(!b(bo[6])){bo[6]=""}bp=bo[6];if(!b(ba)){ba=""}be=bs[0];a6=bs[1];bd=bs[2];bt=bs[3];if(!bk){bc++;bf=br;if(!an||!be.length){for(bu in ak){if(Object.prototype.hasOwnProperty.call(ak,bu)){be=p(by,ak[bu]);if(be.length){break}}}for(bu in af){if(Object.prototype.hasOwnProperty.call(af,bu)){a6=p(by,af[bu]);if(a6.length){break}}}}bA=y(aE);bj=bt.length?y(bt):"";if(bA.length&&!aB(bA)&&(!an||!bj.length||aB(bj))){bt=aE}if(bt.length||be.length){bd=bg;bs=[be,a6,bd,aY(bt.slice(0,bb))];s(bi,JSON2.stringify(bs),ap,a2,V,Y)}}a8+="&idsite="+aU+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+a7.getHours()+"&m="+a7.getMinutes()+"&s="+a7.getSeconds()+"&url="+e(aY(by))+(aE.length?"&urlref="+e(aY(aE)):"")+"&_id="+bv+"&_idts="+bn+"&_idvc="+bc+"&_idn="+bz+(be.length?"&_rcn="+e(be):"")+(a6.length?"&_rck="+e(a6):"")+"&_refts="+bd+"&_viewts="+bf+(String(bp).length?"&_ects="+bp:"")+(String(bt).length?"&_ref="+e(aY(bt.slice(0,bb))):"");