Skip to content

Commit

Permalink
Fix salesagility#9494 - Force displaying line breaks to textarea fields
Browse files Browse the repository at this point in the history
  • Loading branch information
SinergiaCRM committed Feb 14, 2022
1 parent d57e913 commit fc4ddd9
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion modules/Accounts/Account.php
Expand Up @@ -375,7 +375,7 @@ public function set_notification_body($xtpl, $account)
{
$xtpl->assign("ACCOUNT_NAME", $account->name);
$xtpl->assign("ACCOUNT_TYPE", $account->account_type);
$xtpl->assign("ACCOUNT_DESCRIPTION", $account->description);
$xtpl->assign("ACCOUNT_DESCRIPTION", nl2br($account->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Bugs/Bug.php
Expand Up @@ -376,7 +376,7 @@ public function set_notification_body($xtpl, $bug)
$xtpl->assign("BUG_STATUS", $app_list_strings['bug_status_dom'][$bug->status]);
$xtpl->assign("BUG_RESOLUTION", $app_list_strings['bug_resolution_dom'][$bug->resolution]);
$xtpl->assign("BUG_RELEASE", $bug->release_name);
$xtpl->assign("BUG_DESCRIPTION", $bug->description);
$xtpl->assign("BUG_DESCRIPTION", nl2br($bug->description));
$xtpl->assign("BUG_WORK_LOG", $bug->work_log);
$xtpl->assign("BUG_BUG_NUMBER", $bug->bug_number);
return $xtpl;
Expand Down
2 changes: 1 addition & 1 deletion modules/Calls/Call.php
Expand Up @@ -599,7 +599,7 @@ public function set_notification_body($xtpl, $call)
$xtpl->assign("CALL_HOURS", $call->duration_hours);
$xtpl->assign("CALL_MINUTES", $call->duration_minutes);
$xtpl->assign("CALL_STATUS", ((isset($call->status))?$app_list_strings['call_status_dom'][$call->status] : ""));
$xtpl->assign("CALL_DESCRIPTION", $call->description);
$xtpl->assign("CALL_DESCRIPTION", nl2br($call->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Campaigns/Campaign.php
Expand Up @@ -283,7 +283,7 @@ public function set_notification_body($xtpl, $camp)
$xtpl->assign("CAMPAIGN_AMOUNT", $camp->budget);
$xtpl->assign("CAMPAIGN_CLOSEDATE", $camp->end_date);
$xtpl->assign("CAMPAIGN_STATUS", $camp->status);
$xtpl->assign("CAMPAIGN_DESCRIPTION", $camp->content);
$xtpl->assign("CAMPAIGN_DESCRIPTION", nl2br($camp->content));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Cases/Case.php
Expand Up @@ -353,7 +353,7 @@ public function set_notification_body($xtpl, $case)
(isset($case->priority) ? $app_list_strings['case_priority_dom'][$case->priority] : '')
);
$xtpl->assign('CASE_STATUS', (isset($case->status) ? $app_list_strings['case_status_dom'][$case->status] : ''));
$xtpl->assign('CASE_DESCRIPTION', $case->description);
$xtpl->assign('CASE_DESCRIPTION', nl2br($case->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Contacts/Contact.php
Expand Up @@ -578,7 +578,7 @@ public function set_notification_body($xtpl, $contact)
global $locale;

$xtpl->assign("CONTACT_NAME", trim($locale->getLocaleFormattedName($contact->first_name, $contact->last_name)));
$xtpl->assign("CONTACT_DESCRIPTION", $contact->description);
$xtpl->assign("CONTACT_DESCRIPTION", nl2br($contact->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Leads/Lead.php
Expand Up @@ -408,7 +408,7 @@ public function set_notification_body($xtpl, $lead)
$xtpl->assign("LEAD_NAME", $locale->getLocaleFormattedName($lead->first_name, $lead->last_name, $lead->salutation));
$xtpl->assign("LEAD_SOURCE", (isset($lead->lead_source) ? $app_list_strings['lead_source_dom'][$lead->lead_source] : ""));
$xtpl->assign("LEAD_STATUS", (isset($lead->status)? $app_list_strings['lead_status_dom'][$lead->status]:""));
$xtpl->assign("LEAD_DESCRIPTION", $lead->description);
$xtpl->assign("LEAD_DESCRIPTION", nl2br($lead->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Meetings/Meeting.php
Expand Up @@ -697,7 +697,7 @@ public function set_notification_body($xtpl, &$meeting)
$xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));
$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
$xtpl->assign("MEETING_DESCRIPTION", nl2br($meeting->description));
$xtpl->assign("MEETING_LOCATION", $meeting->location);
if (!empty($meeting->join_url)) {
$xtpl->assign('MEETING_URL', $meeting->join_url);
Expand Down
2 changes: 1 addition & 1 deletion modules/Opportunities/Opportunity.php
Expand Up @@ -417,7 +417,7 @@ public function set_notification_body($xtpl, $oppty)
$xtpl->assign("OPPORTUNITY_AMOUNT", $oppty->amount);
$xtpl->assign("OPPORTUNITY_CLOSEDATE", $oppty->date_closed);
$xtpl->assign("OPPORTUNITY_STAGE", (isset($oppty->sales_stage)?$app_list_strings['sales_stage_dom'][$oppty->sales_stage]:""));
$xtpl->assign("OPPORTUNITY_DESCRIPTION", $oppty->description);
$xtpl->assign("OPPORTUNITY_DESCRIPTION", nl2br($oppty->description));

return $xtpl;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Tasks/Task.php
Expand Up @@ -357,7 +357,7 @@ public function set_notification_body($xtpl, $task)
}

$xtpl->assign("TASK_STATUS", (isset($task->status)?$app_list_strings['task_status_dom'][$task->status]:""));
$xtpl->assign("TASK_DESCRIPTION", $task->description);
$xtpl->assign("TASK_DESCRIPTION", nl2br($task->description));

return $xtpl;
}
Expand Down

0 comments on commit fc4ddd9

Please sign in to comment.