Commit bf37fa2a authored by sikeda's avatar sikeda
Browse files

[-dev] Degrading by merge.

git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10142 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 3ab511b8
......@@ -24,7 +24,7 @@
package Archive;
use strict;
use Cwd qw(getcwd);
use Encode qw(decode_utf8 encode_utf8);
use HTML::Entities qw(decode_entities);
......
......@@ -148,7 +148,6 @@ sub mail_file {
my $output;
my @path = split /\//, $filename;
&Language::PushLang($data->{'lang'}) if (defined $data->{'lang'});
my $dump = &Dumper($data); open (DUMP,">>/tmp/dumper2"); printf DUMP 'avant tt2 \n%s',$dump ; close DUMP;
&tt2::parse_tt2($data, $path[$#path], \$output);
&Language::PopLang() if (defined $data->{'lang'});
$message_as_string .= join('',$output);
......@@ -304,7 +303,6 @@ sub mail_file {
unless ($message_as_string = &reformat_message("$headers"."$message_as_string", \@msgs, $data->{'charset'})) {
&Log::do_log('err', "mail::mail_file: Failed to reformat message");
}
my $dump = &Dumper($message_as_string); open (DUMP,">>/tmp/dumper2"); printf DUMP 'avant \n%s',$dump ; close DUMP;
## Set it in case it was not set
$data->{'return_path'} ||= &Conf::get_robot_conf($robot, 'request');
......
......@@ -70,6 +70,7 @@
[% FOREACH file IN plugins('list_menu') %]
[% INCLUDE $file %]
[% END %]
[% END %]
[% IF is_archived %]
[% IF arc_access %]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment