Skip to content

Commit

Permalink
Merge pull request #11695 from aembler/misc-fixes-100523
Browse files Browse the repository at this point in the history
Misc fixes 100523
  • Loading branch information
aembler committed Oct 5, 2023
2 parents 26b4586 + a1b6281 commit b011865
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion concrete/attributes/image_file/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function getDisplayValue()
if (is_object($f)) {
$type = strtolower($f->getTypeObject()->getGenericDisplayType());

return '<a target="_blank" href="' . $f->getDownloadURL() . '" class="ccm-attribute-image-file ccm-attribute-image-file-' . $type . '">' . $f->getTitle() . '</a>';
return '<a target="_blank" href="' . $f->getDownloadURL() . '" class="ccm-attribute-image-file ccm-attribute-image-file-' . $type . '">' . h($f->getTitle()) . '</a>';
}
}

Expand Down
3 changes: 3 additions & 0 deletions concrete/blocks/gallery/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,9 @@ private function getEntries(): Generator
}

$current = $this->formatEntry($entry);
if (!$current) {
continue;
}
$current['displayChoices'] = $this->getDisplayChoices();
}

Expand Down

0 comments on commit b011865

Please sign in to comment.