web commit by joey

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d88ec93d36f8f46ac6578d74917cfc3b1af9905f..6d5ea9ee587ebe470d6ee2b55d681f659da73572 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -72,6 +72,7 @@ sub parentlinks ($) { #{{{
        my $pagelink="";
        my $path="";
        my $skip=1;
+       return if $page eq 'index'; # toplevel
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
@@ -156,8 +157,6 @@ sub genpage ($$$) { #{{{
        my $content=shift;
        my $mtime=shift;
 
-       my $title=pagetitle(basename($page));
-       
        my $template=template("page.tmpl", blind_cache => 1);
        my $actions=0;
 
@@ -186,7 +185,9 @@ sub genpage ($$$) { #{{{
        }
 
        $template->param(
-               title => $title,
+               title => $page eq 'index' 
+                       ? $config{wikiname} 
+                       : pagetitle(basename($page)),
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
@@ -221,7 +222,7 @@ sub displaytime ($) { #{{{
        eval q{use POSIX};
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
-       return Encode::decode_utf8(POSIX::strftime(
+       return decode_utf8(POSIX::strftime(
                        $config{timeformat}, localtime($time)));
 } #}}}
 
@@ -309,7 +310,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
-                       $_ = Encode::decode_utf8($_);
+                       $_=decode_utf8($_);
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
@@ -329,7 +330,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
-                       $_ = Encode::decode_utf8($_);
+                       $_=decode_utf8($_);
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }