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

* 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.
master
joey 2006-10-22 21:12:50 +00:00
parent c49af80ab3
commit 771791104c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/inline.pm
View File

@ -284,7 +284,7 @@ sub genfeed ($$$$@) { #{{{
my $template=template($feedtype."page.tmpl", blind_cache => 1); my $template=template($feedtype."page.tmpl", blind_cache => 1);
$template->param( $template->param(
title => pagetitle($page), title => $page ne "index" ? pagetitle($page) : $config{wikiname},
wikiname => $config{wikiname}, wikiname => $config{wikiname},
pageurl => $url, pageurl => $url,
content => $content, content => $content,

1
IkiWiki/Plugin/polygen.pm
View File

@ -21,6 +21,7 @@ sub preprocess (@) { #{{{
# Sanitize parameters # Sanitize parameters
$grammar =~ IkiWiki::basename($grammar); $grammar =~ IkiWiki::basename($grammar);
$grammar =~ s/[^A-Za-z0-9]//g;
$grammar =~ s/\.grm$//; $grammar =~ s/\.grm$//;
$grammar .= '.grm'; $grammar .= '.grm';
$symbol =~ s/[^A-Za-z0-9]//g if defined $symbol; $symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;

9
debian/changelog vendored
View File

@ -1,13 +1,18 @@
ikiwiki (1.31) UNRELEASED; urgency=low ikiwiki (1.31) UNRELEASED; urgency=low
* Patch from Pawel Tecza to cp -a the templates in the Makefile. * 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 Overriding the page title with meta title already overrode the rss feed
tittle. tittle.
* Add an img plugin, based on Christian Mock's img plugin, but stripped * 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. 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 ikiwiki (1.30) unstable; urgency=low