OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Use htmlspecialchars(entity_label()) to format entity names.

This commit is contained in:
Michael Stenta 2020-07-30 14:52:47 -04:00
parent a0c9a7ecbc
commit 2f333eca67
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/farm/farm_livestock/farm_livestock_weight/farm_livestock_weight.module
View File

@ -348,7 +348,6 @@ function farm_livestock_weight_group_report(&$form_state) {
// Load the farm group asset.
$group = farm_asset_load($id);
$group_name = $group->name;
// Load the farm group members.
$members = farm_group_members($group, REQUEST_TIME, TRUE, $include_archived);
@ -502,14 +501,14 @@ function farm_livestock_weight_group_report(&$form_state) {
foreach ($animals as $animal) {
// Add a row of data.
$row = array();
$name_label = $animal->name;
$name_label = htmlspecialchars(entity_label('farm_asset', $animal));
if ($animal->archived) {
$date = strftime('%Y-%m-%d', $animal->archived);
$name_label = $name_label . ' (' . t('archived') . ' ' . $date . ')';
}
$row[] = $animal->id;
$row[] = $name_label;
$row[] = $animal->group->name;
$row[] = htmlspecialchars(entity_label('farm_asset', $animal->group));
// Save the logs.
$logs = $animal->all_log_data;