diff --git a/Classes/Service/VisibilityService.php b/Classes/Service/VisibilityService.php index a637a53144ee8e132ad61de6e1ab83ba4a923867..24cd4fc558023ccd2bcb86f5f46be94ef1233cd3 100644 --- a/Classes/Service/VisibilityService.php +++ b/Classes/Service/VisibilityService.php @@ -348,14 +348,12 @@ class VisibilityService implements SingletonInterface { if ($this->cachedDefaultVisibilityForElements === NULL) { $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) ->getConnectionForTable('sys_language'); - $results = $queryBuilder->prepare( - 'SELECT uid, tx_languagevisibility_defaultvisibilityel FROM sys_language' - ); + $results = $queryBuilder->prepare('SELECT uid FROM sys_language'); $this->cachedDefaultVisibilityForElements[0] = 'fallback'; if ($results->execute()) { foreach ($results->fetchAll() as $entry) { - $this->cachedDefaultVisibilityForElements[$entry['uid']] = $entry['tx_languagevisibility_defaultvisibilityel']; + $this->cachedDefaultVisibilityForElements[$entry['uid']] = 'active'; } } } @@ -376,19 +374,15 @@ class VisibilityService implements SingletonInterface { * @throws DBALException */ protected function getDefaultVisibilityForPagesByLanguage($languageUid): string { - if ($this->cachedDefaultVisibilityForPages === NULL) { $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) ->getConnectionForTable('sys_language'); - $results = $queryBuilder->prepare( - 'SELECT uid, tx_languagevisibility_defaultvisibility FROM sys_language' - ); + $results = $queryBuilder->prepare('SELECT uid FROM sys_language'); $this->cachedDefaultVisibilityForPages[0] = 'fallback'; if ($results->execute()) { foreach ($results->fetchAll() as $entry) { - - $this->cachedDefaultVisibilityForPages[$entry['uid']] = $entry['tx_languagevisibility_defaultvisibility']; + $this->cachedDefaultVisibilityForPages[$entry['uid']] = 'active'; } } } diff --git a/Configuration/TCA/Overrides/sys_language.php b/Configuration/TCA/Overrides/sys_language.php deleted file mode 100644 index db991fbd3e1bb3d6195530daf2804ef07da37f21..0000000000000000000000000000000000000000 --- a/Configuration/TCA/Overrides/sys_language.php +++ /dev/null @@ -1,73 +0,0 @@ - [ - 'exclude' => 0, - 'label' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:' . $table . '.tx_languagevisibility_defaultvisibility', - 'config' => [ - 'type' => 'select', - 'renderType' => 'selectSingle', - 'items' => [ - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.active', 'active'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.translated', 'translated'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.fallback', 'fallback'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.enforce', 'enforce'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.inactive', 'inactive'], - ], - 'default' => 'fallback', - 'size' => 1, - 'maxitems' => 1, - ] - ], - 'tx_languagevisibility_defaultvisibilityel' => [ - 'exclude' => 0, - 'label' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:' . $table . '.tx_languagevisibility_defaultvisibilityel', - 'config' => [ - 'type' => 'select', - 'renderType' => 'selectSingle', - 'items' => [ - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.active', 'active'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.translated', 'translated'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.fallback', 'fallback'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.enforce', 'enforce'], - ['LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_db.xlf:tx_languagevisibility_visibility.I.inactive', 'inactive'], - ], - 'default' => 'fallback', - 'size' => 1, - 'maxitems' => 1, - ] - ], - ]; - - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns($table, $tempColumns); - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes( - $table, 'tx_languagevisibility_defaultvisibility, tx_languagevisibility_defaultvisibilityel' - ); - }, 'languagevisibility', 'sys_language' -); diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf index 162ab511e672b8a43e0022c1609b7cd551d0f1e7..8a17c451b0404dcece3e6981ba58e99df7905416 100644 --- a/Resources/Private/Language/de.locallang_db.xlf +++ b/Resources/Private/Language/de.locallang_db.xlf @@ -59,14 +59,6 @@ OK OK - - default visibility for pages - Standard-Sichtbarkeit für Seiten - - - default visibility for other elements - Standard-Sichtbarkeit für Elemente - Language Sprache diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf index a92c8fb8ac38a04735835c02c9ebb77cc4d7b2bc..0f5f5a55fe2fb839be41e09a131594550871c490 100644 --- a/Resources/Private/Language/locallang_db.xlf +++ b/Resources/Private/Language/locallang_db.xlf @@ -46,12 +46,6 @@ OK - - default visibility for pages - - - default visibility for other elements - Language diff --git a/ext_tables.sql b/ext_tables.sql index 6b5286a1dca2a86306766364a62aac9a0db7254f..30d2e92b696db1eda7f64abf73eb469b1e8de3c4 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -1,11 +1,3 @@ -# -# Table structure for table 'sys_language' -# -CREATE TABLE sys_language ( - tx_languagevisibility_defaultvisibility varchar(11) DEFAULT 'translated' NOT NULL, - tx_languagevisibility_defaultvisibilityel varchar(11) DEFAULT 'translated' NOT NULL -); - # # Table structure for table 'pages' #