Merge pull request #1992 from sokai/patch-1

Fix description retrieval when page charset is not UTF-8
shaarli · Mar 1, 2024 · 7909448 · 7909448
2 parents 0a418b9 + 661419b
commit 7909448
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/application/http/MetadataRetriever.php b/application/http/MetadataRetriever.php
@@ -59,6 +59,12 @@ public function retrieve(string $url): array
         if (!empty($title) && strtolower($charset) !== 'utf-8') {
             $title = mb_convert_encoding($title, 'utf-8', $charset);
         }
+        if (!empty($description) && strtolower($charset) !== 'utf-8') {
+            $description = mb_convert_encoding($description, 'utf-8', $charset);
+        }
+        if (!empty($tags) && strtolower($charset) !== 'utf-8') {
+            $tags = mb_convert_encoding($tags, 'utf-8', $charset);
+        }
 
         return array_map([$this, 'cleanMetadata'], [
             'title' => $title,