Merge branch 'master' of git://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / txt.pm

diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index 2670e9b6313e6708b1a7292b17d13ab6b15d2c5c..8599bdc8ec881429472ef19f760113f27d0a678f 100644 (file)
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -8,13 +8,28 @@ package IkiWiki::Plugin::txt;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Entities;
-require URI::Find;
+
+my $findurl=0;
 
 sub import {
-       hook(type => "filter",  id => "txt", call => \&filter);
+       hook(type => "getsetup", id => "txt", call => \&getsetup);
+       hook(type => "filter", id => "txt", call => \&filter);
        hook(type => "htmlize", id => "txt", call => \&htmlize);
+
+       eval q{use URI::Find};
+       if (! $@) {
+               $findurl=1;
+       }
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
 }
 
 # We use filter to convert raw text to HTML
@@ -23,14 +38,15 @@ sub filter (@) {
        my %params = @_;
        my $content = $params{content};
 
-       if ($pagesources{$params{page}} =~ /.txt$/) {
-               encode_entities($content);
-               my $finder = URI::Find->new(
-               sub {
-                       my ($uri, $orig_uri) = @_;
-                       return qq|<a href="$uri">$orig_uri</a>|;
-               });
-               $finder->find(\$content);
+       if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
+               encode_entities($content, "<>&");
+               if ($findurl) {
+                       my $finder = URI::Find->new(sub {
+                               my ($uri, $orig_uri) = @_;
+                               return qq|<a href="$uri">$orig_uri</a>|;
+                       });
+                       $finder->find(\$content);
+               }
                $content = "<pre>" . $content . "</pre>";
        }