diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 21:52:06 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-21 21:52:06 +0000 |
commit | 31d0021e9cc1c69b094c13096df0ec925e50654c (patch) | |
tree | 996f1dbe4ad85c510a707d9d7c145af0dbc4690a /IkiWiki.pm | |
parent | a00bc110b11fefd7cce28d909f00e7fc34926ef6 (diff) | |
download | ikiwiki-31d0021e9cc1c69b094c13096df0ec925e50654c.tar ikiwiki-31d0021e9cc1c69b094c13096df0ec925e50654c.tar.gz |
* Add support for links of the form [[../foo]], this links to the page
* Fix code to make absolute urls for rss feeds, was missing some urls.
* Fix double-escaping of html entities in titles etc in rss feeds
that occured if escaped characters were present in the page filename.
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 499d3a71f..54bb1826c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -327,10 +327,18 @@ sub isinlinableimage ($) { #{{{ $file=~/\.(png|gif|jpg|jpeg)$/i; } #}}} -sub pagetitle ($) { #{{{ +sub pagetitle ($;$) { #{{{ my $page=shift; - $page=~s/__(\d+)__/&#$1;/g; + my $unescaped=shift; + + if ($unescaped) { + $page=~s/__(\d+)__/chr($1)/eg; + } + else { + $page=~s/__(\d+)__/&#$1;/g; + } $page=~y/_/ /; + return $page; } #}}} |