add_fml_traditional_article_id, s/address_for_post/ml_name/

2 files changed, 14 insertions, 4 deletions

diff --git a/fml/lib/FML/Header.pm b/fml/lib/FML/Header.pm
index 6d99cc2b..d6ef9a5f 100644
--- a/fml/lib/FML/Header.pm
+++ b/fml/lib/FML/Header.pm
@@ -61,18 +61,24 @@ sub add_fml_ml_name
 {
     my ($header, $config, $args) = @_;
 
-    $header->add('X-ML-Name', $config->{ address_for_post });
+    $header->add('X-ML-Name', $config->{ ml_name });
 }
 
 
-sub add_fml_article_id
+sub add_fml_traditional_article_id
 {
     my ($header, $config, $args) = @_;
-
     $header->add('X-Mail-Count', $args->{ id });
 }
 
 
+sub add_fml_article_id
+{
+    my ($header, $config, $args) = @_;
+    $header->add('X-ML-Count', $args->{ id });
+}
+
+
 sub add_software_info
 {
     my ($header, $config, $args) = @_;
@@ -104,7 +110,7 @@ sub add_x_sequence
 {
     my ($header, $config, $args) = @_;
 
-    $header->add('X-Sequence',  "$args->{ name } $args->{ id }");
+    $header->add('X-Sequence',  "$config->{ ml_name } $args->{ id }");
 }
 
 
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index a8dd4522..d4b19209 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -134,6 +134,10 @@ sub _header_rewrite
 	    $header->add_software_info($config, { id => $id } );
 	}
 
+	if ($rule eq 'add_fml_traditional_article_id') {
+	    $header->add_fml_traditional_article_id($config, { id => $id } );
+	}
+
 	if ($rule eq 'add_fml_ml_name') {
 	    $header->add_fml_ml_name($config, { id => $id } );
 	}