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

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

14
web/core/modules/user/src/UserData.php
View file

@ -50,7 +50,7 @@ class UserData implements UserDataInterface {
}
// If $module and $uid was passed, return the name/value pairs.
elseif (isset($uid)) {
$return = array();
$return = [];
foreach ($result as $record) {
$return[$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
}
@ -58,7 +58,7 @@ class UserData implements UserDataInterface {
}
// If $module and $name was passed, return the uid/value pairs.
elseif (isset($name)) {
$return = array();
$return = [];
foreach ($result as $record) {
$return[$record->uid] = ($record->serialized ? unserialize($record->value) : $record->value);
}
@ -66,7 +66,7 @@ class UserData implements UserDataInterface {
}
// If only $module was passed, return data keyed by uid and name.
else {
$return = array();
$return = [];
foreach ($result as $record) {
$return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
}
@ -84,15 +84,15 @@ class UserData implements UserDataInterface {
$serialized = 1;
}
$this->connection->merge('users_data')
->keys(array(
->keys([
'uid' => $uid,
'module' => $module,
'name' => $name,
))
->fields(array(
])
->fields([
'value' => $value,
'serialized' => $serialized,
))
])
->execute();
}