projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgraded drupal core with security updates
[yaffs-website]
/
web
/
core
/
modules
/
user
/
src
/
UserData.php
diff --git
a/web/core/modules/user/src/UserData.php
b/web/core/modules/user/src/UserData.php
index 735c3de4e61435ae89cdcd5c3c5e620692d68813..a5bc10094bbf3edff4571e38fd7db932d0ea3fe6 100644
(file)
--- a/
web/core/modules/user/src/UserData.php
+++ b/
web/core/modules/user/src/UserData.php
@@
-40,7
+40,7
@@
class UserData implements UserDataInterface {
$query->condition('name', $name);
}
$result = $query->execute();
$query->condition('name', $name);
}
$result = $query->execute();
- // If $module, $uid, and $name w
as
passed, return the value.
+ // If $module, $uid, and $name w
ere
passed, return the value.
if (isset($name) && isset($uid)) {
$result = $result->fetchAllAssoc('uid');
if (isset($result[$uid])) {
if (isset($name) && isset($uid)) {
$result = $result->fetchAllAssoc('uid');
if (isset($result[$uid])) {
@@
-48,7
+48,7
@@
class UserData implements UserDataInterface {
}
return NULL;
}
}
return NULL;
}
- // If $module and $uid w
as passed, return the name/value pairs
.
+ // If $module and $uid w
ere passed, return data keyed by name
.
elseif (isset($uid)) {
$return = [];
foreach ($result as $record) {
elseif (isset($uid)) {
$return = [];
foreach ($result as $record) {
@@
-56,7
+56,7
@@
class UserData implements UserDataInterface {
}
return $return;
}
}
return $return;
}
- // If $module and $name w
as passed, return the uid/value pairs
.
+ // If $module and $name w
ere passed, return data keyed by uid
.
elseif (isset($name)) {
$return = [];
foreach ($result as $record) {
elseif (isset($name)) {
$return = [];
foreach ($result as $record) {