1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

Minor fixes

This commit is contained in:
Hillel Coren 2016-03-08 20:38:28 +02:00
parent a2cbc1b225
commit 3c1084ffe0
2 changed files with 2 additions and 2 deletions

View File

@ -298,7 +298,6 @@ class ContactMailer extends Mailer
$includesPasswordPlaceholder = strpos($template, '$password') !== false;
$str = str_replace(array_keys($variables), array_values($variables), $template);
$str = autolink($str, 100);
if(!$includesPasswordPlaceholder && $passwordHTML){
$pos = strrpos($str, '$password');
@ -308,7 +307,7 @@ class ContactMailer extends Mailer
}
}
$str = str_replace('$password', '', $str);
$str = autolink($str, 100);
return $str;
}

View File

@ -169,6 +169,7 @@
self.last_name = ko.observable('');
self.email = ko.observable('');
self.phone = ko.observable('');
self.password = ko.observable('');
if (data) {
ko.mapping.fromJS(data, {}, this);