Merge remote-tracking branch 'origin/master' into new/bug_6679

[koha_fer] / C4 / XSLT.pm

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 75eeb16..8bc4000 100755 (executable)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -1,6 +1,7 @@
 package C4::XSLT;
 # Copyright (C) 2006 LibLime
 # <jmf at liblime dot com>
+# Parts Copyright Katrin Fischer 2011
 # Parts Copyright ByWater Solutions 2011
 #
 # This file is part of Koha.
@@ -28,7 +29,6 @@ use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Reserves;
-use C4::Output qw//;
 use Encode;
 use XML::LibXML;
 use XML::LibXSLT;
@@ -134,6 +134,7 @@ sub XSLTParse4Display {
                               OPACBaseURL TraceCompleteSubfields
                               UseAuthoritiesForTracings TraceSubjectSubdivisions
                               Display856uAsImage OPACDisplay856uAsImage 
+                              UseControlNumber
                               AlternateHoldingsField AlternateHoldingsSeparator / )
     {
         my $sp = C4::Context->preference( $syspref );
@@ -158,14 +159,14 @@ sub XSLTParse4Display {
         if ($interface eq 'intranet') {
             $xslfile = C4::Context->config('intrahtdocs') . 
                       '/' . C4::Context->preference("template") . 
-                      '/' . C4::Output::_current_language() .
+                      '/' . C4::Templates::_current_language() .
                       '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2intranet$xsl_suffix.xsl";
         } else {
             $xslfile = C4::Context->config('opachtdocs') . 
                       '/' . C4::Context->preference("opacthemes") . 
-                      '/' . C4::Output::_current_language() .
+                      '/' . C4::Templates::_current_language() .
                       '/xslt/' .
                       C4::Context->preference('marcflavour') .
                       "slim2OPAC$xsl_suffix.xsl";
@@ -220,7 +221,7 @@ sub buildKohaItemsNamespace {
         } else {
             $status = "available";
         }
-        my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'});
+        my $homebranch = $item->{homebranch}? xml_escape($branches->{$item->{homebranch}}->{'branchname'}):'';
            my $itemcallnumber = xml_escape($item->{itemcallnumber});
         $xml.= "<item><homebranch>$homebranch</homebranch>".
                "<status>$status</status>".