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

(-)a/C4/XSLT.pm (+12 lines)
Lines 217-222 sub XSLTParse4Display { Link Here
217
            $theme   = C4::Context->preference("opacthemes");
217
            $theme   = C4::Context->preference("opacthemes");
218
            $xslfile = C4::Context->preference('marcflavour') .
218
            $xslfile = C4::Context->preference('marcflavour') .
219
                       "slim2OPACResults.xsl";
219
                       "slim2OPACResults.xsl";
220
        } elsif ($xslsyspref eq 'XSLTListsDisplay') {
221
            # Lists default to *Results.xslt
222
            $htdocs  = C4::Context->config('intrahtdocs');
223
            $theme   = C4::Context->preference("template");
224
            $xslfile = C4::Context->preference('marcflavour') .
225
                        "slim2intranetResults.xsl";
226
        } elsif ($xslsyspref eq 'OPACXSLTListsDisplay') {
227
            # Lists default to *Results.xslt
228
            $htdocs  = C4::Context->config('opachtdocs');
229
            $theme   = C4::Context->preference("opacthemes");
230
            $xslfile = C4::Context->preference('marcflavour') .
231
                       "slim2OPACResults.xsl";
220
        }
232
        }
221
        $xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);
233
        $xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);
222
    }
234
    }
(-)a/opac/opac-shelves.pl (-2 / +2 lines)
Lines 248-254 if ( $op eq 'view' ) { Link Here
248
248
249
            my $borrower = GetMember( borrowernumber => $loggedinuser );
249
            my $borrower = GetMember( borrowernumber => $loggedinuser );
250
250
251
            my $xslfile = C4::Context->preference('OPACXSLTResultsDisplay');
251
            my $xslfile = C4::Context->preference('OPACXSLTListsDisplay');
252
            my $lang   = $xslfile ? C4::Languages::getlanguage()  : undef;
252
            my $lang   = $xslfile ? C4::Languages::getlanguage()  : undef;
253
            my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
253
            my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
254
254
Lines 259-265 if ( $op eq 'view' ) { Link Here
259
                my $record       = GetMarcBiblio($biblionumber);
259
                my $record       = GetMarcBiblio($biblionumber);
260
260
261
                if ( $xslfile ) {
261
                if ( $xslfile ) {
262
                    $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTResultsDisplay",
262
                    $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTListsDisplay",
263
                                                                1, undef, $sysxml, $xslfile, $lang);
263
                                                                1, undef, $sysxml, $xslfile, $lang);
264
                }
264
                }
265
265
(-)a/virtualshelves/shelves.pl (-3 / +2 lines)
Lines 215-221 if ( $op eq 'view' ) { Link Here
215
215
216
            my $borrower = GetMember( borrowernumber => $loggedinuser );
216
            my $borrower = GetMember( borrowernumber => $loggedinuser );
217
217
218
            my $xslfile = C4::Context->preference('XSLTResultsDisplay');
218
            my $xslfile = C4::Context->preference('XSLTListsDisplay') || 'default';
219
            my $lang   = $xslfile ? C4::Languages::getlanguage()  : undef;
219
            my $lang   = $xslfile ? C4::Languages::getlanguage()  : undef;
220
            my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
220
            my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
221
221
Lines 226-232 if ( $op eq 'view' ) { Link Here
226
                my $record       = GetMarcBiblio($biblionumber);
226
                my $record       = GetMarcBiblio($biblionumber);
227
227
228
                if ( $xslfile ) {
228
                if ( $xslfile ) {
229
                    $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "XSLTResultsDisplay",
229
                    $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "XSLTListsDisplay",
230
                                                                1, undef, $sysxml, $xslfile, $lang);
230
                                                                1, undef, $sysxml, $xslfile, $lang);
231
                }
231
                }
232
232
233
- 

Return to bug 15485