diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2023-06-09 22:41:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2023-06-09 22:41:49 +0000 |
| commit | 9aa834275aec6fe189db3df6f75fb2d7a7c87254 (patch) | |
| tree | 28c0b531fbf8df0cc1fe15c19fc0a824e40d8530 | |
| parent | a0bd7ee23f83ff7405c2bd6c92e0cef34c5590cb (diff) | |
| parent | 866296a8a1d1cc461e41d71fcea568a89a5edcd7 (diff) | |
Merge "moveToExternal: Also check for utf8 encoding before trying to convert" into REL1_401.40.0-rc.0
| -rw-r--r-- | maintenance/storage/moveToExternal.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php index cf729c3f13e5..7e280a7fa8e0 100644 --- a/maintenance/storage/moveToExternal.php +++ b/maintenance/storage/moveToExternal.php @@ -231,6 +231,7 @@ class MoveToExternal extends Maintenance { private function resolveLegacyEncoding( $text, $flags ) { if ( $this->legacyEncoding !== null && !in_array( 'utf-8', $flags ) + && !in_array( 'utf8', $flags ) ) { AtEase::suppressWarnings(); $text = iconv( $this->legacyEncoding, 'UTF-8//IGNORE', $text ); |