mirror of
https://github.com/twigphp/Twig.git
synced 2026-09-26 16:14:57 +00:00
Merge branch '1.x' into 2.x
* 1.x: added PHP 8.1 as experimental
This commit is contained in:
+1
-1
@@ -623,7 +623,7 @@ class Environment
|
||||
*/
|
||||
public function setCharset($charset)
|
||||
{
|
||||
if ('UTF8' === $charset = strtoupper($charset)) {
|
||||
if ('UTF8' === $charset = null === $charset ? null : strtoupper($charset)) {
|
||||
// iconv on Windows requires "UTF-8" instead of "UTF8"
|
||||
$charset = 'UTF-8';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user