urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

page with an rss feed.
master
joey 2006-12-21 13:51:50 +00:00
parent e3f7675264
commit 83109863f6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/inline.pm
View File

@ -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);

4
debian/changelog vendored
View File

@ -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