holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change egw.open() (which accepts _blank, _self, etc. as targets) to not pass invalid parameters to egw_link_handler() (which only accepts app names).

Browse Source
This commit is contained in:
Nathan Gray 2013-07-15 16:03:37 +00:00
parent 30d6d76d7a
commit 744345d751
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/js/jsapi/egw_open.js
View File

@ -157,8 +157,13 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
return _wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1],false,false,true);
}
else if (typeof _wnd.egw_link_handler == 'function' && (typeof target == 'undefined' || target =='_self'))
else if (typeof _wnd.egw_link_handler == 'function' && (typeof _target == 'undefined' || _target =='_self' || typeof this.link_app_list()[_target] != "undefined"))
{
if(_target == '_self')
{
// '_self' isn't allowed, but we can handle it
_target = undefined;
}
// Use framework's link handler, if present
return _wnd.egw_link_handler(url,_target);
}