Merge remote branch 'kc/new/bug_6126' into kcmaster

[koha.git] / members / messaging.pl

diff --git a/members/messaging.pl b/members/messaging.pl
index 1427973..8791dcf 100755 (executable)
--- a/members/messaging.pl
+++ b/members/messaging.pl
@@ -13,12 +13,14 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Context;
 use C4::Auth;
@@ -57,12 +59,12 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 my $borrowernumber = $query->param('borrowernumber');
-my $borrower       = GetMember( $borrowernumber ,'borrowernumber');
+my $borrower       = GetMember( 'borrowernumber' => $borrowernumber );
 my $branch         = C4::Context->userenv->{'branch'};
 
 $template->param( $borrower );
 
-my $borrower = GetMemberDetails( $borrowernumber );
+$borrower = GetMemberDetails( $borrowernumber );
 
 
     if ( $borrower->{'category_type'} eq 'C') {
@@ -82,7 +84,6 @@ $template->param( messagingview               => 1,
                   message_queue               => $message_queue,
                   DHTMLcalendar_dateformat    => C4::Dates->DHTMLcalendar(), 
                   borrowernumber              => $borrowernumber,
-                  branchcode                  => $borrower->{'branchcode'},
                   branchname                 => GetBranchName($borrower->{'branchcode'}),
                   dateformat                  => C4::Context->preference("dateformat"),
                   categoryname                => $borrower->{'description'},
@@ -92,7 +93,8 @@ $template->param( messagingview               => 1,
 #$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'}
 #  ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'};
 
-$template->param( BORROWER_INFO         => [ $borrower ],
+$template->param( %{ $borrower } );
+$template->param(
                   messagingview         => 1,
                                  is_child        => ($borrower->{'category_type'} eq 'C'),
                 );