web commit by JeremyReed: html not generated

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 499d3a71f773951e7700aea3ec668d8950b7c733..9f6c3bb1f95557dfc0577e6d8fcf9a7ab759651e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -298,10 +298,9 @@ sub bestlink ($$) { #{{{
        my $link=shift;
        
        my $cwd=$page;
-
-       # relative links
-       while ($link=~s!(^|/)\.\./!!g) {
-               $cwd=~s!/?[^/]+$!!;
+       if ($link=~s/^\/+//) {
+               # absolute links
+               $cwd="";
        }
 
        do {
@@ -327,10 +326,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;
 } #}}}