mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23329 from owncloud/fix-21555 

Avatar must be saved after login is done and external storages set up…
This commit is contained in:
Thomas Müller 2016-03-21 09:47:50 +01:00
parent 16782484b9 d8621c78ed
commit 8442516e10
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/user_ldap/lib/user/user.php
View File

@ -217,7 +217,11 @@ class User {
foreach ($attrs as $attr) { foreach ($attrs as $attr) {
if(isset($ldapEntry[$attr])) { if(isset($ldapEntry[$attr])) {
$this->avatarImage = $ldapEntry[$attr][0]; $this->avatarImage = $ldapEntry[$attr][0];
$this->updateAvatar(); // the call to the method that saves the avatar in the file
// system must be postponed after the login. It is to ensure
// external mounts are mounted properly (e.g. with login
// credentials from the session).
\OCP\Util::connectHook('OC_User', 'post_login', $this, 'updateAvatarPostLogin');
break; break;
} }
} }
@ -461,6 +465,17 @@ class User {
} }
} }
/**
* called by a post_login hook to save the avatar picture
*
* @param array $params
*/
public function updateAvatarPostLogin($params) {
if(isset($params['uid']) && $params['uid'] === $this->getUsername()) {
$this->updateAvatar();
}
}
/** /**
* @brief attempts to get an image from LDAP and sets it as ownCloud avatar * @brief attempts to get an image from LDAP and sets it as ownCloud avatar
* @return null * @return null

1
apps/user_ldap/tests/user/user.php
View File

@ -798,6 +798,7 @@ class Test_User_User extends \Test\TestCase {
} }
$userMock->processAttributes($record); $userMock->processAttributes($record);
\OC_Hook::emit('OC_User', 'post_login', array('uid' => $uid));
} }
public function emptyHomeFolderAttributeValueProvider() { public function emptyHomeFolderAttributeValueProvider() {