Merge branch 'master' into highlighter

This commit is contained in:
Jeremy Lindgren
2013-04-15 09:09:12 -05:00
31 changed files with 8852 additions and 181 deletions

View File

@@ -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;