projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
symfony
/
polyfill-iconv
/
Iconv.php
diff --git
a/vendor/symfony/polyfill-iconv/Iconv.php
b/vendor/symfony/polyfill-iconv/Iconv.php
index b9abecbe8ced3f76a51b2cd905df8a3851279fb0..77e7ca056bfafef8f42ef6ba1d56785d9ca3e955 100644
(file)
--- a/
vendor/symfony/polyfill-iconv/Iconv.php
+++ b/
vendor/symfony/polyfill-iconv/Iconv.php
@@
-174,8
+174,8
@@
final class Iconv
}
} while ($loop);
}
} 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];
}
if (isset(self::$alias[$outCharset])) {
$outCharset = self::$alias[$outCharset];
@@
-292,7
+292,7
@@
final class Iconv
if ((ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode)
&& 'utf-8' !== $c
&& !isset(self::$alias[$c])
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]);
$d = false;
} elseif ('B' === strtoupper($str[$i + 1])) {
$d = base64_decode($str[$i + 2]);
@@
-433,7
+433,7
@@
final class Iconv
{
static $hasXml = null;
if (null === $hasXml) {
{
static $hasXml = null;
if (null === $hasXml) {
- $hasXml = extension_loaded('xml');
+ $hasXml =
\
extension_loaded('xml');
}
if ($hasXml) {
}
if ($hasXml) {
@@
-695,6
+695,10
@@
final class Iconv
} else {
return false;
}
} else {
return false;
}
+ } elseif ($ignore) {
+ continue;
+ } else {
+ return false;
}
$str = $uchr.substr($str, $i);
}
$str = $uchr.substr($str, $i);