diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-01-27 15:17:25 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-27 15:17:25 +0100 |
| commit | 1601d9235a69dff26f23263d53228d632985a71d (patch) | |
| tree | 72f44db7dafe62d161366a284315755217e9f903 /settings | |
| parent | 308396b770f3b1b41ba31ff0ee889d485b14d14a (diff) | |
| download | nextcloud-server-1601d9235a69dff26f23263d53228d632985a71d.tar.gz nextcloud-server-1601d9235a69dff26f23263d53228d632985a71d.zip | |
Make enable_avatars setting more robust
* handles the setting in the same way everywhere
* fixes #21949
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/personal.php | 2 | ||||
| -rw-r--r-- | settings/users.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/personal.php b/settings/personal.php index 261a459a921..d2d4fc90f5e 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -149,7 +149,7 @@ $tmpl->assign('activelanguage', $userLang); $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser())); $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser())); $tmpl->assign('displayName', OC_User::getDisplayName()); -$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true)); +$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true) === true); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); $tmpl->assign('certs', $certificateManager->listCertificates()); $tmpl->assign('showCertificates', $enableCertImport); diff --git a/settings/users.php b/settings/users.php index 9d89ff65b4a..0dff85c1ade 100644 --- a/settings/users.php +++ b/settings/users.php @@ -116,7 +116,7 @@ $tmpl->assign('quota_preset', $quotaPreset); $tmpl->assign('default_quota', $defaultQuota); $tmpl->assign('defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined); $tmpl->assign('recoveryAdminEnabled', $recoveryAdminEnabled); -$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true)); +$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true); $tmpl->assign('show_storage_location', $config->getAppValue('core', 'umgmt_show_storage_location', 'false')); $tmpl->assign('show_last_login', $config->getAppValue('core', 'umgmt_show_last_login', 'false')); |