more details

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d949566d834fb1cfcc053bd48ae91398f2571e80..17e2a2a857e098e7feb10bc21fe326ee22df509e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -721,6 +721,10 @@ sub readfile ($;$$) { #{{{
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;

+       # check for invalid utf-8, and toss it back to avoid crashes
+       if (! utf8::valid($ret)) {
+               $ret=encode_utf8($ret);
+       }

        close $in || error("failed to read $file: $!");
        return $ret;
 } #}}}
        close $in || error("failed to read $file: $!");
        return $ret;
 } #}}}


@@ -938,9 +942,9 @@ sub beautify_urlpath ($) { #{{{
                $url =~ s!/index.$config{htmlext}$!/!;
        }
 
                $url =~ s!/index.$config{htmlext}$!/!;
        }
 

-       # Ensure url is not an empty link, and
-       # if it's relative, make that explicit to avoid colon confusion.
-       if ($url !~ /^\//) {
+       # Ensure url is not an empty link, and if necessary,
+       # add ./ to avoid colon confusion.
+       if ($url !~ /^\// && $url !~ /^\.\.\//) {

                $url="./$url";
        }
 
                $url="./$url";
        }
 


@@ -1295,6 +1299,7 @@ sub lockwiki () { #{{{
 } #}}}
 
 sub unlockwiki () { #{{{
 } #}}}
 
 sub unlockwiki () { #{{{

+       POSIX::close($ENV{IKIWIKI_CGILOCK_FD}) if exists $ENV{IKIWIKI_CGILOCK_FD};

        return close($wikilock) if $wikilock;
        return;
 } #}}}
        return close($wikilock) if $wikilock;
        return;
 } #}}}