From b5d5a38b1d9417c2b6f383d6ecf649b80e81b840 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 25 Jul 2011 15:53:53 +0000 Subject: [PATCH] patch to fix problem with ->not able to see mail<- egw_instant_load.html not found. provided by Vladimir Kolobkov; --- phpgwapi/inc/class.egw_session.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php index 4af1b7fd8b..755e6dcb93 100644 --- a/phpgwapi/inc/class.egw_session.inc.php +++ b/phpgwapi/inc/class.egw_session.inc.php @@ -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 $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) != '/') {