From 26484f336184ce6b5269793078ff05ba5c07da00 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 27 Jul 2010 11:44:34 -0700 Subject: [PATCH] Make the FilePump macro return valid XHTML. Fixes bug #11742. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Macro/FilePump.pm | 2 +- t/Macro/FilePump.t | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 5730a56e8..fa3135b72 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - fixed #11729: Trash your User Function Style, and WebGUI locks you out - fixed #11745: Pagination doesn't work in DataForm list mode - fixed #11741: i18n Asset_Carousel ::carousel slideHeight description + - fixed #11742: linktag FilePump macro not xhtml valid 7.9.9 - fixed #11693: Shopping cart does not show for visitor user diff --git a/lib/WebGUI/Macro/FilePump.pm b/lib/WebGUI/Macro/FilePump.pm index 22f69e381..4f5105739 100644 --- a/lib/WebGUI/Macro/FilePump.pm +++ b/lib/WebGUI/Macro/FilePump.pm @@ -195,7 +195,7 @@ on your print CSS tag. sub linkTag { my ($session, $url, $extras) = @_; - my $template = qq|\n|; + my $template = qq|\n|; return sprintf $template, $url; } diff --git a/t/Macro/FilePump.t b/t/Macro/FilePump.t index 9558071b0..148387f85 100644 --- a/t/Macro/FilePump.t +++ b/t/Macro/FilePump.t @@ -83,7 +83,7 @@ is( ); is( WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'), - sprintf(qq|\n|, + sprintf(qq|\n|, join('/', $uploadsURL, 'filepump', $bundle->bundleUrl . '.'. $bundle->get('lastBuild'), $bundle->bundleUrl.'.css'), ), '... check CSS file, normal mode' @@ -104,7 +104,7 @@ is( ); is( WebGUI::Macro::FilePump::process($session, 'test bundle', 'CSS'), - sprintf(qq|\n|, $fileAsset->getUrl), + sprintf(qq|\n|, $fileAsset->getUrl), '... check CSS file, normal mode' ); is(