mention prefix_directives

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index a6695b3a5e6747942733e0cfcdbc7c40a3077e05..65a1d7fa08c00c36c08cbda7ec0e82b5f323222e 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -57,7 +57,6 @@ sub check_canedit ($$$;$) { #{{{
        my $nonfatal=shift;
        
        my $canedit;
-       my $callback;
        run_hooks(canedit => sub {
                return if defined $canedit;
                my $ret=shift->($page, $q, $session);
@@ -66,12 +65,12 @@ sub check_canedit ($$$;$) { #{{{
                                $canedit=1;
                        }
                        elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $nonfatal;
                                $canedit=0;
-                               $callback->() unless $nonfatal;
                        }
                        elsif (defined $ret) {
-                               $canedit=0;
                                error($ret) unless $nonfatal;
+                               $canedit=0;
                        }
                }
        });
@@ -276,7 +275,7 @@ sub cgi_prefs ($$) { #{{{
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
                foreach my $field (qw(email subscriptions)) {
-                       if (defined $form->field($field) && length $form->field($field)) {
+                       if (defined $form->field($field)) {
                                userinfo_set($user_name, $field, $form->field($field)) ||
                                        error("failed to set $field");
                        }
@@ -719,7 +718,7 @@ sub cgi (;$$) { #{{{
        elsif ($do eq 'create' || $do eq 'edit') {
                cgi_editpage($q, $session);
        }
-       elsif (defined $session->param("postsignin")) {
+       elsif (defined $session->param("postsignin") || $do eq 'postsignin') {
                cgi_postsignin($q, $session);
        }
        else {