diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 13:51:50 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 13:51:50 +0000 |
| commit | 83109863f644a15e04b709e08223c18dc4ea4c7e (patch) | |
| tree | d63098f942e4c040ecaece45f74979c7703bcbed | |
| parent | e3f7675264914032a21fca8a50170d6c0dd375f9 (diff) | |
* Fix an issue with inlining a page with a rss feed inside another
page with an rss feed.
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index fd7a59ab3..c623df1c5 100644 --- 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 $pcontent = absolute_urls(get_inline_content($p, $page), $url); $itemtemplate->param( title => pagetitle(basename($p)), @@ -280,7 +282,6 @@ sub genfeed ($$$$@) { #{{{ 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); diff --git a/debian/changelog b/debian/changelog index 5bff6e39d..6566ede9e 100644 --- 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 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 |