summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-06-11 13:16:01 +0100
committerAlex Pott2015-06-11 13:16:01 +0100
commit5e6c61d4496a989819a932ef4043276cf9ab22f7 (patch)
treef100c79b09896de0118307b9b74c4c4c928280a4
parent0e6d5064e758b4c0bb1cab2ad68abf89abc845de (diff)
Issue #2503017 by joshi.rohit100: Rename the migration setting conf_path to site_path
-rw-r--r--core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php4
-rw-r--r--core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php4
-rw-r--r--core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php2
-rw-r--r--core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
index ff51c62..ed307a4 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
@@ -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.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
index 3756297..a47bab7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureFile.php
@@ -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();
}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
index 353dc0d..a2989d4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
@@ -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);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
index e444e05..b3d15d7 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
@@ -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);