Only set internal_encoding for iconv with PHP < 5.6

Doing so has been deprecated and replaced by the setting "default_charset", see https://wiki.php.net/rfc/default_encoding. Since its default value is UTF-8 (which == xp::ENCODING), we do not have to do anything for PHP 5.6+
xp-framework · Jan 7, 2016 · c3b9088 · c3b9088
1 parent 00b91ea
commit c3b9088
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/shared/src/class-main.php b/shared/src/class-main.php
@@ -72,7 +72,7 @@
 
 // Start I/O layers
 $encoding= get_cfg_var('encoding');
-iconv_set_encoding('internal_encoding', \xp::ENCODING);
+PHP_VERSION < '5.6' && iconv_set_encoding('internal_encoding', \xp::ENCODING);
 array_shift($_SERVER['argv']);
 array_shift($argv);
 if ($encoding) {