summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-12-08 18:54:13 (GMT)
committerxjm2017-12-08 18:54:13 (GMT)
commite4c874e18ceebb896eca5ad5a5e189658030f765 (patch)
tree4fc64a75530f2c49ffce8c6d7224c2533745c44f
parenteca600bdb6b6272f7e873290208b0f562adad3d5 (diff)
Issue #2862207 by kalpaitch, jmmarquez, jeetendrakumar: Config import change profile message
-rw-r--r--core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php2
-rw-r--r--core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
index e948aa5..ea7d29f 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
@@ -136,7 +136,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
// Ensure the profile is not changing.
if ($install_profile !== $core_extension['profile']) {
- $config_importer->logError($this->t('Cannot change the install profile from %new_profile to %profile once Drupal is installed.', ['%profile' => $install_profile, '%new_profile' => $core_extension['profile']]));
+ $config_importer->logError($this->t('Cannot change the install profile from %profile to %new_profile once Drupal is installed.', ['%profile' => $install_profile, '%new_profile' => $core_extension['profile']]));
}
}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index 9d3989c..4024b7f 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -692,7 +692,7 @@ class ConfigImporterTest extends KernelTestBase {
// does not use an install profile. This situation should be impossible
// to get in but site's can removed the install profile setting from
// settings.php so the test is valid.
- $this->assertEqual(['Cannot change the install profile from <em class="placeholder">this_will_not_work</em> to <em class="placeholder"></em> once Drupal is installed.'], $error_log);
+ $this->assertEqual(['Cannot change the install profile from <em class="placeholder"></em> to <em class="placeholder">this_will_not_work</em> once Drupal is installed.'], $error_log);
}
}