[TASK] Replace icon by IconFactory: actions-edit-restore-edit

This also fixes a previously unknown error with a getLL call.

Releases: master
Resolves: #69671
Change-Id: I198bd469ec0e3e7c46758094c5e07c1fdda8e9ea
Reviewed-on: http://review.typo3.org/43233


Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Loek Hilgersom <loek@netcoop.nl>
Tested-by: Loek Hilgersom <loek@netcoop.nl>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>

typo3/sysext/core/Classes/Database/QueryView.php

@@ -556,7 +556,7 @@ class QueryView {
 			$out .= '<a class="btn btn-default" href="' . GeneralUtility::linkThisUrl(BackendUtility::getModuleUrl('tce_db'), array(
 					('cmd[' . $table . '][' . $row['uid'] . '][undelete]') => '1',
 					'redirect' => GeneralUtility::linkThisScript(array())
-				)) . '" title="' . $GLOBALS['LANG']-getLL('undelete_only', TRUE) . '">';
+				)) . '" title="' . $GLOBALS['LANG']->getLL('undelete_only', TRUE) . '">';
 			$out .= $this->iconFactory->getIcon('actions-edit-restore', Icon::SIZE_SMALL) . '</a>';
 			$formEngineParameters = array(
 				'edit[' . $table . '][' . $row['uid'] . ']' => 'edit',
@@ -566,8 +566,8 @@ class QueryView {
 			$out .= '<a class="btn btn-default" href="' . GeneralUtility::linkThisUrl(BackendUtility::getModuleUrl('tce_db'), array(
 					('cmd[' . $table . '][' . $row['uid'] . '][undelete]') => '1',
 					'redirect' => $redirectUrl
-				)) . '">';
-			$out .= \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-restore-edit', array('title' => 'undelete and edit')) . '</a>';
+				)) . '" title="' . $GLOBALS['LANG']->getLL('undelete_and_edit', TRUE) . '">';
+			$out .= $this->iconFactory->getIcon('actions-edit-restore-edit', Icon::SIZE_SMALL) . '</a>';
 		}
 		$_params = array($table => $row);
 		if (is_array($this->hookArray['additionalButtons'])) {

typo3/sysext/core/Classes/Imaging/IconRegistry.php

@@ -334,6 +334,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 				'source' => 'EXT:t3skin/images/icons/actions/edit-restore.png',
 			)
 		),
+		'actions-edit-restore-edit' => array(
+			'provider' => BitmapIconProvider::class,
+			'options' => array(
+				'source' => 'EXT:t3skin/images/icons/actions/edit-undelete-edit.png',
+			)
+		),
 		'actions-edit-undo' => array(
 			'provider' => FontawesomeIconProvider::class,
 			'options' => array(

typo3/sysext/lang/locallang_t3lib_fullsearch.xlf

@@ -21,6 +21,9 @@
 			<trans-unit id="undelete_only">
 				<source>undelete only</source>
 			</trans-unit>
+			<trans-unit id="undelete_and_edit">
+				<source>undelete and edit</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>