* Fix an issue with inlining a page with a rss feed inside another

  page with an rss feed.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index fd7a59ab39cecd12857ebb55de80467d74eb6439..c623df1c5755f995ae930c5288f03347c8b2c652 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -271,6 +271,8 @@ sub genfeed ($$$$@) { #{{{
        my $lasttime = 0;
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
        my $lasttime = 0;
        foreach my $p (@pages) {
                my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));

+               
+               my $pcontent = absolute_urls(get_inline_content($p, $page), $url);

 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),


@@ -280,7 +282,6 @@ sub genfeed ($$$$@) { #{{{
                        date_3339 => date_3339($pagectime{$p}),
                );
 
                        date_3339 => date_3339($pagectime{$p}),
                );
 

-               my $pcontent = absolute_urls(get_inline_content($p, $page), $url);

                if ($itemtemplate->query(name => "enclosure")) {
                        my $file=$pagesources{$p};
                        my $type=pagetype($file);
                if ($itemtemplate->query(name => "enclosure")) {
                        my $file=$pagesources{$p};
                        my $type=pagetype($file);

diff --git a/debian/changelog b/debian/changelog
index 5bff6e39d05478550786209bc7d481c31327c5ed..6566ede9e3c81168703e51535fa0b429c47821b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ ikiwiki (1.36) UNRELEASED; urgency=low
   * Fix sometimes broken links to Discussion pages from blog pages.
   * Add userdir config setting.
   * Fix man page perms in install.
   * Fix sometimes broken links to Discussion pages from blog pages.
   * Add userdir config setting.
   * Fix man page perms in install.

+  * Fix an issue with inlining a page with a rss feed inside another
+    page with an rss feed.

 
 

- -- Joey Hess <joeyh@debian.org>  Tue, 19 Dec 2006 12:08:40 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Dec 2006 08:50:41 -0500

 
 ikiwiki (1.35) unstable; urgency=low
 
 
 ikiwiki (1.35) unstable; urgency=low