Merge branch 'WebGUI8' into HEAD

This commit is contained in:
Graham Knop 2010-04-16 20:52:46 -05:00
commit 373be0881d
871 changed files with 36107 additions and 28933 deletions

View file

@ -150,7 +150,7 @@ sub process {
elsif ($scheme eq 'http' or $scheme eq 'https') {
$url = $uri->as_string;
}
$url =~ tr{/}{/}s;
$url =~ s$(?<!:)/{2,}$/$g; ##Remove //, unless it's after a :, which is not a valid URL character
$output .= $type eq 'js' ? scriptTag($session, $url, $extras) : linkTag($session, $url, $extras);
}
return $output;