Commit 386bb0ad authored by Steven Jones's avatar Steven Jones

Issue #1027358 by Steven Jones

Change the method of detecting if we should add the Aegir API version to the settings.php file.
parent f015c9ea
......@@ -147,15 +147,20 @@ class provisionConfig_drupal_settings extends provisionConfig {
$this->data['extra_config'] .= join("\n", drush_command_invoke_all('provision_drupal_config', d()->uri, $this->data));
$this->group = $this->platform->server->web_group;
// Add a handy variable indicating if the site is being backed up, we can
// then react to this and change any settings we don't want backed up.
$backup_file = drush_get_option('backup_file');
$this->backup_in_progress = !empty($backup_file);
}
}
/**
* Create the directories needed to host a drupal site
*
*
* Also maintains permissions on existing directories.
*/
function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
if (is_null($url)) {
if (d()->type == 'site') {
$url = d()->uri;
......
......@@ -122,7 +122,7 @@
$conf['file_directory_path'] = 'sites/<?php print $this->uri ?>/files';
$conf['file_directory_temp'] = 'sites/<?php print $this->uri ?>/files/tmp';
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print $this->cloaked ? $this->api_version : 0 ?>;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
<?php if (!$this->site_enabled) : ?>
$conf['site_offline'] = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment