Merge branch '5.x' into 6.x

# Conflicts: # CHANGELOG.md
craftcms · Jun 11, 2024 · 3e95e3a · 3e95e3a
2 parents 28787b6 + 80329c8
commit 3e95e3a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- Fixed an error that would occur when running a feed with the backup database setting enabled, when Craft's `backupCommand` was set to false. ([#1461](https://github.com/craftcms/feed-me/pull/1461))
+
 ## 6.1.0 - 2024-05-26
 
 - Added Craft Commerce 5 compatibility. ([#1448](https://github.com/craftcms/feed-me/pull/1448/))

diff --git a/src/services/Process.php b/src/services/Process.php
@@ -644,6 +644,11 @@ public function debugFeed($feed, $limit, $offset, $processedElementIds): void
      */
     private function _backupBeforeFeed($feed): void
     {
+        if (Craft::$app->getConfig()->getGeneral()->backupCommand === false) {
+            Plugin::info('Database not backed up because the backup command is false.');
+            return;
+        }
+
         $logKey = StringHelper::randomString(20);
 
         $limit = Plugin::$plugin->service->getConfig('backupLimit', $feed['id']);

diff --git a/src/templates/feeds/_edit.html b/src/templates/feeds/_edit.html
@@ -21,6 +21,7 @@
 {% set title = (feed.id) ? feed.name : 'Create a new feed'|t('feed-me') %}
 {% set noTabs = true %}
 {% set fullPageForm = true %}
+{% set backupsDisabled = craft.app.config.general.backupCommand is same as(false)  %}
 
 {% set buttons %}
     <div class="buttons">
@@ -206,6 +207,9 @@ <h2>{{ 'Import strategy'|t('feed-me') }}</h2>
         instructions: 'Perform a full backup each time this feed is processed.'|t('feed-me'),
         name: 'backup',
         on: (feed.id) ? feed.backup : true,
+        containerAttributes: backupsDisabled ? {class: ['disabled']} : {},
+        tip: backupsDisabled ? 'Backups are disabled while the backup command is `false`.'|t('feed-me'),
+        disabled: backupsDisabled,
     }) }}
 
     {{ forms.lightswitchField({