|
|
|
@ -618,15 +618,12 @@ sub relurl ($$$) { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (defined $fn) { |
|
|
|
if (defined $fn) { |
|
|
|
$subfn = $fn; |
|
|
|
$subfn = $fn; |
|
|
|
$subfn =~ s/\/[^\/]*$//; |
|
|
|
$subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/; |
|
|
|
$subfn .= '/' unless $subfn =~ /\/$/; |
|
|
|
|
|
|
|
$subfn .= $suburl; |
|
|
|
|
|
|
|
$suburl = $subfn; |
|
|
|
$suburl = $subfn; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$subfn = $url; |
|
|
|
$subfn = $url; |
|
|
|
$subfn =~ s/\/[^\/]*$//; |
|
|
|
$subfn =~ s/(\/)?\/*[^\/]*$/$1$suburl/; |
|
|
|
$subfn .= '/' unless $subfn =~ /\/$/; |
|
|
|
$suburl = $subfn; |
|
|
|
$suburl = "$subfn$suburl"; |
|
|
|
|
|
|
|
$subfn = undef; |
|
|
|
$subfn = undef; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|