@@ -, +, @@ on member-password.pl --- .../prog/en/modules/members/member-password.tt | 4 +++- members/member-password.pl | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -193,7 +193,9 @@ }); }); - [% PROCESS 'password_check.inc' new_password => 'newpassword', minPasswordLength => patron.category.effective_min_password_length, RequireStrongPassword => patron.category.effective_require_strong_password %] + [% IF new_password.defined %] + [% PROCESS 'password_check.inc' new_password => 'newpassword', minPasswordLength => patron.category.effective_min_password_length, RequireStrongPassword => patron.category.effective_require_strong_password %] + [% END %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/members/member-password.pl +++ a/members/member-password.pl @@ -55,13 +55,15 @@ if ( ( $patron_id ne $loggedinuser ) && ( $category_type eq 'S' ) ) { push( @errors, 'NOMATCH' ) if ( ( $newpassword && $newpassword2 ) && ( $newpassword ne $newpassword2 ) ); -if ( $op eq 'cud-update' && $newpassword and not @errors ) { +if ( $op eq 'cud-update' && $newpassword.defined and not @errors ) { try { - $patron->set_password({ password => $newpassword }); + if ( $newpassword ne '' ) { + $patron->set_password({ password => $newpassword }); + $template->param( newpassword => $newpassword ); + } $patron->userid($new_user_id)->store if $new_user_id and $new_user_id ne $patron->userid; - $template->param( newpassword => $newpassword ); if ( $destination eq 'circ' ) { print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber); } --