Issue #2826770 by colan: Version setting "aegir_api" getting zeroed d…

…uring backup task
aegir-project · Nov 24, 2016 · 75825b9 · 75825b9
1 parent 8117b67
commit 75825b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Provision/Config/Drupal/provision_drupal_settings_6.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_6.tpl.php
@@ -141,7 +141,7 @@
   $conf['file_directory_path'] = 'sites/<?php print $this->uri ?>/files';
   $conf['file_directory_temp'] = 'sites/<?php print $this->uri ?>/private/temp';
   $conf['clean_url'] = 1;
-  $conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
+  $conf['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
   $conf['allow_authorize_operations'] = FALSE;
 
   // Nginx tries to cache the admin_menu if we don't do this.

diff --git a/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_7.tpl.php
@@ -141,7 +141,7 @@
   $conf['file_temporary_path'] = 'sites/<?php print $this->uri ?>/private/temp';
   $drupal_hash_salt = '';
   $conf['clean_url'] = 1;
-  $conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
+  $conf['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
   $conf['allow_authorize_operations'] = FALSE;
 
   // Nginx tries to cache the admin_menu if we don't do this.

diff --git a/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php
@@ -139,7 +139,7 @@
   $config['system.file']['path']['temporary'] = 'sites/<?php print $this->uri ?>/private/temp';
   $config_directories[CONFIG_SYNC_DIRECTORY] = 'sites/<?php print $this->uri ?>/private/config/sync';
   $settings['hash_salt'] = '<?php print $drupal_hash_salt_var ?>';
-  $settings['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
+  $settings['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
   $settings['allow_authorize_operations'] = FALSE;
 
   /**