geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 04:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use uppercased charsets consistently (as in js/css/html_attr strategies)

Browse Source
This commit is contained in:
Jordi Boggiano
2013-05-06 14:19:26 +02:00
parent a23fa62331
commit c1c0dccfe3
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+3 -3
View File
@@ -53,7 +53,7 @@ class Twig_Environment
* * debug: When set to true, it automatically set "auto_reload" to true as * * debug: When set to true, it automatically set "auto_reload" to true as
* well (default to false). * well (default to false).
* *
* * charset: The charset used by the templates (default to utf-8). * * charset: The charset used by the templates (default to UTF-8).
* *
* * base_template_class: The base template class to use for generated * * base_template_class: The base template class to use for generated
* templates (default to Twig_Template). * templates (default to Twig_Template).
@@ -99,7 +99,7 @@ class Twig_Environment
), $options); ), $options);
$this->debug = (bool) $options['debug']; $this->debug = (bool) $options['debug'];
$this->charset = $options['charset']; $this->charset = strtoupper($options['charset']);
$this->baseTemplateClass = $options['base_template_class']; $this->baseTemplateClass = $options['base_template_class'];
$this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload']; $this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
$this->strictVariables = (bool) $options['strict_variables']; $this->strictVariables = (bool) $options['strict_variables'];
@@ -566,7 +566,7 @@ class Twig_Environment
*/ */
public function setCharset($charset) public function setCharset($charset)
{ {
$this->charset = $charset; $this->charset = strtoupper($charset);
} }
/** /**
lib/Twig/Extension/Core.php
+14 -14
View File
@@ -869,28 +869,28 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
// each time the function is called. Moving the declaration on the // each time the function is called. Moving the declaration on the
// top of the function slow downs other escaping strategies. // top of the function slow downs other escaping strategies.
static $htmlspecialcharsCharsets = array( static $htmlspecialcharsCharsets = array(
'iso-8859-1' => true, 'iso8859-1' => true, 'ISO-8859-1' => true, 'ISO8859-1' => true,
'iso-8859-15' => true, 'iso8859-15' => true, 'ISO-8859-15' => true, 'ISO8859-15' => true,
'utf-8' => true, 'UTF-8' => true, 'utf-8' => true, 'UTF-8' => true,
'cp866' => true, 'ibm866' => true, '866' => true, 'CP866' => true, 'IBM866' => true, '866' => true,
'cp1251' => true, 'windows-1251' => true, 'win-1251' => true, 'CP1251' => true, 'WINDOWS-1251' => true, 'WIN-1251' => true,
'1251' => true, '1251' => true,
'cp1252' => true, 'windows-1252' => true, '1252' => true, 'CP1252' => true, 'WINDOWS-1252' => true, '1252' => true,
'koi8-r' => true, 'koi8-ru' => true, 'koi8r' => true, 'KOI8-R' => true, 'KOI8-RU' => true, 'KOI8R' => true,
'big5' => true, '950' => true, 'BIG5' => true, '950' => true,
'gb2312' => true, '936' => true, 'GB2312' => true, '936' => true,
'big5-hkscs' => true, 'BIG5-HKSCS' => true,
'shift_jis' => true, 'sjis' => true, '932' => true, 'SHIFT_JIS' => true, 'SJIS' => true, '932' => true,
'euc-jp' => true, 'eucjp' => true, 'EUC-JP' => true, 'EUCJP' => true,
'iso8859-5' => true, 'iso-8859-5' => true, 'macroman' => true, 'ISO8859-5' => true, 'ISO-8859-5' => true, 'MACROMAN' => true,
); );
if (isset($htmlspecialcharsCharsets[$charset])) { if (isset($htmlspecialcharsCharsets[$charset])) {
return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset); return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
} }
if (isset($htmlspecialcharsCharsets[strtolower($charset)])) { if (isset($htmlspecialcharsCharsets[strtoupper($charset)])) {
// cache the uppercase variant for future iterations // cache the lowercase variant for future iterations
$htmlspecialcharsCharsets[$charset] = true; $htmlspecialcharsCharsets[$charset] = true;
return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset); return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);