BUGFIX: require ext-mbstring & use mb_convert_econding instead of utf…

…8_encode
neos · Mar 29, 2017 · a19dfb9 · a19dfb9
1 parent 783765a
commit a19dfb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Classes/Specifications/Iptc/Iim.php b/Classes/Specifications/Iptc/Iim.php
@@ -1254,7 +1254,7 @@ public function __construct(array $properties)
         if (!array_key_exists(self::CODED_CHARACTER_SET, $properties)) {
             array_walk_recursive($properties, function (&$element) {
                 if (is_string($element) && mb_detect_encoding($element, 'UTF-8', true) === false) {
-                    $element = utf8_encode($element);
+                    $element = mb_convert_encoding($element, 'UTF-8', 'ISO-8859-1');
                 }
             });
         }

diff --git a/composer.json b/composer.json
@@ -5,6 +5,8 @@
   "license": "MIT",
   "require": {
     "ext-exif": "*",
+    "ext-mbstring": "*",
+
     "neos/flow": "^4.0",
     "neos/media": "^3.0",
     "neos/metadata": "^2.0",