use intl's native normalizer_normalize() in case the module is available
This commit is contained in:
parent
bfebbe47de
commit
59209e0f2b
|
@ -495,6 +495,9 @@ class OC {
|
|||
require_once $vendorAutoLoad;
|
||||
}
|
||||
|
||||
// initialize intl fallback is necessary
|
||||
\Patchwork\Utf8\Bootup::initIntl();
|
||||
|
||||
if (!defined('PHPUNIT_RUN')) {
|
||||
OC\Log\ErrorHandler::setLogger(OC_Log::$object);
|
||||
if (defined('DEBUG') and DEBUG) {
|
||||
|
|
|
@ -1402,13 +1402,11 @@ class OC_Util {
|
|||
* @return bool|string
|
||||
*/
|
||||
public static function normalizeUnicode($value) {
|
||||
if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
|
||||
$normalizedValue = \Patchwork\PHP\Shim\Normalizer::normalize($value);
|
||||
if ($normalizedValue === false) {
|
||||
\OC_Log::write('core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
|
||||
} else {
|
||||
$value = $normalizedValue;
|
||||
}
|
||||
$normalizedValue = normalizer_normalize($value);
|
||||
if ($normalizedValue === null || $normalizedValue === false) {
|
||||
\OC_Log::write('core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
|
||||
} else {
|
||||
$value = $normalizedValue;
|
||||
}
|
||||
|
||||
return $value;
|
||||
|
|
Loading…
Reference in New Issue