Attachment #126831 for bug #29246

View | Details | Raw Unified | Return to bug 29246
Collapse All | Expand All

Lines 327-333 sub _do_xslt_proc { Link Here

(-)a/C4/Breeding.pm (-1 / +1 lines)
327	return $marc if !$server->{add_xslt};	327	return $marc if !$server->{add_xslt};
328		328
329	my $htdocs = C4::Context->config('intrahtdocs');	329	my $htdocs = C4::Context->config('intrahtdocs');
330	my $theme = C4::Context->preference("template"); #staff	330	my $theme = C4::Context->preference("intranet_theme"); #staff
331	my $lang = C4::Languages::getlanguage() \|\| 'en';	331	my $lang = C4::Languages::getlanguage() \|\| 'en';
332		332
333	my @files= split ',', $server->{add_xslt};	333	my @files= split ',', $server->{add_xslt};





        if ($xslsyspref eq "XSLTDetailsDisplay") {
            $htdocs  = C4::Context->config('intrahtdocs');
            $theme   = C4::Context->preference("intranet_theme");
            $xslfile = C4::Context->preference('marcflavour') .
                       "slim2intranetDetail.xsl";
        } elsif ($xslsyspref eq "XSLTResultsDisplay") {
            $htdocs  = C4::Context->config('intrahtdocs');
            $theme   = C4::Context->preference("intranet_theme");
            $xslfile = C4::Context->preference('marcflavour') .
                        "slim2intranetResults.xsl";
        } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {

        } elsif ($xslsyspref eq 'XSLTListsDisplay') {
            # Lists default to *Results.xslt
            $htdocs  = C4::Context->config('intrahtdocs');
            $theme   = C4::Context->preference("intranet_theme");
            $xslfile = C4::Context->preference('marcflavour') .
                        "slim2intranetResults.xsl";
        } elsif ($xslsyspref eq 'OPACXSLTListsDisplay') {

Lines 59-65 my $vars = { Link Here

(-)a/misc/cronjobs/rss/rss.pl (-2 / +1 lines)
59	ITEMS => getItems( $config{'query'} )	59	ITEMS => getItems( $config{'query'} )
60	};	60	};
61		61
62	my $template_path = $config{"template"};	62	my $template_path = $config{"intranet_theme"};
63	open( my $fh, "<", $template_path ) or die "cannot open $template_path : $!";	63	open( my $fh, "<", $template_path ) or die "cannot open $template_path : $!";
64	$feed->process( $fh, $vars, $outFile );	64	$feed->process( $fh, $vars, $outFile );
65		65
66	-

Return to bug 29246

Lines 199-210 sub get_xsl_filename { Link Here

(-)a/C4/XSLT.pm (-3 / +3 lines)
199		199
200	if ($xslsyspref eq "XSLTDetailsDisplay") {	200	if ($xslsyspref eq "XSLTDetailsDisplay") {
201	$htdocs = C4::Context->config('intrahtdocs');	201	$htdocs = C4::Context->config('intrahtdocs');
202	$theme = C4::Context->preference("template");	202	$theme = C4::Context->preference("intranet_theme");
203	$xslfile = C4::Context->preference('marcflavour') .	203	$xslfile = C4::Context->preference('marcflavour') .
204	"slim2intranetDetail.xsl";	204	"slim2intranetDetail.xsl";
205	} elsif ($xslsyspref eq "XSLTResultsDisplay") {	205	} elsif ($xslsyspref eq "XSLTResultsDisplay") {
206	$htdocs = C4::Context->config('intrahtdocs');	206	$htdocs = C4::Context->config('intrahtdocs');
207	$theme = C4::Context->preference("template");	207	$theme = C4::Context->preference("intranet_theme");
208	$xslfile = C4::Context->preference('marcflavour') .	208	$xslfile = C4::Context->preference('marcflavour') .
209	"slim2intranetResults.xsl";	209	"slim2intranetResults.xsl";
210	} elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {	210	} elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
Lines 220-226 sub get_xsl_filename { Link Here
220	} elsif ($xslsyspref eq 'XSLTListsDisplay') {	220	} elsif ($xslsyspref eq 'XSLTListsDisplay') {
221	# Lists default to *Results.xslt	221	# Lists default to *Results.xslt
222	$htdocs = C4::Context->config('intrahtdocs');	222	$htdocs = C4::Context->config('intrahtdocs');
223	$theme = C4::Context->preference("template");	223	$theme = C4::Context->preference("intranet_theme");
224	$xslfile = C4::Context->preference('marcflavour') .	224	$xslfile = C4::Context->preference('marcflavour') .
225	"slim2intranetResults.xsl";	225	"slim2intranetResults.xsl";
226	} elsif ($xslsyspref eq 'OPACXSLTListsDisplay') {	226	} elsif ($xslsyspref eq 'OPACXSLTListsDisplay') {