Skip to content

Commit 0e0d007

Browse files
Merge pull request SimpleMachines#9016 from Sesquipedalian/3.0/asciiname
[3.0] Fixes undefined array key "asciiname" error
2 parents 6e810cb + 973c42a commit 0e0d007

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Sources/Utils.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,11 +1979,13 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
19791979
// Provide a plain ASCII name for the sake of old browsers.
19801980
if (preg_match('/[\x{80}-\x{10FFFF}]/u', $file['filename'])) {
19811981
$file['asciiname'] = Localization\AsciiTransliterator::toAscii($file['filename'], '?');
1982-
}
19831982

1984-
// Replace ASCII names like ??????.jpg with something more unique.
1985-
if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.')) {
1986-
$file['asciiname'] = md5($file['filename']) . substr($file['asciiname'], strpos($file['asciiname'], '.'));
1983+
// Replace ASCII names like ??????.jpg with something more unique.
1984+
if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.')) {
1985+
$file['asciiname'] = md5($file['filename']) . substr($file['asciiname'], strpos($file['asciiname'], '.'));
1986+
}
1987+
} else {
1988+
$file['asciiname'] = $file['filename'];
19871989
}
19881990

19891991
// Clear any output that was made before now.

0 commit comments

Comments
 (0)