urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Deal with CPAN installing Markdown as Text::Markdown, while it's 

installed as just Markdown by apt.
master
joey 2006-09-16 01:14:30 +00:00
parent 3b42bd84ca
commit 39fd60f1ab
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/mdwn.pm
View File

@ -24,10 +24,13 @@ sub htmlize (@) { #{{{
use warnings 'all'; use warnings 'all';
eval q{use Markdown}; eval q{use Markdown};
if ($@) {
eval q{use Text::Markdown};
if ($@) { if ($@) {
do "/usr/bin/markdown" || do "/usr/bin/markdown" ||
error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)"); error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
} }
}
$markdown_loaded=1; $markdown_loaded=1;
require Encode; require Encode;
} }

4
debian/changelog vendored
View File

@ -36,8 +36,10 @@ ikiwiki (1.27) UNRELEASED; urgency=low
* pagetemplate hooks are now also called when generating cgi pages. * pagetemplate hooks are now also called when generating cgi pages.
* Add a favicon plugin, which simply adds a link tag for an icon to each * Add a favicon plugin, which simply adds a link tag for an icon to each
page (and cgis). page (and cgis).
* Deal with CPAN installing Markdown as Text::Markdown, while it's
installed as just Markdown by apt.
-- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 19:39:36 -0400 -- Joey Hess <joeyh@debian.org> Fri, 15 Sep 2006 21:13:35 -0400
ikiwiki (1.26) unstable; urgency=low ikiwiki (1.26) unstable; urgency=low

4
doc/bugs/markdown_module_location.mdwn
View File

@ -9,3 +9,7 @@ I tried to come up with the magical invocation to allow either location
to be used by ikiwiki, but I couldn't do it. to be used by ikiwiki, but I couldn't do it.
-- JamesWestby -- JamesWestby
Fixed, I think --[[Joey]]
[[bugs/done]]