extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-03 01:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Stylite Bug #1136 - Problem with login in stylite template. Added abbility to 10.1 to be an guest instance in another egw instance.

Browse Source
This commit is contained in:
Andreas Stöckel 2011-01-13 20:28:09 +00:00
parent f17945b493
commit ccf3b8ca42
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdots/inc/class.jdots_framework.inc.php
View File

@ -489,7 +489,16 @@ class jdots_framework extends egw_framework
return '<script type="text/javascript">
if (typeof window.parent.framework != "undefined")
{
var napp = window.parent.framework.getApplicationByName("'.$app.'");
var napp = null;
if (typeof window.egw_app != "undefined")
{
napp = window.egw_app;
}
else
{
napp = window.parent.framework.getApplicationByName("'.$app.'");
}
window.parent.framework.setSidebox(napp,'.$sidebox.',"'.$md5.'");
}
</script>';
@ -820,7 +829,7 @@ class jdots_framework extends egw_framework
//whether the $active_tab really exists in the $apps array.
if ($active_tab && array_key_exists($active_tab, $apps))
{
$apps[$active_tab]['openOnce'] = str_replace('&cd=yes','',$url);
$apps[$active_tab]['openOnce'] = preg_replace('/[&?]cd=yes/','',$url);
$store_prefs = true;
}
else