[BUGFIX] Fix double escaping of icon and title in EXT:impexp 48/50548/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 8 Nov 2016 20:59:29 +0000 (21:59 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 10 Nov 2016 15:15:27 +0000 (16:15 +0100)
The title and icon are double escaped. This leads to HTML output
as readable code. Move translation into the controller.

Resolves: #76277
Releases: master,7.6
Change-Id: I5529e00788ea870475d4b46f2da9dd472d226a97
Reviewed-on: https://review.typo3.org/50548
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html

index 272ca51..aed779e 100644 (file)
@@ -738,9 +738,9 @@ class ImportExportController extends BaseScriptClass
                         $iconAndTitle = $this->iconFactory->getIconForRecord('pages', $record, Icon::SIZE_SMALL)->render()
                             . BackendUtility::getRecordTitle('pages', $record, true);
                     }
+
                     $tableList[] = [
-                        'tableName' => $tableName,
-                        'iconAndTitle' => $iconAndTitle,
+                        'iconAndTitle' => sprintf($this->lang->getLL('makeconfig_tableListEntry'), $tableName, $iconAndTitle),
                         'reference' => $reference
                     ];
                 }
index d0a2580..cf2b056 100644 (file)
@@ -78,7 +78,7 @@
                </div>
                <div class="col-sm-10">
                        <f:for each="{tableList}" as="table">
-                               <f:translate key="makeconfig_tableListEntry" arguments="{0: table.tableName, 1: table.iconAndTitle}" />
+                               <f:format.raw>{table.iconAndTitle}</f:format.raw>
                                <f:form.hidden name="tx_impexp[list][]" value="{table.reference}" />
                                <br />
                        </f:for>