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

Fix wiki links did not load properly after login if your session was expired

Browse Source
This commit is contained in:
nathangray 2018-01-24 10:28:34 -07:00
parent f20b101dbe
commit 670b74cf23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Framework/Ajax.php
View File

@ -552,7 +552,7 @@ abstract class Ajax extends Api\Framework
$link = preg_replace("/^(javascript:egw_link_handler\(')(.*)menuaction=([^&]+)(.*)(','[^']+'\))$/",
'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=' . ($ajax[1] ? $ajax[1] : 'true') .'\',\'admin\')', $file_was=$link);
}
}
$this->sideboxes[$appname][$menu_title] = $file;
@ -865,8 +865,8 @@ abstract class Ajax extends Api\Framework
else if (strpos($url, 'menuaction') > 0)
{
// Coming in with a specific URL, save it and redirect to index.php
// so reloads work nicely
$last_direct_url = $url;
// so reloads work nicely, but strip cd=yes or we'll get the framework again
$last_direct_url = preg_replace('/[&?]cd=yes/','',$url);
Api\Framework::redirect_link('/index.php?cd=yes');
}
else