Make simplify_date always return HTML, and remove the eucconv call th…

…at's not useful for dates
webmin · Feb 17, 2025 · 818b300 · 818b300
1 parent b5eb021
commit 818b300
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/mailbox/index.cgi b/mailbox/index.cgi
@@ -233,7 +233,7 @@ for(my $i=$start; $i<=$end; $i++) {
 		}
 
 	# Date and size columns
-	push(@cols, $bs.&eucconv(&simplify_date(&html_escape($m->{'header'}->{'date'}))).$be);
+	push(@cols, $bs.&simplify_date($m->{'header'}->{'date'}).$be);
 	push(@cols, $bs.&nice_size($m->{'size'}, 1024).$be);
 	$rowtds[$#cols] .= " data-sort=".$m->{'size'};
 

diff --git a/mailbox/view_mail.cgi b/mailbox/view_mail.cgi
@@ -237,8 +237,7 @@ else {
 					$in{'id'}, $subs));
 		}
 	print &ui_table_row($text{'mail_date'},
-		&eucconv(
-			&simplify_date(&html_escape($mail->{'header'}->{'date'}))));
+		&simplify_date($mail->{'header'}->{'date'}));
 
 	my $subj = $mail->{'header'}->{'subject'};
 	$subj =~ s/^((Re:|Fwd:|\[\S+\])\s*)+//ig;