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

patch to fix problem with ->not able to see mail<- egw_instant_load.html not found. provided by Vladimir Kolobkov; Thanks a lot

Browse Source
This commit is contained in:
Klaus Leithoff 2011-07-25 15:52:22 +00:00
parent f297d65790
commit 45468c801a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.egw_session.inc.php
View File

@ -1079,7 +1079,9 @@ class egw_session
// append the url to the webserver url, but avoid more then one slash between the parts of the url // append the url to the webserver url, but avoid more then one slash between the parts of the url
$webserver_url = $GLOBALS['egw_info']['server']['webserver_url']; $webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
if (($url[0] != '/' || $webserver_url != '/') && (!$webserver_url || strpos($url, $webserver_url) === false)) // patch inspired by vladimir kolobkov -> we should not try to match the webserver url against the url without '/' as delimiter,
// as $webserver_url may be part of $url (as /egw is part of phpgwapi/js/egw_instant_load.html)
if (($url[0] != '/' || $webserver_url != '/') && (!$webserver_url || strpos($url, $webserver_url.'/') === false))
{ {
if($url[0] != '/' && substr($webserver_url,-1) != '/') if($url[0] != '/' && substr($webserver_url,-1) != '/')
{ {