From 70d15cc0ec50e278b54232dcbe39757bdb3917a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Goetz?= Date: Wed, 8 Nov 2017 21:51:01 +0100 Subject: [PATCH] fix usages of iconv --- libs/Format/HTML/ContentTypes/Markdown/TOC/Processor.php | 2 +- libs/Format/HTML/Generator.php | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/Format/HTML/ContentTypes/Markdown/TOC/Processor.php b/libs/Format/HTML/ContentTypes/Markdown/TOC/Processor.php index 5d0914c..cbf0507 100644 --- a/libs/Format/HTML/ContentTypes/Markdown/TOC/Processor.php +++ b/libs/Format/HTML/ContentTypes/Markdown/TOC/Processor.php @@ -81,7 +81,7 @@ class Processor implements DocumentProcessorInterface $url = trim($url); $url = preg_replace('~[^\\pL0-9_]+~u', '-', $url); $url = trim($url, "-"); - $url = iconv("utf-8", "us-ascii//TRANSLIT", $url); + $url = iconv("utf-8", "ASCII//TRANSLIT//IGNORE", $url); $url = preg_replace('~[^-a-zA-Z0-9_]+~', '', $url); return $url; diff --git a/libs/Format/HTML/Generator.php b/libs/Format/HTML/Generator.php index ef7f73e..c69d7fc 100755 --- a/libs/Format/HTML/Generator.php +++ b/libs/Format/HTML/Generator.php @@ -154,9 +154,7 @@ class Generator implements \Todaymade\Daux\Format\Base\Generator, LiveGenerator // Sometimes strings are detected as invalid UTF-8 and json_encode can't treat them // iconv can fix those strings - if (function_exists("iconv")) { - $text = iconv('UTF-8', 'UTF-8//IGNORE', $text); - } + $text = iconv('UTF-8', 'UTF-8//IGNORE', $text); return $text; }