Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/polyfill-iconv/Iconv.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | c2387f117808 |
children |
line wrap: on
line diff
--- a/vendor/symfony/polyfill-iconv/Iconv.php Tue Jul 10 15:07:59 2018 +0100 +++ b/vendor/symfony/polyfill-iconv/Iconv.php Thu Feb 28 13:21:36 2019 +0000 @@ -174,8 +174,8 @@ } } while ($loop); - if (isset(self::$alias[ $inCharset])) { - $inCharset = self::$alias[ $inCharset]; + if (isset(self::$alias[$inCharset])) { + $inCharset = self::$alias[$inCharset]; } if (isset(self::$alias[$outCharset])) { $outCharset = self::$alias[$outCharset]; @@ -292,7 +292,7 @@ if ((ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode) && 'utf-8' !== $c && !isset(self::$alias[$c]) - && !self::loadMap('from.', $c, $d)) { + && !self::loadMap('from.', $c, $d)) { $d = false; } elseif ('B' === strtoupper($str[$i + 1])) { $d = base64_decode($str[$i + 2]); @@ -433,7 +433,7 @@ { static $hasXml = null; if (null === $hasXml) { - $hasXml = extension_loaded('xml'); + $hasXml = \extension_loaded('xml'); } if ($hasXml) { @@ -695,6 +695,10 @@ } else { return false; } + } elseif ($ignore) { + continue; + } else { + return false; } $str = $uchr.substr($str, $i);