From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 4 Jan 2010 20:01:25 +0000 (-0500)
Subject: lockedit: Detect if no authentication plugins are enabled, and die with an error... 
X-Git-Tag: 3.20100122~69
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ae493178cf58cf5d7edfa30ccabe758b06febcb4

lockedit: Detect if no authentication plugins are enabled, and die with an error message as this configuration does not make sense.
---

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 0fa329251..8914ba498 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -7,6 +7,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "lockedit", call => \&getsetup);
+	hook(type => "checkconfig", id => "lockedit", call => \&checkconfig);
 	hook(type => "canedit", id => "lockedit", call => \&canedit);
 }
 
@@ -26,6 +27,12 @@ sub getsetup () {
 		},
 }
 
+sub checkconfig () {
+	if (! exists $IkiWiki::hooks{auth}) {
+		error gettext("lockedit plugin is enabled, but no authentication plugins are enabled");
+	}
+}
+
 sub canedit ($$) {
 	my $page=shift;
 	my $cgi=shift;
diff --git a/debian/changelog b/debian/changelog
index aa4f1ac3c..2c121ef54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
+  * lockedit: Detect if no authentication plugins are enabled, and
+    die with an error message as this configuration does not make sense.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500