Fix three PHP8 warnings about indexing empty arrays.

Gnucash · Jan 12, 2023 · 048fed3 · 048fed3
1 parent 4c96975
commit 048fed3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/externals/header.phtml b/externals/header.phtml
@@ -21,15 +21,17 @@
   {
       if (isset($lang) && $lang != "") {
           $get_parms["lang"] = $lang;
+          if (in_array($get_parms["lang"],
+                       array_values($GLOBALS["supported_languages"]), TRUE) ||
+                       array_key_exists($get_parms["lang"],
+                                        $GLOBALS["supported_languages"])) {
+              $url_get_query = http_build_query($get_parms);
+              $lang_href = "$page"."?"."$url_get_query";
+          } else {
+              $lang_href = "$page";
+          }
+          return $lang_href;
       }
-      if (in_array($get_parms["lang"], array_values($GLOBALS["supported_languages"]), TRUE) ||
-           array_key_exists($get_parms["lang"], $GLOBALS["supported_languages"])) {
-          $url_get_query = http_build_query($get_parms);
-          $lang_href = "$page"."?"."$url_get_query";
-      } else {
-          $lang_href = "$page";
-      }
-      return $lang_href;
   }
 
    $input_filter_args = array('lang' => FILTER_SANITIZE_STRING);

diff --git a/lang.php b/lang.php
@@ -63,10 +63,12 @@
     foreach ($languages as $item)
     {
         $parts = explode(";", $item);
-        if (!$parts[1]) {
-            $ranked_langs[$parts[0]] = 1.0;
-        } else {
-            $ranked_langs[$parts[0]] = (float)substr($parts[1], 2);
+        if ($parts) {
+            if (!$parts[1]) {
+                $ranked_langs[$parts[0]] = 1.0;
+            } else {
+                $ranked_langs[$parts[0]] = (float)substr($parts[1], 2);
+            }
         }
     }
     arsort($ranked_langs, SORT_NUMERIC);