summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen'ichi Fukamachi <fukachan@fml.org>2018-09-04 14:19:39 +0900
committerKen'ichi Fukamachi <fukachan@fml.org>2018-09-04 14:19:39 +0900
commitff4866f85c69f103b3d5c66433dcb2ba2905ad73 (patch)
treea9ae4032713443c7b44d3e1c50728ac85a00fddb
parente1a83b9afe47ce152788651d0a395ec3cdd39d43 (diff)
downloadfml8-ff4866f85c69f103b3d5c66433dcb2ba2905ad73.tar.gz
fml8-ff4866f85c69f103b3d5c66433dcb2ba2905ad73.tar.bz2
fml8-ff4866f85c69f103b3d5c66433dcb2ba2905ad73.zip
Revert "FML::Header::Subject->rewrite_article_subject_tag is obsolete."
This reverts commit e1a83b9afe47ce152788651d0a395ec3cdd39d43.
-rw-r--r--fml/lib/FML/Header.pm6
-rw-r--r--fml/lib/FML/Header/Subject.pm7
2 files changed, 5 insertions, 8 deletions
diff --git a/fml/lib/FML/Header.pm b/fml/lib/FML/Header.pm
index 9c154274..a5f24b84 100644
--- a/fml/lib/FML/Header.pm
+++ b/fml/lib/FML/Header.pm
@@ -467,7 +467,7 @@ sub rewrite_article_subject_tag
my $sbj = new Mail::Message::Subject $str;
# mime decode
- $sbj->mime_hdr_decode();
+ $sbj->mime_decode();
# de-tag and cut off Re: Re: Re: ... (duplicated reply tag).
$sbj->delete_dup_reply_tag() if $sbj->has_reply_tag();
@@ -482,7 +482,7 @@ sub rewrite_article_subject_tag
$sbj->set($new_sbj);
# mime encode and replace subject field.
- $sbj->mime_hdr_encode();
+ $sbj->mime_encode();
$header->replace('Subject', $sbj->as_str());
}
@@ -499,7 +499,7 @@ sub rewrite_article_subject_tag_obsolete
my $pkg = "FML::Header::Subject";
eval qq{ use $pkg;};
unless ($@) {
- $pkg->rewrite_article_subject_tag_obsolete($header, $config, $rw_args);
+ $pkg->rewrite_article_subject_tag($header, $config, $rw_args);
}
else {
croak("cannot load $pkg");
diff --git a/fml/lib/FML/Header/Subject.pm b/fml/lib/FML/Header/Subject.pm
index 42936d9f..535b5f98 100644
--- a/fml/lib/FML/Header/Subject.pm
+++ b/fml/lib/FML/Header/Subject.pm
@@ -48,9 +48,7 @@ sub new
}
-=head2 rewrite_article_subject_tag_obsolete($header, $config, $args)
-
-[OBSOLETE] not used now. it should be removed in the future.
+=head2 rewrite_article_subject_tag($header, $config, $args)
add or rewrite the subject tag for C<$header>.
This mothod cuts off Re: (reply identifier) in subject: and
@@ -60,11 +58,10 @@ replace the subject with the newer content e.g. including the ML tag.
# Descriptions: add or rewrite the subject tag.
-# [OBSOLETE] not used now. it should be removed in the future.
# Arguments: OBJ($self) OBJ($header) OBJ($config) HASH_REF($rw_args)
# Side Effects: the header subject is rewritten.
# Return Value: none
-sub rewrite_article_subject_tag_obsolete
+sub rewrite_article_subject_tag
{
my ($self, $header, $config, $rw_args) = @_;
my ($in_code, $out_code);