From a441353fb1bcef4524ecbf4564d7ba250ecb2518 Mon Sep 17 00:00:00 2001 From: Colan Schwartz Date: Sat, 15 Oct 2016 17:46:26 -0400 Subject: [PATCH] Issue #2819021 by colan: Set new temporary file directory variable for Drupal 8. --- Provision/Config/Drupal/Settings.php | 3 ++- Provision/Config/Drupal/provision_drupal_settings_8.tpl.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Provision/Config/Drupal/Settings.php b/Provision/Config/Drupal/Settings.php index 1e90fa4..fedfd4c 100644 --- a/Provision/Config/Drupal/Settings.php +++ b/Provision/Config/Drupal/Settings.php @@ -18,7 +18,6 @@ class Provision_Config_Drupal_Settings extends Provision_Config { if (drush_drupal_major_version() >= 7) { $this->data['db_type'] = ($this->data['db_type'] == 'mysqli') ? 'mysql' : $this->data['db_type']; $this->data['file_directory_path_var'] = 'file_public_path'; - $this->data['file_directory_temp_var'] = 'file_temporary_path'; $this->data['file_directory_private_var'] = 'file_private_path'; $this->data['drupal_hash_salt_var'] = 'empty'; $this->data['utf8mb4_is_configurable'] = version_compare(drush_drupal_version(), '7.50', '>='); @@ -38,9 +37,11 @@ class Provision_Config_Drupal_Settings extends Provision_Config { $this->data['config_directories_active_var'] = 'config_directories_active'; $this->data['config_directories_sync_var'] = 'config_directories_sync'; + $this->data['file_directory_temp_var'] = "system.file']['path']['temporary"; } elseif (drush_drupal_major_version() == 7) { $this->template = 'provision_drupal_settings_7.tpl.php'; + $this->data['file_directory_temp_var'] = 'file_temporary_path'; } elseif (drush_drupal_major_version() <= 6) { $this->template = 'provision_drupal_settings_6.tpl.php'; diff --git a/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php b/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php index 041bb5e..8a36322 100644 --- a/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php +++ b/Provision/Config/Drupal/provision_drupal_settings_8.tpl.php @@ -132,7 +132,7 @@ if (isset($_SERVER['db_name'])) { $settings['install_profile'] = 'profile ?>'; $settings[''] = 'sites/uri ?>/files'; - $settings[''] = 'sites/uri ?>/private/temp'; + $config[''] = 'sites/uri ?>/private/temp'; $settings[''] = 'sites/uri ?>/private/files'; -- 2.7.4