- add <base> to cgi output, this is especially useful for output containing

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9e85e1f4402d8399f0714cba1d9cf34f470d3efe..b07e7fd642f3956604962505d62f02951af2be71 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -39,6 +39,7 @@ sub cgi_recentchanges ($) { #{{{
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                styleurl => styleurl(),
+               baseurl => "$config{url}/",
        );
        print $q->header, $template->output;
 } #}}}
@@ -329,6 +330,7 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("helponformattinglink",
                htmllink("", "HelpOnFormatting", 1));
        $form->tmpl_param("styleurl", styleurl());
+       $form->tmpl_param("baseurl", "$config{url}/");
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);
@@ -509,7 +511,7 @@ sub cgi () { #{{{
        CGI::Session->name("ikiwiki_session_$config{wikiname}");
        
        my $oldmask=umask(077);
-       my $session = CGI::Session->new("driver:db_file", $q,
+       my $session = CGI::Session->new("driver:DB_File", $q,
                { FileName => "$config{wikistatedir}/sessions.db" });
        umask($oldmask);