diff --git a/core/lib/Drupal/Core/Installer/Exception/ActiveConfigurationExistsException.php b/core/lib/Drupal/Core/Installer/Exception/ActiveConfigurationExistsException.php index 8bdb3a7..a688d1e 100644 --- a/core/lib/Drupal/Core/Installer/Exception/ActiveConfigurationExistsException.php +++ b/core/lib/Drupal/Core/Installer/Exception/ActiveConfigurationExistsException.php @@ -17,10 +17,8 @@ class ActiveConfigurationExistsException extends AlreadyInstalledException { /** * {@inheritdoc} */ - public function __construct(TranslationInterface $string_translation) { - $this->specificMessage = 'Active configuration already exists.'; - - parent::__construct($string_translation); + public function __construct(TranslationInterface $string_translation, $message = '') { + parent::__construct($string_translation, $this->t('
  • Active configuration already exists.
  • ')); } } diff --git a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php index e57c165..412b09b 100644 --- a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php +++ b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php @@ -15,24 +15,20 @@ abstract class AlreadyInstalledException extends InstallerException { /** - * @var string - * A specific message set from a class implementing this Exception. - */ - protected $specificMessage = ''; - - /** * Constructs a new "already installed" exception. * * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation * The string translation manager. + * @var string $specific_message + * A specific message set from a class implementing this Exception. */ - public function __construct(TranslationInterface $string_translation) { + public function __construct(TranslationInterface $string_translation, $specific_message = '') { $this->stringTranslation = $string_translation; $title = $this->t('Drupal already installed.'); $message = "