Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-12 22:22:32 +01:00
Code Issues Releases Activity

Minor fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Ninja/Mailers/ContactMailer.php
View File

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

1
resources/views/clients/edit.blade.php
View File

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