Fix double slash removal in FilePump macro. Fixes bug #11478.
This commit is contained in:
parent
1919973f2b
commit
9810b57f40
3 changed files with 4 additions and 14 deletions
|
|
@ -5,6 +5,7 @@
|
|||
- fixed #11475: Inherit permissions on imported package fails if asset already exists.
|
||||
- fixed #11476: Missing override in Page Layout shortcut
|
||||
- fixed: Unable to add threads with permission to edit CS but not in post group
|
||||
- fixed #11478: Overzealous removal of double slashes in FilePump macro
|
||||
|
||||
7.9.0
|
||||
- added #11383: AJAX username checks at registration (Luke Robinson / Orchard Solutions)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ use lib "$FindBin::Bin/../lib";
|
|||
use Test::More;
|
||||
use WebGUI::Test; # Must use this before any other WebGUI modules
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Macro::FilePump;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Init
|
||||
|
|
@ -28,21 +29,13 @@ my $session = WebGUI::Test->session;
|
|||
#----------------------------------------------------------------------------
|
||||
# Tests
|
||||
|
||||
my $tests = 11;
|
||||
plan tests => 1 + $tests;
|
||||
plan tests => 11;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# put your tests here
|
||||
|
||||
my $macro = 'WebGUI::Macro::FilePump';
|
||||
my $loaded = use_ok($macro);
|
||||
|
||||
my $bundle = WebGUI::FilePump::Bundle->create($session, { bundleName => 'test bundle'});
|
||||
|
||||
SKIP: {
|
||||
|
||||
skip "Unable to load $macro", $tests unless $loaded;
|
||||
|
||||
my $root = WebGUI::Asset->getRoot($session);
|
||||
|
||||
my $snippet = $root->addChild({
|
||||
|
|
@ -120,10 +113,6 @@ is(
|
|||
'... check illegal file type access returns empty string'
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Cleanup
|
||||
END {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue