X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fnotices.pl;h=41f2a903bf87d56eb0b2bacb058b928e5711221e;hb=55d0b65522d3caa8d7c819b2cfa7ce8f2483c33e;hp=f6680d5061e85c21980afe634610eeb31bed5f11;hpb=f46abf8b909257a54c9e2c1fdd999ba30c7ac0ae;p=koha.git

diff --git a/members/notices.pl b/members/notices.pl
index f6680d5061..41f2a903bf 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -27,6 +27,7 @@ use CGI;
 use C4::Members;
 use C4::Branch;
 use C4::Letters;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 use C4::Dates qw/format_date/;
 my $input=new CGI;
@@ -51,16 +52,22 @@ $template->param( picture => 1 ) if $picture;
 
 # Getting the messages
 my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
+$template->param( %{$borrower} );
+
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
 
 $template->param(
 			QUEUED_MESSAGES 	=> $queued_messages,
- 			BORROWER_INFO         	=> [ $borrower ],
-                        firstname 		=> $borrower->{'firstname'},
-			surname 		=> $borrower->{'surname'},
 			borrowernumber 		=> $borrowernumber,
-			sentnotices 		=> 1
-		);
+			sentnotices 		=> 1,
+                        branchname              => GetBranchName($borrower->{'branchcode'}),
+                        categoryname            => $borrower->{'description'},
+);
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
-