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

fixed Windows support

Browse Source
This commit is contained in:
Fabien Potencier
2015-10-26 18:00:15 +01:00
parent f5cf424d0e
commit aca92bc53f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+7 -2
View File
@@ -100,7 +100,7 @@ class Twig_Environment
), $options);
$this->debug = (bool) $options['debug'];
$this->charset = strtoupper($options['charset']);
$this->setCharset($options['charset']);
$this->baseTemplateClass = $options['base_template_class'];
$this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
$this->strictVariables = (bool) $options['strict_variables'];
@@ -604,7 +604,12 @@ class Twig_Environment
*/
public function setCharset($charset)
{
$this->charset = strtoupper($charset);
if ('UTF8' === $charset = strtoupper($charset)) {
// iconv on Windows requires "UTF-8" instead of "UTF8"
$charset = 'UTF-8';
}
$this->charset = $charset;
}
/**