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

[yaffs-website] / web / core / modules / user / src / Entity / User.php

diff --git a/web/core/modules/user/src/Entity/User.php b/web/core/modules/user/src/Entity/User.php
index 7529532581e9ee847dee6789f214c800dba3b5bc..54439cff9323894dc98e05655ea5043d58a5766b 100644 (file)
--- a/web/core/modules/user/src/Entity/User.php
+++ b/web/core/modules/user/src/Entity/User.php
@@ -9,6 +9,8 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\user\RoleInterface;
+use Drupal\user\StatusItem;
+use Drupal\user\TimeZoneItem;
 use Drupal\user\UserInterface;
 
 /**
@@ -498,11 +500,13 @@ class User extends ContentEntityBase implements UserInterface {
       ->addPropertyConstraints('value', [
         'AllowedValues' => ['callback' => __CLASS__ . '::getAllowedTimezones'],
       ]);
+    $fields['timezone']->getItemDefinition()->setClass(TimeZoneItem::class);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('User status'))
       ->setDescription(t('Whether the user is active or blocked.'))
       ->setDefaultValue(FALSE);
+    $fields['status']->getItemDefinition()->setClass(StatusItem::class);
 
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Created'))