From 8d9be6f59b0af93e473b0da67a32e06ba0449851 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 16 May 2024 09:25:34 +0000
Subject: [PATCH] Bug 36875: (follow-up) Modify query in translated_content

This removes the MySQLism for FIELD(..).
In this case we just want to get the non-default records in
the front. So we can just test lang=default. And prevent inserting
$lang in the expression. And so prevent execution in ORDER BY.
No longer needing the ->quote call too.

Test plan:
Run Koha/AdditionalContents.t again.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 Koha/AdditionalContent.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Koha/AdditionalContent.pm b/Koha/AdditionalContent.pm
index 3aca46ad87..3b2807a849 100644
--- a/Koha/AdditionalContent.pm
+++ b/Koha/AdditionalContent.pm
@@ -134,9 +134,10 @@ Return the translated content for a given language. The default is returned if n
 
 sub translated_content {
     my ( $self, $lang ) = @_;
+    $lang ||= 'default';
     my $content = $self->translated_contents->search(
-        { lang => [ 'default', ( $lang ? $lang : () ) ] },
-        { ( $lang ? ( order_by => \[ "field(lang, '" . $lang . "', 'default')" ] ) : () ) }
+        { lang     => [ 'default', $lang ] },
+        { order_by => { -asc => [ \'lang="default"', 'id' ] } }
     )->next;
     return $content;
 }
-- 
2.39.5