oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double slash removal in FilePump macro. Fixes bug #11478.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-16 12:07:25 -07:00
parent 1919973f2b
commit 9810b57f40
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -5,6 +5,7 @@
- fixed #11475: Inherit permissions on imported package fails if asset already exists. - fixed #11475: Inherit permissions on imported package fails if asset already exists.
- fixed #11476: Missing override in Page Layout shortcut - fixed #11476: Missing override in Page Layout shortcut
- fixed: Unable to add threads with permission to edit CS but not in post group - 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 7.9.0
- added #11383: AJAX username checks at registration (Luke Robinson / Orchard Solutions) - added #11383: AJAX username checks at registration (Luke Robinson / Orchard Solutions)

2
lib/WebGUI/Macro/FilePump.pm
View file

@ -150,7 +150,7 @@ sub process {
elsif ($scheme eq 'http' or $scheme eq 'https') { elsif ($scheme eq 'http' or $scheme eq 'https') {
$url = $uri->as_string; $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); $output .= $type eq 'js' ? scriptTag($session, $url, $extras) : linkTag($session, $url, $extras);
} }
return $output; return $output;

15
t/Macro/FilePump.t
View file

@ -19,6 +19,7 @@ use lib "$FindBin::Bin/../lib";
use Test::More; use Test::More;
use WebGUI::Test; # Must use this before any other WebGUI modules use WebGUI::Test; # Must use this before any other WebGUI modules
use WebGUI::Session; use WebGUI::Session;
use WebGUI::Macro::FilePump;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Init # Init
@ -28,21 +29,13 @@ my $session = WebGUI::Test->session;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Tests # Tests
my $tests = 11; plan tests => 11;
plan tests => 1 + $tests;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# put your tests here # put your tests here
my $macro = 'WebGUI::Macro::FilePump';
my $loaded = use_ok($macro);
my $bundle = WebGUI::FilePump::Bundle->create($session, { bundleName => 'test bundle'}); 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 $root = WebGUI::Asset->getRoot($session);
my $snippet = $root->addChild({ my $snippet = $root->addChild({
@ -120,10 +113,6 @@ is(
'... check illegal file type access returns empty string' '... check illegal file type access returns empty string'
); );
}
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Cleanup # Cleanup
END { END {