Skip to content

Commit 921ffde

Browse files
Merge branch '4.4' into 5.3
* 4.4: [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [Cache] disable lock on CLI [VarDumper] add more "transient-on-macos" groups
2 parents c7eef3a + a6eb653 commit 921ffde

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Crawler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,11 +1182,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
11821182

11831183
try {
11841184
return mb_convert_encoding($htmlContent, 'HTML-ENTITIES', $charset);
1185-
} catch (\Exception | \ValueError $e) {
1185+
} catch (\Exception|\ValueError $e) {
11861186
try {
11871187
$htmlContent = iconv($charset, 'UTF-8', $htmlContent);
11881188
$htmlContent = mb_convert_encoding($htmlContent, 'HTML-ENTITIES', 'UTF-8');
1189-
} catch (\Exception | \ValueError $e) {
1189+
} catch (\Exception|\ValueError $e) {
11901190
}
11911191

11921192
return $htmlContent;

0 commit comments

Comments
 (0)