/trunk/vendor/symfony/polyfill-mbstring/Mbstring.php |
---|
79,7 → 79,7 |
public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null) |
{ |
if (\is_array($fromEncoding) || false !== strpos($fromEncoding, ',')) { |
if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) { |
$fromEncoding = self::mb_detect_encoding($s, $fromEncoding); |
} else { |
$fromEncoding = self::getEncoding($fromEncoding); |