Merge branch 'master' into highlighter

2013-04-16 23:07:03 -05:00
parent 83f6d853e0 bec7ae8c95
commit 3cd664c25c
22 changed files with 8514 additions and 81 deletions
--- a/code/map_data.js
+++ b/code/map_data.js
@ -266,7 +266,7 @@ window.renderPortal = function(ent) {
    u = u || oo.level !== portalLevel;

    // Allow plugins to add additional conditions as to when a portal gets re-rendered
-    var hookData = {portal: ent[2], oldPortal: oo.details, reRender: false};
+    var hookData = {portal: ent[2], oldPortal: oo.details, portalGuid: ent[0], reRender: false};
    runHooks('beforePortalReRender', hookData);
    u = u || hookData.reRender;