make htmlentities use the right encoding

This commit is contained in:
Robert Kaiser 2012-09-20 01:28:21 +02:00
Родитель 3a153fa018
Коммит 0ee136626c
1 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -95,11 +95,6 @@ if (file_exists($fdbsecret)) {
// http://socorro.readthedocs.org/en/latest/databasetabledesc.html
// For the DB schema, see
// https://github.com/mozilla/socorro/blob/master/sql/schema.sql
// Make sure we get UTF-8 data.
print('encoding: '.pg_client_encoding($db_conn)."\n");
pg_set_client_encoding($db_conn, 'UNICODE');
print('encoding: '.pg_client_encoding($db_conn)."\n");
}
else {
// Won't work! (Set just for documenting what fields are in the file.)
@ -321,7 +316,8 @@ foreach ($reports as $rname=>$rep) {
else {
// common case, useful signature
$sigdisplay = preg_replace('/_+\.*$/', '', $data['sig']);
$link = $td->appendChild($doc->createElement('a', htmlentities($sigdisplay)));
$link = $td->appendChild($doc->createElement('a',
htmlentities($sigdisplay, ENT_COMPAT, 'UTF-8')));
$link->setAttribute('href', $url_siglinkbase.rawurlencode($data['sig']));
}
$td = $tr->appendChild($doc->createElement('td', $data['cnt']));
@ -337,8 +333,9 @@ foreach ($reports as $rname=>$rep) {
}
$link = $td->appendChild($doc->createElement('a', $bug));
$link->setAttribute('href', $url_buglinkbase.$bug);
$link->setAttribute('title', $bugdata['status'].' '.$bugdata['resolution']
.' - '.htmlentities($bugdata['short_desc']));
$link->setAttribute('title',
$bugdata['status'].' '.$bugdata['resolution'].' - '
.htmlentities($bugdata['short_desc'], ENT_COMPAT, 'UTF-8'));
if ($bugdata['status'] == 'RESOLVED') {
$link->setAttribute('class', 'resolvedbug');
}