Skip to content

Commit

Permalink
Merge pull request #3899 from ocextension/patch-8
Browse files Browse the repository at this point in the history
Fix the issue with admin password reset link in email
  • Loading branch information
danielkerr committed Feb 1, 2016
2 parents 0d7e436 + dade1c5 commit bfbbbe6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions upload/admin/controller/common/forgotten.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function index() {
$mail->setFrom($this->config->get('config_email'));
$mail->setSender(html_entity_decode($this->config->get('config_name'), ENT_QUOTES, 'UTF-8'));
$mail->setSubject(html_entity_decode($subject, ENT_QUOTES, 'UTF-8'));
$mail->setText($message);
$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));
$mail->send();

$this->session->data['success'] = $this->language->get('text_success');
Expand Down Expand Up @@ -105,4 +105,4 @@ protected function validate() {

return !$this->error;
}
}
}

0 comments on commit bfbbbe6

Please sign in to comment.