X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9ff9ea55f70a455a96fad3d34266343327528723..83be2f2d09c550b033101cdfe7b843e9893e0aa4:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b70f51175..a89d9c252 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -166,7 +166,7 @@ sub loadplugin ($) { #{{{
 
 	return if grep { $_ eq $plugin} @{$config{disable_plugins}};
 
-	foreach my $dir (possibly_foolish_untaint($config{libdir}),
+	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
 	                 "$installdir/lib/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			require IkiWiki::Plugin::external;
@@ -1017,7 +1017,9 @@ sub file_pruned ($$) { #{{{
 
 sub gettext { #{{{
 	# Only use gettext in the rare cases it's needed.
-	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
+	if ((exists $ENV{LANG} && length $ENV{LANG}) ||
+	    (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
+	    (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {
 		if (! $gettext_obj) {
 			$gettext_obj=eval q{
 				use Locale::gettext q{textdomain};