[Koha-cvs] koha/C4 Auth.pm [rel_3_0]

[paul poulain]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/10/16 09:03:52

Modified files:
	C4             : Auth.pm 

Log message:
	fixing internal server error when not logged in in OPAC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.4&r2=1.54.2.5

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.4
retrieving revision 1.54.2.5
diff -u -b -r1.54.2.4 -r1.54.2.5
--- Auth.pm	21 Sep 2006 14:00:40 -0000	1.54.2.4
+++ Auth.pm	16 Oct 2006 09:03:52 -0000	1.54.2.5
@@ -213,33 +213,28 @@
                         TemplateEncoding => C4::Context->preference("TemplateEncoding"),
                         AmazonContent    => C4::Context->preference("AmazonContent"),
                         LibraryName      => C4::Context->preference("LibraryName"),
-                        branchname       => C4::Context->userenv->{"branchname"}, 
+                        branchname       => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", 
                 );
 
 	}
         else {
             warn "template type should be OPAC, here it is=[".$in->{'type'}."]" unless ($in->{'type'} eq 'opac');
-            
             $template->param(
-                suggestion           => C4::Context->preference("suggestion"),
-                virtualshelves       => C4::Context->preference("virtualshelves"),
-                OpacNav              => C4::Context->preference("OpacNav"),
-                opacheader           => C4::Context->preference("opacheader"),
-                opaccredits          => C4::Context->preference("opaccredits"),
-                opacsmallimage       => C4::Context->preference("opacsmallimage"),
-		opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
-		opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
-		opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
-                opacuserlogin    => C4::Context->preference("opacuserlogin"),
-                opacbookbag      => C4::Context->preference("opacbookbag"),
-            
-          # FIXME : can't understand why there is an internal servor error when the line bellow
-          #         are uncommented.
-          
-                TemplateEncoding => C4::Context->preference("TemplateEncoding"),
-                AmazonContent    => C4::Context->preference("AmazonContent"),
-                LibraryName      => C4::Context->preference("LibraryName"),
-                branchname       => C4::Context->userenv->{"branchname"}, 
+                suggestion           => "".C4::Context->preference("suggestion"),
+                virtualshelves       => "".C4::Context->preference("virtualshelves"),
+                OpacNav              => "".C4::Context->preference("OpacNav"),
+                opacheader           => "".C4::Context->preference("opacheader"),
+                opaccredits          => "".C4::Context->preference("opaccredits"),
+                opacsmallimage       => "".C4::Context->preference("opacsmallimage"),
+                opaclayoutstylesheet => "".C4::Context->preference("opaclayoutstylesheet"),
+                opaccolorstylesheet => "".C4::Context->preference("opaccolorstylesheet"),
+                opaclanguagesdisplay => "".C4::Context->preference("opaclanguagesdisplay"),
+                opacuserlogin    => "".C4::Context->preference("opacuserlogin"),
+                opacbookbag      => "".C4::Context->preference("opacbookbag"),
+                TemplateEncoding => "".C4::Context->preference("TemplateEncoding"),
+                AmazonContent    => "".C4::Context->preference("AmazonContent"),
+                LibraryName      => "".C4::Context->preference("LibraryName"),
+                branchname       => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", 
             );
         }
     return ( $template, $borrowernumber, $cookie );