Fix errors on fresh install

clickpress · Mar 2, 2021 · 5a835db · 5a835db
1 parent d5eb153
commit 5a835db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/src/Model/NewsPodcastsModel.php b/src/Model/NewsPodcastsModel.php
@@ -41,7 +41,7 @@ class NewsPodcastsModel extends \NewsModel
     public static function findPublishedByPids($arrPids, $blnFeatured = null, $intLimit = 0, $intOffset = 0, array $arrAddColumns = [], array $arrOptions = [])
     {
         if (!\is_array($arrPids) || empty($arrPids)) {
-            return null;
+            return [];
         }
 
         $t = static::$strTable;

diff --git a/src/NewsPodcasts.php b/src/NewsPodcasts.php
@@ -60,20 +60,18 @@ public function generateFeed($intId): void
     {
         $objFeed = NewsPodcastsFeedModel::findByArchive($intId);
 
-        if (null === $objFeed) {
-            return;
-        }
-
-        $objFeed->feedName = $objFeed->alias ?: 'podcast_' . $objFeed->id;
-
-        // Delete XML file
-        if ('delete' === Input::get('act')) {
-            Files::getInstance()->delete($objFeed->feedName . '.xml');
-        } // Update XML file
-        else {
-            $this->generateFiles($objFeed->row());
-            $logger = System::getContainer()->get('monolog.logger.contao');
-            $logger->log(LogLevel::INFO, 'Generated podcast feed "' . $objFeed->feedName . '.xml"', ['contao' => new ContaoContext(__METHOD__, TL_CRON)]);
+        if (null !== $objFeed) {
+            $objFeed->feedName = $objFeed->alias ?: 'podcast_' . $objFeed->id;
+
+            // Delete XML file
+            if ('delete' === Input::get('act')) {
+                Files::getInstance()->delete($objFeed->feedName . '.xml');
+            } // Update XML file
+            else {
+                $this->generateFiles($objFeed->row());
+                $logger = System::getContainer()->get('monolog.logger.contao');
+                $logger->log(LogLevel::INFO, 'Generated podcast feed "' . $objFeed->feedName . '.xml"', ['contao' => new ContaoContext(__METHOD__, TL_CRON)]);
+            }
         }
     }
 
@@ -188,7 +186,8 @@ protected static function generateFiles($arrFeed): void
 
 
         // Add filter, if newsCategories is installed
-        $arrOptions = [];
+	$arrOptions = [];
+	$arrColumns = [];
         if(null !== $arrFeed['news_categoriesRoot'] && NewsPodcastsBackend::checkNewsCategoriesBundle()) {
 
             $db = System::getContainer()->get('database_connection');

diff --git a/src/NewsPodcastsBackend.php b/src/NewsPodcastsBackend.php
@@ -262,7 +262,12 @@ public function getAllowedArchives()
     public function preservePodcastFeeds()
     {
         $objFeeds = NewsPodcastsFeedModel::findAll();
-        while ($objFeeds->next()) {
+
+	if (null === $objFeeds)  {
+		return [];
+	}
+
+	while ($objFeeds->next()) {
             $arrFeeds[] = $objFeeds->alias ?: 'news' . $objFeeds->id;
         }