Merge branch '4.x' of github.com:contao/contao into feature/language-…

…dependent-module-configuration
contao · Dec 30, 2021 · 243920b · 243920b
2 parents 127497d + 6a815a4
commit 243920b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/calendar-bundle/src/Resources/contao/classes/Calendar.php b/calendar-bundle/src/Resources/contao/classes/Calendar.php
@@ -144,6 +144,12 @@ protected function generateFiles($arrFeed)
 		{
 			while ($objArticle->next())
 			{
+				// Never add unpublished elements to the RSS feeds
+				if (!$objArticle->published || ($objArticle->start && $objArticle->start > $time) || ($objArticle->stop && $objArticle->stop <= $time))
+				{
+					continue;
+				}
+
 				$jumpTo = $objArticle->getRelated('pid')->jumpTo;
 
 				// No jumpTo page set (see #4784)

diff --git a/core-bundle/src/Command/UserListCommand.php b/core-bundle/src/Command/UserListCommand.php
@@ -44,7 +44,7 @@ protected function configure(): void
         $this
             ->addOption('column', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'The columns display in the table')
             ->addOption('admins', null, InputOption::VALUE_NONE, 'Return only admins')
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'text')
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, json)', 'txt')
             ->setDescription('Lists Contao back end users.')
         ;
     }
@@ -62,6 +62,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         switch ($input->getOption('format')) {
             case 'text':
+                trigger_deprecation('contao/core-bundle', '4.13', 'Using --format=text is deprecated and will be removed in Contao 5. Use --format=txt instead.');
+                // no break
+
+            case 'txt':
                 if (0 === $users->count()) {
                     $io->note('No accounts found.');
 

diff --git a/news-bundle/src/Resources/contao/classes/News.php b/news-bundle/src/Resources/contao/classes/News.php
@@ -146,7 +146,6 @@ protected function generateFiles($arrFeed)
 		if ($objArticle !== null)
 		{
 			$arrUrls = array();
-
 			$request = $container->get('request_stack')->getCurrentRequest();
 
 			if ($request)
@@ -155,10 +154,17 @@ protected function generateFiles($arrFeed)
 				$request->attributes->set('_scope', 'frontend');
 			}
 
+			$time = time();
 			$origObjPage = $GLOBALS['objPage'] ?? null;
 
 			while ($objArticle->next())
 			{
+				// Never add unpublished elements to the RSS feeds
+				if (!$objArticle->published || ($objArticle->start && $objArticle->start > $time) || ($objArticle->stop && $objArticle->stop <= $time))
+				{
+					continue;
+				}
+
 				$jumpTo = $objArticle->getRelated('pid')->jumpTo;
 
 				// No jumpTo page set (see #4784)

diff --git a/news-bundle/src/Resources/contao/models/NewsModel.php b/news-bundle/src/Resources/contao/models/NewsModel.php
@@ -244,8 +244,7 @@ public static function findPublishedByPids($arrPids, $blnFeatured=null, $intLimi
 			$arrColumns[] = "$t.featured=''";
 		}
 
-		// Never return unpublished elements in the back end, so they don't end up in the RSS feed
-		if (!static::isPreviewMode($arrOptions) || TL_MODE == 'BE')
+		if (!static::isPreviewMode($arrOptions))
 		{
 			$time = Date::floorToMinute();
 			$arrColumns[] = "$t.published='1' AND ($t.start='' OR $t.start<='$time') AND ($t.stop='' OR $t.stop>'$time')";