Skip to content

Commit 37f5e83

Browse files
committed
Merge branch 'hotfix/50' into develop
Forward port #50
2 parents 563a241 + 679c09d commit 37f5e83

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ All notable changes to this project will be documented in this file, in reverse
3838

3939
- [#49](https://github.com/zfcampus/zf-apigility-documentation/pull/49) fixes
4040
representation of nested collections.
41+
- [#50](https://github.com/zfcampus/zf-apigility-documentation/pull/50) fixes
42+
escaping of field decriptions; previously, the template was improperly using
43+
`escapeTransformDescription()` instead of `agTransformDescription()`.
4144

4245
## 1.2.2 - 2016-08-10
4346

view/zf-apigility-documentation/operation.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ $collapseId = $this->escapeHtmlAttr(sprintf('ops-collapse-%s-%s%s', $serv
3838
<tr>
3939
<td><?php echo $this->escapeHtml($field->getName()) ?></td>
4040
<td><?php echo $this->escapeHtml($field->getFieldType() ?: '') ?></td>
41-
<td><?php echo $this->escapeTransformDescription($field->getDescription()) ?></td>
41+
<td><?php echo $this->agTransformDescription($field->getDescription()) ?></td>
4242
<td class="center-block"><span class="badge"><?php echo ($field->isRequired()) ? 'YES' : 'NO' ?></span></td>
4343
</tr>
4444
<?php

0 commit comments

Comments
 (0)