sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10960 from owncloud/use-intl-module-master 

use intl's native normalizer_normalize() in case the module is available
remotes/origin/fix-10825
Lukas Reschke 2014-09-15 14:13:30 +07:00
parent 31898aa635 59209e0f2b
commit 07b14bcd4f
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
Unescape Escape View File

@ -496,6 +496,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
Unescape Escape 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;