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

fixed egroupware.org bug #3002: PHP Warning: mb_strpos() in class.egw_session.inc.php on line 1081

Browse Source
This commit is contained in:
Ralf Becker 2011-07-03 06:54:32 +00:00
parent a89430ae8e
commit a7aef6a4da
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1078,15 +1078,16 @@ class egw_session
}
// append the url to the webserver url, but avoid more then one slash between the parts of the url
if (($url[0] != '/' || $GLOBALS['egw_info']['server']['webserver_url'] != '/') && strpos($url, $GLOBALS['egw_info']['server']['webserver_url']) === false)
$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
if (($url[0] != '/' || $webserver_url != '/') && (!$webserver_url || strpos($url, $webserver_url) === false))
{
if($url[0] != '/' && substr($GLOBALS['egw_info']['server']['webserver_url'],-1) != '/')
if($url[0] != '/' && substr($webserver_url,-1) != '/')
{
$url = $GLOBALS['egw_info']['server']['webserver_url'] .'/'. $url;
$url = $webserver_url .'/'. $url;
}
else
{
$url = $GLOBALS['egw_info']['server']['webserver_url'] . $url;
$url = $webserver_url . $url;
}
}