about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-08-20 20:24:48 +0000
committerEric Wong <e@yhbt.net>2020-08-20 21:11:17 +0000
commitdbc225da82ac9a8f6515a978f6abc44dddb67aab (patch)
tree612b6d3c29e7dd50e929bc0dc5cad6d9f4d715cd /lib/PublicInbox
parent713b42f9c78b3963797ac988456d0c6d20375db1 (diff)
downloadpublic-inbox-dbc225da82ac9a8f6515a978f6abc44dddb67aab.tar.gz
Both callers of load_from_data call utf8::decode, so just
do utf8::decode in load_from_data.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/Over.pm1
-rw-r--r--lib/PublicInbox/Smsg.pm2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 2b314882..81b9fca7 100644
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -68,7 +68,6 @@ sub load_from_row ($;$) {
         bless $smsg, 'PublicInbox::Smsg';
         if (defined(my $data = delete $smsg->{ddd})) {
                 $data = uncompress($data);
-                utf8::decode($data);
                 PublicInbox::Smsg::load_from_data($smsg, $data);
 
                 # saves over 600K for 1000+ message threads
diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm
index 62cb951e..f22cd43e 100644
--- a/lib/PublicInbox/Smsg.pm
+++ b/lib/PublicInbox/Smsg.pm
@@ -40,6 +40,7 @@ sub to_doc_data {
 
 sub load_from_data ($$) {
         my ($self) = $_[0]; # data = $_[1]
+        utf8::decode($_[1]);
         (
                 $self->{subject},
                 $self->{from},
@@ -67,7 +68,6 @@ sub load_expand {
         my $dt = get_val($doc, PublicInbox::Search::DT());
         my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $dt);
         $self->{ds} = timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
-        utf8::decode($data);
         load_from_data($self, $data);
         $self;
 }