From 39fd60f1abcba33f3d793185cc0e31fb56441215 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 16 Sep 2006 01:14:30 +0000
Subject: * Deal with CPAN installing Markdown as Text::Markdown, while it's  
 installed as just Markdown by apt.

---
 IkiWiki/Plugin/mdwn.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin/mdwn.pm')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index e5228c329..0fc077f5e 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,8 +25,11 @@ sub htmlize (@) { #{{{
 
 		eval q{use Markdown};
 		if ($@) {
-			do "/usr/bin/markdown" ||
-				error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+			eval q{use Text::Markdown};
+			if ($@) {
+				do "/usr/bin/markdown" ||
+					error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+			}
 		}
 		$markdown_loaded=1;
 		require Encode;
-- 
cgit v1.2.3