cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update fix for the issue 94

Browse Source
This commit is contained in:
Sujit Prasad
2016-06-23 12:00:07 +05:30
parent 6b0e2384fe
commit 6d669ff3da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/helpdesk/MailController.php
View File

@@ -140,7 +140,7 @@ class MailController extends Controller
$date = $date_time[1].'-'.$date_time[2].'-'.$date_time[3].' '.$date_time[4]; $date = $date_time[1].'-'.$date_time[2].'-'.$date_time[3].' '.$date_time[4];
$date = date('Y-m-d H:i:s', strtotime($date)); $date = date('Y-m-d H:i:s', strtotime($date));
if (isset($mail->subject)) { if (isset($mail->subject)) {
$subject = $mail->subject; $subject = utf8_decode($mail->subject);
} else { } else {
$subject = 'No Subject'; $subject = 'No Subject';
} }

2
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -269,7 +269,7 @@ class PhpMailController extends Controller
} }
} }
$mail->Subject = $subject; $mail->Subject = utf8_decode($subject);
if ($template == 'ticket-reply-agent') { if ($template == 'ticket-reply-agent') {
$line = '---Reply above this line--- <br/><br/>'; $line = '---Reply above this line--- <br/><br/>';
$mail->Body = utf8_decode($line.$messagebody); $mail->Body = utf8_decode($line.$messagebody);