From 12c9393fad135937b6d881b5a840eec50a52789a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Na=CC=88gler?= <frank.naegler@typo3.org>
Date: Mon, 5 Oct 2015 20:29:31 +0200
Subject: [PATCH] [TASK] Call explicit render() on icon objects

Resolves: #70417
Releases: master
Change-Id: Ie855b996636b749562acf3baa67b1756c2ad3db2
Reviewed-on: http://review.typo3.org/43826
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
 Classes/FrontendEditPanel.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Classes/FrontendEditPanel.php b/Classes/FrontendEditPanel.php
index 3b60905..0e1d3a0 100644
--- a/Classes/FrontendEditPanel.php
+++ b/Classes/FrontendEditPanel.php
@@ -109,36 +109,36 @@ 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) . '</span>';
+			$icon = '<span title="' . htmlspecialchars($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) . '</span>';
+			$icon = '<span title="' . htmlspecialchars($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) . '</span>';
+			$icon = '<span title="' . htmlspecialchars($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
 		// Hiding for localizations because it is unknown what should be the function in that case
 		if (isset($allow['hide']) && $hideField && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) {
 			if ($dataArr[$hideField]) {
-				$icon = $this->iconFactory->getIcon('actions-edit-unhide');
+				$icon = $this->iconFactory->getIcon('actions-edit-unhide')->render();
 				$panel .= $this->editPanelLinkWrap($icon, $formName, 'unhide');
 			} else {
-				$icon = $this->iconFactory->getIcon('actions-edit-hide');
+				$icon = $this->iconFactory->getIcon('actions-edit-hide')->render();
 				$panel .= $this->editPanelLinkWrap($icon, $formName, 'hide', '', $this->backendUser->extGetLL('p_hideConfirm'));
 			}
 		}
 		if (isset($allow['new'])) {
 			if ($table === 'pages') {
 				$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_newSubpage')) . '">'
-					. $this->iconFactory->getIcon('actions-page-new', Icon::SIZE_SMALL)
+					. $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')) . '">'
-					. $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL)
+					. $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL)->render()
 					. '</span>';
 				$panel .= $this->editPanelLinkWrap($icon, $formName, 'new', $currentRecord, '', $newUID);
 			}
@@ -147,7 +147,7 @@ class FrontendEditPanel {
 		// 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')) . '">'
-				. $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)
+				. $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render()
 				. '</span>';
 			$panel .= $this->editPanelLinkWrap($icon, $formName, 'delete', '', $this->backendUser->extGetLL('p_deleteConfirm'));
 		}
@@ -217,7 +217,7 @@ class FrontendEditPanel {
 		$this->frontendController->set_no_cache('Display frontend edit icons', TRUE);
 		$iconTitle = $this->cObj->stdWrap($conf['iconTitle'], $conf['iconTitle.']);
 		$iconImg = '<span title="' . htmlspecialchars($iconTitle, ENT_COMPAT, 'UTF-8', FALSE) . '" class="frontEndEditIcons" style="' . ($conf['styleAttribute'] ? htmlspecialchars($conf['styleAttribute']) : '') . '">'
-			. $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)
+			. $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL)->render()
 			. '</span>';
 		$nV = GeneralUtility::_GP('ADMCMD_view') ? 1 : 0;