response

2 files changed, 20 insertions, 1 deletions

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 127c321f0..c1811643b 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,6 +9,8 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
+	hook(type => "canedit", id => "httpauth", call => \&canedit,
+		last => 1);
 }
 
 sub getsetup () {
@@ -33,10 +35,20 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-	elsif (defined $config{cgiauthurl}) {
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
 		exit;
 	}
+	else {
+		return undef;
+	}
 }
 
 1
diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
index 3a4debfe5..ecb49fe43 100644
--- a/doc/forum/where_are_the_tags.mdwn
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -1,2 +1,9 @@
 Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
 have tags enabled. --[[jerojasro]]
+
+> This wiki does not use one global toplevel set of tags (`tagbase` is not
+> set).
+> 
+> There are tags used for the [[plugins]], and a tag cloud of those
+> there. [[wishlist]] and [[patch]] are tags too, but I don't see the point
+> of a tag cloud for such tags. --[[Joey]]