fix from sigurdne, for bug #3300 and #2740

This commit is contained in:
Ralf Becker 2003-05-01 12:49:11 +00:00
parent 21d8e8fd62
commit 52ff07f6c9

View File

@ -961,7 +961,14 @@
$lastslashpos < $baselen ? $length = 0 : $length = $lastslashpos - $baselen; $lastslashpos < $baselen ? $length = 0 : $length = $lastslashpos - $baselen;
$extra_path = $rarray['fake_extra_path'] = $rarray['real_extra_path'] = substr ($string, strlen ($base), $length); $extra_path = $rarray['fake_extra_path'] = $rarray['real_extra_path'] = substr ($string, strlen ($base), $length);
if($string[1] != ':')
{
$name = $rarray['fake_name'] = $rarray['real_name'] = substr ($string, strrpos ($string, $base_sep) + 1); $name = $rarray['fake_name'] = $rarray['real_name'] = substr ($string, strrpos ($string, $base_sep) + 1);
}
else
{
$name = $rarray['fake_name'] = $rarray['real_name'] = $string;
}
if ($fake) if ($fake)
{ {
@ -986,8 +993,15 @@
} }
} }
else else
{
if($rarray['fake_name'][1] != ':')
{ {
$rarray['fake_full_path'] = $opp_base . $rarray['fake_extra_path'] . '/' . $rarray['fake_name']; $rarray['fake_full_path'] = $opp_base . $rarray['fake_extra_path'] . '/' . $rarray['fake_name'];
}
else
{
$rarray['fake_full_path'] = $rarray['fake_name'];
}
if ($extra_path) if ($extra_path)
{ {
$rarray['fake_leading_dirs'] = $opp_base . $extra_path; $rarray['fake_leading_dirs'] = $opp_base . $extra_path;