my autotag branch seems ready

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ba2c09c369956579175cf8dd50a0f5308923f05a..8af290745283a5bc86c45cc4bffb9e156cda5a05 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1089,11 +1089,11 @@ sub htmllink ($$$;@) {
                        my $cgilink = "";
                        if (length $config{cgiurl}) {
                                $cgilink = "<a href=\"".
-                               cgiurl(
-                                       do => "create",
-                                       page => lc($link),
-                                       from => $lpage
-                               )."\" rel=\"nofollow\">?</a>";
+                                       cgiurl(
+                                               do => "create",
+                                               page => lc($link),
+                                               from => $lpage
+                                       )."\" rel=\"nofollow\">?</a>";
                        }
                        return "<span class=\"createlink\">$cgilink$linktext</span>"
                }
@@ -2245,7 +2245,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;