aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-01 20:08:42 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-01 20:08:42 +0000
commit53d81ebcd6cf235ae7db636b946f5342b863cc74 (patch)
tree4228467ea2b7a197b998fc0928e10dc3f48bbd0b /IkiWiki
parent845d120a901ccd8ec3b9ed3e87d9ebb0f4895501 (diff)
downloadikiwiki-53d81ebcd6cf235ae7db636b946f5342b863cc74.tar
ikiwiki-53d81ebcd6cf235ae7db636b946f5342b863cc74.tar.gz
* Patch from Roland Mas to support an rss=no parameter to inline directives.
Closes: #380743
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/inline.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 110410abc..03471668c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -35,6 +35,9 @@ sub preprocess_inline (@) { #{{{
if (! exists $params{show} && $params{archive} eq "no") {
$params{show}=10;
}
+ if (! exists $params{rss}) {
+ $params{rss}="yes";
+ }
# Avoid nested inlines, to avoid loops etc.
if ($processing_inline) {
@@ -68,7 +71,7 @@ sub preprocess_inline (@) { #{{{
}
$ret.=$formtemplate->output;
}
- elsif ($config{rss}) {
+ elsif ($config{rss} && $params{rss} eq "yes")) {
# Add a rss link button.
my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
$linktemplate->param(rssurl => rsspage(basename($params{page})));
@@ -105,7 +108,7 @@ sub preprocess_inline (@) { #{{{
# TODO: should really add this to renderedfiles and call
# check_overwrite, but currently renderedfiles
# only supports listing one file per page.
- if ($config{rss}) {
+ if ($config{rss} && $params{rss} eq "yes") {
writefile(rsspage($params{page}), $config{destdir},
genrss($params{page}, @list));
$toping{$params{page}}=1 unless $config{rebuild};