diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-11 21:42:27 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-11 21:42:27 +0100 |
| commit | 037fcde1334d7b4d2bdeaaad0a71adc692b27ff8 (patch) | |
| tree | 6f10b1a8d54cfea8cc3adf343de0bbf0f115f3d2 /lib/user.php | |
| parent | f58ed7a509da54fcd29e21dc6fc75528822157a4 (diff) | |
| parent | 58e57151e51a02788377f761b183c15cd03b0ef0 (diff) | |
| download | nextcloud-server-037fcde1334d7b4d2bdeaaad0a71adc692b27ff8.tar.gz nextcloud-server-037fcde1334d7b4d2bdeaaad0a71adc692b27ff8.zip | |
Merge branch 'master' into fixing-1424-master
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/user.php b/lib/user.php index 76c4c45ee30..0ab224bb15f 100644 --- a/lib/user.php +++ b/lib/user.php @@ -445,10 +445,12 @@ class OC_User { * Check whether a specified user can change his display name */ public static function canUserChangeDisplayName($uid) { - foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) { - if($backend->userExists($uid)) { - return true; + if (OC_Config::getValue('allow_user_to_change_display_name', true)) { + foreach(self::$_usedBackends as $backend) { + if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) { + if($backend->userExists($uid)) { + return true; + } } } } @@ -485,7 +487,7 @@ class OC_User { */ public static function getHome($uid) { foreach(self::$_usedBackends as $backend) { - if($backend->implementsActions(OC_USER_BACKEND_GET_HOME)) { + if($backend->implementsActions(OC_USER_BACKEND_GET_HOME) && $backend->userExists($uid)) { $result=$backend->getHome($uid); if($result) { return $result; |