diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-02-14 09:22:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 09:22:02 -0600 |
| commit | c5dffc465cbaef7c58d0ef4d9c322c0a597e8aed (patch) | |
| tree | c05963e8c0adb01d5bdb41f6a763908fa904a575 /lib/private | |
| parent | 257e28f46dd732ea2a9b379c4b1655bb19cd0c7e (diff) | |
| parent | 200a28255e058843465c63080d917170de293ee6 (diff) | |
| download | nextcloud-server-c5dffc465cbaef7c58d0ef4d9c322c0a597e8aed.tar.gz nextcloud-server-c5dffc465cbaef7c58d0ef4d9c322c0a597e8aed.zip | |
Merge pull request #3472 from nextcloud/enable-avatars-always
Always enable avatars
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Template/JSConfigHelper.php | 2 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 1 | ||||
| -rw-r--r-- | lib/private/legacy/template.php | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index f17c6a16194..1c241989fd2 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -204,7 +204,7 @@ class JSConfigHelper { 'session_keepalive' => $this->config->getSystemValue('session_keepalive', true), 'version' => implode('.', \OCP\Util::getVersion()), 'versionstring' => \OC_Util::getVersionString(), - 'enable_avatars' => $this->config->getSystemValue('enable_avatars', true) === true, + 'enable_avatars' => true, // here for legacy reasons - to not crash existing code that relies on this value 'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null), 'modRewriteWorking' => (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'), ]), diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 19fc9462185..f1621363237 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -100,7 +100,6 @@ 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) === true); if (\OC_User::getUser() === false) { $this->assign('userAvatarSet', false); diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index a07bf214f34..09e3d130f49 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -121,10 +121,8 @@ class OC_Template extends \OC\Template\Base { OC_Util::addStyle("styles",null,true); // avatars - if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) { - \OC_Util::addScript('jquery.avatar', null, true); - \OC_Util::addScript('placeholder', null, true); - } + \OC_Util::addScript('jquery.avatar', null, true); + \OC_Util::addScript('placeholder', null, true); OC_Util::addVendorScript('select2/select2'); OC_Util::addVendorStyle('select2/select2', null, true); |