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

[Alex Vandiver]

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

1:  9b26a72 = 1:  2499d7e Use HTML::FormatExternal to allow external HTML → text formatters
2:  056dfba ! 2:  4fefae3 Allow $HTMLFormatter to contain the full path
    @@ -1,10 +1,6 @@
     Author: Alex Vandiver <alexmv at bestpractical.com>
     
         Allow $HTMLFormatter to contain the full path
    -    
    -    Some webservers unset or limit $ENV{PATH} when running; search in
    -    /usr/bin by default, and further allow the setting to contain an
    -    explicit full path to the executable.
     
     diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
     --- a/etc/RT_Config.pm.in
    @@ -13,9 +9,8 @@
      L<HTML::FormatExternal> module be installed; it is an optional
      dependency which RT will not install by default.
      
    -+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
    -+the aforementioned executables.
    ++If the chosen formatter is not in the webserver's $PATH, you may set
    ++this option the full path to one of the aforementioned executables.
     +
      =cut
      
    @@ -24,18 +19,6 @@
     diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
     --- a/lib/RT/Interface/Email.pm
     +++ b/lib/RT/Interface/Email.pm
    -@@
    -     if ($wanted) {
    -         @order = ($wanted, "core");
    -     } else {
    --        @order = ("w3m", "elinks", "html2text", "links", "lynx", "core");
    -+        # Try a sane default full path, in case the webserver has a very
    -+        # limited $ENV{PATH}
    -+        @order = map {($_, "/usr/bin/$_")} qw/w3m elinks html2text links lynx/;
    -+        push @order, "core";
    -     }
    -     # Always fall back to core, even if it is not listed
    -     for my $prog (@order) {
     @@
                      next;
                  }
-:  ------- > 3:  77f6139 Provide a default PATH in cases where it is unset (mod_fastcgi)
3:  4201d8f ! 4:  58b3db3 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.
      
    - 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
    + If the chosen formatter is not in the webserver's $PATH, you may set
    + this option the full path to one of the aforementioned executables.
     
     diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
     --- a/lib/RT/Interface/Email.pm
4:  7bc6f4f = 5:  5a54a02 HTML::HTML5::ToText mistakenly installs a global __WARN__ handler; local it
5:  9a3e5c8 = 6:  6449b2e Update tests to work with any of the HTML formatters