Merge remote-tracking branch 'origin/12-13' into 12-13

georgringer · Apr 17, 2024 · b5192f0 · b5192f0
2 parents b7f9478 + a381130
commit b5192f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 55 deletions.
diff --git a/Classes/Routing/AbstractNewsAliasMapper.php b/Classes/Routing/AbstractNewsAliasMapper.php
@@ -24,8 +24,6 @@
  * 2. It allows to use "fallback handling" which is only available in TYPO3 v12.1
  *    see https://review.typo3.org/c/Packages/TYPO3.CMS/+/76545 to have our News plugin
  *    manage the optional parameter for a news detail page, when a news record was not found.
- *    For v12 setups, the fallbackValue is automatically set to "null" to keep the same functionality
- *    as in v11 with this news mapper.
  */
 abstract class AbstractNewsAliasMapper extends PersistedAliasMapper
 {

diff --git a/Classes/Routing/NewsAliasMapper.php b/Classes/Routing/NewsAliasMapper.php
@@ -24,8 +24,6 @@
  * 2. It allows to use "fallback handling" which is only available in TYPO3 v12.1
  *    see https://review.typo3.org/c/Packages/TYPO3.CMS/+/76545 to have our News plugin
  *    manage the optional parameter for a news detail page, when a news was not found.
- *    For v12 setups, the fallbackValue is automatically set to "null" to keep the same functionality
- *    as in v11 with this news mapper.
  *
  * @deprecated File is not used by news extension anymore and will be removed with version 12
  */

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -2,21 +2,7 @@
 # Table structure for table 'tx_news_domain_model_news'
 #
 CREATE TABLE tx_news_domain_model_news (
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-	tstamp int(11) DEFAULT '0' NOT NULL,
-	crdate int(11) DEFAULT '0' NOT NULL,
-	editlock tinyint(4) DEFAULT '0' NOT NULL,
-	sys_language_uid int(11) DEFAULT '0' NOT NULL,
-	l10n_parent int(11) DEFAULT '0' NOT NULL,
-	l10n_diffsource mediumtext,
-	l10n_source int(11) DEFAULT '0' NOT NULL,
-	deleted tinyint(4) DEFAULT '0' NOT NULL,
-	hidden tinyint(4) DEFAULT '0' NOT NULL,
-	starttime int(11) DEFAULT '0' NOT NULL,
-	endtime int(11) DEFAULT '0' NOT NULL,
-	sorting int(11) DEFAULT '0' NOT NULL,
-	fe_group varchar(100) DEFAULT '' NOT NULL,
+    sorting int(11) DEFAULT '0' NOT NULL,
 	title varchar(255) DEFAULT '' NOT NULL,
 	teaser text,
 	bodytext mediumtext,
@@ -49,9 +35,6 @@ CREATE TABLE tx_news_domain_model_news (
 	import_id varchar(100) DEFAULT '' NOT NULL,
 	import_source varchar(100) DEFAULT '' NOT NULL,
 
-	PRIMARY KEY (uid),
-	KEY parent (pid),
-	KEY sys_language_uid_l10n_parent (sys_language_uid,l10n_parent),
 	KEY path_segment (path_segment(185), uid),
 	KEY import (import_id,import_source)
 );
@@ -61,8 +44,6 @@ CREATE TABLE tx_news_domain_model_news (
 # Extend table structure of table 'sys_category'
 #
 CREATE TABLE sys_category (
-	fe_group varchar(100) DEFAULT '0' NOT NULL,
-
 	images int(11) unsigned DEFAULT '0',
 	single_pid int(11) unsigned DEFAULT '0' NOT NULL,
 	shortcut int(11) DEFAULT '0' NOT NULL,
@@ -109,52 +90,23 @@ CREATE TABLE tx_news_domain_model_news_related_mm (
 # Table structure for table 'tx_news_domain_model_link'
 #
 CREATE TABLE tx_news_domain_model_link (
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-	tstamp int(11) DEFAULT '0' NOT NULL,
-	crdate int(11) DEFAULT '0' NOT NULL,
-	sys_language_uid int(11) DEFAULT '0' NOT NULL,
-	l10n_parent int(11) DEFAULT '0' NOT NULL,
-	l10n_diffsource mediumtext,
-	l10n_source int(11) DEFAULT '0' NOT NULL,
-	sorting int(10) DEFAULT '0' NOT NULL,
-	deleted tinyint(4) DEFAULT '0' NOT NULL,
-	hidden tinyint(4) DEFAULT '0' NOT NULL,
 	parent int(11) DEFAULT '0' NOT NULL,
 	title tinytext,
 	description text,
-	uri text,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid),
-	KEY news (parent)
+	uri text
 );
 
 #
 # Table structure for table 'tx_news_domain_model_tag'
 #
 CREATE TABLE tx_news_domain_model_tag (
-	uid int(11) NOT NULL auto_increment,
-	pid int(11) DEFAULT '0' NOT NULL,
-	tstamp int(11) DEFAULT '0' NOT NULL,
-	crdate int(11) DEFAULT '0' NOT NULL,
-	sorting int(11) DEFAULT '0' NOT NULL,
-	deleted tinyint(4) DEFAULT '0' NOT NULL,
-	hidden tinyint(4) DEFAULT '0' NOT NULL,
-	sys_language_uid int(11) DEFAULT '0' NOT NULL,
-	l10n_parent int(11) DEFAULT '0' NOT NULL,
-	l10n_diffsource mediumtext,
-	l10n_source int(11) DEFAULT '0' NOT NULL,
 	title tinytext,
 	slug varchar(2048),
 	seo_title varchar(255) NOT NULL DEFAULT '',
 	seo_description text,
 	seo_headline varchar(255) NOT NULL DEFAULT '',
 	seo_text text,
-	notes text,
-
-	PRIMARY KEY (uid),
-	KEY parent (pid)
+	notes text
 );
 
 #