aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-04 14:56:04 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-04 14:56:17 -0500
commitf8bd25bfc7c590abbd31f42bb4d745d43c3d7f14 (patch)
treed6defa69ee2c39150ff44765ffe02a22f0b56275
parentaed16b4833f98eda566f75b6a1a679febc1ba5ff (diff)
downloadikiwiki-f8bd25bfc7c590abbd31f42bb4d745d43c3d7f14.tar
ikiwiki-f8bd25bfc7c590abbd31f42bb4d745d43c3d7f14.tar.gz
signinedit: Auto-disable the plugin when all authentication methods are disabled.
-rw-r--r--IkiWiki/Plugin/signinedit.pm1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 032a0034c..8b44a68f7 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -29,6 +29,7 @@ sub canedit ($$$) {
# signin can override this.
if (! defined $session->param("name") ||
! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+ return "" unless exists $IkiWiki::hooks{auth};
return sub { IkiWiki::needsignin($cgi, $session) };
}
else {
diff --git a/debian/changelog b/debian/changelog
index df3490640..aa4f1ac3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
* inline: Avoid showing edit links if page editing is disabled.
(Sjoerd)
+ * signinedit: Auto-disable the plugin when all authentication methods
+ are disabled.
-- Joey Hess <joeyh@debian.org> Mon, 04 Jan 2010 12:53:24 -0500