
| Revision | 2e8ab06a83b8787316e4300a425120c3088ed25e (tree) |
|---|---|
| Time | 2016-10-29 23:59:12 |
| Author | |
| Commiter | umorigu |
BugTrack/2392 Fix encoding: die_message() outputs suitable charset
| @@ -462,13 +462,17 @@ EOD; | ||
| 462 | 462 | if(defined('SKIN_FILE') && file_exists(SKIN_FILE) && is_readable(SKIN_FILE)) { |
| 463 | 463 | catbody($title, $page, $body); |
| 464 | 464 | } else { |
| 465 | - header('Content-Type: text/html; charset=euc-jp'); | |
| 465 | + $charset = 'utf-8'; | |
| 466 | + if(defined('CONTENT_CHARSET')) { | |
| 467 | + $charset = CONTENT_CHARSET; | |
| 468 | + } | |
| 469 | + header("Content-Type: text/html; charset=$charset"); | |
| 466 | 470 | print <<<EOD |
| 467 | -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> | |
| 471 | +<!DOCTYPE html> | |
| 468 | 472 | <html> |
| 469 | 473 | <head> |
| 474 | + <meta http-equiv="content-type" content="text/html; charset=$charset"> | |
| 470 | 475 | <title>$title</title> |
| 471 | - <meta http-equiv="content-type" content="text/html; charset=euc-jp"> | |
| 472 | 476 | </head> |
| 473 | 477 | <body> |
| 474 | 478 | $body |