Merge branch 'master' into autotag

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5355b838d07b304f44e75a5b8a176c77b7575c26..dbf50feb46d31cc1a97f14456527d7cd1ea6a2cd 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2255,7 +2255,7 @@ sub derel ($$) {
        if ($path =~ m!^\./!) {
                $from=~s#/?[^/]+$## if defined $from;
                $path=~s#^\./##;
-               $path="$from/$path" if length $from;
+               $path="$from/$path" if defined $from && length $from;
        }
 
        return $path;