Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
wikitext.pm
diff --git
a/IkiWiki/Plugin/wikitext.pm
b/IkiWiki/Plugin/wikitext.pm
index 8b8cbe75e7711c3d17abe7f94ecedfca94f99d16..b24630b15bf9c380e2b68af44f59bcffaaf5bb70 100644
(file)
--- a/
IkiWiki/Plugin/wikitext.pm
+++ b/
IkiWiki/Plugin/wikitext.pm
@@
-4,16
+4,30
@@
package IkiWiki::Plugin::wikitext;
use warnings;
use strict;
use warnings;
use strict;
-use
Text::WikiFormat
;
+use
IkiWiki 3.00
;
-sub import { #{{{
- IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize);
-} # }}}
+sub import {
+ hook(type => "getsetup", id => "wiki", call => \&getsetup);
+ hook(type => "htmlize", id => "wiki", call => \&htmlize);
+}
-sub htmlize ($) { #{{{
- my $content = shift;
+sub getsetup () {
+ return
+ plugin => {
+ safe => 0, # format plugin
+ rebuild => undef,
+ section => "format",
+ },
+}
+
+sub htmlize (@) {
+ my %params=@_;
+ my $content = $params{content};
+
+ eval q{use Text::WikiFormat};
+ return $content if $@;
return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
-}
# }}}
+}
1
1