Skip to content

[stable23] Fix missing setlocale with php 8 #29737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 6 commits into from
Nov 17, 2021
Merged

[stable23] Fix missing setlocale with php 8 #29737

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e80182
Fix missing setlocale with php 8
YoitoFes Nov 13, 2021
3b83976
Check whether setlocale works only after setlocale
YoitoFes Nov 13, 2021
df52393
Add check whether escapeshellcmd behaves the same as basename
YoitoFes Nov 15, 2021
d27be60
OC_Util: Add fallbacks to check if current locale is UTF8
YoitoFes Nov 15, 2021
5fc031c
OC_Util::isSetLocaleWorking: fix typo
YoitoFes Nov 15, 2021
acece8f
OC_Util::isNonUTF8Locale: fix lint error
YoitoFes Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
OC_Util::isNonUTF8Locale: fix lint error 
Signed-off-by: Naoto Kobayashi <[email protected]>
  • Loading branch information
@YoitoFes @backportbot
YoitoFes authored and backportbot[bot] committed Nov 16, 2021
commit acece8f4baf5c55e651593f43699b67124321a99
10 changes: 5 additions & 5 deletions lib/private/legacy/OC_Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,12 +1244,12 @@ public function isHtaccessWorking(\OCP\IConfig $config) {
* @return bool
*/
private static function isNonUTF8Locale() {
if (function_exists("escapeshellcmd")) {
return ('' === escapeshellcmd('§'));
} else if (function_exists("escapeshellarg")) {
return ('\'\'' === escapeshellarg('§'));
if (function_exists('escapeshellcmd')) {
return '' === escapeshellcmd('§');
} elseif (function_exists('escapeshellarg')) {
return '\'\'' === escapeshellarg('§');
} else {
return (0 === preg_match('/utf-?8/i', setlocale(LC_CTYPE, 0)));
return 0 === preg_match('/utf-?8/i', setlocale(LC_CTYPE, 0));
}
}

Expand Down