mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use intl's native normalizer_normalize() in case the module is available

This commit is contained in:
Thomas Müller 2014-09-09 14:41:45 +02:00
parent bfebbe47de
commit 59209e0f2b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base.php
View File

@ -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) {

12
lib/private/util.php
View File

@ -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;