factored out an urlabs from aggregate and cgi

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 926d42a497159845ae8ab94c62a054374a61d468..ef8ccb2da51e4b763418344237280cf563011fba 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,7 +544,7 @@ sub checkconfig () {
                error(gettext("Must specify url to wiki with --url when using --cgi"));
        }
 
                error(gettext("Must specify url to wiki with --url when using --cgi"));
        }
 

-       if (length $config{url}) {
+       if (defined $config{url} && length $config{url}) {

                eval q{use URI};
                my $baseurl = URI->new($config{url});
 
                eval q{use URI};
                my $baseurl = URI->new($config{url});
 


@@ -1068,6 +1068,14 @@ sub baseurl (;$) {
        return $page;
 }
 
        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
 sub abs2rel ($$) {
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are


@@ -1140,7 +1148,7 @@ sub urlto ($;$$) {
        my $absolute=shift;
        
        if (! length $to) {
        my $absolute=shift;
        
        if (! length $to) {

-               return beautify_urlpath(baseurl($from)."index.$config{htmlext}");
+               $to = 'index';

        }
 
        if (! $destsources{$to}) {
        }
 
        if (! $destsources{$to}) {


@@ -1931,7 +1939,7 @@ sub misctemplate ($$;@) {
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
                title => $title,
                wikiname => $config{wikiname},
                content => $content,

-               baseurl => baseurl(),
+               baseurl => $config{url}.'/',

                html5 => $config{html5},
                %params,
        );
                html5 => $config{html5},
                %params,
        );


@@ -2033,7 +2041,7 @@ sub rcs_recentchanges ($) {
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
 }
 
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
 }
 

-sub rcs_diff ($) {
+sub rcs_diff ($;$) {

        $hooks{rcs}{rcs_diff}{call}->(@_);
 }
 
        $hooks{rcs}{rcs_diff}{call}->(@_);
 }