Further fix not to pass NULL to stringy method

civicrm · Aug 20, 2022 · 613c39f · 613c39f
1 parent fa41317
commit 613c39f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Civi/Core/Locale.php b/Civi/Core/Locale.php
@@ -245,7 +245,7 @@ public function apply(): Locale {
   public function renegotiate(array $availableLocales): ?Locale {
     $fallbacks = array_merge(
       // We'd like to stay in the active locale (or something closely related)
-      static::getLocalePrecedence($this->nominal),
+      ($this->nominal ? static::getLocalePrecedence($this->nominal) : []),
       // If we can't, then try the system locale (or something closely related)
       static::getLocalePrecedence(\Civi::settings()->get('lcMessages'))
     );