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

Make the FilePump macro return valid XHTML. Fixes bug #11742.

Browse source
This commit is contained in:
Colin Kuskie 2010-07-27 11:44:34 -07:00
parent fd79c7723b
commit 26484f3361
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
- fixed #11729: Trash your User Function Style, and WebGUI locks you out - fixed #11729: Trash your User Function Style, and WebGUI locks you out
- fixed #11745: Pagination doesn't work in DataForm list mode - fixed #11745: Pagination doesn't work in DataForm list mode
- fixed #11741: i18n Asset_Carousel ::carousel slideHeight description - fixed #11741: i18n Asset_Carousel ::carousel slideHeight description
- fixed #11742: linktag FilePump macro not xhtml valid
7.9.9 7.9.9
- fixed #11693: Shopping cart does not show for visitor user - fixed #11693: Shopping cart does not show for visitor user

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

@ -195,7 +195,7 @@ on your print CSS tag.
sub linkTag { sub linkTag {
my ($session, $url, $extras) = @_; my ($session, $url, $extras) = @_;
my $template = qq|<link rel="stylesheet" type="text/css" href="%s" $extras>\n|; my $template = qq|<link rel="stylesheet" type="text/css" href="%s" $extras \\>\n|;
return sprintf $template, $url; return sprintf $template, $url;
} }

4
t/Macro/FilePump.t
View file

@ -83,7 +83,7 @@ is(
); );
is( is(
WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'), WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'),
sprintf(qq|<link rel="stylesheet" type="text/css" href="%s" >\n|, sprintf(qq|<link rel="stylesheet" type="text/css" href="%s" \\>\n|,
join('/', $uploadsURL, 'filepump', $bundle->bundleUrl . '.'. $bundle->get('lastBuild'), $bundle->bundleUrl.'.css'), join('/', $uploadsURL, 'filepump', $bundle->bundleUrl . '.'. $bundle->get('lastBuild'), $bundle->bundleUrl.'.css'),
), ),
'... check CSS file, normal mode' '... check CSS file, normal mode'
@ -104,7 +104,7 @@ is(
); );
is( is(
WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'), WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'),
sprintf(qq|<link rel="stylesheet" type="text/css" href="/filePumpFileAsset" >\n|, $fileAsset->getUrl), sprintf(qq|<link rel="stylesheet" type="text/css" href="/filePumpFileAsset" \\>\n|, $fileAsset->getUrl),
'... check CSS file, normal mode' '... check CSS file, normal mode'
); );
is( is(