Skip to content

Commit

Permalink
Fix PHP 8.2 deprecation warnings caused by gettext.inc
Browse files Browse the repository at this point in the history
  • Loading branch information
LarsMichelsen committed Oct 14, 2023
1 parent f1e8888 commit ac2570d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions ChangeLog
@@ -1,6 +1,7 @@
1.9.38
Frontend:
* FIX: Fix XSS vulnerability
* FIX: Fix PHP 8.2 deprecation warnings caused by gettext.inc
* FIX: Fix PHP 8.2 deprecation warnings caused by std_speedometer gadget

1.9.37
Expand Down
12 changes: 6 additions & 6 deletions share/server/core/ext/php-gettext-1.0.12/gettext.inc
Expand Up @@ -88,18 +88,18 @@ function get_list_of_locales($locale) {
if ($modifier) {
if ($country) {
if ($charset)
array_push($locale_names, "${lang}_$country.$charset@$modifier");
array_push($locale_names, "${lang}_$country@$modifier");
array_push($locale_names, "{$lang}_$country.$charset@$modifier");
array_push($locale_names, "{$lang}_$country@$modifier");
} elseif ($charset)
array_push($locale_names, "${lang}.$charset@$modifier");
array_push($locale_names, "{$lang}.$charset@$modifier");
array_push($locale_names, "$lang@$modifier");
}
if ($country) {
if ($charset)
array_push($locale_names, "${lang}_$country.$charset");
array_push($locale_names, "${lang}_$country");
array_push($locale_names, "{$lang}_$country.$charset");
array_push($locale_names, "{$lang}_$country");
} elseif ($charset)
array_push($locale_names, "${lang}.$charset");
array_push($locale_names, "{$lang}.$charset");
array_push($locale_names, $lang);
}

Expand Down

0 comments on commit ac2570d

Please sign in to comment.