mirror of
https://github.com/FriendsOfTYPO3/feedit.git
synced 2024-11-08 17:06:09 +01:00
[BUGFIX] feedit: Double encoding of labels
Translated labels containing UTF-8 characters were double-encoded in frontend editing. extGetLL() already runs htmlspecialchars() on labels, so we do not have to do that again in FrontendEditPanel. This fixes the titles of the admin panel buttons. Also, since we can expect all pages to be UTF-8 now, we can drop the forced conversion of UTF-8 characters to XML entities. This fixes the confirmation popup texts. Resolves: #63131 Releases: master, 7.6 Change-Id: I49faff20ff4da8434868534d566c0d3da85e30c6 Reviewed-on: https://review.typo3.org/46247 Reviewed-by: Daniel Goerz <ervaude@gmail.com> Tested-by: Daniel Goerz <ervaude@gmail.com> Reviewed-by: Christian Weiske <typo3@cweiske.de> Tested-by: Christian Weiske <typo3@cweiske.de> Reviewed-by: Susanne Moog <typo3@susannemoog.de> Tested-by: Susanne Moog <typo3@susannemoog.de>
This commit is contained in:
parent
6250d2d254
commit
d8a0196d87
1 changed files with 6 additions and 6 deletions
|
@ -111,14 +111,14 @@ class FrontendEditPanel
|
|||
$panel .= $this->backendUser->adminPanel->ext_makeToolBar();
|
||||
}
|
||||
if (isset($allow['edit'])) {
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_editRecord')) . '">' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_editRecord') . '">' . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord);
|
||||
}
|
||||
// Hiding in workspaces because implementation is incomplete
|
||||
if (isset($allow['move']) && $sortField && $this->backendUser->workspace === 0) {
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_moveUp')) . '">' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_moveUp') . '">' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'up');
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_moveDown')) . '">' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_moveDown') . '">' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)->render() . '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'down');
|
||||
}
|
||||
// Hiding in workspaces because implementation is incomplete
|
||||
|
@ -134,12 +134,12 @@ class FrontendEditPanel
|
|||
}
|
||||
if (isset($allow['new'])) {
|
||||
if ($table === 'pages') {
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_newSubpage')) . '">'
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_newSubpage') . '">'
|
||||
. $this->iconFactory->getIcon('actions-page-new', Icon::SIZE_SMALL)->render()
|
||||
. '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, '');
|
||||
} else {
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_newRecordAfter')) . '">'
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_newRecordAfter') . '">'
|
||||
. $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL)->render()
|
||||
. '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, '', $newUID);
|
||||
|
@ -148,7 +148,7 @@ class FrontendEditPanel
|
|||
// Hiding in workspaces because implementation is incomplete
|
||||
// Hiding for localizations because it is unknown what should be the function in that case
|
||||
if (isset($allow['delete']) && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) {
|
||||
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_delete')) . '">'
|
||||
$icon = '<span title="' . $this->backendUser->extGetLL('p_delete') . '">'
|
||||
. $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render()
|
||||
. '</span>';
|
||||
$panel .= $this->editPanelLinkWrap($icon, $formName, 'delete', '', $this->backendUser->extGetLL('p_deleteConfirm'));
|
||||
|
|
Loading…
Reference in a new issue