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

"an other small fix for egw_vfs::concat"

Browse Source
This commit is contained in:
Ralf Becker 2008-10-01 18:02:23 +00:00
parent 0baa7f22e3
commit c38cb2da76
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_vfs.inc.php
View File

@ -927,7 +927,7 @@ class egw_vfs extends vfs_stream_wrapper
} }
/** /**
* Concat a relative path to an url, taking into account, that the url might already end with a slash * Concat a relative path to an url, taking into account, that the url might already end with a slash or the path starts with one or is empty
* *
* @param string $url base url or path, might end in a / * @param string $url base url or path, might end in a /
* @param string $relative relative path to add to $url * @param string $relative relative path to add to $url
@ -936,7 +936,8 @@ class egw_vfs extends vfs_stream_wrapper
static function concat($url,$relative) static function concat($url,$relative)
{ {
list($url,$query) = explode('?',$url,2); list($url,$query) = explode('?',$url,2);
return (substr($url,-1) == '/' ? $url.$relative : $url.'/'.$relative).($query ? '?'.$query : ''); if (substr($url,-1) == '/') $url = substr($url,0,-1);
return ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative).($query ? '?'.$query : '');
} }
/** /**