Commit 5e6c61d4 authored by alexpott's avatar alexpott
Browse files

Issue #2503017 by joshi.rohit100: Rename the migration setting conf_path to site_path

parent 0e6d5064
......@@ -63,8 +63,8 @@ public function query() {
* {@inheritdoc}
*/
protected function initializeIterator() {
$conf_path = isset($this->configuration['conf_path']) ? $this->configuration['conf_path'] : 'sites/default';
$this->filePath = $this->variableGet('file_directory_path', $conf_path . '/files') . '/';
$site_path = isset($this->configuration['site_path']) ? $this->configuration['site_path'] : 'sites/default';
$this->filePath = $this->variableGet('file_directory_path', $site_path . '/files') . '/';
$this->tempFilePath = $this->variableGet('file_directory_temp', '/tmp') . '/';
// FILE_DOWNLOADS_PUBLIC == 1 and FILE_DOWNLOADS_PRIVATE == 2.
......
......@@ -47,8 +47,8 @@ public function query() {
* {@inheritdoc}
*/
public function initializeIterator() {
$conf_path = isset($this->configuration['conf_path']) ? $this->configuration['conf_path'] : 'sites/default';
$this->filePath = $this->variableGet('file_directory_path', $conf_path . '/files') . '/';
$site_path = isset($this->configuration['site_path']) ? $this->configuration['site_path'] : 'sites/default';
$this->filePath = $this->variableGet('file_directory_path', $site_path . '/files') . '/';
$this->tempFilePath = $this->variableGet('file_directory_temp', '/tmp') . '/';
return parent::initializeIterator();
}
......
......@@ -49,7 +49,7 @@ protected function setUp() {
/** @var \Drupal\migrate\Entity\MigrationInterface $migration */
$migration = entity_load('migration', 'd6_file');
$source = $migration->get('source');
$source['conf_path'] = 'core/modules/simpletest';
$source['site_path'] = 'core/modules/simpletest';
$migration->set('source', $source);
$this->prepare($migration, $dumps);
$executable = new MigrateExecutable($migration, $this);
......
......@@ -41,7 +41,7 @@ protected function setUp() {
/** @var \Drupal\migrate\Entity\MigrationInterface $migration */
$migration = entity_load('migration', 'd6_user_picture_file');
$source = $migration->get('source');
$source['conf_path'] = 'core/modules/simpletest';
$source['site_path'] = 'core/modules/simpletest';
$migration->set('source', $source);
$this->prepare($migration, $dumps);
$executable = new MigrateExecutable($migration, $this);
......
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