Removed the rss feeds for every page, which wasn't really entirely useful.
Let's only do them for blog pages.master
parent
5951c1dc82
commit
8926a3bfbe
|
@ -159,7 +159,7 @@ sub postprocess_html_inline { #{{{
|
|||
$params{show}=10;
|
||||
}
|
||||
$inlinepages{$parentpage}=$params{pages};
|
||||
|
||||
|
||||
my $template=HTML::Template->new(blind_cache => 1,
|
||||
filename => (($params{archive} eq "no")
|
||||
? "$config{templatedir}/inlinepage.tmpl"
|
||||
|
@ -204,7 +204,7 @@ sub genpage ($$$) { #{{{
|
|||
$template->param(historyurl => $u);
|
||||
}
|
||||
|
||||
if ($config{rss}) {
|
||||
if ($config{rss} && $inlinepages{$page}) {
|
||||
$template->param(rssurl => rsspage($page));
|
||||
}
|
||||
|
||||
|
@ -238,7 +238,7 @@ sub absolute_urls ($$) { #{{{
|
|||
$content=~s/<a\s+href="(?!http:\/\/)([^"]+)"/<a href="$url$1"/ig;
|
||||
$content=~s/<img\s+src="(?!http:\/\/)([^"]+)"/<img src="$url$1"/ig;
|
||||
return $content;
|
||||
} #}}}zo
|
||||
} #}}}
|
||||
|
||||
sub genrss ($$$) { #{{{
|
||||
my $content=shift;
|
||||
|
@ -264,7 +264,6 @@ sub genrss ($$$) { #{{{
|
|||
if (! exists $params{pages}) {
|
||||
return "";
|
||||
}
|
||||
$inlinepages{$parentpage}=$params{pages};
|
||||
|
||||
$isblog=1;
|
||||
foreach my $page (blog_list($params{pages}, $params{show})) {
|
||||
|
@ -282,16 +281,6 @@ sub genrss ($$$) { #{{{
|
|||
|
||||
$content = postprocess($page, $content, inline => $gen_blog);
|
||||
|
||||
# Regular page gets a feed that is updated every time the
|
||||
# page is changed, so the mtime is encoded in the guid.
|
||||
push @items, {
|
||||
itemtitle => pagetitle(basename($page)),
|
||||
itemguid => "$url?mtime=$mtime",
|
||||
itemurl => $url,
|
||||
itempubdate => date_822($mtime),
|
||||
itemcontent => absolute_urls($content, $url),
|
||||
} unless $isblog;
|
||||
|
||||
$template->param(
|
||||
title => $config{wikiname},
|
||||
pageurl => $url,
|
||||
|
@ -357,7 +346,7 @@ sub render ($) { #{{{
|
|||
# TODO: should really add this to renderedfiles and call
|
||||
# check_overwrite, as above, but currently renderedfiles
|
||||
# only supports listing one file per page.
|
||||
if ($config{rss}) {
|
||||
if ($config{rss} && exists $inlinepages{$page}) {
|
||||
writefile("$config{destdir}/".rsspage($page),
|
||||
genrss($content, $page, mtime("$config{srcdir}/$file")));
|
||||
}
|
||||
|
|
|
@ -19,3 +19,5 @@
|
|||
page that someone wrote in a web browser annoying (`gqip` is vim user's
|
||||
friend here). Is there any way to improve this?
|
||||
* The diff links in RecentChanges go to a viewcvs backtrace if the rev in question is when the page was added. Is this a viewcvs bug, or a behavior ikiwiki needs to work around?
|
||||
* If a page stops inlining anthing, its rss feed file
|
||||
will linger around and not be deleted.
|
||||
|
|
|
@ -44,10 +44,6 @@ Currently implemented:
|
|||
matching a specified [[GlobList]] will be displayed as a weblog within
|
||||
the blog page. And an RSS feed can be generated to follow the blog.
|
||||
|
||||
ikiwiki also supports generating RSS feed for individual pages that
|
||||
do not contain a [[blog]]. These feeds can be used to be sent a new
|
||||
version of a page when it is changed.
|
||||
|
||||
* Fast compiler
|
||||
|
||||
ikiwiki is fast and smart about updating a wiki, it only builds pages
|
||||
|
|
|
@ -66,9 +66,8 @@ flags such as --verbose can be negated with --no-verbose.
|
|||
|
||||
* --rss, --norss
|
||||
|
||||
If rss is set, along with every html page rendered by ikiwiki, an rss
|
||||
page will also be rendered, to allow users to subscribe to a rss feed of
|
||||
changes to that page.
|
||||
If rss is set, ikiwiki will generate rss feeds for pages that inline
|
||||
a blog.
|
||||
|
||||
* --cgi
|
||||
|
||||
|
|
Loading…
Reference in New Issue