From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Mar 2010 18:52:21 +0000 (-0400)
Subject: check for 'require' instead of 'use'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/85778f59fd0d84410f6e4191802e634b0f3c8935?ds=sidebyside

check for 'require' instead of 'use'
---

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 2cf01ea68..06102058b 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -28,7 +28,7 @@ sub load ($;$) {
 	}
 	close IN;
 
-	if ($content=~/(use\s+)?IkiWiki::Setup::(\w+)/) {
+	if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) {
 		$config{setuptype}=$2;
 		if ($1) {
 			error sprintf(gettext("cannot load %s in safe mode"), $file)