Fix compatibility with old PHP 5.4

NagVis · Oct 18, 2023 · 662643c · 662643c
1 parent 98d9cd6
commit 662643c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,11 +1,14 @@
 1.9.39
+Core:
+ * FIX: Fix PHP 5.4 compatibility issue (syntax error, unexpected ':', expecting '{' in)
+ * FIX: Fix PHP 8.2 deprecation warnings caused by std_speedometer gadget
+
 
 1.9.38
 Frontend:
  * FIX: Fix XSS vulnerability
  * FIX: Fix PHP 8.2 deprecation warnings caused by shapes on automaps and host alias
  * 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
 Frontend:

diff --git a/share/server/core/functions/oldPhpVersionFixes.php b/share/server/core/functions/oldPhpVersionFixes.php
@@ -57,7 +57,7 @@ function date_default_timezone_set($timezone_identifier) {
 // PHP 8.2 deprecates utf8_encode. To stay compatible with older installations
 // and installations not providing the mbstring extension, we implement an approach
 // which defaults to mbstring and falls back to a polyfill.
-function iso8859_1_to_utf8(string $s): string {
+function iso8859_1_to_utf8($s) {
  if (function_exists("mb_convert_encoding")) {
  return mb_convert_encoding($s, 'UTF-8', 'ISO-8859-1');
  }