Skip to content

Commit 45e0f4a

Browse files
committed
[TASK] Remove static_info_tables references
1 parent fa19f7c commit 45e0f4a

File tree

4 files changed

+33
-52
lines changed

4 files changed

+33
-52
lines changed

Configuration/TCA/Overrides/pages.php

+32-35
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,40 @@
22

33
declare(strict_types = 1);
44

5-
// Feature is not available if EXT:static_info_tables is not loaded
6-
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('static_info_tables')) {
7-
$temporaryColumns = [
8-
'tx_locate_regions' => [
9-
'exclude' => true,
10-
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_regions',
11-
'config' => [
12-
'type' => 'select',
13-
'renderType' => 'selectMultipleSideBySide',
14-
'foreign_table' => 'tx_locate_domain_model_region',
15-
'foreign_table_where' => 'ORDER BY title',
16-
'MM' => 'tx_locate_page_region_mm',
17-
'size' => 10,
18-
'autoSizeMax' => 30,
19-
'multiple' => false,
20-
'items' => [
21-
[
22-
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_regions.applyWhenNoMatch',
23-
'value' => \Leuchtfeuer\Locate\Domain\Repository\RegionRepository::APPLY_WHEN_NO_IP_MATCHES,
24-
],
5+
$temporaryColumns = [
6+
'tx_locate_regions' => [
7+
'exclude' => true,
8+
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_regions',
9+
'config' => [
10+
'type' => 'select',
11+
'renderType' => 'selectMultipleSideBySide',
12+
'foreign_table' => 'tx_locate_domain_model_region',
13+
'foreign_table_where' => 'ORDER BY title',
14+
'MM' => 'tx_locate_page_region_mm',
15+
'size' => 10,
16+
'autoSizeMax' => 30,
17+
'multiple' => false,
18+
'items' => [
19+
[
20+
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_regions.applyWhenNoMatch',
21+
'value' => \Leuchtfeuer\Locate\Domain\Repository\RegionRepository::APPLY_WHEN_NO_IP_MATCHES,
2522
],
2623
],
2724
],
28-
'tx_locate_invert' => [
29-
'exclude' => true,
30-
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_invert',
31-
'description' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_invert.description',
32-
'config' => [
33-
'type' => 'check',
34-
'renderType' => 'checkboxToggle',
35-
],
25+
],
26+
'tx_locate_invert' => [
27+
'exclude' => true,
28+
'label' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_invert',
29+
'description' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:pages.tx_locate_invert.description',
30+
'config' => [
31+
'type' => 'check',
32+
'renderType' => 'checkboxToggle',
3633
],
37-
];
34+
],
35+
];
3836

39-
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $temporaryColumns);
40-
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
41-
'pages',
42-
'--div--;LLL:EXT:locate/Resources/Private/Language/Database.xlf:tabs.locate,tx_locate_invert,tx_locate_regions'
43-
);
44-
}
37+
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('pages', $temporaryColumns);
38+
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
39+
'pages',
40+
'--div--;LLL:EXT:locate/Resources/Private/Language/Database.xlf:tabs.locate,tx_locate_invert,tx_locate_regions'
41+
);

Configuration/TCA/tx_locate_domain_model_region.php

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
declare(strict_types = 1);
44

5-
// Feature is not available if EXT:static_info_tables is not loaded
6-
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('static_info_tables') === false) {
7-
return;
8-
}
9-
105
return [
116
'ctrl' => [
127
'title' => 'LLL:EXT:locate/Resources/Private/Language/Database.xlf:tx_locate_domain_model_region',

Documentation/Functions/GeoBlocking/Index.rst

-9
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ Geo Blocking
88

99
You can block pages (and page translations) for access from certain countries.
1010

11-
.. note::
12-
13-
You need to to install the `static info tables <https://extensions.typo3.org/extension/static_info_tables/>`__ extension to use
14-
the geo blocking feature.
15-
1611
.. _functions-geoBlocking-regions:
1712

1813
Regions
@@ -47,10 +42,6 @@ status code will be returned, which you can process e.g. via a site
4742

4843
You can invert the selection. If you do this, the page will be unavailable in the specified regions.
4944

50-
.. note::
51-
52-
Not take action if you logged in as backend user or EXT:static_info_tables is not loaded.
53-
5445
.. _functions-geoBlocking-assignRegions-outlier:
5546

5647
Outlier

ext_emconf.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
'typo3' => '13.4.0-13.4.99',
1111
],
1212
'conflicts' => [],
13-
'suggests' => [
14-
'static_info_tables' => '',
15-
],
13+
'suggests' => [],
1614
],
1715
'state' => 'stable',
1816
'author' => 'Dev Leuchtfeuer',

0 commit comments

Comments
 (0)