diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-01 14:08:40 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-01 14:08:40 +0100 |
| commit | e23cd3501901fb6b816df37f4f0394d5ffa2a4dd (patch) | |
| tree | 3f09d0850bf66a4fe5cc6d9a0751e116550898c3 | |
| parent | 95199013f05849fde0b1f732c8b799b57548e8d8 (diff) | |
| parent | 1601d9235a69dff26f23263d53228d632985a71d (diff) | |
| download | nextcloud-server-e23cd3501901fb6b816df37f4f0394d5ffa2a4dd.tar.gz nextcloud-server-e23cd3501901fb6b816df37f4f0394d5ffa2a4dd.zip | |
Merge pull request #21953 from owncloud/make-enable_avatars-more-robust
Make enable_avatars setting more robust
| -rw-r--r-- | core/js/config.php | 2 | ||||
| -rw-r--r-- | lib/private/templatelayout.php | 2 | ||||
| -rw-r--r-- | settings/personal.php | 2 | ||||
| -rw-r--r-- | settings/users.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/js/config.php b/core/js/config.php index 708da777ee4..9ea8f3864d1 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -140,7 +140,7 @@ $array = array( 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true), 'version' => implode('.', \OCP\Util::getVersion()), 'versionstring' => OC_Util::getVersionString(), - 'enable_avatars' => \OC::$server->getConfig()->getSystemValue('enable_avatars', true), + 'enable_avatars' => \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true, 'lost_password_link'=> \OC::$server->getConfig()->getSystemValue('lost_password_link', null), 'modRewriteWorking' => (getenv('front_controller_active') === 'true'), ) diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 7f17ab15335..bc66c0dfb1e 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -130,7 +130,7 @@ class TemplateLayout extends \OC_Template { $this->assign('user_displayname', $userDisplayName); $this->assign('user_uid', \OC_User::getUser()); $this->assign('appsmanagement_active', $appsMgmtActive); - $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true)); + $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true) === true); if (\OC_User::getUser() === false) { $this->assign('userAvatarSet', false); 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')); |