-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
15 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ | |
/*************************************************************** | ||
* Copyright notice | ||
* | ||
* (c) 2012-2023 Rene Nitzsche ([email protected]) | ||
* (c) 2012-2024 Rene Nitzsche ([email protected]) | ||
* All rights reserved | ||
* | ||
* This script is part of the TYPO3 project. The TYPO3 project is | ||
|
@@ -33,6 +33,7 @@ | |
|
||
/** | ||
* Wrapper for language usage. | ||
* Muss komplett überarbeitet werden. Da sind viele fragwürdige Dinge enthalten. | ||
* | ||
* @author Rene Nitzsche | ||
*/ | ||
|
@@ -185,10 +186,14 @@ protected function loadLLOverlay46($confLL) | |
$this->LOCAL_LANG[$languageKey][$labelKey][0]['target'] = $labelValue; | ||
// For labels coming from the TypoScript (database) the charset is assumed to be "forceCharset" | ||
// and if that is not set, assumed to be that of the individual system languages | ||
if ($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset']) { | ||
if ($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'] ?? false) { | ||
$this->LOCAL_LANG_charset[$languageKey][$labelKey] = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset']; | ||
} else { | ||
$this->LOCAL_LANG_charset[$languageKey][$labelKey] = $GLOBALS['TSFE']->csConvObj->charSetArray[$languageKey]; | ||
// FIXME: verhindert zunächst nur Warnungen. Muss aber eh komplett überarbeitet werden | ||
$csConvObj = $GLOBALS['TSFE']->csConvObj; | ||
if ($csConvObj && isset($csConvObj->charSetArray[$languageKey])) { | ||
$this->LOCAL_LANG_charset[$languageKey][$labelKey] = $csConvObj->charSetArray[$languageKey]; | ||
} | ||
} | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ | |
/*************************************************************** | ||
* Copyright notice | ||
* | ||
* (c) 2013-2023 Rene Nitzsche | ||
* (c) 2013-2024 Rene Nitzsche | ||
* Contact: [email protected] | ||
* All rights reserved | ||
* | ||
|
@@ -323,10 +323,10 @@ public function fetchFirstReference($content, $configuration) | |
{ | ||
$contentObject = $this->cObj; | ||
|
||
if ($configuration['refUid'] || $configuration['refUid.']) { | ||
$uid = intval($contentObject->stdWrap($configuration['refUid'], $configuration['refUid.'])); | ||
if (isset($configuration['refUid']) || isset($configuration['refUid.'])) { | ||
$uid = intval($contentObject->stdWrap($configuration['refUid'] ?? '', $configuration['refUid.'] ?? [])); | ||
} else { | ||
$uid = $contentObject->data['_LOCALIZED_UID'] ? $contentObject->data['_LOCALIZED_UID'] : $contentObject->data['uid']; | ||
$uid = $contentObject->data['_LOCALIZED_UID'] ?? $contentObject->data['uid']; | ||
} | ||
$refTable = ($configuration['refTable'] && is_array($GLOBALS['TCA'][$configuration['refTable']])) ? | ||
$configuration['refTable'] : 'tt_content'; | ||
|