summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
40a9d8b)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4413
7612ce4b-ef26-0410-bec9-
ea0150e637f0
function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
global $msn_user_support, $default_use_mdn, $default_use_priority,
function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
global $msn_user_support, $default_use_mdn, $default_use_priority,
- $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on;
+ $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on,
+ $squirrelmail_language;
$header = $message->rfc822_header;
$env = array();
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ if ($squirrelmail_language == 'ja_JP') {
+ $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ } else {
+ $env[_("Subject")] = decodeHeader(htmlspecialchars($header->subject));
+ }
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');