From 9ea2bb7eca37ded5637be28b888da5af503b89c5 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Fri, 19 Oct 2012 08:33:04 -0400 Subject: [PATCH] Bug 8947: [SIGNED-OFF] XSLT fallback logic backwards The logic for the XSLT fallback was backwards, which meant that non-English installations of the CCSR theme were unable to use XSLT stylesheets. This patch corrects the logic. To test: 1) Switch to the ccsr OPAC theme. 2) Switch to a language other than English for the OPAC. 3) Turn on the default XSLT stylesheets for the OPAC. 4) Do a search or view a record that would result in something being displayed with XSLT. This will work after the patch, but not before. Signed-off-by: Magnus Enger Works as advertised! Signed-off-by: Paul Poulain --- C4/XSLT.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index d17b82832e..19ec16282b 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -166,9 +166,9 @@ sub XSLTParse4Display { "slim2OPACResults.xsl"; } $xslfilename = "$htdocs/$theme/$lang/xslt/$xslfile"; - $xslfilename = "$htdocs/$theme/en/xslt/$xslfile" unless ( $lang ne 'en' && !-f $xslfilename ); - $xslfilename = "$htdocs/prog/$lang/xslt/$xslfile" unless ( !-f $xslfilename ); - $xslfilename = "$htdocs/prog/en/xslt/$xslfile" unless ( $lang ne 'en' && !-f $xslfilename ); + $xslfilename = "$htdocs/$theme/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); + $xslfilename = "$htdocs/prog/$lang/xslt/$xslfile" unless ( -f $xslfilename ); + $xslfilename = "$htdocs/prog/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename ); } if ( $xslfilename =~ m/\{langcode\}/ ) { -- 2.39.5