Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / user / user.module

diff --git a/web/core/modules/user/user.module b/web/core/modules/user/user.module
index b865e958d9e9ef64ea48598db6ba7b1baa3b12cf..2d7d24a006386d024b3c1aba91975cb98e846dd2 100644 (file)
--- a/web/core/modules/user/user.module
+++ b/web/core/modules/user/user.module
@@ -31,6 +31,8 @@ use Drupal\user\UserInterface;
  *
  * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
  *   Use \Drupal\user\UserInterface::USERNAME_MAX_LENGTH instead.
+ *
+ * @see https://www.drupal.org/node/2831620
  */
 const USERNAME_MAX_LENGTH = 60;
 
@@ -39,6 +41,8 @@ const USERNAME_MAX_LENGTH = 60;
  *
  * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_ADMINISTRATORS_ONLY instead.
+ *
+ * @see https://www.drupal.org/node/2831620
  */
 const USER_REGISTER_ADMINISTRATORS_ONLY = 'admin_only';
 
@@ -47,6 +51,8 @@ const USER_REGISTER_ADMINISTRATORS_ONLY = 'admin_only';
  *
  * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_VISITORS instead.
+ *
+ * @see https://www.drupal.org/node/2831620
  */
 const USER_REGISTER_VISITORS = 'visitors';
 
@@ -57,6 +63,8 @@ const USER_REGISTER_VISITORS = 'visitors';
  * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
  *   Use \Drupal\user\UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL
  *   instead.
+ *
+ * @see https://www.drupal.org/node/2831620
  */
 const USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL = 'visitors_admin_approval';
 
@@ -78,7 +86,7 @@ function user_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Setting permissions') . '</dt>';
       $output .= '<dd>' . t('After creating roles, you can set permissions for each role on the <a href=":permissions_user">Permissions page</a>. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating  a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', [':permissions_user' => \Drupal::url('user.admin_permissions')]) . '</dd>';
       $output .= '<dt>' . t('Managing account settings') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":accounts">Account settings page</a> allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', [':accounts'  => \Drupal::url('entity.user.admin_form')]) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":accounts">Account settings page</a> allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', [':accounts' => \Drupal::url('entity.user.admin_form')]) . '</dd>';
       $output .= '<dt>' . t('Managing user account fields') . '</dt>';
       $output .= '<dd>' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the <a href=":accounts">Account settings page</a>. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the <a href=":field_help">Field module help page</a>.', [':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', ['name' => 'field']) : '#', ':accounts' => \Drupal::url('entity.user.admin_form')]) . '</dd>';
       $output .= '</dl>';
@@ -169,7 +177,7 @@ function user_entity_extra_field_info() {
 
   $fields['user']['user']['display']['member_for'] = [
     'label' => t('Member for'),
-    'description' => t('User module \'member for\' view element.'),
+    'description' => t("User module 'member for' view element."),
     'weight' => 5,
   ];
 
@@ -1003,7 +1011,7 @@ function user_user_role_insert(RoleInterface $role) {
     $action = Action::create([
       'id' => $add_id,
       'type' => 'user',
-      'label' => t('Add the @label role to the selected users', ['@label' => $role->label()]),
+      'label' => t('Add the @label role to the selected user(s)', ['@label' => $role->label()]),
       'configuration' => [
         'rid' => $role->id(),
       ],
@@ -1016,7 +1024,7 @@ function user_user_role_insert(RoleInterface $role) {
     $action = Action::create([
       'id' => $remove_id,
       'type' => 'user',
-      'label' => t('Remove the @label role from the selected users', ['@label' => $role->label()]),
+      'label' => t('Remove the @label role from the selected user(s)', ['@label' => $role->label()]),
       'configuration' => [
         'rid' => $role->id(),
       ],