From ab63d2234ca89275c40c63f393cc7848adbb3fd7 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 3 Jul 2020 14:22:32 +0200
Subject: [PATCH] Guard against nils in conditions

---
 app/services/user_locale_setter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/user_locale_setter.rb b/app/services/user_locale_setter.rb
index 1f36f4ea66..1a5951df20 100644
--- a/app/services/user_locale_setter.rb
+++ b/app/services/user_locale_setter.rb
@@ -61,9 +61,9 @@ class UserLocaleSetter
   end
 
   def valid_current_locale
-    if available_locale?(current_user_locale)
+    if current_user_locale && available_locale?(current_user_locale)
       current_user_locale
-    elsif available_locale?(cookies[:locale])
+    elsif cookies[:locale] && available_locale?(cookies[:locale])
       cookies[:locale]
     else
       I18n.default_locale