diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-03-27 15:33:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-27 15:33:57 +0200 |
commit | 0be7548e22afa44da030484aaaee2fbfac3b2d51 (patch) | |
tree | dcffe3cc4655714554a2925fe2ef2f2ab042cb80 /apps | |
parent | 6741b373560f969707dd96be44d18182c1ec4848 (diff) | |
parent | 17afaa488faadac42ac85d71444140b2e14337cb (diff) | |
download | nextcloud-server-0be7548e22afa44da030484aaaee2fbfac3b2d51.tar.gz nextcloud-server-0be7548e22afa44da030484aaaee2fbfac3b2d51.zip |
Merge pull request #37346 from nextcloud/fix/34557/undefined-getExtStorageHome
fix undefined method getExtStorageHome()
Diffstat (limited to 'apps')
-rw-r--r-- | apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php | 2 | ||||
-rw-r--r-- | apps/user_ldap/lib/User/OfflineUser.php | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php b/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php index 0d3c5b8f3f3..6f2a1007c16 100644 --- a/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php +++ b/apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php @@ -62,7 +62,7 @@ class ExtStorageConfigHandler extends UserContext implements IConfigHandler { } $ldapUser = $access->userManager->get($user->getUID()); - $extHome = $ldapUser->getExtStorageHome(); + $extHome = $ldapUser !== null ? $ldapUser->getExtStorageHome() : ''; return $this->processInput($optionValue, $extHome); } diff --git a/apps/user_ldap/lib/User/OfflineUser.php b/apps/user_ldap/lib/User/OfflineUser.php index 4adf5302bfe..6801a21a1d2 100644 --- a/apps/user_ldap/lib/User/OfflineUser.php +++ b/apps/user_ldap/lib/User/OfflineUser.php @@ -60,6 +60,7 @@ class OfflineUser { * @var string $foundDeleted the timestamp when the user was detected as unavailable */ protected $foundDeleted; + protected ?string $extStorageHome = null; /** * @var string $email */ @@ -207,6 +208,13 @@ class OfflineUser { return (int)$this->foundDeleted; } + public function getExtStorageHome(): string { + if ($this->extStorageHome === null) { + $this->fetchDetails(); + } + return (string)$this->extStorageHome; + } + /** * getter for having active shares * @return bool @@ -227,6 +235,7 @@ class OfflineUser { 'uid' => 'user_ldap', 'homePath' => 'user_ldap', 'foundDeleted' => 'user_ldap', + 'extStorageHome' => 'user_ldap', 'email' => 'settings', 'lastLogin' => 'login', ]; |