From 8998d368cb86e16bb15854ea5c2629239d98bbd8 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <typo3@scripting-base.de>
Date: Fri, 9 Oct 2015 19:20:06 +0200
Subject: [PATCH] [FOLLOWUP][TASK] Use only one instance of iconFactory per
class
Resolves: #70550
Releases: master
Change-Id: Ifb6f551658604c701301a5619fedb3e971ab97a2
Reviewed-on: http://review.typo3.org/43947
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
---
.../Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php | 4 +++-
.../sysext/backend/Classes/RecordList/AbstractRecordList.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
index 31e653aeb530..66d975226aef 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
@@ -136,7 +136,9 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
public function getItem()
{
$title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.clearCache_clearCache', true);
- return '<span title="' . $title . '">' . $this->iconRegistry->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render() . '</span>';
+ return '<span title="' . $title . '">'
+ . $this->iconFactory->getIcon('apps-toolbar-menu-cache', Icon::SIZE_SMALL)->render()
+ . '</span>';
}
/**
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index c7c60f05426a..16394e48c904 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -222,7 +222,7 @@ abstract class AbstractRecordList
* @param string $colType Defines the tag being used for the columns. Default is td.
* @return string HTML content for the table row
*/
- public function addElement($h, $icon, $data, $rowParams = '', $_ = '', $_ = '', $colType = 'td')
+ public function addElement($h, $icon, $data, $rowParams = '', $_ = '', $_2 = '', $colType = 'td')
{
$colType = ($colType === 'th') ? 'th' : 'td';
$noWrap = $this->no_noWrap ? '' : ' nowrap="nowrap"';
--
GitLab