factored out an urlabs from aggregate and cgi

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3a4cfd5e730cd7fc04a14a94d8a3fbd71f053fc5..ef8ccb2da51e4b763418344237280cf563011fba 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1068,6 +1068,14 @@ sub baseurl (;$) {
        return $page;
 }
 
+sub urlabs ($$) {
+       my $url=shift;
+       my $urlbase=shift;
+
+       eval q{use URI};
+       URI->new_abs($url, $urlbase)->as_string;
+}
+
 sub abs2rel ($$) {
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
@@ -1931,7 +1939,7 @@ sub misctemplate ($$;@) {
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
-               baseurl => $config{url},
+               baseurl => $config{url}.'/',
                html5 => $config{html5},
                %params,
        );