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

[Thomas D]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Thomas D <thd>	06/08/30 19:21:09

Modified files:
	C4             : Auth.pm 

Log message:
	Restoring rel_2_2 file from accidental overwrite in tgarip1957's HEAD commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.36.2.20&r2=1.36.2.21

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.20
retrieving revision 1.36.2.21
diff -u -b -r1.36.2.20 -r1.36.2.21
--- Auth.pm	25 Aug 2006 21:07:08 -0000	1.36.2.20
+++ Auth.pm	30 Aug 2006 19:21:09 -0000	1.36.2.21
@@ -27,7 +27,7 @@
 use C4::Context;
 use C4::Output;              # to get the template
 use C4::Interface::CGI::Output;
-use C4::Members;  # getpatroninformation
+use C4::Circulation::Circ2;  # getpatroninformation
 # use Net::LDAP;
 # use Net::LDAP qw(:all);
 
@@ -56,8 +56,7 @@
 			  });
 
   print $query->header(
-    -type => "text/html",
-    -charset=>"utf-8",
+    -type => guesstype($template->output),
     -cookie => $cookie
   ), $template->output;
 
@@ -509,8 +508,7 @@
 					-value => $sessionID,
 					-expires => '');
 	print $query->header(
-		-type => "text/html",
-		-charset=>"utf-8",
+		-type => guesstype($template->output),
 		-cookie => $cookie
 		), $template->output;
 	exit;