Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

8.0.x
Alex Pott 2015-06-11 13:16:01 +01:00
parent 0e6d5064e7
commit 5e6c61d449
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
View File

@ -63,8 +63,8 @@ class File extends DrupalSqlBase {
* {@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.

4
core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
View File

@ -47,8 +47,8 @@ class UserPictureFile extends DrupalSqlBase {
* {@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();
}

2
core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
View File

@ -49,7 +49,7 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
/** @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);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
View File

@ -41,7 +41,7 @@ class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
/** @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);