Merge branch 'master' into newmc

[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster / HTML.pm

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 8ddd9e1971b3170e9b8380be1a3d606ec2319d6c..8df45ee4f839113259def81fcadf982c14e813d2 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -11,9 +11,11 @@ use Data::Dumper qw/Dumper/;
 
 sub ftime ($)   { POSIX::strftime '%c', localtime shift }
 sub literal ($) {
+       my ($html) = @_;
+       return unless $html;
        my $b = HTML::TreeBuilder->new;
        $b->ignore_unknown(0);
-       $b->parse(shift // '');
+       $b->parse($html);
        HTML::Element::Library::super_literal $b->guts->as_HTML;
 }
 
@@ -90,7 +92,7 @@ $logo =~ s/(\s+)/ /g;
 
 sub process_skel {
        my ($tree, %args) = @_;
-       $tree->fid('logo')->replace_with(literal $logo);
+       $tree->fid('logo')->replace_with(HTML::Element::Library::super_literal $logo);
        $tree->content_handler(
                title   =>         $args{title},
                content => literal $args{meat});