Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / lib / Drupal / Core / StringTranslation / TranslatableMarkup.php

diff --git a/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php b/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
index 80162125850fc95314e7cab8444fccfee5e8b3ca..3e9461accd8b367d10ea3a1c6eec003c829ce5eb 100644 (file)
--- a/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
@@ -23,13 +23,6 @@ class TranslatableMarkup extends FormattableMarkup {
 
   use ToStringTrait;
 
-  /**
-   * The string to be translated.
-   *
-   * @var string
-   */
-  protected $string;
-
   /**
    * The translated markup without placeholder replacements.
    *
@@ -139,8 +132,7 @@ class TranslatableMarkup extends FormattableMarkup {
       $message = $string instanceof TranslatableMarkup ? '$string ("' . $string->getUntranslatedString() . '") must be a string.' : '$string ("' . (string) $string . '") must be a string.';
       throw new \InvalidArgumentException($message);
     }
-    $this->string = $string;
-    $this->arguments = $arguments;
+    parent::__construct($string, $arguments);
     $this->options = $options;
     $this->stringTranslation = $string_translation;
   }