Merge branch '3.x-dev' into 3.0-m06

Conflicts:
	js/piwik.min.js
	piwik.js

2 files changed, 2 insertions, 2 deletions

diff --git a/js/piwik.js b/js/piwik.js
index 9a135e5edc..658db1580c 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -4689,7 +4689,7 @@ if (typeof window.Piwik !== 'object') {
 
                 var request = getRequest(linkParams, customData, 'link');
 
-                sendRequest(request, (callback ? 0 : configTrackerPause), callback);
+                sendRequest(request, configTrackerPause, callback);
             }
 
             /*
diff --git a/js/piwik.min.js b/js/piwik.min.js
index 002e4cb757..961e829840 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -51,7 +51,7 @@ if(!cF.test(cE)){var cC=bY(cH.className,cE,af(cJ,cD),U.hasNodeAttribute(cH,"down
 if(cE&&cE.name===cD.name&&cE.piece===cD.piece&&cE.target===cD.target){return true}}return false}function bc(cF){if(!cF){return false}var cI=p.findTargetNode(cF);if(!cI||p.shouldIgnoreInteraction(cI)){return false}var cJ=cw(cI);if(cu&&cJ&&cJ.type){return false}if(U.isLinkElement(cI)&&U.hasNodeAttributeWithValue(cI,"href")){var cC=String(U.getAttributeValueFromNode(cI,"href"));if(0===cC.indexOf("#")){return false}if(aB(cC)){return true}if(!p.isUrlToCurrentDomain(cC)){return false}var cG=p.buildContentBlock(cF);if(!cG){return}var cE=cG.name;var cK=cG.piece;var cH=cG.target;if(!U.hasNodeAttributeWithValue(cI,p.CONTENT_TARGET_ATTR)||cI.wasContentTargetAttrReplaced){cI.wasContentTargetAttrReplaced=true;cH=p.toAbsoluteUrl(cC);U.setAnyAttribute(cI,p.CONTENT_TARGET_ATTR,cH)}var cD=cc(cC,"click",cE,cK,cH);p.setHrefAttribute(cI,cD);return true}return false}function au(cD){if(!cD||!cD.length){return}var cC;for(cC=0;cC<cD.length;cC++){bc(cD[cC])}}function aF(cC){return function(cD){if(!cC){return}var cG=p.findParentContentNode(cC);
 var cH;if(cD){cH=cD.target||cD.srcElement}if(!cH){cH=cC}if(!aQ(cG,cH)){return}bM(bg);if(U.isLinkElement(cC)&&U.hasNodeAttributeWithValue(cC,"href")&&U.hasNodeAttributeWithValue(cC,p.CONTENT_TARGET_ATTR)){var cE=U.getAttributeValueFromNode(cC,"href");if(!aB(cE)&&cC.wasContentTargetAttrReplaced){U.setAnyAttribute(cC,p.CONTENT_TARGET_ATTR,"")}}var cL=cw(cC);if(ad&&cL&&cL.type){return cL.type}if(bc(cG)){return"href"}var cI=p.buildContentBlock(cG);if(!cI){return}var cF=cI.name;var cM=cI.piece;var cK=cI.target;var cJ=aw("click",cF,cM,cK);bd(cJ,bg);return cJ}}function bx(cE){if(!cE||!cE.length){return}var cC,cD;for(cC=0;cC<cE.length;cC++){cD=p.findTargetNode(cE[cC]);if(cD&&!cD.contentInteractionTrackingSetupDone){cD.contentInteractionTrackingSetupDone=true;aa(cD,"click",aF(cD))}}}function a7(cE,cF){if(!cE||!cE.length){return[]}var cC,cD;for(cC=0;cC<cE.length;cC++){if(aD(cE[cC])){cE.splice(cC,1);cC--}else{bG.push(cE[cC])}}if(!cE||!cE.length){return[]}au(cF);bx(cF);var cG=[];for(cC=0;cC<cE.length;
 cC++){cD=bX(p.buildImpressionRequestParams(cE[cC].name,cE[cC].piece,cE[cC].target),undefined,"contentImpressions");if(cD){cG.push(cD)}}return cG}function b3(cD){var cC=p.collectContent(cD);return a7(cC,cD)}function aO(cD){if(!cD||!cD.length){return[]}var cC;for(cC=0;cC<cD.length;cC++){if(!p.isNodeVisible(cD[cC])){cD.splice(cC,1);cC--}}if(!cD||!cD.length){return[]}return b3(cD)}function ao(cE,cC,cD){var cF=p.buildImpressionRequestParams(cE,cC,cD);return bX(cF,null,"contentImpression")}function cx(cF,cD){if(!cF){return}var cC=p.findParentContentNode(cF);var cE=p.buildContentBlock(cC);if(!cE){return}if(!cD){cD="Unknown"}return aw(cD,cE.name,cE.piece,cE.target)}function ce(cD,cF,cC,cE){return"e_c="+n(cD)+"&e_a="+n(cF)+(B(cC)?"&e_n="+n(cC):"")+(B(cE)?"&e_v="+n(cE):"")}function ah(cE,cG,cC,cF,cH){if(String(cE).length===0||String(cG).length===0){return false}var cD=bX(ce(cE,cG,cC,cF),cH,"event");bd(cD,bg)}function bF(cC,cF,cD,cG){var cE=bX("search="+n(cC)+(cF?"&search_cat="+n(cF):"")+(B(cD)?"&search_count="+cD:""),cG,"sitesearch");
-bd(cE,bg)}function ci(cC,cF,cE){var cD=bX("idgoal="+cC+(cF?"&revenue="+cF:""),cE,"goal");bd(cD,bg)}function cp(cF,cC,cJ,cI,cE){var cH=cC+"="+n(by(cF));var cD=bZ(cE,"click",cF);if(cD){cH+="&"+cD}var cG=bX(cH,cJ,"link");bd(cG,(cI?0:bg),cI)}function bp(cD,cC){if(cD!==""){return cD+cC.charAt(0).toUpperCase()+cC.slice(1)}return cC}function bN(cH){var cG,cC,cF=["","webkit","ms","moz"],cE;if(!aT){for(cC=0;cC<cF.length;cC++){cE=cF[cC];if(Object.prototype.hasOwnProperty.call(y,bp(cE,"hidden"))){if(y[bp(cE,"visibilityState")]==="prerender"){cG=true}break}}}if(cG){aa(y,cE+"visibilitychange",function cD(){y.removeEventListener(cE+"visibilitychange",cD,false);cH()});return}cH()}function ar(cC){if(y.readyState==="complete"){cC()}else{if(L.addEventListener){L.addEventListener("load",cC)}else{if(L.attachEvent){L.attachEvent("onload",cC)}}}}function aR(cF){var cC=false;if(y.attachEvent){cC=y.readyState==="complete"}else{cC=y.readyState!=="loading"}if(cC){cF();return}var cE;if(y.addEventListener){aa(y,"DOMContentLoaded",function cD(){y.removeEventListener("DOMContentLoaded",cD,false);
+bd(cE,bg)}function ci(cC,cF,cE){var cD=bX("idgoal="+cC+(cF?"&revenue="+cF:""),cE,"goal");bd(cD,bg)}function cp(cF,cC,cJ,cI,cE){var cH=cC+"="+n(by(cF));var cD=bZ(cE,"click",cF);if(cD){cH+="&"+cD}var cG=bX(cH,cJ,"link");bd(cG,bg,cI)}function bp(cD,cC){if(cD!==""){return cD+cC.charAt(0).toUpperCase()+cC.slice(1)}return cC}function bN(cH){var cG,cC,cF=["","webkit","ms","moz"],cE;if(!aT){for(cC=0;cC<cF.length;cC++){cE=cF[cC];if(Object.prototype.hasOwnProperty.call(y,bp(cE,"hidden"))){if(y[bp(cE,"visibilityState")]==="prerender"){cG=true}break}}}if(cG){aa(y,cE+"visibilitychange",function cD(){y.removeEventListener(cE+"visibilitychange",cD,false);cH()});return}cH()}function ar(cC){if(y.readyState==="complete"){cC()}else{if(L.addEventListener){L.addEventListener("load",cC)}else{if(L.attachEvent){L.attachEvent("onload",cC)}}}}function aR(cF){var cC=false;if(y.attachEvent){cC=y.readyState==="complete"}else{cC=y.readyState!=="loading"}if(cC){cF();return}var cE;if(y.addEventListener){aa(y,"DOMContentLoaded",function cD(){y.removeEventListener("DOMContentLoaded",cD,false);
 if(!cC){cC=true;cF()}})}else{if(y.attachEvent){y.attachEvent("onreadystatechange",function cD(){if(y.readyState==="complete"){y.detachEvent("onreadystatechange",cD);if(!cC){cC=true;cF()}}});if(y.documentElement.doScroll&&L===L.top){(function cD(){if(!cC){try{y.documentElement.doScroll("left")}catch(cG){setTimeout(cD,0);return}cC=true;cF()}}())}}}aa(L,"load",function(){if(!cC){cC=true;cF()}},false)}function b9(cC){var cD=cw(cC);if(cD&&cD.type){cD.href=k(cD.href);cp(cD.href,cD.type,undefined,null,cC)}}function b1(){return y.all&&!y.addEventListener}function ck(cC){var cE=cC.which;var cD=(typeof cC.button);if(!cE&&cD!=="undefined"){if(b1()){if(cC.button&1){cE=1}else{if(cC.button&2){cE=3}else{if(cC.button&4){cE=2}}}}else{if(cC.button===0||cC.button==="0"){cE=1}else{if(cC.button&1){cE=2}else{if(cC.button&2){cE=3}}}}}return cE}function bq(cC){switch(ck(cC)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aH(cC){return cC.target||cC.srcElement}function ak(cC){return function(cF){cF=cF||L.event;
 var cE=bq(cF);var cG=aH(cF);if(cF.type==="click"){var cD=false;if(cC&&cE==="middle"){cD=true}if(cG&&!cD){b9(cG)}}else{if(cF.type==="mousedown"){if(cE==="middle"&&cG){ay=cE;ba=cG}else{ay=ba=null}}else{if(cF.type==="mouseup"){if(cE===ay&&cG===ba){b9(cG)}ay=ba=null}else{if(cF.type==="contextmenu"){b9(cG)}}}}}}function ae(cD,cC){aa(cD,"click",ak(cC),false);if(cC){aa(cD,"mouseup",ak(cC),false);aa(cD,"mousedown",ak(cC),false);aa(cD,"contextmenu",ak(cC),false)}}function bb(cD){if(!ad){ad=true;var cE,cC=aG(a9,"ignore"),cF=y.links;if(cF){for(cE=0;cE<cF.length;cE++){if(!cC.test(cF[cE].className)){ae(cF[cE],cD)}}}}}function az(cE,cG,cH){if(bL){return true}bL=true;var cI=false;var cF,cD;function cC(){cI=true}ar(function(){function cJ(cL){setTimeout(function(){if(!bL){return}cI=false;cH.trackVisibleContentImpressions();cJ(cL)},cL)}function cK(cL){setTimeout(function(){if(!bL){return}if(cI){cI=false;cH.trackVisibleContentImpressions()}cK(cL)},cL)}if(cE){cF=["scroll","resize"];for(cD=0;cD<cF.length;cD++){if(y.addEventListener){y.addEventListener(cF[cD],cC)
 }else{L.attachEvent("on"+cF[cD],cC)}}cK(100)}if(cG&&cG>0){cG=parseInt(cG,10);cJ(cG)}})}function b7(){var cD,cF,cG={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cD in cG){if(Object.prototype.hasOwnProperty.call(cG,cD)){cF=f.mimeTypes[cG[cD]];ct[cD]=(cF&&cF.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&B(f.javaEnabled)&&f.javaEnabled()){ct.java="1"}if(t(L.GearsFactory)){ct.gears="1"}ct.cookie=bB()}var cE=parseInt(P.width,10);var cC=parseInt(P.height,10);ct.res=parseInt(cE,10)+"x"+parseInt(cC,10)}b7();aU();at();this.getVisitorId=function(){return aE().uuid};this.getVisitorInfo=function(){return cd()};this.getAttributionInfo=function(){return bj()};this.getAttributionCampaignName=function(){return bj()[0]