RT# 77504 - Fixed error display issue, and javascript to prevent error.

[freeside.git] / httemplate / misc / process / change-password.html

diff --git a/httemplate/misc/process/change-password.html b/httemplate/misc/process/change-password.html
index be83786..a3e0601 100644 (file)
--- a/httemplate/misc/process/change-password.html
+++ b/httemplate/misc/process/change-password.html
@@ -7,6 +7,7 @@
 %              $cgi->param('contactnum', $contactnum);
 %              $cgi->param("changepw${contactnum}_error", $error);
 %      }
+%    $cgi->param('error', $error);
 % } else {
 %      if ($svcnum) { $cgi->query_string($svcnum); }
 %      elsif ($contactnum) { $cgi->query_string($contactnum); }
@@ -52,7 +53,7 @@ if ($svcnum) {
            ! $part_svc->restrict_edit_password )
          );
 
-       my $error = $svc_acct->is_password_allowed($newpass)
+       $error = $svc_acct->is_password_allowed($newpass)
                ||  $svc_acct->set_password($newpass)
                ||  $svc_acct->replace;
 
@@ -63,7 +64,7 @@ elsif ($contactnum) {
        my $contact = qsearchs('contact', { 'contactnum' => $contactnum } )
       or return { 'error' => "Contact not found" . $contactnum };
 
-       my $error = $contact->is_password_allowed($newpass)
+       $error = $contact->is_password_allowed($newpass)
                ||  $contact->change_password($newpass);
 
        # annoyingly specific to view/svc_acct.cgi, for now...