Updated to Drupal 8.5. Core Media not yet in use.

[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 fe7fc222d0a260c49ebb9c1f2bd7201fc04fb98f..8056f33ce13d103fadc5366281be9feb164a28db 100644 (file)
--- a/web/core/modules/user/src/UserData.php
+++ b/web/core/modules/user/src/UserData.php
@@ -48,30 +48,26 @@ class UserData implements UserDataInterface {
       }
       return NULL;
     }
+    $return = [];
     // If $module and $uid were passed, return data keyed by name.
-    elseif (isset($uid)) {
-      $return = [];
+    if (isset($uid)) {
       foreach ($result as $record) {
         $return[$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
       return $return;
     }
     // If $module and $name were passed, return data keyed by uid.
-    elseif (isset($name)) {
-      $return = [];
+    if (isset($name)) {
       foreach ($result as $record) {
         $return[$record->uid] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
       return $return;
     }
     // If only $module was passed, return data keyed by uid and name.
-    else {
-      $return = [];
-      foreach ($result as $record) {
-        $return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
-      }
-      return $return;
+    foreach ($result as $record) {
+      $return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
     }
+    return $return;
   }
 
   /**