X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8daaa11baa70e07f6405ccb4474e97cac9627961..344ab0a16b749c44d6d19dbe1a179c8e30ceef31:/IkiWiki/CGI.pm diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 85fc1a386..0c6670546 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -92,7 +92,7 @@ sub cgi_recentchanges ($) { #{{{ delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess; $change->{pages} = [ map { - $_->{link} = htmllink("", "", $_->{page}, 1); + $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page})); $_; } @{$change->{pages}} ]; @@ -129,8 +129,7 @@ sub cgi_signin ($$) { #{{{ params => $q, action => $config{cgiurl}, header => 0, - template => (-e "$config{templatedir}/signin.tmpl" ? - {template_params("signin.tmpl")} : ""), + template => scalar template_params("signin.tmpl"), stylesheet => baseurl()."style.css", ); my $buttons=["Login"]; @@ -198,8 +197,7 @@ sub cgi_prefs ($$) { #{{{ javascript => 0, params => $q, action => $config{cgiurl}, - template => (-e "$config{templatedir}/prefs.tmpl" ? - {template_params("prefs.tmpl")} : ""), + template => scalar template_params("prefs.tmpl"), stylesheet => baseurl()."style.css", ); my $buttons=["Save Preferences", "Logout", "Cancel"]; @@ -293,8 +291,7 @@ sub cgi_editpage ($$) { #{{{ params => $q, action => $config{cgiurl}, table => 0, - template => (-e "$config{templatedir}/editpage.tmpl" ? - {template_params("editpage.tmpl")} : ""), + template => scalar template_params("editpage.tmpl"), ); run_hooks(formbuilder_setup => sub { @@ -510,6 +507,12 @@ sub cgi_editpage ($$) { #{{{ print $form->render(submit => \@buttons); return; } + else { + # Make sure that the repo is up-to-date; + # locking prevents the post-commit hook + # from updating it. + rcs_update(); + } } else { require IkiWiki::Render; @@ -649,6 +652,9 @@ sub cgi (;$$) { #{{{ $q->param('do', 'create'); cgi_editpage($q, $session); } + elsif ($do eq 'postsignin') { + error(gettext("login failed, perhaps you need to turn on cookies?")); + } else { error("unknown do parameter"); }