better plugin support feature

2 files changed, 5 insertions, 4 deletions

diff --git a/js/piwik.js b/js/piwik.js
index bc67640f01..fdca5f061e 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -1355,13 +1355,14 @@ if (typeof window.Piwik !== 'object') {
         function executePluginMethod(methodName, callback) {
             var result = '',
                 i,
-                pluginMethod, value;
+                pluginMethod, value, isFunction;
 
             for (i in plugins) {
                 if (Object.prototype.hasOwnProperty.call(plugins, i)) {
-                    pluginMethod = plugins[i][methodName];
+                    isFunction = plugins[i] && 'function' === typeof plugins[i][methodName];
 
-                    if (isFunction(pluginMethod)) {
+                    if (isFunction) {
+                        pluginMethod = plugins[i][methodName];
                         value = pluginMethod(callback);
                         if (value) {
                             result += value;
diff --git a/js/piwik.min.js b/js/piwik.min.js
index ca14c44899..c4be5bbc6b 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -21,7 +21,7 @@ return ag}H();default:ae=G;if(ad==45){ai=true;ad=ah.charCodeAt(++G)}if(ad>=48&&a
 if(ad=="}"){break}if(ae){if(ad==","){ad=y();if(ad=="}"){H()}}else{H()}}if(ad==","||typeof ad!="string"||(F?ad.charAt(0):ad[0])!="@"||y()!=":"){H()}ac[ad.slice(1)]=W(y())}return ac}}H()}return ad};var P=function(ae,ad,af){var ac=w(ae,ad,af);if(ac===L){delete ae[ad]}else{ae[ad]=ac}};var w=function(af,ae,ag){var ad=af[ae],ac;if(typeof ad=="object"&&ad){if(u.call(ad)==E){for(ac=ad.length;ac--;){P(ad,ac,ag)}}else{m(ad,function(ah){P(ad,ah,ag)})}}return ag.call(af,ae,ad)};V.parse=function(ae,af){var ac,ad;G=0;X=""+ae;ac=W(y());if(y()!="$"){H()}G=X=null;return af&&u.call(af)==U?w((ad={},ad[""]=ac,ad),"",af):ac}}}V.runInContext=j;return V}if(h&&!c){j(i,h)}else{var f=i.JSON,k=i.JSON3,d=false;var g=j(i,(i.JSON3={noConflict:function(){if(!d){d=true;i.JSON=f;i.JSON3=k;f=k=null}return g}}));i.JSON={parse:g.parse,stringify:g.stringify}}if(c){define(function(){return g})}}).call(this);JSON_PIWIK=a})()}if(typeof _paq!=="object"){_paq=[]}if(typeof window.Piwik!=="object"){window.Piwik=(function(){var n,a={},t={},A=document,f=navigator,R=screen,N=window,g=N.performance||N.mozPerformance||N.msPerformance||N.webkitPerformance,p=N.encodeURIComponent,M=N.decodeURIComponent,i=unescape,C=[],z,d,Y=[];
 function l(af){try{return M(af)}catch(ag){return unescape(af)}}function D(ag){var af=typeof ag;return af!=="undefined"}function v(af){return typeof af==="function"}function Q(af){return typeof af==="object"}function s(af){return typeof af==="string"||af instanceof String}function w(ag){if(!ag){return true}var af;var ah=true;for(af in ag){if(Object.prototype.hasOwnProperty.call(ag,af)){ah=false}}return ah}function ab(af){if(console!==undefined&&console&&console.error){console.error(af)}}function X(){var ak,aj,am,ag,af;for(ak=0;ak<arguments.length;ak+=1){af=null;if(arguments[ak]&&arguments[ak].slice){af=arguments[ak].slice()}ag=arguments[ak];am=ag.shift();var al,ah;var ai=s(am)&&am.indexOf("::")>0;if(ai){al=am.split("::");ah=al[0];am=al[1];if("object"===typeof d[ah]&&"function"===typeof d[ah][am]){d[ah][am].apply(d[ah],ag)}else{if(af){Y.push(af)}}}else{for(aj=0;aj<C.length;aj++){if(s(am)){ah=C[aj];var an=am.indexOf(".")>0;if(an){al=am.split(".");if(ah&&"object"===typeof ah[al[0]]){ah=ah[al[0]];
 am=al[1]}else{if(af){Y.push(af);break}}}if(ah[am]){ah[am].apply(ah,ag)}else{var ao="The method '"+am+'\' was not found in "_paq" variable.  Please have a look at the Piwik tracker documentation: http://developer.piwik.org/api-reference/tracking-javascript';ab(ao);if(!an){throw new TypeError(ao)}}if(am==="addTracker"){break}if(am==="setTrackerUrl"||am==="setSiteId"){break}}else{am.apply(C[aj],ag)}}}}}function ae(ai,ah,ag,af){if(ai.addEventListener){ai.addEventListener(ah,ag,af);return true}if(ai.attachEvent){return ai.attachEvent("on"+ah,ag)}ai["on"+ah]=ag}function j(af){if(A.readyState==="complete"){af()}else{if(N.addEventListener){N.addEventListener("load",af)}else{if(N.attachEvent){N.attachEvent("onload",af)}}}}function m(ai){var af=false;if(A.attachEvent){af=A.readyState==="complete"}else{af=A.readyState!=="loading"}if(af){ai();return}var ah;if(A.addEventListener){ae(A,"DOMContentLoaded",function ag(){A.removeEventListener("DOMContentLoaded",ag,false);if(!af){af=true;ai()}})}else{if(A.attachEvent){A.attachEvent("onreadystatechange",function ag(){if(A.readyState==="complete"){A.detachEvent("onreadystatechange",ag);
-if(!af){af=true;ai()}}});if(A.documentElement.doScroll&&N===N.top){(function ag(){if(!af){try{A.documentElement.doScroll("left")}catch(aj){setTimeout(ag,0);return}af=true;ai()}}())}}}ae(N,"load",function(){if(!af){af=true;ai()}},false)}function U(ag,ak){var af="",ai,ah,aj;for(ai in a){if(Object.prototype.hasOwnProperty.call(a,ai)){ah=a[ai][ag];if(v(ah)){aj=ah(ak);if(aj){af+=aj}}}}return af}function Z(){var af;U("unload");if(n){do{af=new Date()}while(af.getTimeAlias()<n)}}function k(ah,ag){var af=A.createElement("script");af.type="text/javascript";af.src=ah;if(af.readyState){af.onreadystatechange=function(){var ai=this.readyState;if(ai==="loaded"||ai==="complete"){af.onreadystatechange=null;ag()}}}else{af.onload=ag}A.getElementsByTagName("head")[0].appendChild(af)}function E(){var af="";try{af=N.top.document.referrer}catch(ah){if(N.parent){try{af=N.parent.document.referrer}catch(ag){af=""}}}if(af===""){af=A.referrer}return af}function o(af){var ah=new RegExp("^([a-z]+):"),ag=ah.exec(af);
+if(!af){af=true;ai()}}});if(A.documentElement.doScroll&&N===N.top){(function ag(){if(!af){try{A.documentElement.doScroll("left")}catch(aj){setTimeout(ag,0);return}af=true;ai()}}())}}}ae(N,"load",function(){if(!af){af=true;ai()}},false)}function U(ag,al){var af="",ai,ah,aj,ak;for(ai in a){if(Object.prototype.hasOwnProperty.call(a,ai)){ak=a[ai]&&"function"===typeof a[ai][ag];if(ak){ah=a[ai][ag];aj=ah(al);if(aj){af+=aj}}}}return af}function Z(){var af;U("unload");if(n){do{af=new Date()}while(af.getTimeAlias()<n)}}function k(ah,ag){var af=A.createElement("script");af.type="text/javascript";af.src=ah;if(af.readyState){af.onreadystatechange=function(){var ai=this.readyState;if(ai==="loaded"||ai==="complete"){af.onreadystatechange=null;ag()}}}else{af.onload=ag}A.getElementsByTagName("head")[0].appendChild(af)}function E(){var af="";try{af=N.top.document.referrer}catch(ah){if(N.parent){try{af=N.parent.document.referrer}catch(ag){af=""}}}if(af===""){af=A.referrer}return af}function o(af){var ah=new RegExp("^([a-z]+):"),ag=ah.exec(af);
 return ag?ag[1]:null}function c(af){var ah=new RegExp("^(?:(?:https?|ftp):)/*(?:[^@]+@)?([^:/#]+)"),ag=ah.exec(af);return ag?ag[1]:af}function P(ah,ag){var af="[\\?&#]"+ag+"=([^&#]*)";var aj=new RegExp(af);var ai=aj.exec(ah);return ai?M(ai[1]):""}function y(af){return unescape(p(af))}function ad(av){var ah=function(aB,aA){return(aB<<aA)|(aB>>>(32-aA))},aw=function(aD){var aB="",aC,aA;for(aC=7;aC>=0;aC--){aA=(aD>>>(aC*4))&15;aB+=aA.toString(16)}return aB},ak,ay,ax,ag=[],ao=1732584193,am=4023233417,al=2562383102,aj=271733878,ai=3285377520,au,at,ar,aq,ap,az,af,an=[];av=y(av);af=av.length;for(ay=0;ay<af-3;ay+=4){ax=av.charCodeAt(ay)<<24|av.charCodeAt(ay+1)<<16|av.charCodeAt(ay+2)<<8|av.charCodeAt(ay+3);an.push(ax)}switch(af&3){case 0:ay=2147483648;break;case 1:ay=av.charCodeAt(af-1)<<24|8388608;break;case 2:ay=av.charCodeAt(af-2)<<24|av.charCodeAt(af-1)<<16|32768;break;case 3:ay=av.charCodeAt(af-3)<<24|av.charCodeAt(af-2)<<16|av.charCodeAt(af-1)<<8|128;break}an.push(ay);while((an.length&15)!==14){an.push(0)
 }an.push(af>>>29);an.push((af<<3)&4294967295);for(ak=0;ak<an.length;ak+=16){for(ay=0;ay<16;ay++){ag[ay]=an[ak+ay]}for(ay=16;ay<=79;ay++){ag[ay]=ah(ag[ay-3]^ag[ay-8]^ag[ay-14]^ag[ay-16],1)}au=ao;at=am;ar=al;aq=aj;ap=ai;for(ay=0;ay<=19;ay++){az=(ah(au,5)+((at&ar)|(~at&aq))+ap+ag[ay]+1518500249)&4294967295;ap=aq;aq=ar;ar=ah(at,30);at=au;au=az}for(ay=20;ay<=39;ay++){az=(ah(au,5)+(at^ar^aq)+ap+ag[ay]+1859775393)&4294967295;ap=aq;aq=ar;ar=ah(at,30);at=au;au=az}for(ay=40;ay<=59;ay++){az=(ah(au,5)+((at&ar)|(at&aq)|(ar&aq))+ap+ag[ay]+2400959708)&4294967295;ap=aq;aq=ar;ar=ah(at,30);at=au;au=az}for(ay=60;ay<=79;ay++){az=(ah(au,5)+(at^ar^aq)+ap+ag[ay]+3395469782)&4294967295;ap=aq;aq=ar;ar=ah(at,30);at=au;au=az}ao=(ao+au)&4294967295;am=(am+at)&4294967295;al=(al+ar)&4294967295;aj=(aj+aq)&4294967295;ai=(ai+ap)&4294967295}az=aw(ao)+aw(am)+aw(al)+aw(aj)+aw(ai);return az.toLowerCase()}function T(ah,af,ag){if(!ah){ah=""}if(!af){af=""}if(ah==="translate.googleusercontent.com"){if(ag===""){ag=af}af=P(af,"u");
 ah=c(af)}else{if(ah==="cc.bingj.com"||ah==="webcache.googleusercontent.com"||ah.slice(0,5)==="74.6."){af=A.links[0].href;ah=c(af)}}return[ah,af,ag]}function F(ag){var af=ag.length;if(ag.charAt(--af)==="."){ag=ag.slice(0,af)}if(ag.slice(0,2)==="*."){ag=ag.slice(1)}if(ag.indexOf("/")!==-1){ag=ag.substr(0,ag.indexOf("/"))}return ag}function ac(ag){ag=ag&&ag.text?ag.text:ag;if(!s(ag)){var af=A.getElementsByTagName("title");if(af&&D(af[0])){ag=af[0].text}}return ag}function J(af){if(!af){return[]}if(!D(af.children)&&D(af.childNodes)){return af.children}if(D(af.children)){return af.children}return[]}function O(ag,af){if(!ag||!af){return false}if(ag.contains){return ag.contains(af)}if(ag===af){return true}if(ag.compareDocumentPosition){return !!(ag.compareDocumentPosition(af)&16)}return false}function G(ah,ai){if(ah&&ah.indexOf){return ah.indexOf(ai)}if(!D(ah)||ah===null){return -1}if(!ah.length){return -1}var af=ah.length;if(af===0){return -1}var ag=0;while(ag<af){if(ah[ag]===ai){return ag}ag++