projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[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 54439cff9323894dc98e05655ea5043d58a5766b..b8675866f6f47163ce6b0a64e85a78b8f5ddd6b0 100644
(file)
--- a/
web/core/modules/user/src/Entity/User.php
+++ b/
web/core/modules/user/src/Entity/User.php
@@
-22,6
+22,13
@@
use Drupal\user\UserInterface;
* @ContentEntityType(
* id = "user",
* label = @Translation("User"),
* @ContentEntityType(
* id = "user",
* label = @Translation("User"),
+ * label_collection = @Translation("Users"),
+ * label_singular = @Translation("user"),
+ * label_plural = @Translation("users"),
+ * label_count = @PluralTranslation(
+ * singular = "@count user",
+ * plural = "@count users",
+ * ),
* handlers = {
* "storage" = "Drupal\user\UserStorage",
* "storage_schema" = "Drupal\user\UserStorageSchema",
* handlers = {
* "storage" = "Drupal\user\UserStorage",
* "storage_schema" = "Drupal\user\UserStorageSchema",
@@
-348,6
+355,7
@@
class User extends ContentEntityBase implements UserInterface {
public function isAuthenticated() {
return $this->id() > 0;
}
public function isAuthenticated() {
return $this->id() > 0;
}
+
/**
* {@inheritdoc}
*/
/**
* {@inheritdoc}
*/
@@
-420,7
+428,7
@@
class User extends ContentEntityBase implements UserInterface {
'name' => [LanguageInterface::LANGCODE_DEFAULT => ''],
// Explicitly set the langcode to ensure that field definitions do not
// need to be fetched to figure out a default.
'name' => [LanguageInterface::LANGCODE_DEFAULT => ''],
// Explicitly set the langcode to ensure that field definitions do not
// need to be fetched to figure out a default.
- 'langcode' => [LanguageInterface::LANGCODE_DEFAULT => LanguageInterface::LANGCODE_NOT_SPECIFIED]
+ 'langcode' => [LanguageInterface::LANGCODE_DEFAULT => LanguageInterface::LANGCODE_NOT_SPECIFIED]
,
], $entity_type->id());
}
return clone static::$anonymousUser;
], $entity_type->id());
}
return clone static::$anonymousUser;