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

[yaffs-website] / web / core / modules / user / src / ContextProvider / CurrentUserContext.php

diff --git a/web/core/modules/user/src/ContextProvider/CurrentUserContext.php b/web/core/modules/user/src/ContextProvider/CurrentUserContext.php
index e9eccd8190b18ac3de2a94cd446ad08b3bf1a987..aacc5f774afbeb7ce9f4cc665895bb70cabe3e36 100644 (file)
--- a/web/core/modules/user/src/ContextProvider/CurrentUserContext.php
+++ b/web/core/modules/user/src/ContextProvider/CurrentUserContext.php
@@ -50,6 +50,12 @@ class CurrentUserContext implements ContextProviderInterface {
   public function getRuntimeContexts(array $unqualified_context_ids) {
     $current_user = $this->userStorage->load($this->account->id());
 
+    if ($current_user) {
+      // @todo Do not validate protected fields to avoid bug in TypedData,
+      //   remove this in https://www.drupal.org/project/drupal/issues/2934192.
+      $current_user->_skipProtectedUserFieldConstraint = TRUE;
+    }
+
     $context = new Context(new ContextDefinition('entity:user', $this->t('Current user')), $current_user);
     $cacheability = new CacheableMetadata();
     $cacheability->setCacheContexts(['user']);