X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/7a680431edd837809cd62666ead08944ddc5658c..89256ab870299242c2f62858680c4a2870600a14:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81c9a92f4..c0f5deab6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -520,7 +520,11 @@ sub loadplugin ($) { #{{{
 	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;
+			eval { require IkiWiki::Plugin::external };
+			if ($@) {
+				my $reason=$@;
+				error(sprintf(gettext("failed to load external plugin needed for %s plugin: %s"), $plugin, $reason));
+			}
 			import IkiWiki::Plugin::external "$dir/plugins/$plugin";
 			$loaded_plugins{$plugin}=1;
 			return 1;
@@ -614,7 +618,7 @@ sub pagename ($) { #{{{
 
 	my $type=pagetype($file);
 	my $page=$file;
-	$page=~s/\Q.$type\E*$// if defined $type;
+	$page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension};
 	return $page;
 } #}}}