Commit 6e4fdcaf authored by omega8cc's avatar omega8cc Committed by Steven Jones

Issue #1421356 by omega8cc: Fixed Wrong variables for files paths hardcoded for D7 sites.

parent 1711b8da
......@@ -17,6 +17,12 @@ class Provision_Config_Drupal_Settings extends Provision_Config {
function process() {
if (drush_drupal_major_version() >= 7) {
$this->data['db_type'] = ($this->data['db_type'] == 'mysqli') ? 'mysql' : $this->data['db_type'];
$this->file_directory_path_var = 'file_public_path';
$this->file_directory_temp_var = 'file_temporary_path';
}
else {
$this->file_directory_path_var = 'file_directory_path';
$this->file_directory_temp_var = 'file_directory_temp';
}
$this->version = provision_version();
$this->api_version = provision_api_version();
......
......@@ -124,8 +124,8 @@ print '<?php' ?>
global $conf;
$conf['install_profile'] = '<?php print $this->profile ?>';
$conf['file_directory_path'] = 'sites/<?php print $this->uri ?>/files';
$conf['file_directory_temp'] = 'sites/<?php print $this->uri ?>/files/tmp';
$conf['<?php print $this->file_directory_path_var ?>'] = 'sites/<?php print $this->uri ?>/files';
$conf['<?php print $this->file_directory_temp_var ?>'] = 'sites/<?php print $this->uri ?>/files/tmp';
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
......
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