Load site default language ID into session unless the one in session …

…is associated with the current site.
AlchemyCMS · Jul 1, 2024 · 5df0ed8 · 5df0ed8
1 parent 72973ad
commit 5df0ed8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/controllers/concerns/alchemy/admin/current_language.rb b/app/controllers/concerns/alchemy/admin/current_language.rb
@@ -13,7 +13,11 @@ module CurrentLanguage
 
       def load_current_language
         @current_language = if session[:alchemy_language_id].present?
-          set_alchemy_language(session[:alchemy_language_id])
+          if current_alchemy_site.languages.where(id: session[:alchemy_language_id]).exists?
+            set_alchemy_language(session[:alchemy_language_id])
+          else
+            current_alchemy_site.default_language
+          end
         else
           Current.language
         end