mirror of
https://github.com/FriendsOfTYPO3/feedit.git
synced 2024-11-12 18:36:09 +01:00
Remove deprecations
Do not access global lang variable anymore. Load language file once in constructor. Do not use deprecated interface, use replacement instead.
This commit is contained in:
parent
0310e56a01
commit
bcdfa41703
3 changed files with 7 additions and 14 deletions
|
@ -71,6 +71,7 @@ class FrontendEditPanel
|
|||
$this->cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
|
||||
$this->cObj->start([]);
|
||||
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
|
||||
$this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_tsfe.xlf');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -371,23 +372,13 @@ class FrontendEditPanel
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns the label for key. If a translation for the language set in $this->uc['lang']
|
||||
* is found that is returned, otherwise the default value.
|
||||
* If the global variable $LOCAL_LANG is NOT an array (yet) then this function loads
|
||||
* the global $LOCAL_LANG array with the content of "EXT:core/Resources/Private/Language/locallang_tsfe.xlf"
|
||||
* such that the values therein can be used for labels in the Admin Panel
|
||||
* Returns htmlescaped label for key.
|
||||
*
|
||||
* @param string $key Key for a label in the $GLOBALS['LOCAL_LANG'] array of "EXT:core/Resources/Private/Language/locallang_tsfe.xlf
|
||||
* @param string $key Localization key as accepted by LanguageService
|
||||
* @return string The value for the $key
|
||||
*/
|
||||
protected function getLabel(string $key): string
|
||||
{
|
||||
if (!is_array($GLOBALS['LOCAL_LANG'])) {
|
||||
$this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_tsfe.xlf');
|
||||
if (!is_array($GLOBALS['LOCAL_LANG'])) {
|
||||
$GLOBALS['LOCAL_LANG'] = [];
|
||||
}
|
||||
}
|
||||
return htmlspecialchars($this->getLanguageService()->getLL($key));
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
|
|||
/**
|
||||
* Admin Panel Edit Module
|
||||
*/
|
||||
class EditModule extends AbstractModule implements PageSettingsProviderInterface, InitializableInterface, ResourceProviderInterface
|
||||
class EditModule extends AbstractModule implements PageSettingsProviderInterface, RequestEnricherInterface, ResourceProviderInterface
|
||||
{
|
||||
/**
|
||||
* @var UriBuilder
|
||||
|
@ -128,8 +128,9 @@ class EditModule extends AbstractModule implements PageSettingsProviderInterface
|
|||
* Includes the frontend edit initialization
|
||||
*
|
||||
* @param ServerRequestInterface $request
|
||||
* @return ServerRequestInterface
|
||||
*/
|
||||
public function initializeModule(ServerRequestInterface $request): void
|
||||
public function enrich(ServerRequestInterface $request): ServerRequestInterface
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -199,6 +199,7 @@ class EditToolbarService
|
|||
->setMaxResults(1)
|
||||
->execute()
|
||||
->fetch();
|
||||
// @extensionScannerIgnoreLine At least in v10 this is a false positive
|
||||
$tsfe->sys_page->versionOL('pages', $row);
|
||||
if (is_array($row)) {
|
||||
$link = (string)$uriBuilder->buildUriFromRoute(
|
||||
|
|
Loading…
Reference in a new issue