bugfix: Type mismatched while reporting uid (#17252)

2 files changed, 3 insertions, 3 deletions

diff --git a/js/piwik.js b/js/piwik.js
index 68a7dae957..227e3472f2 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -3647,7 +3647,7 @@ if (typeof window.Matomo !== 'object') {
                     '&h=' + now.getHours() + '&m=' + now.getMinutes() + '&s=' + now.getSeconds() +
                     '&url=' + encodeWrapper(purify(currentUrl)) +
                     (configReferrerUrl.length ? '&urlref=' + encodeWrapper(purify(configReferrerUrl)) : '') +
-                    ((configUserId && configUserId.length) ? '&uid=' + encodeWrapper(configUserId) : '') +
+                    (isNumberOrHasLength(configUserId) ? '&uid=' + encodeWrapper(configUserId) : '') +
                     '&_id=' + cookieVisitorIdValues.uuid +
 
                     '&_idn=' + cookieVisitorIdValues.newVisitor + // currently unused
diff --git a/js/piwik.min.js b/js/piwik.min.js
index 92a144c9ef..6927e03dd9 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -40,7 +40,7 @@ an(S,"blur",az);ab++;t.addPlugin("HeartBeat"+ab,{unload:function(){if(aO&&dc()){
 if(dm.length===32&&dk.test(dm)){var dj=dm.substr(16,32);if(c2(dj)){var dl=dm.substr(0,16);return dl}}return""}function cO(){if(!bP){bP=dg(bO)}var dk=new Date(),di=Math.round(dk.getTime()/1000),dj=aU("id"),dn=aD(dj),dm,dl;if(dn){dm=dn.split(".");dm.unshift("0");if(bP.length){dm[1]=bP}return dm}if(bP.length){dl=bP}else{if("0"===b6()){dl=""}else{dl=cR()}}dm=["1",dl,di];return dm}function aZ(){var dl=cO(),dj=dl[0],dk=dl[1],di=dl[2];return{newVisitor:dj,uuid:dk,createTs:di}}function aH(){var dl=new Date(),dj=dl.getTime(),dm=aZ().createTs;var di=parseInt(dm,10);var dk=(di*1000)+cK-dj;return dk}function aN(di){if(!b7){return}var dk=new Date(),dj=Math.round(dk.getTime()/1000);if(!J(di)){di=aZ()}var dl=di.uuid+"."+di.createTs+".";dd(aU("id"),dl,aH(),br,cX,bT,aJ)}function bN(){var di=aD(aU("ref"));if(di.length){try{di=S.JSON.parse(di);if(V(di)){return di}}catch(dj){}}return["","",0,""]}function by(dj){var di="testvalue";dd("test",di,10000,null,dj,bT,aJ);if(aD("test")===di){bZ("test",null,dj);return true
 }return false}function aF(){var dj=bn;bn=false;var di,dk;for(di=0;di<bw.length;di++){dk=aU(bw[di]);if(dk!==cM&&dk!==be&&0!==aD(dk)){bZ(dk,br,cX)}}bn=dj}function b4(di){b7=di}function dh(dm){if(!dm||!V(dm)){return}var dl=[];var dk;for(dk in dm){if(Object.prototype.hasOwnProperty.call(dm,dk)){dl.push(dk)}}var dn={};dl.sort();var di=dl.length;var dj;for(dj=0;dj<di;dj++){dn[dl[dj]]=dm[dl[dj]]}return dn}function cd(){dd(aU("ses"),"1",cn,br,cX,bT,aJ)}function bh(){var dl="";var dj="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dk=dj.length;var di;for(di=0;di<6;di++){dl+=dj.charAt(Math.floor(Math.random()*dk))}return dl}function aA(dj){if(!h){return dj}var dk=(typeof h.getEntriesByType==="function")&&h.getEntriesByType("navigation")?h.getEntriesByType("navigation")[0]:h.timing;if(!dk){return dj}var di="";if(dk.connectEnd&&dk.fetchStart){if(dk.connectEnd<dk.fetchStart){return}di+="&pf_net="+(dk.connectEnd-dk.fetchStart)}if(dk.responseStart&&dk.requestStart){if(dk.responseStart<dk.requestStart){return
 }di+="&pf_srv="+(dk.responseStart-dk.requestStart)}if(dk.responseStart&&dk.responseEnd){if(dk.responseEnd<dk.responseStart){return}di+="&pf_tfr="+(dk.responseEnd-dk.responseStart)}if(dk.domInteractive&&dk.domLoading){if(dk.domInteractive<dk.domLoading){return}di+="&pf_dm1="+(dk.domInteractive-dk.domLoading)}if(dk.domComplete&&dk.domInteractive){if(dk.domComplete<dk.domInteractive){return}di+="&pf_dm2="+(dk.domComplete-dk.domInteractive)}if(dk.loadEventEnd&&dk.loadEventStart){if(dk.loadEventEnd<dk.loadEventStart){return}di+="&pf_onl="+(dk.loadEventEnd-dk.loadEventStart)}return dj+di}function cr(dk,dF,dG){var dE,dj=new Date(),ds=Math.round(dj.getTime()/1000),dp,dC,dl=1024,dL,dt,dB=aR,dm=aU("ses"),dz=aU("ref"),dw=aU("cvar"),dx=aD(dm),dD=bN(),dH=a5||bO,dq,di;if(bn){aF()}if(cQ){return""}var dy=aZ();var dv=G.characterSet||G.charset;if(!dv||dv.toLowerCase()==="utf-8"){dv=null}dq=dD[0];di=dD[1];dp=dD[2];dC=dD[3];if(!dx){if(!bx||!dq.length){for(dE in cp){if(Object.prototype.hasOwnProperty.call(cp,dE)){dq=e(dH,cp[dE]);
-if(dq.length){break}}}for(dE in bI){if(Object.prototype.hasOwnProperty.call(bI,dE)){di=e(dH,bI[dE]);if(di.length){break}}}}dL=d(bp);dt=dC.length?d(dC):"";if(dL.length&&!aW(dL)&&(!bx||!dt.length||aW(dt))){dC=bp}if(dC.length||dq.length){dp=ds;dD=[dq,di,dp,b3(dC.slice(0,dl))];dd(dz,S.JSON.stringify(dD),c5,br,cX,bT,aJ)}}dk+="&idsite="+b7+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dj.getHours()+"&m="+dj.getMinutes()+"&s="+dj.getSeconds()+"&url="+s(b3(dH))+(bp.length?"&urlref="+s(b3(bp)):"")+((bA&&bA.length)?"&uid="+s(bA):"")+"&_id="+dy.uuid+"&_idn="+dy.newVisitor+(dq.length?"&_rcn="+s(dq):"")+(di.length?"&_rck="+s(di):"")+"&_refts="+dp+(String(dC).length?"&_ref="+s(b3(dC.slice(0,dl))):"")+(dv?"&cs="+s(dv):"")+"&send_image=0";var dK=cI();for(dE in dK){if(Object.prototype.hasOwnProperty.call(dK,dE)){dk+="&"+dE+"="+dK[dE]}}var dJ=[];if(dF){for(dE in dF){if(Object.prototype.hasOwnProperty.call(dF,dE)&&/^dimension\d+$/.test(dE)){var dn=dE.replace("dimension","");dJ.push(parseInt(dn,10));dJ.push(String(dn));
+if(dq.length){break}}}for(dE in bI){if(Object.prototype.hasOwnProperty.call(bI,dE)){di=e(dH,bI[dE]);if(di.length){break}}}}dL=d(bp);dt=dC.length?d(dC):"";if(dL.length&&!aW(dL)&&(!bx||!dt.length||aW(dt))){dC=bp}if(dC.length||dq.length){dp=ds;dD=[dq,di,dp,b3(dC.slice(0,dl))];dd(dz,S.JSON.stringify(dD),c5,br,cX,bT,aJ)}}dk+="&idsite="+b7+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dj.getHours()+"&m="+dj.getMinutes()+"&s="+dj.getSeconds()+"&url="+s(b3(dH))+(bp.length?"&urlref="+s(b3(bp)):"")+(Y(bA)?"&uid="+s(bA):"")+"&_id="+dy.uuid+"&_idn="+dy.newVisitor+(dq.length?"&_rcn="+s(dq):"")+(di.length?"&_rck="+s(di):"")+"&_refts="+dp+(String(dC).length?"&_ref="+s(b3(dC.slice(0,dl))):"")+(dv?"&cs="+s(dv):"")+"&send_image=0";var dK=cI();for(dE in dK){if(Object.prototype.hasOwnProperty.call(dK,dE)){dk+="&"+dE+"="+dK[dE]}}var dJ=[];if(dF){for(dE in dF){if(Object.prototype.hasOwnProperty.call(dF,dE)&&/^dimension\d+$/.test(dE)){var dn=dE.replace("dimension","");dJ.push(parseInt(dn,10));dJ.push(String(dn));
 dk+="&"+dE+"="+s(dF[dE]);delete dF[dE]}}}if(dF&&B(dF)){dF=null}for(dE in cs){if(Object.prototype.hasOwnProperty.call(cs,dE)){dk+="&"+dE+"="+s(cs[dE])}}for(dE in bo){if(Object.prototype.hasOwnProperty.call(bo,dE)){var du=(-1===M(dJ,dE));if(du){dk+="&dimension"+dE+"="+s(bo[dE])}}}if(dF){dk+="&data="+s(S.JSON.stringify(dF))}else{if(ao){dk+="&data="+s(S.JSON.stringify(ao))}}function dr(dM,dN){var dO=S.JSON.stringify(dM);if(dO.length>2){return"&"+dN+"="+s(dO)}return""}var dI=dh(bX);var dA=dh(cm);dk+=dr(dI,"cvar");dk+=dr(dA,"e_cvar");if(aR){dk+=dr(aR,"_cvar");for(dE in dB){if(Object.prototype.hasOwnProperty.call(dB,dE)){if(aR[dE][0]===""||aR[dE][1]===""){delete aR[dE]}}}if(bR){dd(dw,S.JSON.stringify(aR),cn,br,cX,bT,aJ)}}if(a3&&bG&&!bi){dk=aA(dk);bi=true}if(aM){dk+="&pv_id="+aM}aN(dy);cd();dk+=ac(dG,{tracker:bK,request:dk});if(cZ.length){dk+="&"+cZ}if(A(cc)){dk=cc(dk)}return dk}bS=function a8(){var di=new Date();di=di.getTime();if(!cY){return false}if(cY+a6<=di){bK.ping();return true}return false
 };function bs(dl,dk,dq,dm,di,dt){var dp="idgoal=0",dj=new Date(),dr=[],ds,dn=String(dl).length;if(dn){dp+="&ec_id="+s(dl)}dp+="&revenue="+dk;if(String(dq).length){dp+="&ec_st="+dq}if(String(dm).length){dp+="&ec_tx="+dm}if(String(di).length){dp+="&ec_sh="+di}if(String(dt).length){dp+="&ec_dt="+dt}if(c0){for(ds in c0){if(Object.prototype.hasOwnProperty.call(c0,ds)){if(!J(c0[ds][1])){c0[ds][1]=""}if(!J(c0[ds][2])){c0[ds][2]=""}if(!J(c0[ds][3])||String(c0[ds][3]).length===0){c0[ds][3]=0}if(!J(c0[ds][4])||String(c0[ds][4]).length===0){c0[ds][4]=1}dr.push(c0[ds])}}dp+="&ec_items="+s(S.JSON.stringify(dr))}dp=cr(dp,ao,"ecommerce");bH(dp,bL);if(dn){c0={}}}function b0(di,dm,dl,dk,dj,dn){if(String(di).length&&J(dm)){bs(di,dm,dl,dk,dj,dn)}}function bu(di){if(J(di)){bs("",di,"","","","")}}function b1(dj,dl,dk){aM=bh();var di=cr("action_name="+s(al(dj||bk)),dl,"log");if(!bi){di=aA(di)}bH(di,bL,dk)}function a1(dk,dj){var dl,di="(^| )(piwik[_-]"+dj+"|matomo[_-]"+dj;if(dk){for(dl=0;dl<dk.length;dl++){di+="|"+dk[dl]
 }}di+=")( |$)";return new RegExp(di)}function aV(di){return(aE&&di&&0===String(di).indexOf(aE))}function cu(dm,di,dn,dj){if(aV(di)){return 0}var dl=a1(bM,"download"),dk=a1(a9,"link"),dp=new RegExp("\\.("+c6.join("|")+")([?&#]|$)","i");if(dk.test(dm)){return"link"}if(dj||dl.test(dm)||dp.test(di)){return"download"}if(dn){return 0}return"link"}function au(dj){var di;di=dj.parentNode;while(di!==null&&J(di)){if(ae.isLinkElement(dj)){break}dj=di;di=dj.parentNode}return dj}function db(dn){dn=au(dn);if(!ae.hasNodeAttribute(dn,"href")){return}if(!J(dn.href)){return}var dm=ae.getAttributeValueFromNode(dn,"href");var dj=dn.pathname||cl(dn.href);var dp=dn.hostname||d(dn.href);var dq=dp.toLowerCase();var dk=dn.href.replace(dp,dq);var dl=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");if(!dl.test(dk)){var di=cu(dn.className,dk,ar(dq,dj),ae.hasNodeAttribute(dn,"download"));if(di){return{type:di,href:dk}}}}function aQ(di,dj,dk,dl){var dm=v.buildInteractionRequestParams(di,dj,dk,dl);
@@ -70,4 +70,4 @@ function ad(aq,ap){var ao=new P(aq,ap);I.push(ao);_paq=c(_paq,C);for(E=0;E<_paq.
 (function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.matomoPluginAsyncInit&&window.matomoPluginAsyncInit.length){var a=0;
 for(a;a<window.matomoPluginAsyncInit.length;a++){if(typeof window.matomoPluginAsyncInit[a]==="function"){window.matomoPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(window&&window.matomoAsyncInit){window.matomoAsyncInit()}if(!window.Matomo.getAsyncTrackers().length){if(b()){window.Matomo.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Matomo.trigger("MatomoInitialized",[]);window.Matomo.initialized=true}());(function(){var a=(typeof window.AnalyticsTracker);if(a==="undefined"){window.AnalyticsTracker=window.Matomo}}());
 if(typeof window.piwik_log!=="function"){window.piwik_log=function(c,e,g,f){function b(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var d,a=window.Matomo.getTracker(g,e);a.setDocumentTitle(c);a.setCustomData(f);d=b("tracker_pause");if(d){a.setLinkTrackingTimer(d)}d=b("download_extensions");if(d){a.setDownloadExtensions(d)}d=b("hosts_alias");if(d){a.setDomains(d)}d=b("ignore_classes");if(d){a.setIgnoreClasses(d)}a.trackPageView();if(b("install_tracker")){piwik_track=function(i,j,k,h){a.setSiteId(j);a.setTrackerUrl(k);a.trackLink(i,h)};a.enableLinkTracking()}}}
-/*!! @license-end */;
\ No newline at end of file
+/*!! @license-end */;