* htmlscrubber: Further work around #365971 by adding tags for 'br/', 'hr/'

[ikiwiki.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b28ad27a8e01c32a17d5fc979c3f9c2b85156b74..53b051816740db8a2448ac76c04192e887843eb1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -14,7 +14,7 @@ my %page_numfeeds;
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
-       hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi);
+       hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
@@ -173,10 +173,8 @@ sub preprocess_inline (@) { #{{{
                }
        }
 
-       if ($feeds) {
-               my $rssurl=basename(rsspage($params{destpage}).$feednum);
-               my $atomurl=basename(atompage($params{destpage}).$feednum);
-       }
+       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;
        my $ret="";
 
        if ($config{cgiurl} && (exists $params{rootpage} ||