Merge branch 'hotfix/3.2.16' into release/3.4.0

Conflicts: assets/contao/js/core.js system/docs/CHANGELOG.md system/modules/core/classes/Frontend.php system/modules/core/widgets/MetaWizard.php
contao · Nov 17, 2014 · 921adb7 · 921adb7
2 parents 3233dd4 + 8e3d193
commit 921adb7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/contao/classes/News.php b/contao/classes/News.php
@@ -31,11 +31,10 @@ class News extends \Frontend
 	/**
 	 * Update a particular RSS feed
 	 * @param integer
-	 * @param boolean
 	 */
-	public function generateFeed($intId, $blnIsFeedId=false)
+	public function generateFeed($intId)
 	{
-		$objFeed = $blnIsFeedId ? \NewsFeedModel::findByPk($intId) : \NewsFeedModel::findByArchive($intId);
+		$objFeed = \NewsFeedModel::findByPk($intId);
 
 		if ($objFeed === null)
 		{
@@ -82,6 +81,28 @@ public function generateFeeds()
 	}
 
 
+	/**
+	 * Generate all feeds including a certain archive
+	 * @param integer
+	 */
+	public function generateFeedsByArchive($intId)
+	{
+		$objFeed = \NewsFeedModel::findByArchive($intId);
+
+		if ($objFeed !== null)
+		{
+			while ($objFeed->next())
+			{
+				$objFeed->feedName = $objFeed->alias ?: 'news' . $objFeed->id;
+
+				// Update the XML file
+				$this->generateFiles($objFeed->row());
+				$this->log('Generated news feed "' . $objFeed->feedName . '.xml"', __METHOD__, TL_CRON);
+			}
+		}
+	}
+
+
 	/**
 	 * Generate an XML files and save them to the root directory
 	 * @param array

diff --git a/contao/dca/tl_news.php b/contao/dca/tl_news.php
@@ -765,7 +765,7 @@ public function generateFeed()
 
 		foreach ($session as $id)
 		{
-			$this->News->generateFeed($id);
+			$this->News->generateFeedsByArchive($id);
 		}
 
 		$this->import('Automator');
@@ -979,6 +979,6 @@ public function toggleVisibility($intId, $blnVisible, DataContainer $dc=null)
 		// Update the RSS feed (for some reason it does not work without sleep(1))
 		sleep(1);
 		$this->import('News');
-		$this->News->generateFeed(CURRENT_ID);
+		$this->News->generateFeedsByArchive(CURRENT_ID);
 	}
 }
diff --git a/contao/dca/tl_news_archive.php b/contao/dca/tl_news_archive.php
@@ -419,7 +419,7 @@ public function generateFeed()
 
 		foreach ($session as $id)
 		{
-			$this->News->generateFeed($id);
+			$this->News->generateFeedsByArchive($id);
 		}
 
 		$this->import('Automator');

diff --git a/contao/dca/tl_news_feed.php b/contao/dca/tl_news_feed.php
@@ -372,7 +372,7 @@ public function generateFeed()
 
 		foreach ($session as $id)
 		{
-			$this->News->generateFeed($id, true);
+			$this->News->generateFeedsByArchive($id);
 		}
 
 		$this->import('Automator');