* Change the rss feed title from the wikiname to the page title, with

  an exception for the wiki's toplevel index page, which will still use the
  wikiname as the feed title.
* Sanitize possibly problimatic characters out of the polygen grammar names,
  just in case. Should not be exploitable anyway, since it only tries to run
  polygen after finding the specified grammar file.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8bd09de4017c9d73fc4faee8d28f470e77e07ea1..bd0742d36a0e66067d652b00f09c53c801617175 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -284,7 +284,7 @@ sub genfeed ($$$$@) { #{{{
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(
-               title => pagetitle($page),
+               title => $page ne "index" ? pagetitle($page) : $config{wikiname},
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index 05ad4416ec58c7ad4962305a20dfef6374a47dfa..966b6cb51d5a9bda7015935ff63a52ff0aa83c20 100644 (file)
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -21,6 +21,7 @@ sub preprocess (@) { #{{{
 
        # Sanitize parameters
        $grammar =~ IkiWiki::basename($grammar);
+       $grammar =~ s/[^A-Za-z0-9]//g;
        $grammar =~ s/\.grm$//;
        $grammar .= '.grm';
        $symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;

diff --git a/debian/changelog b/debian/changelog
index 99d01554d3b43879a2a353597e9b3def24fd3771..12779e221851ea1476800e0aa57eebbfb5c76122 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,18 @@
 ikiwiki (1.31) UNRELEASED; urgency=low
 
   * Patch from Pawel Tecza to cp -a the templates in the Makefile.
-  * Change the rss feed title from the wikiname to the page title.
+  * Change the rss feed title from the wikiname to the page title, with
+    an exception for the wiki's toplevel index page, which will still use the
+    wikiname as the feed title.
     Overriding the page title with meta title already overrode the rss feed
     tittle.
   * Add an img plugin, based on Christian Mock's img plugin, but stripped
     down to the bare essentials. Useful for handling large images on websites.
+  * Sanitize possibly problimatic characters out of the polygen grammar names,
+    just in case. Should not be exploitable anyway, since it only tries to run
+    polygen after finding the specified grammar file.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 21 Oct 2006 17:13:47 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 22 Oct 2006 15:47:08 -0400
 
 ikiwiki (1.30) unstable; urgency=low