Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
287c26bd
Unverified
Commit
287c26bd
authored
4 years ago
by
Christoph Wurst
Committed by
Morris Jobke
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Replace patchwork/utf8 with symfony-polyfill-*
Signed-off-by:
Christoph Wurst
<
christoph@winzerhof-wurst.at
>
parent
82947263
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
3rdparty
+1
-1
1 addition, 1 deletion
3rdparty
lib/base.php
+1
-2
1 addition, 2 deletions
lib/base.php
lib/private/legacy/OC_Util.php
+7
-1
7 additions, 1 deletion
lib/private/legacy/OC_Util.php
with
9 additions
and
4 deletions
3rdparty
@
86573beb
Compare
875ee275
...
86573beb
Subproject commit 8
75ee27505a280f58a893b16976fe36572fd82c4
Subproject commit 8
6573beb84cf3b62b6d01ee377225df83b7d2453
This diff is collapsed.
Click to expand it.
lib/base.php
+
1
−
2
View file @
287c26bd
...
@@ -629,8 +629,7 @@ class OC {
...
@@ -629,8 +629,7 @@ class OC {
self
::
handleAuthHeaders
();
self
::
handleAuthHeaders
();
self
::
registerAutoloaderCache
();
self
::
registerAutoloaderCache
();
// initialize intl fallback is necessary
// initialize intl fallback if necessary
\Patchwork\Utf8\Bootup
::
initIntl
();
OC_Util
::
isSetLocaleWorking
();
OC_Util
::
isSetLocaleWorking
();
if
(
!
defined
(
'PHPUNIT_RUN'
))
{
if
(
!
defined
(
'PHPUNIT_RUN'
))
{
...
...
This diff is collapsed.
Click to expand it.
lib/private/legacy/OC_Util.php
+
7
−
1
View file @
287c26bd
...
@@ -1293,7 +1293,13 @@ class OC_Util {
...
@@ -1293,7 +1293,13 @@ class OC_Util {
* @return bool
* @return bool
*/
*/
public
static
function
isSetLocaleWorking
()
{
public
static
function
isSetLocaleWorking
()
{
\Patchwork\Utf8\Bootup
::
initLocale
();
if
(
''
===
basename
(
'§'
))
{
// Borrowed from \Patchwork\Utf8\Bootup::initLocale
setlocale
(
LC_ALL
,
'C.UTF-8'
,
'C'
);
setlocale
(
LC_CTYPE
,
'en_US.UTF-8'
,
'fr_FR.UTF-8'
,
'es_ES.UTF-8'
,
'de_DE.UTF-8'
,
'ru_RU.UTF-8'
,
'pt_BR.UTF-8'
,
'it_IT.UTF-8'
,
'ja_JP.UTF-8'
,
'zh_CN.UTF-8'
,
'0'
);
}
// Check again
if
(
''
===
basename
(
'§'
))
{
if
(
''
===
basename
(
'§'
))
{
return
false
;
return
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment