releasing version 1.23

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 724cdf315d34854d8094ffdfd2f08f32645f51a0..8ceaa95e09f0f491401248716dc365ddd73a41b5 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -95,7 +95,7 @@ sub preprocess_inline (@) { #{{{
                        # is to let the meta plugin get page title info; so stop
                        # calling this next line then once the meta plugin can
                        # store that accross runs (also tags plugin).
                        # is to let the meta plugin get page title info; so stop
                        # calling this next line then once the meta plugin can
                        # store that accross runs (also tags plugin).

-                       my $content=get_inline_content($page, $params{page});
+                       my $content=get_inline_content($page, $params{destpage});

                        # Don't use htmllink because this way the title is separate
                        # and can be overridden by other plugins.
                        my $link=htmlpage(bestlink($params{page}, $page));
                        # Don't use htmllink because this way the title is separate
                        # and can be overridden by other plugins.
                        my $link=htmlpage(bestlink($params{page}, $page));


@@ -199,11 +199,11 @@ sub rsspage ($) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{
 } #}}}
 
 sub genrss ($$@) { #{{{

-       my $desc = shift;
+       my $desc=shift;

        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        

-       my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));

        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";