From c6ef3094ca1419b3530acca827f993d5ff78769d Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 7 Apr 2026 09:02:54 -0400
Subject: [PATCH] Bug 41440: Fix bug revealed by unit test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 C4/Languages.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/C4/Languages.pm b/C4/Languages.pm
index b9ed3e2acf..36da463c2b 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -812,9 +812,10 @@ sub get_rfc4646_from_iso639 {
     return $cached if $cached;
     my $rfc_subtag =
         Koha::Database->new()->schema->resultset('LanguageRfc4646ToIso639')->find( { iso639_2_code => $iso_code } );
-    $memory_cache->set_in_cache( $cache_key, $rfc_subtag );
     if ($rfc_subtag) {
-        return $rfc_subtag->rfc4646_subtag;
+        my $subtag = $rfc_subtag->rfc4646_subtag;
+        $memory_cache->set_in_cache( $cache_key, $subtag );
+        return $subtag;
     } else {
         return;
     }