diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-10-22 21:12:50 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-10-22 21:12:50 +0000 |
| commit | 771791104c78e4527fdfb51be0c6e5fae46b1aee (patch) | |
| tree | 432e2f9915678bedcd9eb59bf8fbdd21c65bee84 | |
| parent | c49af80ab38f71abcbe9887dde4b76d462595f4a (diff) | |
| download | ikiwiki-771791104c78e4527fdfb51be0c6e5fae46b1aee.tar ikiwiki-771791104c78e4527fdfb51be0c6e5fae46b1aee.tar.gz | |
* 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.
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/polygen.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 8bd09de40..bd0742d36 100644 --- 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 05ad4416e..966b6cb51 100644 --- 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 99d01554d..12779e221 100644 --- 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 |