[Rt-commit] rt branch, 4.2/html-external-formatter, repushed

[Alex Vandiver]

The branch 4.2/html-external-formatter was deleted and repushed:
       was 8887a8b9dc100149e2d1ed236b741d86186f9a8a
       now 9a3e5c825611c6ac2cbbaf208cbed709dee97f8a

1:  b95b986 ! 1:  9b26a72 Use HTML::FormatExternal to allow external HTML → text formatters
    @@ -96,12 +96,19 @@
     +            require HTML::FormatText::WithLinks::AndTables;
     +            $formatter = \&_HTMLFormatText;
     +        } else {
    -+            my $package = "HTML::FormatText::" . ucfirst($prog);
    -+            unless ($package->require) {
    -+                RT->Logger->warn("Could not load $package; install HTML::FormatExternal")
    ++            unless (HTML::FormatExternal->require) {
    ++                RT->Logger->warn("HTML::FormatExternal is not installed; falling back to internal perl formatter")
     +                    if $wanted;
     +                next;
     +            }
    ++
    ++            my $package = "HTML::FormatText::" . ucfirst($prog);
    ++            unless ($package->require) {
    ++                RT->Logger->warn("$prog is not a valid formatter provided by HTML::FormatExternal")
    ++                    if $wanted;
    ++                next;
    ++            }
    ++
     +            unless (defined $package->program_version) {
     +                RT->Logger->warn("Could not find external '$prog' HTML formatter; is it installed?")
     +                    if $wanted;
-:  ------- > 2:  056dfba Allow $HTMLFormatter to contain the full path
2:  61cd55e ! 3:  4201d8f Add HTML::HTML5::ToText as a better pure-perl HTML → text converter
    @@ -28,8 +28,8 @@
     +requires that the L<HTML::FormatExternal> module be installed.  Neither
     +of these modules are installed by RT by default.
      
    - =cut
    - 
    + If the chosen formatter is not in the webserver's $PATH nor in the
    + standard F</usr/bin/>, you may set this option the full path to one of
     
     diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
     --- a/lib/RT/Interface/Email.pm
    @@ -57,6 +57,6 @@
     +                return $text;
     +            };
              } else {
    -             my $package = "HTML::FormatText::" . ucfirst($prog);
    -             unless ($package->require) {
    +             unless (HTML::FormatExternal->require) {
    +                 RT->Logger->warn("HTML::FormatExternal is not installed; falling back to internal perl formatter")
     
3:  4647de4 = 4:  7bc6f4f HTML::HTML5::ToText mistakenly installs a global __WARN__ handler; local it
4:  8887a8b = 5:  9a3e5c8 Update tests to work with any of the HTML formatters