opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to drupal-org-drupal 8.0.0-rc2. For more information, see https://www.drupal.org/node/2598668

Browse source
This commit is contained in:
Pantheon Automation 2015-10-21 21:44:50 -07:00 • committed by Greg Anderson
parent f32e58e4b1
commit 8e18df8c36
3062 changed files with 15044 additions and 172506 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/modules/user/user.module
View file

@ -7,7 +7,6 @@ use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Session\AccountInterface;
@ -888,7 +887,7 @@ function user_view($account, $view_mode = 'full', $langcode = NULL) {
/**
* Constructs a drupal_render() style array from an array of loaded users.
*
* @param \Drupal\user\UserInterface[] $account
* @param \Drupal\user\UserInterface[] $accounts
* An array of user accounts as returned by User::loadMultiple().
* @param string $view_mode
* (optional) View mode, e.g., 'full', 'teaser', etc. Defaults to 'teaser.'
@ -1190,7 +1189,7 @@ function user_role_revoke_permissions($rid, array $permissions = array()) {
* language.
*
* @return array
* An array containint various information about the message.
* An array containing various information about the message.
* See \Drupal\Core\Mail\MailManagerInterface::mail() for details.
*
* @see user_mail_tokens()